summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'master' into developRichard van der Hoff2020-07-081-1/+1
|\|
| * 1.16.0Richard van der Hoff2020-07-081-1/+1
* | Stop populating unused table `local_invites`. (#7793)Richard van der Hoff2020-07-073-80/+24
* | Refactor getting replication updates from database v2. (#7740)Erik Johnston2020-07-0710-195/+335
* | Add documentation for JWT login type and improve sample config. (#7776)Patrick Cloke2020-07-062-25/+58
* | Convert the appservice handler to async/await. (#7775)Patrick Cloke2020-07-062-43/+32
* | Don't ignore `set_tweak` actions with no explicit `value`. (#7766)reivilibre2020-07-061-4/+27
* | Allow to use higher versions of prometheus_client (#7780)Oliver Kurz2020-07-061-1/+1
* | isort 5 compatibility (#7786)Will Hunt2020-07-0515-25/+15
* | Merge different Resource implementation classes (#7732)Erik Johnston2020-07-0315-309/+256
* | Fix inconsistent handling of upper and lower cases of email addresses. (#7021)Dirk Klimpel2020-07-035-18/+84
* | Merge tag 'v1.16.0rc2' into developPatrick Cloke2020-07-023-3/+3
|\|
| * 1.16.0rc2Patrick Cloke2020-07-021-1/+1
| * Merge branch 'master' into release-v1.16.0Patrick Cloke2020-07-0211-97/+106
| |\
| * | Fix new metric where we used ms instead of seconds (#7771)Erik Johnston2020-07-012-2/+2
* | | Merge branch 'master' into developPatrick Cloke2020-07-0211-97/+106
|\ \ \ | | |/ | |/|
| * | 1.15.2Patrick Cloke2020-07-021-1/+1
| * | Correctly handle outliers as prev events over federationErik Johnston2020-07-021-3/+3
| * | Ensure that HTML pages served from Synapse include headers to avoid embedding.Patrick Cloke2020-07-0210-94/+103
* | | Hack to add push priority to push notifications (#7765)reivilibre2020-07-011-3/+14
* | | Add early returns to `_check_for_soft_fail` (#7769)Richard van der Hoff2020-07-011-64/+55
* | | Use symbolic names for replication stream names (#7768)Richard van der Hoff2020-07-0110-22/+26
* | | Type checking for `FederationHandler` (#7770)Richard van der Hoff2020-07-011-17/+30
* | | Fix incorrect error message when database CTYPE was set incorrectly. (#7760)Richard van der Hoff2020-07-011-1/+1
| |/ |/|
* | 1.16.0rc1Andrew Morgan2020-07-011-1/+1
* | Back out MSC2625 implementation (#7761)Brendan Abolivier2020-07-016-142/+33
* | Additional configuration options for auto-join rooms (#7763)Patrick Cloke2020-06-303-67/+273
* | Add some metrics for inbound and outbound federation processing times (#7755)Erik Johnston2020-06-304-17/+42
* | Explain the purpose of the "tests" conditional dependency requirement (#7751)Andrew Morgan2020-06-301-0/+4
* | Add another yield point to state res v2 (#7746)Erik Johnston2020-06-261-2/+10
* | Yield during large v2 state res. (#7735)Erik Johnston2020-06-243-11/+52
* | add org.matrix.login.jwt so that m.login.jwt can be deprecated (#7675)Sorunome2020-06-241-1/+4
* | Set Content-Length for Metrics requests (#7730)Christian Svensson2020-06-231-1/+4
* | Allow local media to be marked as safe from being quarantined. (#7718)Patrick Cloke2020-06-224-35/+52
* | Convert directory handler to async/await (#7727)Patrick Cloke2020-06-222-40/+32
* | Speed up state res v2 across large state differences. (#7725)Erik Johnston2020-06-191-1/+2
* | add a commentRichard van der Hoff2020-06-181-0/+2
* | Merge pull request #7716 from matrix-org/babolivier/unread_fixBrendan Abolivier2020-06-172-2/+2
|\ \
| * | Fix unread counts in syncBrendan Abolivier2020-06-172-2/+2
* | | Convert the typing handler to async/await. (#7679)Patrick Cloke2020-06-171-18/+11
* | | Require parameterized package version to be at least 0.7.0. (#7680)Oleg Girko2020-06-171-1/+2
|/ /
* | Add support for using rust-python-jaeger-reporter (#7697)Erik Johnston2020-06-171-3/+36
* | Support running multiple media repos. (#7706)Erik Johnston2020-06-172-3/+21
* | Fetch from the r0 media path instead of the unspecced v1. (#7714)Patrick Cloke2020-06-171-4/+4
* | Implement unread counter (MSC2625) (#7673)Brendan Abolivier2020-06-176-32/+141
|\ \
| * \ Merge branch 'develop' into babolivier/mark_unreadBrendan Abolivier2020-06-1551-271/+218
| |\ \
| * \ \ Merge branch 'develop' into babolivier/mark_unreadBrendan Abolivier2020-06-1513-103/+295
| |\ \ \
| * | | | Incorporate reviewBrendan Abolivier2020-06-151-15/+11
| * | | | LintBrendan Abolivier2020-06-121-3/+8
| * | | | Incorporate review bitsBrendan Abolivier2020-06-122-21/+19
| * | | | Pre-populate the unread_count columnBrendan Abolivier2020-06-121-0/+5
| * | | | Don't update the schema versionBrendan Abolivier2020-06-122-1/+1
| * | | | Use attr instead of a dictBrendan Abolivier2020-06-121-21/+31
| * | | | Fix summary rotationBrendan Abolivier2020-06-121-12/+35
| * | | | Log for invalid values of notifBrendan Abolivier2020-06-111-0/+6
| * | | | Fix SQLBrendan Abolivier2020-06-111-3/+3
| * | | | Fix schema updateBrendan Abolivier2020-06-111-1/+1
| * | | | LintBrendan Abolivier2020-06-111-1/+2
| * | | | Save the count of unread messages to event_push_summaryBrendan Abolivier2020-06-113-20/+53
| * | | | Actually act on mark_unreadBrendan Abolivier2020-06-111-3/+7
| * | | | Appease mypyBrendan Abolivier2020-06-101-1/+1
| * | | | LintBrendan Abolivier2020-06-101-3/+3
| * | | | Use temporary prefixes as per the MSCBrendan Abolivier2020-06-103-3/+5
| * | | | Use a more efficient way of calculating countersBrendan Abolivier2020-06-101-23/+20
| * | | | Add a new unread_counter to sync responsesBrendan Abolivier2020-06-103-3/+28
| * | | | Rename dont_push into mark_unreadBrendan Abolivier2020-06-102-5/+4
| * | | | Merge branch 'develop' into babolivier/mark_unreadBrendan Abolivier2020-06-10616-26200/+42607
| |\ \ \ \
| * | | | | Add experimental "dont_push" push action to suppress push for notificationsMatthew Hodgson2019-09-191-5/+10
* | | | | | fix broken link in sample config (#7712)Richard van der Hoff2020-06-161-1/+1
* | | | | | Refactor getting replication updates from database. (#7636)Erik Johnston2020-06-168-72/+250
* | | | | | Fix "argument of type 'ObservableDeferred' is not iterable" error (#7708)Patrick Cloke2020-06-162-5/+6
* | | | | | Include a user agent in federation requests. (#7677)Patrick Cloke2020-06-163-4/+32
* | | | | | Replace all remaining six usage with native Python 3 equivalents (#7704)Dagfinn Ilmari Mannsåker2020-06-1657-201/+90
* | | | | | Convert the device message and pagination handlers to async/await. (#7678)Patrick Cloke2020-06-162-31/+18
* | | | | | Create a ListenerConfig object (#7681)Richard van der Hoff2020-06-167-148/+216
* | | | | | Merge branch 'master' into developBrendan Abolivier2020-06-163-9/+11
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | 1.15.1Brendan Abolivier2020-06-161-1/+1
| * | | | | Wrap register_device coroutine in an ensureDeferred (#7684)Andrew Morgan2020-06-161-5/+7
| * | | | | Enable 3PID add/bind/unbind endpoints on r0 routesBrendan Abolivier2020-06-151-3/+3
* | | | | | Ensure the body is a string before comparing push rules. (#7701)Patrick Cloke2020-06-151-2/+2
* | | | | | Ensure etag is a string for GET room_keys/version response (#7691)Hubert Chathi2020-06-151-0/+1
* | | | | | Update m.id.phone to use 'phone' instead of 'number' (#7687)Andrew Morgan2020-06-151-2/+10
* | | | | | Fix "There was no active span when trying to log." error (#7698)Erik Johnston2020-06-151-0/+1
| |_|_|_|/ |/| | | |
* | | | | Discard RDATA from already seen positions. (#7648)Patrick Cloke2020-06-153-6/+33
* | | | | Replace iteritems/itervalues/iterkeys with native versions. (#7692)Patrick Cloke2020-06-1546-263/+183
* | | | | Fix warnings about losing log context during UI auth. (#7688)Patrick Cloke2020-06-121-1/+1
* | | | | Fix a typo when comparing the URI & method during UI Auth. (#7689)Patrick Cloke2020-06-121-1/+1
| |_|_|/ |/| | |
* | | | Remove "user_id" from GET /presence. (#7606)Will Hunt2020-06-111-1/+3
* | | | Merge branch 'master' into developBrendan Abolivier2020-06-111-1/+1
|\| | |
| * | | 1.15.0 v1.15.0 github/release-v1.15.0 release-v1.15.0Brendan Abolivier2020-06-111-1/+1
| | |/ | |/|
* | | Increase the default SAML session expirary time to 15 minutes. (#7664)Patrick Cloke2020-06-111-2/+2
* | | fix typo in sample_config.yaml (#7652)wondratsch2020-06-111-1/+1
* | | Take out a lock before modifying _CACHES (#7663)Richard van der Hoff2020-06-101-5/+15
* | | Add option to enable encryption by default for new rooms (#7639)Andrew Morgan2020-06-105-29/+144
* | | Clean-up the fallback login code. (#7657)Patrick Cloke2020-06-103-64/+129
|/ /
* | 1.15.0rc1 v1.15.0rc1Brendan Abolivier2020-06-091-1/+1
* | Revert "1.15.0rc1"Brendan Abolivier2020-06-091-1/+1
* | 1.15.0rc1Brendan Abolivier2020-06-091-1/+1
* | Fix bug in account data replication stream. (#7656)Erik Johnston2020-06-095-4/+34
* | Convert the registration handler to async/await. (#7649)Patrick Cloke2020-06-082-68/+47
* | Accept device information at the login fallback endpoint. (#7629)Patrick Cloke2020-06-081-35/+120
* | Convert user directory handler and related classes to async/await. (#7640)Patrick Cloke2020-06-054-107/+73
* | Add an option to disable autojoin for guest accounts (#6637)Travis Ralston2020-06-052-1/+15
* | Update to the stable SSO prefix for UI Auth. (#7630)Patrick Cloke2020-06-051-1/+1
* | Fix type information on `assert_*_is_admin` methods (#7645)Richard van der Hoff2020-06-052-23/+18
* | Remove some unused constants. (#7644)Richard van der Hoff2020-06-051-4/+0
* | Typo fixes.Patrick Cloke2020-06-052-2/+2
* | Allow new users to be registered via the admin API even if the monthly active...Dirk Klimpel2020-06-052-1/+8
* | Add device management to admin API (#7481)Dirk Klimpel2020-06-052-0/+169
* | Attempt to fix PhoneHomeStatsTestCase.test_performance_100 being flaky. (#7634)Patrick Cloke2020-06-051-19/+23
* | Support CS API v0.6.0 (#6585)Andrew Morgan2020-06-051-15/+1
* | Add support for webp thumbnailing (#7586)WGH2020-06-051-0/+1
* | Performance improvements and refactor of Ratelimiter (#7595)Andrew Morgan2020-06-0510-162/+193
* | Fix encryption algorithm typos in tests/comments (#7637)Andrew Morgan2020-06-041-4/+4
* | Advertise the token login type when OpenID Connect is enabled. (#7631)Patrick Cloke2020-06-041-8/+3
* | Cleanups to the OpenID Connect integration (#7628)Richard van der Hoff2020-06-034-83/+125
* | async/await get_user_id_by_threepid (#7620)Andrew Morgan2020-06-033-28/+28
* | Check if the localpart is reserved for guests earlier in the registration flo...Brendan Abolivier2020-06-031-9/+9
* | Fix exceptions when fetching events from a down host. (#7622)Erik Johnston2020-06-031-1/+1
* | Clean up exception handling in SAML2ResponseResource (#7614)Richard van der Hoff2020-06-034-60/+68
* | Fix a bug in automatic user creation with m.login.jwt. (#7585)Olof Johansson2020-06-011-7/+8
* | Process cross-signing keys when resyncing device lists (#7594)Brendan Abolivier2020-06-012-18/+62
* | Email notifications for new users when creating via the Admin API. (#7267)Dirk Klimpel2020-06-011-0/+16
* | Improve performance of _get_state_groups_from_groups_txn (#7567)Dagfinn Ilmari Mannsåker2020-06-011-6/+6
* | Convert groups local and server to async/await. (#7600)Patrick Cloke2020-06-012-190/+149
* | Don't fail all of an iteration of the device list retry loop on error (#7609)Brendan Abolivier2020-06-011-15/+21
* | Use upsert when inserting read receipts (#7607)Dagfinn Ilmari Mannsåker2020-06-011-9/+4
* | Fix 'FederationGroupsRoomsServlet' API when group has room server is not in. ...Erik Johnston2020-05-291-8/+12
* | Make inflight background metrics more efficient. (#7597)Erik Johnston2020-05-291-34/+70
* | Merge branch 'master' into developBrendan Abolivier2020-05-281-1/+1
|\ \
| * | 1.14.0Brendan Abolivier2020-05-281-1/+1
* | | Merge pull request #7584 from matrix-org/erikj/save_and_send_fed_token_in_bgErik Johnston2020-05-272-7/+36
|\ \ \
| * | | Ensure we persist and ack the same tokenErik Johnston2020-05-271-5/+7
| * | | Remove spurious changeErik Johnston2020-05-271-2/+0
| * | | Speed up processing of federation stream RDATA rows.Erik Johnston2020-05-273-2/+31
| |/ /
* | | allow emails to be passed through SAML (#7385)Christopher Cooper2020-05-271-2/+10
* | | Merge tag 'v1.14.0rc2' into developBrendan Abolivier2020-05-275-7/+48
|\| |
| * | 1.14.0rc2Brendan Abolivier2020-05-271-1/+1
| * | Fix sample config docs error (#7581)Jason Robinson2020-05-271-1/+1
| * | Fix up commentsErik Johnston2020-05-271-2/+2
| * | Fix specifying cache factors via env vars with * in name. (#7580)Erik Johnston2020-05-271-5/+39
| * | Don't apply cache factor to event cache. (#7578)Erik Johnston2020-05-271-0/+4
| * | Ensure ReplicationStreamer is always started when replication enabled. (#7579)Erik Johnston2020-05-271-0/+3
* | | Fix incorrect placeholder syntax in database prepartion code (#7575)Andrew Morgan2020-05-271-3/+2
* | | Merge branch 'develop' of github.com:matrix-org/synapse into developBrendan Abolivier2020-05-262-63/+46
|\ \ \ | |/ / |/| |
| * | Convert identity handler to async/await. (#7561)Patrick Cloke2020-05-262-63/+46
* | | Not full release yet, this is rc1Brendan Abolivier2020-05-261-1/+1
* | | 1.14.0Brendan Abolivier2020-05-261-1/+1
|/ /
* | Replace device_27_unique_idx bg update with a fg one (#7562)Richard van der Hoff2020-05-265-62/+94
* | Fix incorrect exception handling in KeyUploadServlet.on_POST (#7563)Richard van der Hoff2020-05-261-1/+1
* | Fix recording of federation stream token (#7564)Richard van der Hoff2020-05-261-24/+44
* | Simplify reap_monthly_active_users (#7558)Richard van der Hoff2020-05-231-59/+41
* | Optimise some references to hs.config (#7546)Richard van der Hoff2020-05-223-19/+32
* | Fix missing CORS headers on OPTION responses (#7560)Erik Johnston2020-05-221-1/+1
* | Add option to move event persistence off master (#7517)Erik Johnston2020-05-2220-73/+378
* | Return 200 OK for all OPTIONS requests (#7534)Patrick Cloke2020-05-223-11/+31
* | Add ability to wait for replication streams (#7542)Erik Johnston2020-05-2218-104/+288
* | Convert sending mail to async/await. (#7557)Erik Johnston2020-05-223-74/+57
* | Use a non-empty RelayState for user interactive auth with SAML. (#7552)Patrick Cloke2020-05-221-1/+4
* | On upgrade room only send canonical alias once. (#7547)Erik Johnston2020-05-221-55/+60
* | Fix exception reporting due to HTTP request errors. (#7556)Erik Johnston2020-05-223-4/+23
* | synapse.metrics: implement detailed memory usage reporting on PyPy (#7536)Ivan Shapovalov2020-05-221-1/+78
* | Fix stacktrace mangling in `patch_inline_callbacks` (#7554)Richard van der Hoff2020-05-221-2/+7
* | mypy for synapse.http.site (#7553)Richard van der Hoff2020-05-221-3/+6
* | Fix some DETECTED VIOLATIONS in the config file (#7550)Richard van der Hoff2020-05-226-29/+36
* | Retry to sync out of sync device lists (#7453)Brendan Abolivier2020-05-212-19/+95
* | Stub out GET presence requests in the frontend proxy (#7545)Richard van der Hoff2020-05-211-17/+4
* | add a commentRichard van der Hoff2020-05-211-0/+3
* | Fix bug in persist events when dealing with non member types. (#7548)Erik Johnston2020-05-211-2/+2
* | Hash passwords earlier in the password reset process (#7538)Patrick Cloke2020-05-204-11/+32
* | Merge branch 'master' into developPatrick Cloke2020-05-191-1/+1
|\ \
| * | 1.13.0Patrick Cloke2020-05-191-1/+1
* | | Omit displayname or avatar_url if they aren't set instead of returning null (...Aaron Raimist2020-05-191-2/+6
* | | Merge tag 'v1.13.0rc3' into developPatrick Cloke2020-05-184-32/+31
|\| |
| * | 1.13.0rc3 v1.13.0rc3Patrick Cloke2020-05-181-1/+1
| * | Hash passwords earlier in the registration process (#7523)Patrick Cloke2020-05-183-31/+30
* | | Allow ReplicationRestResource to be added to workers (#7515)Erik Johnston2020-05-182-5/+12
* | | Merge pull request #7519 from matrix-org/rav/kill_py2_codeRichard van der Hoff2020-05-1814-189/+45
|\ \ \
| * | | remove miscellaneous PY2 codeRichard van der Hoff2020-05-156-67/+24
| * | | remove `builtins.buffer` code from storage codeRichard van der Hoff2020-05-153-24/+3
| * | | remove redundant `__func__`Richard van der Hoff2020-05-152-13/+4
| * | | remove to_asciiRichard van der Hoff2020-05-153-38/+12
| * | | Remove `exception_to_unicode`Richard van der Hoff2020-05-152-48/+3
* | | | Add type hints to room member handlers (#7513)Patrick Cloke2020-05-152-139/+173
* | | | Fix limit logic for AccountDataStream (#7384)Richard van der Hoff2020-05-152-31/+99
* | | | Fix a couple of small typosAndrew Morgan2020-05-152-3/+3
* | | | Support UI Authentication for OpenID Connect accounts (#7457)Patrick Cloke2020-05-154-36/+94
* | | | Add a worker store for search insertion. (#7516)Erik Johnston2020-05-152-47/+51
* | | | Prevent 0-member/null room_version rooms from appearing in group room queries...Andrew Morgan2020-05-151-14/+78
* | | | Move event stream handling out of slave store. (#7491)Erik Johnston2020-05-157-116/+160
* | | | Add type hints to event_auth code. (#7505)Patrick Cloke2020-05-151-32/+46
* | | | Fix a small typo in the arguments of simple_update in update_remote_profile_c...Andrew Morgan2020-05-151-1/+1
|/ / /
* | | Update the room member handler to use async/await. (#7507)Patrick Cloke2020-05-152-74/+58
* | | Implement room version 6 (MSC2240). (#7506)Patrick Cloke2020-05-151-26/+4
* | | Ignore incoming presence updates when presence is disabled (#7508)Andrew Morgan2020-05-151-2/+4
* | | Strictly enforce canonicaljson requirements in a new room version (#7381)Patrick Cloke2020-05-145-4/+70
* | | Enforce MSC2209: auth rules for notifications in power level event (#7502)Patrick Cloke2020-05-142-3/+31
* | | Workaround for failure to wrap reason in Failure (#7473)Andrew Morgan2020-05-141-0/+7
* | | Fix b'GET' in prometheus metrics (#7503)Richard van der Hoff2020-05-141-2/+4
* | | Allow expired accounts to logout (#7443)Andrew Morgan2020-05-142-20/+36
* | | Move EventStream handling into default ReplicationDataHandler (#7493)Erik Johnston2020-05-144-36/+39
* | | Add `instance_map` config and route replication calls (#7495)Erik Johnston2020-05-142-6/+32
* | | Merge tag 'v1.13.0rc2' into developRichard van der Hoff2020-05-144-22/+21
|\| |
| * | 1.13.0rc2Richard van der Hoff2020-05-141-1/+1
| * | Stop `get_joined_users` corruption from custom statuses (#7376)Richard van der Hoff2020-05-141-1/+2
| * | Do not validate that the client dict is stable during UI Auth. (#7483)Patrick Cloke2020-05-132-20/+18
| * | Fix new flake8 errors (#7489)Patrick Cloke2020-05-135-11/+17
* | | Allow censoring of events to happen on workers. (#7492)Erik Johnston2020-05-133-8/+3
* | | Fix copypasted comment (#7477)Paul Tötterman2020-05-131-1/+1
* | | SpellingErik Johnston2020-05-132-2/+2
* | | Shuffle persist event data store functions. (#7440)Erik Johnston2020-05-1317-1234/+1373
* | | Have all instances correctly respond to REPLICATE command. (#7475)Erik Johnston2020-05-133-48/+50
* | | Fix Redis reconnection logic (#7482)Erik Johnston2020-05-132-2/+14
* | | Fix new flake8 errors (#7470)Erik Johnston2020-05-125-11/+17
* | | Convert federation handler to async/await. (#7459)Patrick Cloke2020-05-112-21/+16
* | | Convert search code to async/await. (#7460)Patrick Cloke2020-05-111-24/+20
* | | Allow configuration of Synapse's cache without using synctl or environment va...Amber Brown2020-05-1121-124/+402
* | | Remove unused store method get_hosts_in_room (#7448)Andrew Morgan2020-05-111-10/+0
* | | Merge branch 'release-v1.13.0' into developAndrew Morgan2020-05-117-20/+65
|\| |
| * | 1.13.0rc1Andrew Morgan2020-05-111-1/+1
| * | Rework UI Auth session validation for registration (#7455)Patrick Cloke2020-05-083-14/+62
| * | Fix errors from malformed log line (#7454)Richard van der Hoff2020-05-071-1/+1
| * | Drop support for redis.dbid (#7450)Richard van der Hoff2020-05-072-4/+1
* | | Extend spam checker to allow for multiple modules (#7435)Andrew Morgan2020-05-082-47/+69
* | | Implement OpenID Connect-based login (#7256)Quentin Gliech2020-05-0815-12/+1323
* | | Add room details admin endpoint (#7317)Manuel Stahl2020-05-073-1/+58
* | | Merge branch 'release-v1.13.0' into developBrendan Abolivier2020-05-075-18/+49
|\| |
| * | Add a configuration setting for the dummy event threshold (#7422)Brendan Abolivier2020-05-072-1/+18
| * | Improve per-block CPU and DB usage metrics (#7426)Patrick Cloke2020-05-061-12/+26
| * | Port group attestation renewal slow down from matrix-org-hotfixes (#7442)Andrew Morgan2020-05-061-4/+2
| * | Make redis go faster with hiredis (#7439)Richard van der Hoff2020-05-061-1/+3
* | | Fixes typo (bellow -> below) (#7449)Patrick Cloke2020-05-072-2/+2
* | | Add more type hints to SAML handler. (#7445)Patrick Cloke2020-05-071-12/+16
* | | Support any process writing to cache invalidation stream. (#7436)Erik Johnston2020-05-0723-225/+223
* | | Merge branch 'release-v1.13.0' into developRichard van der Hoff2020-05-067-117/+208
|\| |
| * | Stop Auth methods from polling the config on every req. (#7420)Andrew Morgan2020-05-062-73/+114
| * | Merge pull request #7423 from matrix-org/erikj/faster_device_lists_fetchErik Johnston2020-05-063-10/+25
| |\ \
| | * \ Merge branch 'release-v1.13.0' into erikj/faster_device_lists_fetchRichard van der Hoff2020-05-0542-577/+562
| | |\ \
| | * | | Speed up fetching device lists changes in sync.Erik Johnston2020-05-053-10/+25
| * | | | Merge branch 'release-v1.13.0' into rav/fix_dropped_messagesRichard van der Hoff2020-05-051-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'release-v1.13.0' into rav/fix_dropped_messagesRichard van der Hoff2020-05-0542-576/+562
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Wait for a POSITION on the right connection before accepting RDATARichard van der Hoff2020-05-052-19/+38
| * | | | | Wait to subscribe before sending REPLICATERichard van der Hoff2020-05-052-20/+35
| | |_|/ / | |/| | |
* | | | | Merge pull request #7428 from matrix-org/rav/cross_signing_keys_cacheRichard van der Hoff2020-05-061-77/+21
|\ \ \ \ \
| * | | | | Make get_e2e_cross_signing_key delegate to get_e2e_cross_signing_keys_bulkRichard van der Hoff2020-05-061-54/+6
| * | | | | Fix batching for fetching cross-signing keysRichard van der Hoff2020-05-061-23/+15
| | |_|/ / | |/| | |
* | | | | Merge branch 'release-v1.13.0' into developRichard van der Hoff2020-05-063-3/+47
|\| | | |
| * | | | Move logs about discarded RDATA to debug (#7421)Brendan Abolivier2020-05-051-1/+1
| | |/ / | |/| |
| * | | Add backwards compatibility codepath to LoggingContext. (#7408)Patrick Cloke2020-05-051-0/+41
| * | | Fix bug in EventContext.deserialize. (#7393)Erik Johnston2020-05-051-2/+5