summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Add 'device_lists_outbound_pokes' as extra table.Erik Johnston2020-02-282-2/+11
* Fixed set a user as an admin with the new API (#6928)Dirk Klimpel2020-02-282-10/+12
* 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
* | Don't refuse to start worker if media listener configured. (#7002)Erik Johnston2020-02-271-14/+20
* | Add some type annotations in `synapse.storage` (#6987)Richard van der Hoff2020-02-276-82/+266
* | Store room version on invite (#6983)Richard van der Hoff2020-02-264-2/+68
* | Port PresenceHandler to async/await (#6991)Erik Johnston2020-02-264-109/+99
* | Updated warning for incorrect database collation/ctype (#6985)Uday Bansal2020-02-261-3/+7
* | Ensure 'deactivated' parameter is a boolean on user admin API, Fix error hand...Andrew Morgan2020-02-262-4/+8
* | Sanity-check database before running upgrades (#6982)Richard van der Hoff2020-02-252-17/+32
* | Merge worker apps into one. (#6964)Erik Johnston2020-02-2513-2317/+1045
* | Remove redundant store_room call (#6979)Richard van der Hoff2020-02-241-23/+0
* | Upsert room version when we join over federation (#6968)Richard van der Hoff2020-02-242-10/+29
* | Fix minor issues with email config (#6962)Richard van der Hoff2020-02-241-36/+30
* | No longer use room alias events to calculate room names for push notification...Patrick Cloke2020-02-211-22/+14
* | Change displayname of user as admin in rooms (#6876)Dirk Klimpel2020-02-211-1/+11
* | Stop returning aliases as part of the room list. (#6970)Patrick Cloke2020-02-211-9/+0
* | Publishing/removing from the directory requires a power level greater than ca...Patrick Cloke2020-02-211-5/+5
* | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Patrick Cloke2020-02-2153-168/+159
* | Merge pull request #6967 from matrix-org/rav/increase_max_events_behindRichard van der Hoff2020-02-211-1/+1
|\ \
| * | Increase MAX_EVENTS_BEHIND for replication clientsErik Johnston2020-02-211-1/+1
* | | Merge branch 'master' into developRichard van der Hoff2020-02-212-6/+6
|\ \ \ | |/ / |/| / | |/
| * 1.11.0 v1.11.0 github/release-v1.11.0 release-v1.11.0Richard van der Hoff2020-02-211-1/+1
| * Small grammar fixes to the ACME v1 deprecation notice (#6944)Andrew Morgan2020-02-211-5/+5
* | Do not send alias events when creating / upgrading a room (#6941)Patrick Cloke2020-02-202-40/+15
* | don't insert into the device table for remote cross-signing keys (#6956)Hubert Chathi2020-02-201-15/+18
* | Add some clarifications to README.md in the database schema directory. (#6615)Ruben Barkow-Kuder2020-02-201-8/+16
* | Minor perf fixes to `get_auth_chain_ids`.Erik Johnston2020-02-192-7/+5
* | Freeze allocated objects on startup. (#6953)Erik Johnston2020-02-191-0/+9
* | Reduce auth chains fetched during v2 state res. (#6952)Erik Johnston2020-02-193-11/+34
|/
* 1.11.0rc1Richard van der Hoff2020-02-191-1/+1
* Revert `get_auth_chain_ids` changes (#6951)Erik Johnston2020-02-191-28/+0
* Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekableRichard van der Hoff2020-02-197-84/+77
|\
| * Make room alias lists peekableRichard van der Hoff2020-02-191-1/+3
| * Add `allow_departed_users` param to `check_in_room_or_world_readable`Richard van der Hoff2020-02-195-15/+33
| * Refactor the membership check methods in AuthRichard van der Hoff2020-02-183-71/+44
* | Move MSC2432 stuff onto unstable prefix (#6948)Richard van der Hoff2020-02-192-1/+9
* | Tiny optimisation for _get_handler_for_request (#6950)Richard van der Hoff2020-02-191-1/+3
* | Increase DB/CPU perf of `_is_server_still_joined` check. (#6936)Erik Johnston2020-02-192-15/+59
* | Merge pull request #6945 from matrix-org/babolivier/fix-retention-debug-logBrendan Abolivier2020-02-191-1/+1
|\ \
| * | Fix log in message retention purge jobsBrendan Abolivier2020-02-181-1/+1
* | | Limit size of get_auth_chain_ids query (#6947)Erik Johnston2020-02-191-18/+23
| |/ |/|
* | Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939)Richard van der Hoff2020-02-182-1/+39
* | Merge pull request #6872 from matrix-org/rav/dictpropertyRichard van der Hoff2020-02-181-81/+118
|\ \
| * | Rewrite _EventInternalMetadata to back it with a _dictRichard van der Hoff2020-02-141-16/+39
| * | Replace _event_dict_property with DictPropertyRichard van der Hoff2020-02-141-65/+79
* | | Merge pull request #6907 from matrix-org/babolivier/acme-configBrendan Abolivier2020-02-182-1/+34
|\ \ \ | |_|/ |/| |
| * | Make the log more noticeableBrendan Abolivier2020-02-181-1/+2
| * | Print the error as an error log and raise the same exception we gotBrendan Abolivier2020-02-181-9/+10
| * | Linters are hard but in they end they just want what's best for usBrendan Abolivier2020-02-131-1/+1
| * | LintBrendan Abolivier2020-02-131-6/+7
| * | LintBrendan Abolivier2020-02-131-7/+6
| * | Add a separator for the config warningBrendan Abolivier2020-02-131-1/+1
| * | Add a comprehensive error when failing to register for an ACME accountBrendan Abolivier2020-02-131-1/+13
| * | Add mention and warning about ACME v1 deprecation to the Synapse configBrendan Abolivier2020-02-131-0/+19
* | | Increase perf of `get_auth_chain_ids` used in state res v2. (#6937)Erik Johnston2020-02-181-0/+23
* | | Stop sending events when creating or deleting aliases (#6904)Patrick Cloke2020-02-182-40/+41
* | | Merge branch 'master' into developRichard van der Hoff2020-02-171-1/+1
|\ \ \
| * | | 1.10.1 v1.10.1 github/release-v1.10.1 release-v1.10.1Richard van der Hoff2020-02-171-1/+1
| * | | wait for current_state_events_membership before delete_old_current_state_even...Richard van der Hoff2020-02-171-2/+5
* | | | Raise the default power levels for invites, tombstones and server acls (#6834)Andrew Morgan2020-02-171-1/+9
* | | | wait for current_state_events_membership before delete_old_current_state_even...Richard van der Hoff2020-02-171-2/+5
* | | | Add type hints to the spam check module (#6915)Patrick Cloke2020-02-142-22/+34
* | | | Add a warning about indentation to generated config (#6920)Richard van der Hoff2020-02-141-2/+14
| |_|/ |/| |
* | | Filter the results of user directory searching via the spam checker (#6888)Patrick Cloke2020-02-142-2/+39
* | | Remove m.lazy_load_members from unstable features since it is in CS r0.5.0 (#...Aaron Raimist2020-02-131-1/+0
| |/ |/|
* | Return a 404 for admin api user lookup if user not found (#6901)Andrew Morgan2020-02-121-1/+4
* | Merge branch 'master' into developBrendan Abolivier2020-02-121-1/+1
|\|
| * 1.10.0Brendan Abolivier2020-02-121-1/+1
* | Merge branch 'release-v1.10.0' into developRichard van der Hoff2020-02-111-1/+1
|\|
| * 1.10.0rc5 v1.10.0rc5Richard van der Hoff2020-02-111-1/+1
* | Merge branch 'release-v1.10.0' into developRichard van der Hoff2020-02-112-1/+2
|\|
| * 1.10.0rc4Richard van der Hoff2020-02-111-1/+1
| * filter out m.room.aliases from /sync state blocks (#6884)Matthew Hodgson2020-02-101-0/+1
* | Reject device display names that are too long (#6882)Patrick Cloke2020-02-101-1/+13
* | Merge tag 'v1.10.0rc3' into developRichard van der Hoff2020-02-102-1/+8
|\|
| * 1.10.0rc3 v1.10.0rc3Richard van der Hoff2020-02-101-1/+1
| * filter out m.room.aliases from the CS API until a better solution is specced ...Matthew Hodgson2020-02-101-0/+7
* | Add support for putting fed user query API on workers (#6873)Erik Johnston2020-02-073-21/+23
* | Remove unused `get_room_stats_state` method. (#6869)Richard van der Hoff2020-02-071-25/+0
* | Add a `make_event_from_dict` method (#6858)Richard van der Hoff2020-02-073-12/+19
* | Add typing to synapse.federation.sender (#6871)Erik Johnston2020-02-076-105/+130
* | Allow moving group read APIs to workers (#6866)Erik Johnston2020-02-077-687/+713
* | Admin api to add an email address (#6789)Dirk Klimpel2020-02-073-0/+49
* | remove unused room_version_to_event_format (#6857)Richard van der Hoff2020-02-071-23/+1
* | Merge pull request #6856 from matrix-org/rav/redact_changes/6Richard van der Hoff2020-02-073-58/+46
|\ \
| * | Pass room_version into `event_from_pdu_json`Richard van der Hoff2020-02-063-58/+46
* | | Limit the number of events that can be requested when backfilling events (#6864)Patrick Cloke2020-02-061-0/+4
|/ /
* | pass room version into FederationClient.send_join (#6854)Richard van der Hoff2020-02-062-30/+33
* | Allow empty federation_certificate_verification_whitelist (#6849)timfi2020-02-061-0/+2
* | Third party event rules Update (#6781)PeerD2020-02-062-4/+9
* | Reduce amount of logging at INFO level. (#6862)Erik Johnston2020-02-0611-21/+21
* | Merge pull request #6823 from matrix-org/rav/redact_changes/5Richard van der Hoff2020-02-062-19/+13
|\ \
| * | 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-052-9/+7
* | | Merge tag 'v1.10.0rc2' into developErik Johnston2020-02-067-22/+73
|\ \ \ | |/ / |/| / | |/
| * 1.10.0rc2Erik Johnston2020-02-061-1/+1
| * Check sender_key matches on inbound encrypted events. (#6850)Erik Johnston2020-02-052-14/+66
| * Merge pull request #6844 from matrix-org/uhoreg/cross_signing_fix_device_fedHubert Chathi2020-02-051-0/+10
| * Fix detecting unknown devices from remote encrypted events. (#6848)Erik Johnston2020-02-045-7/+6
* | Merge pull request #6840 from matrix-org/rav/federation_client_asyncRichard van der Hoff2020-02-051-136/+142
|\ \
| * | 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
| * | Merge remote-tracking branch 'origin/develop' into rav/federation_client_asyncRichard van der Hoff2020-02-043-348/+379
| |\ \
| * | | 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
* | | | Reduce performance logging to DEBUG (#6833)Michael Kaye2020-02-051-1/+1
* | | | Database updates to populate rooms.room_version (#6847)Richard van der Hoff2020-02-042-0/+57
* | | | Merge pull request #6844 from matrix-org/uhoreg/cross_signing_fix_device_fedHubert Chathi2020-02-041-0/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | add device signatures to device key query resultsHubert Chathi2020-02-041-0/+10
* | | | Merge pull request #6837 from matrix-org/rav/federation_asyncRichard van der Hoff2020-02-043-235/+211
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | make FederationHandler.send_invite asyncRichard van der Hoff2020-02-032-6/+4
| * | make FederationHandler.on_get_missing_events asyncRichard van der Hoff2020-02-031-5/+4
| * | make FederationHandler.user_joined_room asyncRichard van der Hoff2020-02-031-3/+3
| * | make FederationHandler._clean_room_for_join asyncRichard van der Hoff2020-02-031-4/+4
| * | make FederationHandler._notify_persisted_event asyncRichard van der Hoff2020-02-031-4/+6
| * | make FederationHandler.persist_events_and_notify asyncRichard van der Hoff2020-02-031-10/+10
| * | make FederationHandler._make_and_verify_event asyncRichard van der Hoff2020-02-031-5/+10
| * | make FederationHandler.do_remotely_reject_invite asyncRichard van der Hoff2020-02-032-8/+11
| * | make FederationHandler._check_for_soft_fail asyncRichard van der Hoff2020-02-031-13/+9
| * | make FederationHandler._persist_auth_tree asyncRichard van der Hoff2020-02-031-11/+7
| * | make FederationHandler.do_invite_join asyncRichard van der Hoff2020-02-032-18/+18
| * | make FederationHandler.on_event_auth asyncRichard van der Hoff2020-02-031-5/+4
| * | make FederationHandler.on_exchange_third_party_invite_request asyncRichard van der Hoff2020-02-031-14/+12
| * | make FederationHandler.construct_auth_difference asyncRichard van der Hoff2020-02-031-3/+4
| * | make FederationHandler._update_context_for_auth_events asyncRichard van der Hoff2020-02-031-10/+10
| * | make FederationHandler._update_auth_events_and_context_for_auth asyncRichard van der Hoff2020-02-031-20/+21
| * | make FederationHandler.do_auth asyncRichard van der Hoff2020-02-031-10/+14
| * | make FederationHandler._prep_event asyncRichard van der Hoff2020-02-031-23/+10
| * | make FederationHandler._handle_new_event asyncRichard van der Hoff2020-02-031-6/+7
| * | make FederationHandler._handle_new_events asyncRichard van der Hoff2020-02-031-8/+6
| * | make FederationHandler.on_make_leave_request asyncRichard van der Hoff2020-02-031-13/+10
| * | make FederationHandler.on_send_leave_request asyncRichard van der Hoff2020-02-031-5/+3
| * | make FederationHandler.on_make_join_request asyncRichard van der Hoff2020-02-031-13/+10
| * | make FederationHandler.on_invite_request asyncRichard van der Hoff2020-02-031-5/+4
| * | make FederationHandler.on_send_join_request asyncRichard van der Hoff2020-02-031-9/+7
| * | make FederationHandler.on_query_auth asyncRichard van der Hoff2020-02-031-7/+6
* | | Add typing to SyncHandler (#6821)Erik Johnston2020-02-032-348/+375
* | | Fix stacktraces when using ObservableDeferred and async/await (#6836)Erik Johnston2020-02-031-0/+4
|/ /
* | Allow URL-encoded user IDs on user admin api paths (#6825)Andrew Morgan2020-02-031-2/+2
* | Fix `room_version` in `on_invite_request` flow (#6827)Richard van der Hoff2020-02-032-7/+10
|/
* 1.10.0rc1Erik Johnston2020-01-311-1/+1
* Fix deleting of stale marker for device lists (#6819)Erik Johnston2020-01-311-7/+7
* pass room_version into compute_event_signature (#6807)Richard van der Hoff2020-01-312-9/+24
* Merge pull request #6806 from matrix-org/rav/redact_changes/3Richard van der Hoff2020-01-313-37/+39
|\
| * Pass room_version into add_hashes_and_signaturesRichard van der Hoff2020-01-302-8/+14
| * Pass room_version into create_local_event_from_event_dictRichard van der Hoff2020-01-302-25/+19
| * Store the room version in EventBuilderRichard van der Hoff2020-01-301-5/+7
* | Merge pull request #6820 from matrix-org/rav/get_room_version_idRichard van der Hoff2020-01-3110-35/+58
|\ \
| * | Add `get_room_version` methodRichard van der Hoff2020-01-312-5/+26
| * | s/get_room_version/get_room_version_id/Richard van der Hoff2020-01-319-30/+32
* | | Fix bug with getting missing auth event during join 500'ed (#6810)Erik Johnston2020-01-311-1/+5
|/ /
* | pass room version into FederationHandler.on_invite_request (#6805)Richard van der Hoff2020-01-302-4/+4
* | Log when we delete room in bg update (#6816)Erik Johnston2020-01-301-0/+2
|/
* MSC2260: Block direct sends of m.room.aliases events (#6794)Richard van der Hoff2020-01-301-0/+12
* Backgroud update to clean out rooms from current state (#6802)Erik Johnston2020-01-302-2/+125
* Resync remote device list when detected as stale. (#6786)Erik Johnston2020-01-302-4/+24
* Fix sending server up commands from workers (#6811)Erik Johnston2020-01-304-13/+34
* When server leaves room check for stale device lists. (#6801)Erik Johnston2020-01-302-6/+82
* When a client asks for remote keys check if should resync. (#6797)Erik Johnston2020-01-301-3/+29
* Type defintions for use in refactoring for redaction changes (#6803)Richard van der Hoff2020-01-303-4/+12
* Remove unused DeviceRow class (#6800)Erik Johnston2020-01-291-20/+1
* Make /directory/room/<alias> handle restrictive power levelsRichard van der Hoff2020-01-291-1/+6
* Set the PL for aliases events to 0.Richard van der Hoff2020-01-292-3/+16
* Factor out a `copy_power_levels_contents` methodRichard van der Hoff2020-01-292-13/+47
* Fix race in federation sender that delayed device updates. (#6799)Erik Johnston2020-01-292-30/+22
* Delete current state when server leaves a room (#6792)Erik Johnston2020-01-292-75/+197
* Fix bug when querying remote user keys that require a resync. (#6796)Erik Johnston2020-01-291-1/+2
* Fix outbound federation request metrics (#6795)Erik Johnston2020-01-281-0/+4
* Merge pull request #6787 from matrix-org/rav/msc2260Richard van der Hoff2020-01-282-5/+35
|\
| * fix bad variable refRichard van der Hoff2020-01-281-1/+1
| * Implement updated auth rules from MSC2260Richard van der Hoff2020-01-282-5/+35
* | Detect unknown remote devices and mark cache as stale (#6776)Erik Johnston2020-01-285-8/+125
|/
* Pass room version object into event_auth.check and check_redaction (#6788)Richard van der Hoff2020-01-286-27/+48
* Warn if postgres database has non-C locale. (#6734)Erik Johnston2020-01-283-0/+52
* Merge branch 'master' into developErik Johnston2020-01-282-2/+8
|\
| * 1.9.1 v1.9.1 github/release-v1.9.1 release-v1.9.1Erik Johnston2020-01-281-1/+1
| * Fix setting `mau_limit_reserved_threepids` config (#6793)Erik Johnston2020-01-281-1/+7
* | Add `rooms.room_version` column (#6729)Erik Johnston2020-01-277-71/+251
* | Propagate cache invalidates from workers to other workers. (#6748)Erik Johnston2020-01-273-5/+28
* | Validate client_secret parameter (#6767)Andrew Morgan2020-01-244-6/+41
* | Make 'event.redacts' never raise. (#6771)Erik Johnston2020-01-233-6/+26
* | Merge branch 'master' into developBrendan Abolivier2020-01-231-1/+1
|\|
| * 1.9.0Brendan Abolivier2020-01-231-1/+1
* | a bit of debugging for media storage providers (#6757)Richard van der Hoff2020-01-232-0/+7
* | Minor fixes to user admin api (#6761)Richard van der Hoff2020-01-231-9/+5
* | Remove unnecessary abstractions in admin handler (#6751)Andrew Morgan2020-01-223-73/+10
|/
* 1.9.0rc1Brendan Abolivier2020-01-221-1/+1
* Admin API to list, filter and sort rooms (#6720)Andrew Morgan2020-01-225-3/+224
* Fix typo in _select_thumbnailBrendan Abolivier2020-01-221-1/+1
* Fix and add test to deprecated quarantine media admin api (#6756)Andrew Morgan2020-01-221-1/+1
* Allow monthly active user limiting support for worker mode, fixes #4639. (#6742)Neil Johnson2020-01-225-82/+99
* Allow streaming cache invalidate all to workers. (#6749)Erik Johnston2020-01-224-15/+63
* Add a DeltaState to track changes to be made to current state (#6716)Erik Johnston2020-01-202-99/+111
* Fixup synapse.rest to pass mypy (#6732)Erik Johnston2020-01-209-33/+45
* Fix `/events/:event_id` deprecated API. (#6731)Erik Johnston2020-01-201-1/+1
* Fixup synapse.api to pass mypy (#6733)Erik Johnston2020-01-203-4/+9
* Fix changing password via user admin API. (#6730)Erik Johnston2020-01-201-2/+2
* Fix empty account_validity config blockAndrew Morgan2020-01-201-1/+2
* Add more logging around message retention policies support (#6717)Brendan Abolivier2020-01-172-0/+21
* bump version to v1.9.0.dev2 v1.9.0.dev2Richard van der Hoff2020-01-171-1/+1
* Fix syntax error in run_upgrade for schema 57 (#6728)Satsuki Yanagi2020-01-171-3/+4
* Merge pull request #6714 from matrix-org/babolivier/retention_select_eventBrendan Abolivier2020-01-173-7/+7
|\
| * Fixup diffBrendan Abolivier2020-01-161-6/+7
| * Remove get_room_event_after_stream_ordering entirelyBrendan Abolivier2020-01-162-58/+13
| * LintBrendan Abolivier2020-01-161-6/+12
| * Correctly order when selecting before stream orderingBrendan Abolivier2020-01-151-2/+5
| * Fix typoBrendan Abolivier2020-01-151-1/+1
| * Fix instantiation of message retention purge jobsBrendan Abolivier2020-01-152-13/+48
* | bump version to v1.9.0.dev1 v1.9.0.dev1Richard van der Hoff2020-01-171-1/+1
* | Merge pull request #6724 from matrix-org/rav/log_saml_attributesRichard van der Hoff2020-01-179-24/+66
|\ \
| * | Log saml assertions rather than the whole responseRichard van der Hoff2020-01-162-1/+25
| * | move batch_iter to a separate moduleRichard van der Hoff2020-01-168-23/+41
* | | Delegate remote_user_id mapping to the saml mapping provider (#6723)Richard van der Hoff2020-01-172-6/+22
* | | Wake up transaction queue when remote server comes back online (#6706)Erik Johnston2020-01-179-7/+129
* | | Clarify the `account_validity` and `email` sections of the sample configurati...Richard van der Hoff2020-01-173-140/+167
|/ /
* | Add StateMap type alias (#6715)Erik Johnston2020-01-1613-93/+114
* | Add org.matrix.e2e_cross_signing to unstable_features in /versions as per MSC...Neil Johnson2020-01-161-0/+2
* | Port synapse.replication.tcp to async/await (#6666)Erik Johnston2020-01-1613-104/+78
* | Fix purge_room admin API (#6711)Erik Johnston2020-01-151-1/+1
* | Remove duplicate session check in web fallback servlet (#6702)Andrew Morgan2020-01-151-4/+0
* | Merge branch 'develop' into rav/module_api_extensionsRichard van der Hoff2020-01-1536-240/+682
|\ \
| * | Implement RedirectException (#6687)Richard van der Hoff2020-01-152-5/+35
| * | Add `local_current_membership` table (#6655)Erik Johnston2020-01-1513-89/+247
| |/
| * Process EDUs in parallel with PDUs. (#6697)Erik Johnston2020-01-141-12/+58
| * Fixup synapse.replication to pass mypy checks (#6667)Erik Johnston2020-01-1410-86/+103
| * Quarantine media by ID or user ID (#6681)Andrew Morgan2020-01-132-3/+181
| * Kill off RegistrationError (#6691)Richard van der Hoff2020-01-132-15/+3
| * Don't assign numeric IDs for empty usernames (#6690)Richard van der Hoff2020-01-131-1/+1
| * Merge pull request #6689 from matrix-org/rav/saml_mapping_provider_updatesRichard van der Hoff2020-01-131-6/+16
| |\
| | * Pass client redirect URL into SAML mapping providersRichard van der Hoff2020-01-121-4/+11
| | * Pass the module_api into the SamlMappingProviderRichard van der Hoff2020-01-121-2/+5
| * | Allow additional_resources to implement Resource directly (#6686)Richard van der Hoff2020-01-131-2/+11
| * | Fix exceptions on requests for non-ascii urls (#6682)Richard van der Hoff2020-01-131-1/+1
| * | comment for run_in_backgroundRichard van der Hoff2020-01-121-0/+3
| * | Refuse to start if sqlite is older than 3.11.0Richard van der Hoff2020-01-092-4/+7