summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into babolivier/mark_unreadBrendan Abolivier2020-06-1526-115/+448
|\
| * Remove "user_id" from GET /presence. (#7606)Will Hunt2020-06-112-1/+4
| * Merge branch 'master' into developBrendan Abolivier2020-06-113-4/+16
| |\
| | * 1.15.0 v1.15.0 github/release-v1.15.0 release-v1.15.0Brendan Abolivier2020-06-113-1/+13
| | * Merge branch 'release-v1.15.0' of github.com:matrix-org/synapse into release-...Brendan Abolivier2020-06-090-0/+0
| | |\
| | | * Update CHANGES.mdRichard van der Hoff2020-06-091-1/+1
| | * | Fix some attributionsBrendan Abolivier2020-06-091-3/+3
| | |/
| * | Increase the default SAML session expirary time to 15 minutes. (#7664)Patrick Cloke2020-06-113-3/+4
| * | fix typo in sample_config.yaml (#7652)wondratsch2020-06-113-2/+3
| * | Take out a lock before modifying _CACHES (#7663)Richard van der Hoff2020-06-102-5/+16
| * | Add option to enable encryption by default for new rooms (#7639)Andrew Morgan2020-06-1011-36/+275
| * | Clean-up the fallback login code. (#7657)Patrick Cloke2020-06-104-64/+130
| |/
* | Incorporate reviewBrendan Abolivier2020-06-151-15/+11
* | LintBrendan Abolivier2020-06-121-3/+8
* | Incorporate review bitsBrendan Abolivier2020-06-123-22/+20
* | 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
* | LintBrendan Abolivier2020-06-121-3/+1
* | Test that a mark_unread action updates the right counter when using a slave s...Brendan Abolivier2020-06-121-0/+15
* | Remove debug loggingBrendan Abolivier2020-06-121-2/+0
* | Test that a mark_unread action updates the right counterBrendan Abolivier2020-06-121-5/+16
* | 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
* | ChangelogBrendan Abolivier2020-06-102-1/+1
* | Fix testsBrendan Abolivier2020-06-102-17/+21
* | 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-10963-30448/+65965
|\|
| * 1.15.0rc1 v1.15.0rc1Brendan Abolivier2020-06-0945-44/+67
| * Revert "1.15.0rc1"Brendan Abolivier2020-06-0945-67/+44
| * 1.15.0rc1Brendan Abolivier2020-06-0945-44/+67
| * Fix bug in account data replication stream. (#7656)Erik Johnston2020-06-096-4/+35
| * Convert the registration handler to async/await. (#7649)Patrick Cloke2020-06-083-68/+48
| * Accept device information at the login fallback endpoint. (#7629)Patrick Cloke2020-06-082-35/+121
| * Convert user directory handler and related classes to async/await. (#7640)Patrick Cloke2020-06-056-111/+78
| * Add an option to disable autojoin for guest accounts (#6637)Travis Ralston2020-06-055-1/+33
| * Clarifications to the admin api documentation (#7647)Richard van der Hoff2020-06-058-89/+126
| * Update to the stable SSO prefix for UI Auth. (#7630)Patrick Cloke2020-06-052-1/+2
| * Fix type information on `assert_*_is_admin` methods (#7645)Richard van der Hoff2020-06-053-23/+19
| * Remove some unused constants. (#7644)Richard van der Hoff2020-06-052-4/+1
| * 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-054-16/+172
| * Add device management to admin API (#7481)Dirk Klimpel2020-06-055-0/+920
| * Attempt to fix PhoneHomeStatsTestCase.test_performance_100 being flaky. (#7634)Patrick Cloke2020-06-052-19/+24
| * Support CS API v0.6.0 (#6585)Andrew Morgan2020-06-052-15/+2
| * Add support for webp thumbnailing (#7586)WGH2020-06-053-36/+101
| * Performance improvements and refactor of Ratelimiter (#7595)Andrew Morgan2020-06-0519-230/+322
| * Fix encryption algorithm typos in tests/comments (#7637)Andrew Morgan2020-06-044-10/+11
| * Advertise the token login type when OpenID Connect is enabled. (#7631)Patrick Cloke2020-06-042-8/+4
| * Cleanups to the OpenID Connect integration (#7628)Richard van der Hoff2020-06-038-324/+428
| * async/await get_user_id_by_threepid (#7620)Andrew Morgan2020-06-034-28/+29
| * Check the changelog number in check-newsfragment (#7623)Richard van der Hoff2020-06-032-4/+17
| * Replace instances of reactor pumping with get_success. (#7619)Andrew Morgan2020-06-033-121/+152
| * Check if the localpart is reserved for guests earlier in the registration flo...Brendan Abolivier2020-06-032-9/+10
| * Fix exceptions when fetching events from a down host. (#7622)Erik Johnston2020-06-032-1/+2
| * `synctl restart` should start synapse if it wasn't running (#7624)Richard van der Hoff2020-06-032-1/+2
| * Switch back to upstream dh-virtualenv (#7621)Richard van der Hoff2020-06-032-1/+2
| * Merge branch 'master' into developRichard van der Hoff2020-06-031-1/+1
| |\
| | * Fix typo in PR link github/release-v1.14.0 release-v1.14.0Richard van der Hoff2020-06-031-1/+1
| * | Clean up exception handling in SAML2ResponseResource (#7614)Richard van der Hoff2020-06-037-61/+77
| * | update grafana dashboardRichard van der Hoff2020-06-021-88/+525
| * | Mention #synapse:matrix.org in README troubleshooting (#7603)Andrew Morgan2020-06-012-1/+5
| * | Advertise Python 3.8 support in setup.py (#7602)Andrew Morgan2020-06-012-0/+2
| * | Fix a bug in automatic user creation with m.login.jwt. (#7585)Olof Johansson2020-06-013-7/+162
| * | Process cross-signing keys when resyncing device lists (#7594)Brendan Abolivier2020-06-014-18/+119
| * | Email notifications for new users when creating via the Admin API. (#7267)Dirk Klimpel2020-06-013-0/+92
| * | Improve performance of _get_state_groups_from_groups_txn (#7567)Dagfinn Ilmari Mannsåker2020-06-012-6/+7
| * | Convert groups local and server to async/await. (#7600)Patrick Cloke2020-06-013-190/+150
| * | Don't fail all of an iteration of the device list retry loop on error (#7609)Brendan Abolivier2020-06-012-15/+22
| * | Use upsert when inserting read receipts (#7607)Dagfinn Ilmari Mannsåker2020-06-012-9/+5
| * | Update OpenBSD installation instructions (#7587)hashashini2020-05-302-22/+41
| * | Fix 'FederationGroupsRoomsServlet' API when group has room server is not in. ...Erik Johnston2020-05-292-8/+13
| * | Make inflight background metrics more efficient. (#7597)Erik Johnston2020-05-292-34/+71
| * | Add entry to set dependency against psql service (#7591)David Rio Deiros2020-05-282-0/+4
| * | Merge branch 'master' into developBrendan Abolivier2020-05-283-1/+13
| |\|
| | * Update debian changelog v1.14.0Brendan Abolivier2020-05-281-0/+6
| | * 1.14.0Brendan Abolivier2020-05-282-1/+7
| * | Merge pull request #7584 from matrix-org/erikj/save_and_send_fed_token_in_bgErik Johnston2020-05-274-7/+69
| |\ \
| | * | Ensure we persist and ack the same tokenErik Johnston2020-05-271-5/+7
| | * | Remove spurious changeErik Johnston2020-05-271-2/+0
| | * | Add test for Linearizer.is_queued(..)Erik Johnston2020-05-271-0/+32
| | * | NewsfileErik Johnston2020-05-271-0/+1
| | * | 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-273-2/+13
| * | Merge tag 'v1.14.0rc2' into developBrendan Abolivier2020-05-278-8/+116
| |\|
| | * Improve changelog wording v1.14.0rc2Brendan Abolivier2020-05-271-1/+1
| | * 1.14.0rc2Brendan Abolivier2020-05-276-5/+18
| | * Fix sample config docs error (#7581)Jason Robinson2020-05-273-2/+3
| | * Fix up commentsErik Johnston2020-05-272-3/+3
| | * Fix specifying cache factors via env vars with * in name. (#7580)Erik Johnston2020-05-274-5/+74
| | * Don't apply cache factor to event cache. (#7578)Erik Johnston2020-05-273-0/+21
| | * Ensure ReplicationStreamer is always started when replication enabled. (#7579)Erik Johnston2020-05-272-0/+4
| * | Fix incorrect placeholder syntax in database prepartion code (#7575)Andrew Morgan2020-05-272-3/+3
| * | Merge branch 'develop' of github.com:matrix-org/synapse into developBrendan Abolivier2020-05-263-63/+47
| |\ \ | | |/ | |/|
| | * Convert identity handler to async/await. (#7561)Patrick Cloke2020-05-263-63/+47
| * | Remove the changes to the debian changelog v1.14.0rc1Brendan Abolivier2020-05-261-6/+0
| * | Merge branch 'release-v1.14.0' of github.com:matrix-org/synapse into release-...Brendan Abolivier2020-05-261-14/+1
| |\ \
| | * | Merge event persistence move changelog entriesErik Johnston2020-05-261-14/+1
| * | | Not full release yet, this is rc1Brendan Abolivier2020-05-262-3/+3
| |/ /
| * | More changelog fixBrendan Abolivier2020-05-261-2/+1
| * | Changelog fixesBrendan Abolivier2020-05-261-9/+8
| * | 1.14.0Brendan Abolivier2020-05-2678-76/+106
| |/
| * Replace device_27_unique_idx bg update with a fg one (#7562)Richard van der Hoff2020-05-267-65/+104
| * Fix incorrect exception handling in KeyUploadServlet.on_POST (#7563)Richard van der Hoff2020-05-262-1/+2
| * Fix recording of federation stream token (#7564)Richard van der Hoff2020-05-263-24/+116
| * Simplify reap_monthly_active_users (#7558)Richard van der Hoff2020-05-232-59/+42
| * Optimise some references to hs.config (#7546)Richard van der Hoff2020-05-228-136/+162
| * Fix missing CORS headers on OPTION responses (#7560)Erik Johnston2020-05-223-1/+30
| * Add option to move event persistence off master (#7517)Erik Johnston2020-05-2222-73/+382
| * Return 200 OK for all OPTIONS requests (#7534)Patrick Cloke2020-05-225-11/+85
| * Add ability to wait for replication streams (#7542)Erik Johnston2020-05-2224-112/+304
| * Convert sending mail to async/await. (#7557)Erik Johnston2020-05-225-76/+60
| * Use a non-empty RelayState for user interactive auth with SAML. (#7552)Patrick Cloke2020-05-222-1/+5
| * On upgrade room only send canonical alias once. (#7547)Erik Johnston2020-05-222-55/+61
| * Fix exception reporting due to HTTP request errors. (#7556)Erik Johnston2020-05-224-4/+24
| * synapse.metrics: implement detailed memory usage reporting on PyPy (#7536)Ivan Shapovalov2020-05-222-1/+79
| * Refresh apt cache when building dh_virtualenv docker image (#7555)Richard van der Hoff2020-05-222-2/+5
| * Fix stacktrace mangling in `patch_inline_callbacks` (#7554)Richard van der Hoff2020-05-222-2/+8
| * mypy for synapse.http.site (#7553)Richard van der Hoff2020-05-223-3/+8
| * Fix some DETECTED VIOLATIONS in the config file (#7550)Richard van der Hoff2020-05-228-55/+72
| * Retry to sync out of sync device lists (#7453)Brendan Abolivier2020-05-214-20/+158
| * Stub out GET presence requests in the frontend proxy (#7545)Richard van der Hoff2020-05-212-17/+5
| * Ensure worker config exists in systemd service (#7528)David Vo2020-05-212-1/+2
| * 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-212-2/+3
| * Update CONTRIBUTING.md (#7541)Richard van der Hoff2020-05-201-15/+4
| * Remove Ubuntu Cosmic and Disco which are both EOL. (#7539)Patrick Cloke2020-05-202-2/+1
| * Hash passwords earlier in the password reset process (#7538)Patrick Cloke2020-05-205-11/+33
| * Minor clarifications to the TURN docs (#7533)Richard van der Hoff2020-05-202-15/+43
| * Merge branch 'master' into developPatrick Cloke2020-05-196-32/+58
| |\
| | * Merge tag 'v1.13.0'Patrick Cloke2020-05-19257-5032/+12281
| | |\
| | | * Update changelog based on feedback. v1.13.0 github/release-v1.13.0 release-v1.13.0Patrick Cloke2020-05-191-1/+1
| | | * Move warnings in the changelog and re-iterate changes to branches.Patrick Cloke2020-05-191-18/+32
| | | * 1.13.0Patrick Cloke2020-05-194-4/+16
| | | * update dh-virtualenv (#7526)Richard van der Hoff2020-05-195-11/+11
| * | | synctl warns when no process is stopped and avoids start (#6598)Romain Bouyé2020-05-192-3/+29
| * | | Improve API doc readability (#7527)Paul Tötterman2020-05-191-10/+11
| * | | Omit displayname or avatar_url if they aren't set instead of returning null (...Aaron Raimist2020-05-192-2/+7
| * | | Merge tag 'v1.13.0rc3' into developPatrick Cloke2020-05-185-32/+40
| |\ \ \ | | | |/ | | |/|
| | * | 1.13.0rc3 v1.13.0rc3Patrick Cloke2020-05-183-2/+10
| | * | Hash passwords earlier in the registration process (#7523)Patrick Cloke2020-05-184-31/+31
| * | | Allow ReplicationRestResource to be added to workers (#7515)Erik Johnston2020-05-183-5/+13
| * | | Merge pull request #7519 from matrix-org/rav/kill_py2_codeRichard van der Hoff2020-05-1816-196/+48
| |\ \ \
| | * | | changelogRichard van der Hoff2020-05-151-0/+1
| | * | | remove miscellaneous PY2 codeRichard van der Hoff2020-05-156-67/+24
| | * | | remove `builtins.buffer` code from storage codeRichard van der Hoff2020-05-154-31/+5
| | * | | 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
| * | | | fix mypy for tests/replication (#7518)Richard van der Hoff2020-05-184-14/+9
| * | | | Add type hints to room member handlers (#7513)Patrick Cloke2020-05-154-139/+176
| * | | | Fix limit logic for AccountDataStream (#7384)Richard van der Hoff2020-05-154-31/+217
| * | | | Fix a couple of small typosAndrew Morgan2020-05-152-3/+3
| * | | | Support UI Authentication for OpenID Connect accounts (#7457)Patrick Cloke2020-05-156-41/+105
| * | | | Add a worker store for search insertion. (#7516)Erik Johnston2020-05-153-47/+52
| * | | | Prevent 0-member/null room_version rooms from appearing in group room queries...Andrew Morgan2020-05-152-14/+79
| * | | | Move event stream handling out of slave store. (#7491)Erik Johnston2020-05-158-116/+161
| * | | | Add type hints to event_auth code. (#7505)Patrick Cloke2020-05-153-32/+48
| * | | | Fix a small typo in the arguments of simple_update in update_remote_profile_c...Andrew Morgan2020-05-152-1/+2
| * | | | Formatting for reverse-proxy docs (#7514)Richard van der Hoff2020-05-152-68/+79
| |/ / /
| * | | Add Caddy 2 example (#7463)Jeff Peeler2020-05-152-1/+12
| * | | Update the room member handler to use async/await. (#7507)Patrick Cloke2020-05-153-74/+59
| * | | Implement room version 6 (MSC2240). (#7506)Patrick Cloke2020-05-155-41/+14
| * | | Ignore incoming presence updates when presence is disabled (#7508)Andrew Morgan2020-05-152-2/+5
| * | | Strictly enforce canonicaljson requirements in a new room version (#7381)Patrick Cloke2020-05-147-5/+137
| * | | Merge branch 'master' into developRichard van der Hoff2020-05-149-65/+294
| |\ \ \ | | | |/ | | |/|
| | * | remove spurious changelog filesRichard van der Hoff2020-05-142-2/+0
| | * | Notes on using git (#7496)Richard van der Hoff2020-05-145-58/+261
| | * | Update reverse_proxy.mdRichard van der Hoff2020-05-051-4/+4
| | * | Add a section about support to the top of the README (#7392)Brendan Abolivier2020-05-012-0/+12
| | * | Make it clearer that #synapse:matrix.org is our support channel (#7379)Brendan Abolivier2020-05-014-3/+19
| * | | Enforce MSC2209: auth rules for notifications in power level event (#7502)Patrick Cloke2020-05-144-3/+65
| * | | Workaround for failure to wrap reason in Failure (#7473)Andrew Morgan2020-05-142-0/+8
| * | | Fix b'GET' in prometheus metrics (#7503)Richard van der Hoff2020-05-142-2/+5
| * | | Allow expired accounts to logout (#7443)Andrew Morgan2020-05-145-22/+140
| * | | Move EventStream handling into default ReplicationDataHandler (#7493)Erik Johnston2020-05-145-36/+40
| * | | Add `instance_map` config and route replication calls (#7495)Erik Johnston2020-05-143-6/+33
| * | | Merge tag 'v1.13.0rc2' into developRichard van der Hoff2020-05-147-68/+95
| |\ \ \ | | | |/ | | |/|
| | * | 1.13.0rc2 v1.13.0rc2Richard van der Hoff2020-05-141-3/+2
| | * | 1.13.0rc2Richard van der Hoff2020-05-145-4/+17
| | * | Stop `get_joined_users` corruption from custom statuses (#7376)Richard van der Hoff2020-05-143-2/+52
| | * | Do not validate that the client dict is stable during UI Auth. (#7483)Patrick Cloke2020-05-134-65/+29
| | * | Fix new flake8 errors (#7489)Patrick Cloke2020-05-137-12/+19
| * | | Allow censoring of events to happen on workers. (#7492)Erik Johnston2020-05-134-8/+4
| * | | Fix copypasted comment (#7477)Paul Tötterman2020-05-132-1/+2
| * | | Clean up replication unit tests. (#7490)Erik Johnston2020-05-138-51/+16
| * | | SpellingErik Johnston2020-05-132-2/+2
| * | | Shuffle persist event data store functions. (#7440)Erik Johnston2020-05-1319-1235/+1376
| * | | Have all instances correctly respond to REPLICATE command. (#7475)Erik Johnston2020-05-134-48/+51
| * | | Fix Redis reconnection logic (#7482)Erik Johnston2020-05-133-2/+15
| * | | Update documentation about SSO mapping providers (#7458)Patrick Cloke2020-05-123-77/+147
| * | | Fix new flake8 errors (#7470)Erik Johnston2020-05-127-12/+19
| * | | Convert federation handler to async/await. (#7459)Patrick Cloke2020-05-113-21/+17
| * | | Convert search code to async/await. (#7460)Patrick Cloke2020-05-112-24/+21
| * | | Allow configuration of Synapse's cache without using synctl or environment va...Amber Brown2020-05-1132-146/+620
| * | | Remove unused store method get_hosts_in_room (#7448)Andrew Morgan2020-05-112-10/+1
| * | | Merge branch 'release-v1.13.0' into developAndrew Morgan2020-05-11150-320/+582
| |\| |
| | * | Don't UPGRADE database rows v1.13.0rc1Andrew Morgan2020-05-111-1/+1
| | * | RST indentingAndrew Morgan2020-05-111-2/+2
| | * | Put rollback instructions in upgrade notesAndrew Morgan2020-05-111-0/+19
| | * | Fix changelog typoAndrew Morgan2020-05-111-1/+1
| | * | Oh yeah, RSTAndrew Morgan2020-05-111-2/+1
| | * | Absolute URL it is thenAndrew Morgan2020-05-111-1/+2
| | * | Fix upgrade notes linkAndrew Morgan2020-05-111-1/+1
| | * | Provide summary of upgrade issues in changelog. Fix )Andrew Morgan2020-05-112-12/+33
| | * | Move next version notes from changelog to upgrade notesAndrew Morgan2020-05-112-14/+15
| | * | Changelog fixesAndrew Morgan2020-05-111-3/+3
| | * | 1.13.0rc1Andrew Morgan2020-05-11144-143/+139
| | * | Documentation on setting up redis (#7446)Neil Johnson2020-05-112-60/+108
| | * | Rework UI Auth session validation for registration (#7455)Patrick Cloke2020-05-086-102/+280
| | * | Fix errors from malformed log line (#7454)Richard van der Hoff2020-05-072-1/+2
| | * | Drop support for redis.dbid (#7450)Richard van der Hoff2020-05-073-4/+2
| * | | Extend spam checker to allow for multiple modules (#7435)Andrew Morgan2020-05-086-60/+95
| * | | Implement OpenID Connect-based login (#7256)Quentin Gliech2020-05-0821-12/+2163
| * | | Add room details admin endpoint (#7317)Manuel Stahl2020-05-077-1/+165
| * | | Merge branch 'release-v1.13.0' into developBrendan Abolivier2020-05-0710-18/+65
| |\| |
| | * | Add a configuration setting for the dummy event threshold (#7422)Brendan Abolivier2020-05-074-1/+31
| | * | Improve per-block CPU and DB usage metrics (#7426)Patrick Cloke2020-05-062-12/+27
| | * | Port group attestation renewal slow down from matrix-org-hotfixes (#7442)Andrew Morgan2020-05-062-4/+3
| | * | Make redis go faster with hiredis (#7439)Richard van der Hoff2020-05-062-1/+4
| * | | Fixes typo (bellow -> below) (#7449)Patrick Cloke2020-05-073-2/+3
| * | | Add more type hints to SAML handler. (#7445)Patrick Cloke2020-05-073-12/+18
| * | | Support any process writing to cache invalidation stream. (#7436)Erik Johnston2020-05-0726-231/+226
| * | | Merge pull request #7398 from Starbix/alpine-3.11Brendan Abolivier2020-05-072-1/+2
| |\ \ \
| | * | | Update runtime docker image to Alpine v3.11Cédric Laubacher2020-05-032-1/+2
| * | | | Merge branch 'release-v1.13.0' into developRichard van der Hoff2020-05-0614-150/+264
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Stop Auth methods from polling the config on every req. (#7420)Andrew Morgan2020-05-067-106/+168
| | * | | Merge pull request #7423 from matrix-org/erikj/faster_device_lists_fetchErik Johnston2020-05-064-10/+26
| | |\ \ \
| | | * \ \ Merge branch 'release-v1.13.0' into erikj/faster_device_lists_fetchRichard van der Hoff2020-05-0566-691/+847
| | | |\ \ \
| | | * | | | Update changelog.d/7423.miscRichard van der Hoff2020-05-051-1/+1
| | | * | | | NewsfileErik Johnston2020-05-051-0/+1
| | | * | | | Speed up fetching device lists changes in sync.Erik Johnston2020-05-053-10/+25
| | * | | | | Merge pull request #7427 from matrix-org/rav/fix_dropped_messagesRichard van der Hoff2020-05-063-34/+70
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'release-v1.13.0' into rav/fix_dropped_messagesRichard van der Hoff2020-05-052-1/+2
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Merge branch 'release-v1.13.0' into rav/fix_dropped_messagesRichard van der Hoff2020-05-0566-690/+847
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | * | | | | changelogRichard van der Hoff2020-05-051-0/+1
| | | * | | | | 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-062-77/+22
| |\ \ \ \ \ \
| | * | | | | | Make get_e2e_cross_signing_key delegate to get_e2e_cross_signing_keys_bulkRichard van der Hoff2020-05-062-54/+7