summary refs log tree commit diff
path: root/synapse/federation (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * Improve signature checking on some federation APIs (#6262)Richard van der Hoff2019-10-282-5/+9
| * | use %r to __repr__ objectsMichael Kaye2019-10-242-3/+3
| |/
* | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-241-1/+1
|\|
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2019-10-222-49/+0
| |\
| * | Move storage classes into a main "data store".Erik Johnston2019-10-211-1/+1
* | | implement federation parts of cross-signingHubert Chathi2019-10-221-2/+2
| |/ |/|
* | rip out some unreachable codeRichard van der Hoff2019-10-172-49/+0
|/
* Fix /federation/v1/state for recent room versions (#6170)Richard van der Hoff2019-10-081-13/+0
* add some metrics on the federation sender (#6160)Richard van der Hoff2019-10-031-5/+6
* Land improved room list based on room stats (#6019)Erik Johnston2019-10-021-0/+8
* Fix exception when resetting retry timingsRichard van der Hoff2019-09-201-1/+1
* Remove origin parameter from add_display_name_to_third_party_invite and add p...Andrew Morgan2019-09-112-3/+3
* Merge pull request #5984 from matrix-org/joriks/opentracing_link_send_to_edu_...Erik Johnston2019-09-052-3/+13
|\
| * use access methods (duh..)Jorik Schellekens2019-09-051-1/+3
| * Link the send loop with the edus contextsJorik Schellekens2019-09-052-3/+11
* | Add opentracing to all client servlets (#5983)Jorik Schellekens2019-09-051-1/+5
|/
* Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-302-15/+15
* Merge pull request #5859 from matrix-org/rei/msc2197reivilibre2019-08-282-15/+67
|\
| * Use MSC2197 on stable prefix as it has almost finished FCPOlivier Wilkinson (reivilibre)2019-08-202-26/+4
| * Add support for inbound MSC2197 requests on unstable Federation APIOlivier Wilkinson (reivilibre)2019-08-151-1/+59
| * Support MSC2197 outbound with unstable prefixOlivier Wilkinson (reivilibre)2019-08-151-15/+31
* | Propagate opentracing contexts through EDUs (#5852)Jorik Schellekens2019-08-223-80/+108
* | Opentracing across workers (#5771)Jorik Schellekens2019-08-221-15/+28
* | Opentrace e2e keys (#5855)Jorik Schellekens2019-08-221-0/+3
* | Opentracing misc (#5856)Jorik Schellekens2019-08-161-6/+7
* | Wrap `get_local_public_room_list` call in `maybeDeferred` because itOlivier Wilkinson (reivilibre)2019-08-141-2/+8
|/
* Return 502 not 500 when failing to reach any remote server.Erik Johnston2019-08-011-4/+3
* Room Complexity Client Implementation (#5783)Amber Brown2019-07-302-7/+60
* Merge pull request #5744 from matrix-org/erikj/log_leave_origin_mismatchRichard van der Hoff2019-07-261-2/+2
|\
| * Log when we receive a /make_* request from a different originRichard van der Hoff2019-07-261-2/+2
* | Merge tag 'v1.2.0rc2' into developAndrew Morgan2019-07-241-1/+3
|\|
| * Fix servlet metric names (#5734)Jorik Schellekens2019-07-241-1/+3
* | Replace returnValue with return (#5736)Amber Brown2019-07-236-90/+75
|/
* Convert synapse.federation.transport.server to async (#5689)Richard van der Hoff2019-07-181-242/+188
* Add basic opentracing support (#5544)Jorik Schellekens2019-07-111-5/+21
* remove dead transaction persist code (#5622)Richard van der Hoff2019-07-052-41/+0
* Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-047-22/+32
* Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-4/+4
* Fix logging error when a tampered event is detected. (#5500)Richard van der Hoff2019-06-211-1/+0
* Run Black. (#5482)Amber Brown2019-06-2011-752/+613
* Add experimental option to reduce extremities.Erik Johnston2019-06-181-0/+3
* Clean up code for sending federation EDUs. (#5381)Richard van der Hoff2019-06-131-14/+26
* Prevent multiple device list updates from breaking a batch send (#5156)Andrew Morgan2019-06-061-2/+3
* Associate a request_name with each verify request, for loggingRichard van der Hoff2019-06-052-1/+5
* Add a test room version where we enforce key validity (#5348)Richard van der Hoff2019-06-051-15/+24
* Clean up debug logging (#5347)Richard van der Hoff2019-06-051-3/+13
* Fix failure to fetch batches of PDUs (#5342)Richard van der Hoff2019-06-041-0/+1
* Rename get_events->get_events_from_store_or_dest (#5344)Richard van der Hoff2019-06-041-20/+13
* Enforce validity period on server_keys for fed requests. (#5321)Richard van der Hoff2019-06-032-3/+5
* Implement the SHHS complexity API (#5216)Amber Brown2019-05-301-1/+30
* Fix error handling for rooms whose versions are unknown. (#5219)Richard van der Hoff2019-05-211-1/+13
* Make all the rate limiting options more consistent (#5181)Amber Brown2019-05-151-5/+1
* Run `black` on per_destination_queueRichard van der Hoff2019-05-091-35/+39
* Limit the number of EDUs in transactions to 100 as expected by receiver (#5138)Quentin Dufour2019-05-091-26/+30
* add options to require an access_token to GET /profile and /publicRooms on CS...Matthew Hodgson2019-05-081-0/+10
* more logging improvementsRichard van der Hoff2019-04-251-8/+11
* remove extraneous exception loggingRichard van der Hoff2019-04-251-2/+2
* Clarify logging when PDU signature checking failsRichard van der Hoff2019-04-251-0/+19
* Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-014-25/+27
* Use event streams to calculate presenceErik Johnston2019-03-272-3/+89
* Make federation endpoints more tolerant of trailing slashes v2 (#4935)Andrew Morgan2019-03-262-8/+8
* Remove trailing slashes from outbound federation requests and retry on 400 (#...Andrew Morgan2019-03-211-7/+14
|\
| * Switch to wrapper function around _send_requestAndrew Morgan2019-03-131-5/+5
| * Cleaner way of implementing trailing slashesAndrew Morgan2019-03-121-5/+10
| * Merge branch 'develop' into anoa/trailing_slashes_clientAndrew Morgan2019-03-111-7/+7
| |\
| * | lintAndrew Morgan2019-03-081-1/+3
| * | Retry certain federation requests on 404Andrew Morgan2019-03-081-5/+5
| * | Remove trailing slashes from outbound federation requestsAndrew Morgan2019-03-081-7/+7
* | | Batch up outgoing read-receipts to reduce federation traffic. (#4890)Richard van der Hoff2019-03-202-21/+158
* | | Merge pull request #4855 from matrix-org/rav/refactor_transaction_queueRichard van der Hoff2019-03-155-758/+860
|\ \ \
| * | | Rename and move the classesRichard van der Hoff2019-03-135-808/+860
| * | | Factor per-destination stuff out of TransactionQueueRichard van der Hoff2019-03-131-132/+182
* | | | Merge pull request #4852 from matrix-org/rav/move_rr_sending_to_workerRichard van der Hoff2019-03-152-0/+44
|\| | |
| * | | Move client receipt processing to federation sender worker.Richard van der Hoff2019-03-132-0/+44
| | |/ | |/|
* / | Revert "Make federation endpoints more tolerant of trailing slashes for some ...Erik Johnston2019-03-142-8/+8
|/ /
* / Make federation endpoints more tolerant of trailing slashes for some endpoint...Andrew Morgan2019-03-112-8/+8
|/
* Remove unnecessary dollar signsAndrew Morgan2019-03-041-22/+22
* Avoid rebuilding Edu objects in worker mode (#4770)Richard van der Hoff2019-03-042-14/+31
* Make 'event_id' a required parameter in federated state requests (#4741)Amber Brown2019-02-271-2/+2
* When presence is enabled don't send over replicationErik Johnston2019-02-271-0/+3
* Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_room...Andrew Morgan2019-02-267-243/+588
|\
| * Revert "Prevent showing non-fed rooms in fed /publicRooms"Andrew Morgan2019-02-261-2/+1
| * Merge pull request #4736 from matrix-org/anoa/public_rooms_federateAndrew Morgan2019-02-261-1/+2
| |\
| | * Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_room...Erik Johnston2019-02-257-241/+561
| | |\
| | * | Don't restrict non-fed rooms over client APIsAndrew Morgan2019-02-251-1/+2
| * | | Merge pull request #4737 from matrix-org/erikj/failure_log_tbErik Johnston2019-02-251-2/+3
| |\ \ \
| | * | | Log tracebacks correctlyErik Johnston2019-02-251-2/+3
| | | |/ | | |/|
| * / | MSC 1866 - Use M_UNSUPPORTED_ROOM_VERSION for invite APIErik Johnston2019-02-232-2/+26
| |/ /