summary refs log tree commit diff
path: root/synapse/federation (follow)
Commit message (Expand)AuthorAgeFilesLines
* Strip "join_authorised_via_users_server" from join events which do not need i...Patrick Cloke2021-09-303-9/+9
* add event id to logcontext when handling incoming PDUs (#10936)Richard van der Hoff2021-09-291-1/+4
* Use direct references for configuration variables (part 6). (#10916)Patrick Cloke2021-09-291-1/+1
* Factor out common code for persisting fetched auth events (#10896)Richard van der Hoff2021-09-241-2/+0
* Use direct references for configuration variables (part 4). (#10893)Patrick Cloke2021-09-231-1/+3
* Remove unnecessary parentheses around tuples returned from methods (#10889)Andrew Morgan2021-09-231-2/+2
* Use direct references for some configuration variables (part 2) (#10812)Patrick Cloke2021-09-152-2/+2
* Use direct references for some configuration variables (#10798)Patrick Cloke2021-09-131-1/+2
* Add types to synapse.util. (#10601)reivilibre2021-09-101-2/+6
* Split `FederationHandler` in half (#10692)Richard van der Hoff2021-08-261-2/+5
* Cache the result of fetching the room hierarchy over federation. (#10647)Patrick Cloke2021-08-261-40/+66
* Do not include stack traces for known exceptions when trying multiple federat...Patrick Cloke2021-08-231-1/+6
* Split `on_receive_pdu` in half (#10640)Richard van der Hoff2021-08-191-3/+1
* Attempt to pull from the legacy spaces summary API over federation. (#10583)Patrick Cloke2021-08-171-9/+55
* Validate the max_rooms_per_space parameter to ensure it is non-negative. (#10...Patrick Cloke2021-08-161-4/+18
* Experimental support for MSC3266 Room Summary API. (#10394)Michael Telatynski2021-08-161-2/+2
* Split `synapse.federation.transport.server` into multiple files. (#10590)Patrick Cloke2021-08-166-2158/+2218
* Clean up some logging in the federation event handler (#10591)Richard van der Hoff2021-08-161-0/+1
* Support federation in the new spaces summary API (MSC2946). (#10569)Patrick Cloke2021-08-163-0/+132
* Fix a harmless exception when the staged events queue is empty. (#10592)Patrick Cloke2021-08-131-5/+10
* Convert Transaction and Edu object to attrs (#10542)Patrick Cloke2021-08-066-92/+74
* Fix exceptions in logs when failing to get remote room list (#10541)Erik Johnston2021-08-061-1/+2
* Refactoring before implementing the updated spaces summary. (#10527)Patrick Cloke2021-08-051-9/+14
* Prune inbound federation queues if they get too long (#10390)Erik Johnston2021-08-021-0/+17
* Improve failover logic for MSC3083 restricted rooms. (#10447)Patrick Cloke2021-07-291-4/+39
* Update the MSC3083 support to verify if joins are from an authorized server. ...Patrick Cloke2021-07-264-19/+141
* Add type hints to synapse.federation.transport.client. (#10408)Patrick Cloke2021-07-261-201/+298
* Add type hints to additional servlet functions (#10437)Patrick Cloke2021-07-211-11/+2
* Do not include signatures/hashes in make_{join,leave,knock} responses. (#10404)Patrick Cloke2021-07-161-6/+3
* Stagger send presence to remotes (#10398)Erik Johnston2021-07-152-5/+107
* Use inline type hints in various other places (in `synapse/`) (#10380)Jonathan de Jong2021-07-157-72/+62
* Add type hints to get_domain_from_id and get_localpart_from_id. (#10385)Patrick Cloke2021-07-131-24/+72
* Ensure we always drop the federation inbound lock (#10336)Erik Johnston2021-07-091-0/+1
* Handle old staged inbound events (#10303)Erik Johnston2021-07-061-10/+57
* Move methods involving event authentication to EventAuthHandler. (#10268)Patrick Cloke2021-07-011-3/+3
* Fix the inbound PDU metric (#10279)Erik Johnston2021-06-301-17/+20
* Merge branch 'release-v1.37' into developRichard van der Hoff2021-06-291-2/+96
|\
| * Handle inbound events from federation asynchronously (#10272)Erik Johnston2021-06-291-2/+96
* | Soft-fail spammy events received over federation (#10263)Richard van der Hoff2021-06-291-6/+6
* | Add additional types to the federation transport server. (#10213)Patrick Cloke2021-06-281-114/+474
* | Improve validation for `send_{join,leave,knock}` (#10225)Richard van der Hoff2021-06-242-55/+78
|/
* Expose opentracing trace id in response headers (#10199)Richard van der Hoff2021-06-181-0/+3
* Remove the experimental flag for knocking and use stable prefixes / endpoints...Patrick Cloke2021-06-153-51/+7
* Implement knock feature (#6739)Sorunome2021-06-094-8/+277
* Add type hints to the federation server transport. (#10080)Patrick Cloke2021-06-082-72/+166
* When joining a remote room limit the number of events we concurrently check s...Erik Johnston2021-06-082-217/+173
* Rewrite the KeyRing (#10035)Erik Johnston2021-06-021-1/+3
* Merge branch 'master' into developAndrew Morgan2021-06-011-0/+7
|\
| * Allow response of `/send_join` to be larger. (#10093)Erik Johnston2021-05-281-0/+7
* | Set opentracing priority before setting other tags (#10092)Richard van der Hoff2021-05-281-1/+2
* | Merge tag 'v1.35.0rc2' into developErik Johnston2021-05-271-1/+1
|\|
| * Pass the origin when calculating the spaces summary over GET. (#10079)Patrick Cloke2021-05-271-1/+1
* | Remove the experimental spaces enabled flag. (#10063)Patrick Cloke2021-05-261-7/+6
|/
* Don't hammer the database for destination retry timings every ~5mins (#10036)Erik Johnston2021-05-211-1/+1
* Add `Keyring.verify_events_for_server` and reduce memory usage (#10018)Erik Johnston2021-05-201-12/+5
* Use ijson to parse the response to `/send_join`, reducing memory usage. (#9958)Erik Johnston2021-05-202-22/+91
* Allow a user who could join a restricted room to see it in spaces summary. (#...Patrick Cloke2021-05-201-1/+1
* Support fetching the spaces summary via GET over federation. (#9947)Patrick Cloke2021-05-112-0/+27
* Add debug logging for issue #9533 (#9959)Richard van der Hoff2021-05-111-0/+9
* Fix `m.room_key_request` to-device messages (#9961)Richard van der Hoff2021-05-111-19/+0
* Revert "Experimental Federation Speedup (#9702)"Andrew Morgan2021-04-282-102/+58
* Pass errors back to the client when trying multiple federation destinations. ...Patrick Cloke2021-04-271-58/+60
* Remove `synapse.types.Collection` (#9856)Richard van der Hoff2021-04-221-2/+12
* Fix bug where we sent remote presence states to remote servers (#9850)Erik Johnston2021-04-201-0/+4
* Fix (final) Bugbear violations (#9838)Jonathan de Jong2021-04-201-2/+2
* Don't send normal presence updates over federation replication stream (#9828)Erik Johnston2021-04-192-163/+3
* remove `HomeServer.get_config` (#9815)Richard van der Hoff2021-04-142-2/+2
* Experimental Federation Speedup (#9702)Jonathan de Jong2021-04-142-62/+93
* Remove redundant "coding: utf-8" lines (#9786)Jonathan de Jong2021-04-1413-13/+0
* Fix duplicate logging of exceptions in transaction processing (#9780)Richard van der Hoff2021-04-091-7/+3
* Bugbear: Add Mutable Parameter fixes (#9682)Jonathan de Jong2021-04-081-2/+3
* Fix sharded federation sender sometimes using 100% CPU.Erik Johnston2021-04-081-2/+4
* Add a Synapse Module for configuring presence update routing (#9491)Andrew Morgan2021-04-061-1/+18
* Add type hints to expiring cache. (#9730)Patrick Cloke2021-04-061-1/+1
* Add type hints to the federation handler and server. (#9743)Patrick Cloke2021-04-062-15/+15
* Improve tracing for to device messages (#9686)Erik Johnston2021-04-011-0/+8
* Make RateLimiter class check for ratelimit overrides (#9711)Erik Johnston2021-03-301-1/+4
* Add type hints for the federation sender. (#9681)Patrick Cloke2021-03-292-44/+160
* Fixed undefined variable error in catchup (#9664)Erik Johnston2021-03-241-0/+2
* Spaces summary: call out to other servers (#9653)Richard van der Hoff2021-03-242-11/+204
* Federation API for Space summary (#9652)Richard van der Hoff2021-03-231-9/+58
* Import HomeServer from the proper module. (#9665)Patrick Cloke2021-03-231-1/+1
* Make federation catchup send last event from any server. (#9640)Erik Johnston2021-03-182-38/+91
* Don't go into federation catch up mode so easily (#9561)Erik Johnston2021-03-152-153/+182
* Fix additional type hints from Twisted 21.2.0. (#9591)Patrick Cloke2021-03-121-3/+5
* Reject concurrent transactions (#9597)Richard van der Hoff2021-03-121-35/+42
* Improve logging when processing incoming transactions (#9596)Richard van der Hoff2021-03-121-27/+34
* Use the chain cover index in get_auth_chain_ids. (#9576)Patrick Cloke2021-03-101-2/+4
* Fix additional type hints. (#9543)Patrick Cloke2021-03-091-1/+1
* Add ResponseCache tests. (#9458)Jonathan de Jong2021-03-081-5/+8
* Replace `last_*_pdu_age` metrics with timestamps (#9540)Richard van der Hoff2021-03-042-12/+9
* Ratelimit cross-user key sharing requests. (#8957)Patrick Cloke2021-02-191-2/+18
* Be smarter about which hosts to send presence to when processing room joins (...Andrew Morgan2021-02-191-1/+1
* Add configs to make profile data more private (#9203)AndrewFerr2021-02-191-4/+3
* Add type hints to groups code. (#9393)Patrick Cloke2021-02-171-2/+39
* Update black, and run auto formatting over the codebase (#9381)Eric Eastwood2021-02-1610-127/+99
* Ratelimit invites by room and target user (#9258)Erik Johnston2021-01-291-1/+1
* Precompute joined hosts and store in Redis (#9198)Erik Johnston2021-01-261-15/+35
* Merge tag 'v1.26.0rc1' into developPatrick Cloke2021-01-202-2/+2
|\
| * Support icons for Identity Providers (#9154)Richard van der Hoff2021-01-202-2/+2
* | Various improvements to the federation client. (#9129)Patrick Cloke2021-01-201-58/+67
|/
* Support routing edu's to multiple instances (#9042)Erik Johnston2021-01-071-5/+16
* Add type hints to the crypto module. (#8999)Patrick Cloke2021-01-041-1/+1
* Allow spam-checker modules to be provide async methods. (#8890)David Teller2020-12-111-1/+6
* Merge pull request #8858 from matrix-org/rav/sso_uiaRichard van der Hoff2020-12-021-1/+1
|\
| * fix up various test casesRichard van der Hoff2020-12-021-1/+1
* | Apply an IP range blacklist to push and key revocation requests. (#8821)Patrick Cloke2020-12-022-2/+1
|/
* Consistently use room_id from federation request body (#8776)Richard van der Hoff2020-11-192-48/+43
* Add ability for access tokens to belong to one user but grant access to anoth...Erik Johnston2020-10-291-1/+1
* Fix not sending events over federation when using sharded event persisters (#...Erik Johnston2020-10-142-3/+8
* Add type hints to response cache. (#8507)Patrick Cloke2020-10-091-3/+5
* Remove the deprecated Handlers object (#8494)Patrick Cloke2020-10-091-1/+6
* Add type hints to some handlers (#8505)Patrick Cloke2020-10-091-1/+1
* Remove stream ordering from Metadata dict (#8452)Richard van der Hoff2020-10-052-0/+4
* Merge tag 'v1.21.0rc2' into developRichard van der Hoff2020-10-021-1/+1
|\
| * Fix malformed log line in new federation "catch up" logic (#8442)Richard van der Hoff2020-10-021-1/+1
* | Enable mypy checking for unreachable code and fix instances. (#8432)Patrick Cloke2020-10-011-3/+2
|/
* Add prometheus metrics to track federation delays (#8430)Richard van der Hoff2020-10-012-1/+45
* Mypy fixes for `synapse.handlers.federation` (#8422)Richard van der Hoff2020-09-291-1/+3
* Merge tag 'v1.20.0rc5' into developPatrick Cloke2020-09-181-5/+3
|\
| * Merge tag 'v1.19.3' into release-v1.20.0Patrick Cloke2020-09-181-5/+3
| |\
| | * Use _check_sigs_and_hash_and_fetch to validate backfill requests (#8350)Andrew Morgan2020-09-181-5/+3
* | | Catch-up after Federation Outage (bonus): Catch-up on Synapse Startup (#8322)reivilibre2020-09-181-0/+51
* | | Simplify super() calls to Python 3 syntax. (#8344)Patrick Cloke2020-09-183-9/+5
* | | Merge remote-tracking branch 'origin/release-v1.20.0' into developErik Johnston2020-09-182-17/+48
|\| |
| * | Fix ratelimiting for federation `/send` requests. (#8342)Erik Johnston2020-09-182-17/+48
| * | Merge branch 'erikj/fix_origin_check' into release-v1.20.0Erik Johnston2020-09-161-3/+4
| |\|
* | | Merge branch 'erikj/fix_origin_check' into developErik Johnston2020-09-161-3/+4
|\ \ \ | | |/ | |/|
| * | Don't assume that an event has an origin fieldErik Johnston2020-09-161-3/+4
* | | Catch-up after Federation Outage (split, 4): catch-up loop (#8272)reivilibre2020-09-151-4/+125
* | | Catch up after Federation Outage (split, 2): Track last successful stream ord...reivilibre2020-09-041-0/+11
* | | Catch-up after Federation Outage (split, 1) (#8230)reivilibre2020-09-041-2/+9
| |/ |/|
* | Stop sub-classing object (#8249)Patrick Cloke2020-09-049-11/+11
* | Remove obsolete order field in `send_new_transaction` (#8245)reivilibre2020-09-033-28/+22
* | Convert additional database code to async/await. (#8195)Patrick Cloke2020-08-281-8/+11
* | Convert calls of async database methods to async (#8166)Patrick Cloke2020-08-272-10/+10
* | Add type hints for state. (#8140)Patrick Cloke2020-08-241-2/+2
* | Be stricter about JSON that is accepted by Synapse (#8106)Patrick Cloke2020-08-192-6/+4
* | Convert stream database to async/await. (#8074)Patrick Cloke2020-08-173-3/+3
* | Drop federation transmission queues during a significant remote outage. (#7864)reivilibre2020-08-131-0/+22
|/
* Fix typing for notifier (#8064)Erik Johnston2020-08-121-2/+5
* Merge branch 'master' into developOlivier Wilkinson (reivilibre)2020-07-303-3/+3
|\
| * Update worker docs with recent enhancements (#7969)Erik Johnston2020-07-293-3/+3
* | Convert federation client to async/await. (#7975)Patrick Cloke2020-07-303-73/+50
|/
* Convert state resolution to async/await (#7942)Patrick Cloke2020-07-241-1/+3
* Convert presence handler helpers to async/await. (#7939)Patrick Cloke2020-07-231-1/+3
* Put a cache on `/state_ids` (#7931)Richard van der Hoff2020-07-231-2/+11
* Abort federation requests if the client disconnects early (#7930)Richard van der Hoff2020-07-231-0/+6
* Convert room list handler to async/await. (#7912)Patrick Cloke2020-07-211-8/+2
* Convert synapse.app to async/await. (#7868)Patrick Cloke2020-07-171-21/+19
* Allow moving typing off master (#7869)Erik Johnston2020-07-161-51/+74
* Add ability to run multiple pusher instances (#7855)Erik Johnston2020-07-162-9/+9
* Remove obsolete comment.Olivier Wilkinson (reivilibre)2020-07-161-2/+0
* Ensure that calls to `json.dumps` are compatible with the standard library js...Patrick Cloke2020-07-151-1/+1
* Do not use canonicaljson to magically handle decoding bytes from JSON. (#7802)Patrick Cloke2020-07-101-3/+3
* Add ability to shard the federation sender (#7798)Erik Johnston2020-07-103-3/+81
* Fix some spelling mistakes / typos. (#7811)Patrick Cloke2020-07-096-11/+11
* Add `HomeServer.signing_key` property (#7805)Richard van der Hoff2020-07-081-1/+1
* Merge different Resource implementation classes (#7732)Erik Johnston2020-07-031-5/+1
* Fix new metric where we used ms instead of seconds (#7771)Erik Johnston2020-07-011-1/+1
* Add some metrics for inbound and outbound federation processing times (#7755)Erik Johnston2020-06-302-17/+30
* Replace all remaining six usage with native Python 3 equivalents (#7704)Dagfinn Ilmari Mannsåker2020-06-163-8/+3
* Replace iteritems/itervalues/iterkeys with native versions. (#7692)Patrick Cloke2020-06-154-14/+9
* add a commentRichard van der Hoff2020-05-211-0/+3
* Strictly enforce canonicaljson requirements in a new room version (#7381)Patrick Cloke2020-05-141-1/+5
* Fix typing annotations in synapse/federation (#7382)Richard van der Hoff2020-05-051-15/+31
* Fix catchup-on-reconnect for the Federation Stream (#7374)Richard van der Hoff2020-05-054-25/+39
* async/await is_server_admin (#7363)Andrew Morgan2020-05-011-3/+2
* Further improvements to requesting the public rooms list on a homeserver whic...Andrew Morgan2020-05-012-23/+70
* Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-221-9/+40
|\
| * Query missing cross-signing keys on local sig upload (#7289)Andrew Morgan2020-04-221-9/+40
* | Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-201-11/+3
|\|
| * Revert "Query missing cross-signing keys on local sig upload"Richard van der Hoff2020-04-201-11/+3
* | Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-201-3/+11
|\|
| * Query missing cross-signing keys on local sig uploadAndrew Morgan2020-04-171-3/+11
* | Add typing information to federation_server. (#7219)Patrick Cloke2020-04-071-66/+107
* | Move catchup of replication streams to worker. (#7024)Erik Johnston2020-03-251-0/+9
* | Clean up some LoggingContext stuff (#7120)Richard van der Hoff2020-03-241-2/+2
* | Convert `*StreamRow` classes to inner classes (#7116)Richard van der Hoff2020-03-231-1/+1
* | Fix a bug in the federation API which could cause occasional "Failed to get P...Patrick Cloke2020-03-193-30/+21
|/
* Remove unused federation endpoint (`query_auth`) (#7026)Patrick Cloke2020-03-174-146/+79
* Add some type annotations to the federation base & client classes (#6995)Patrick Cloke2020-02-282-28/+42
* Merge remote-tracking branch 'origin/release-v1.11.1' into developPatrick Cloke2020-02-271-6/+8
|\
| * Cast a coroutine into a Deferred in the federation base (#6996)Patrick Cloke2020-02-261-6/+8
* | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Patrick Cloke2020-02-211-2/+2
|/
* Add support for putting fed user query API on workers (#6873)Erik Johnston2020-02-071-2/+5
* Add a `make_event_from_dict` method (#6858)Richard van der Hoff2020-02-071-3/+2
* Add typing to synapse.federation.sender (#6871)Erik Johnston2020-02-075-105/+128
* Pass room_version into `event_from_pdu_json`Richard van der Hoff2020-02-063-58/+46
* pass room version into FederationClient.send_join (#6854)Richard van der Hoff2020-02-061-28/+32
* Reduce amount of logging at INFO level. (#6862)Erik Johnston2020-02-062-4/+4
* Simplify `room_version` handling in `FederationClient.send_invite`Richard van der Hoff2020-02-051-10/+6
* Pass room version object into `FederationClient.get_pdu`Richard van der Hoff2020-02-051-3/+5
* make FederationClient._do_send_invite asyncRichard van der Hoff2020-02-051-10/+7
* Apply suggestions from code reviewRichard van der Hoff2020-02-051-2/+4
* make FederationClient.send_invite asyncRichard van der Hoff2020-02-031-6/+5
* make FederationClient.get_missing_events asyncRichard van der Hoff2020-02-031-20/+20
* make FederationClient._do_send_leave asyncRichard van der Hoff2020-02-031-4/+3
* make FederationClient.send_leave.send_request asyncRichard van der Hoff2020-02-031-5/+2
* make FederationClient._do_send_join asyncRichard van der Hoff2020-02-031-4/+3
* make FederationClient.send_join.send_request asyncRichard van der Hoff2020-02-031-4/+3
* make FederationClient.make_membership_event.send_request asyncRichard van der Hoff2020-02-031-4/+3
* make FederationClient._try_destination_list asyncRichard van der Hoff2020-02-031-10/+26
* make FederationClient.send_leave asyncRichard van der Hoff2020-02-031-10/+9
* make FederationClient.send_join asyncRichard van der Hoff2020-02-031-11/+13
* make FederationClient.make_membership_event asyncRichard van der Hoff2020-02-031-10/+11
* make FederationClient.get_event_auth asyncRichard van der Hoff2020-02-031-6/+4
* make FederationClient.get_room_state_ids asyncRichard van der Hoff2020-02-031-4/+5
* make FederationClient.get_pdu asyncRichard van der Hoff2020-02-031-15/+17
* make FederationClient.backfill asyncRichard van der Hoff2020-02-031-15/+11
* Fix `room_version` in `on_invite_request` flow (#6827)Richard van der Hoff2020-02-032-7/+10
* Merge pull request #6806 from matrix-org/rav/redact_changes/3Richard van der Hoff2020-01-311-3/+1
|\
| * Pass room_version into create_local_event_from_event_dictRichard van der Hoff2020-01-301-3/+1
* | s/get_room_version/get_room_version_id/Richard van der Hoff2020-01-312-13/+13
* | pass room version into FederationHandler.on_invite_request (#6805)Richard van der Hoff2020-01-301-1/+1
|/
* Fix sending server up commands from workers (#6811)Erik Johnston2020-01-302-12/+19
* Remove unused DeviceRow class (#6800)Erik Johnston2020-01-291-20/+1
* Fix race in federation sender that delayed device updates. (#6799)Erik Johnston2020-01-291-29/+3
* Add `rooms.room_version` column (#6729)Erik Johnston2020-01-271-17/+33
* Wake up transaction queue when remote server comes back online (#6706)Erik Johnston2020-01-172-3/+34
* Add StateMap type alias (#6715)Erik Johnston2020-01-161-1/+2
* Port synapse.replication.tcp to async/await (#6666)Erik Johnston2020-01-161-1/+3
* Process EDUs in parallel with PDUs. (#6697)Erik Johnston2020-01-141-12/+58
* Merge pull request #6349 from matrix-org/babolivier/msc1802Brendan Abolivier2019-12-114-28/+140
|\
| * Merge branch 'develop' into babolivier/msc1802Brendan Abolivier2019-12-058-26/+34
| |\
| * | LintBrendan Abolivier2019-11-111-3/+2
| * | LintBrendan Abolivier2019-11-111-3/+1
| * | Fix prefix for v2/send_leaveBrendan Abolivier2019-11-111-0/+2
| * | Add server-side support to the v2 APIBrendan Abolivier2019-11-112-14/+33
| * | Implement v2 API for send_leaveBrendan Abolivier2019-11-112-5/+56
| * | Add missing yieldBrendan Abolivier2019-11-111-1/+1
| * | Implement v2 API for send_joinBrendan Abolivier2019-11-112-8/+51
* | | Move get_state methods into FederationHandler (#6503)Richard van der Hoff2019-12-101-80/+11
* | | Refactor get_events_from_store_or_dest to return a dict (#6501)Richard van der Hoff2019-12-101-29/+15
* | | Remove fallback for missing /federation/v1/state_ids API (#6488)Richard van der Hoff2019-12-092-96/+17
| |/ |/|
* | Implementation of MSC2314 (#6176)Amber Brown2019-11-282-12/+20
* | Clean up newline quote marks around the codebase (#6362)Andrew Morgan2019-11-213-5/+5
* | Replace instance variations of homeserver with correct case/spacingAndrew Morgan2019-11-124-9/+9
|/
* Depublish a room from the public rooms list when it is upgraded (#6232)Andrew Morgan2019-11-011-1/+1
* Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-316-25/+32
|\
| * Update black to 19.10b0 (#6304)Amber Brown2019-11-011-5/+6
| * Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-315-20/+26
* | rename get_devices_by_remote to get_device_updates_by_remoteHubert Chathi2019-10-301-2/+2
* | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-305-131/+106
|\|
| * Fix small typo in comment (#6269)Andrew Morgan2019-10-301-1/+1
| * Merge pull request #6280 from matrix-org/erikj/receipts_async_awaitErik Johnston2019-10-301-1/+3
| |\
| | * Port receipt and read markers to async/waitErik Johnston2019-10-291-1/+3
| * | Don't return coroutinesErik Johnston2019-10-291-6/+6
| |/
| * Port federation_server to async/awaitErik Johnston2019-10-291-118/+87
| * Merge tag 'v1.5.0rc2' into developRichard van der Hoff2019-10-282-5/+9
| |\