summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Fixed set a user as an admin with the new API (#6928)Dirk Klimpel2020-03-024-38/+194
* Cast a coroutine into a Deferred in the federation base (#6996)Patrick Cloke2020-02-262-6/+9
* 1.11.0 v1.11.0 github/release-v1.11.0 release-v1.11.0Richard van der Hoff2020-02-214-2/+16
* Small grammar fixes to the ACME v1 deprecation notice (#6944)Andrew Morgan2020-02-213-10/+10
* update changes.md v1.11.0rc1Richard van der Hoff2020-02-191-6/+5
* 1.11.0rc1Richard van der Hoff2020-02-1957-56/+74
* Revert `get_auth_chain_ids` changes (#6951)Erik Johnston2020-02-192-28/+1
* Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekableRichard van der Hoff2020-02-1910-86/+97
|\
| * changelogRichard van der Hoff2020-02-191-0/+1
| * Make room alias lists peekableRichard van der Hoff2020-02-192-1/+20
| * 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-184-73/+46
* | Merge pull request #6940 from matrix-org/babolivier/federate.mdBrendan Abolivier2020-02-194-153/+127
|\ \
| * | Incorporate reviewBrendan Abolivier2020-02-192-12/+13
| * | Incorporate reviewBrendan Abolivier2020-02-182-21/+17
| * | PhrasingBrendan Abolivier2020-02-181-1/+1
| * | ChangelogBrendan Abolivier2020-02-181-0/+1
| * | Add mention of SRV records as an advanced topicBrendan Abolivier2020-02-181-0/+10
| * | Argh trailing spacesBrendan Abolivier2020-02-181-2/+2
| * | Fix links in the reverse proxy docBrendan Abolivier2020-02-181-3/+4
| * | Make federate.md more of a sumary of the steps to follow to set up replicationBrendan Abolivier2020-02-181-17/+28
| * | Split the delegating documentation out of federate.md and trim it downBrendan Abolivier2020-02-182-133/+87
* | | Move MSC2432 stuff onto unstable prefix (#6948)Richard van der Hoff2020-02-194-4/+23
* | | Tiny optimisation for _get_handler_for_request (#6950)Richard van der Hoff2020-02-192-1/+4
* | | Increase DB/CPU perf of `_is_server_still_joined` check. (#6936)Erik Johnston2020-02-193-15/+60
* | | Merge pull request #6945 from matrix-org/babolivier/fix-retention-debug-logBrendan Abolivier2020-02-192-1/+2
|\ \ \
| * | | Update changelog.d/6945.bugfixBrendan Abolivier2020-02-191-1/+1
| * | | ChangelogBrendan Abolivier2020-02-181-0/+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-192-18/+24
| |_|/ |/| |
* | | Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939)Richard van der Hoff2020-02-185-11/+128
* | | Merge pull request #6872 from matrix-org/rav/dictpropertyRichard van der Hoff2020-02-183-82/+120
|\ \ \
| * | | changelogRichard van der Hoff2020-02-141-0/+1
| * | | 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-142-66/+80
* | | | Merge pull request #6907 from matrix-org/babolivier/acme-configBrendan Abolivier2020-02-184-1/+40
|\ \ \ \ | |_|/ / |/| | |
| * | | 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
| * | | ChangelogBrendan Abolivier2020-02-131-0/+1
| * | | 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-132-0/+24
* | | | Increase perf of `get_auth_chain_ids` used in state res v2. (#6937)Erik Johnston2020-02-182-0/+24
* | | | Fix worker docs to point `/publicised_groups` API correctly. (#6938)Erik Johnston2020-02-182-3/+5
* | | | Merge pull request #6909 from matrix-org/babolivier/acme-installBrendan Abolivier2020-02-182-11/+18
|\ \ \ \
| * | | | Update INSTALL.mdBrendan Abolivier2020-02-131-1/+3
| * | | | ChangelogBrendan Abolivier2020-02-131-0/+1
| * | | | Update INSTALL.md to recommend reverse proxying and warn about ACMEv1 depreca...Brendan Abolivier2020-02-131-11/+15
| | |_|/ | |/| |
* | | | Stop sending events when creating or deleting aliases (#6904)Patrick Cloke2020-02-184-42/+194
* | | | Kill off deprecated "config-on-the-fly" docker mode (#6918)Richard van der Hoff2020-02-183-40/+33
* | | | #6924 has been released in 1.10.1Richard van der Hoff2020-02-171-1/+0
* | | | Merge branch 'master' into developRichard van der Hoff2020-02-173-1/+16
|\ \ \ \
| * \ \ \ Merge branch 'release-v1.10.1'Richard van der Hoff2020-02-174-3/+21
| |\ \ \ \
| | * | | | 1.10.1 v1.10.1 github/release-v1.10.1 release-v1.10.1Richard van der Hoff2020-02-174-2/+16
| | * | | | wait for current_state_events_membership before delete_old_current_state_even...Richard van der Hoff2020-02-172-2/+6
* | | | | | Raise the default power levels for invites, tombstones and server acls (#6834)Andrew Morgan2020-02-173-2/+13
* | | | | | wait for current_state_events_membership before delete_old_current_state_even...Richard van der Hoff2020-02-172-2/+6
* | | | | | Add type hints to the spam check module (#6915)Patrick Cloke2020-02-144-22/+36
* | | | | | contrib/docker: Ensure correct encoding and locale settings on DB creation (#...Fridtjof Mund2020-02-142-0/+4
* | | | | | Add a warning about indentation to generated config (#6920)Richard van der Hoff2020-02-144-4/+29
* | | | | | Convert the directory handler tests to use HomeserverTestCase (#6919)Patrick Cloke2020-02-142-24/+18
| |_|_|_|/ |/| | | |
* | | | | Filter the results of user directory searching via the spam checker (#6888)Patrick Cloke2020-02-145-2/+135
| |_|/ / |/| | |
* | | | Update changelog for #6905 to group it with upcoming PRsBrendan Abolivier2020-02-131-1/+1
* | | | Add documentation for the spam checker module (#6906)Patrick Cloke2020-02-132-0/+86
* | | | Merge pull request #6905 from matrix-org/babolivier/acme.mdBrendan Abolivier2020-02-132-12/+44
|\ \ \ \
| * | | | Update docs/ACME.mdBrendan Abolivier2020-02-131-1/+1
| * | | | Mention that using Synapse to serve certificates requires restartsBrendan Abolivier2020-02-121-1/+3
| * | | | ChangelogBrendan Abolivier2020-02-121-0/+1
| * | | | Remove duplicated info about certbot et alBrendan Abolivier2020-02-121-5/+0
| * | | | Update ACME.md to mention ACME v1 deprecationBrendan Abolivier2020-02-121-7/+41
| | |_|/ | |/| |
* / | | Remove m.lazy_load_members from unstable features since it is in CS r0.5.0 (#...Aaron Raimist2020-02-132-1/+1
|/ / /
* | | Merge pull request #6891 from matrix-org/babolivier/retention-doc-amendBrendan Abolivier2020-02-123-0/+8
|\ \ \
| * | | RephraseBrendan Abolivier2020-02-122-5/+5
| * | | Update the changelog fileBrendan Abolivier2020-02-111-1/+1
| * | | Also spell it out in the purge history API docBrendan Abolivier2020-02-111-0/+3
| * | | ChangelogBrendan Abolivier2020-02-111-0/+1
| * | | Spell out that Synapse never purges the last event sent in a roomBrendan Abolivier2020-02-111-0/+4
* | | | Return a 404 for admin api user lookup if user not found (#6901)Andrew Morgan2020-02-123-1/+21
* | | | Merge branch 'master' into developBrendan Abolivier2020-02-125-6/+21
|\ \ \ \ | | |/ / | |/| |
| * | | Merge tag 'v1.10.0'Brendan Abolivier2020-02-1287-520/+1795
| |\ \ \ | | | |/ | | |/|
| | * | Move the warning at the top of the release changes v1.10.0 github/release-v1.10.0 release-v1.10.0Brendan Abolivier2020-02-121-3/+2
| | * | 1.10.0Brendan Abolivier2020-02-124-2/+16
| | * | bump the version of Alpine Linux used in the docker images (#6897)Richard van der Hoff2020-02-122-1/+2
| * | | Update documentation (#6859)Robin Vleij2020-02-051-1/+2
* | | | Use BSD-compatible in-place editing for sed. (#6887)Patrick Cloke2020-02-122-1/+3
| |_|/ |/| |
* | | Merge branch 'release-v1.10.0' into developRichard van der Hoff2020-02-112-5/+9
|\ \ \ | | |/ | |/|
| * | 1.10.0rc5 v1.10.0rc5Richard van der Hoff2020-02-112-2/+6
| * | changelog wordingRichard van der Hoff2020-02-111-2/+2
| * | Update CHANGES.mdRichard van der Hoff2020-02-111-1/+1
| * | changelog formattingRichard van der Hoff2020-02-111-2/+2
* | | Merge branch 'release-v1.10.0' into developRichard van der Hoff2020-02-113-1/+11
|\| |
| * | 1.10.0rc4Richard van der Hoff2020-02-113-2/+10
| * | filter out m.room.aliases from /sync state blocks (#6884)Matthew Hodgson2020-02-102-0/+2
* | | Reject device display names that are too long (#6882)Patrick Cloke2020-02-103-1/+32
* | | Add an additional test to the SyTest blacklist for worker mode. (#6883)Patrick Cloke2020-02-102-0/+3
* | | Merge tag 'v1.10.0rc3' into developRichard van der Hoff2020-02-104-2/+23
|\| |
| * | 1.10.0rc3 v1.10.0rc3Richard van der Hoff2020-02-104-3/+16
| * | filter out m.room.aliases from the CS API until a better solution is specced ...Matthew Hodgson2020-02-102-0/+8
* | | Merge remote-tracking branch 'origin/release-v1.10.0' into developRichard van der Hoff2020-02-102-0/+19
|\| |
| * | Update setuptools for python 3.5 tests (#6880)Richard van der Hoff2020-02-102-0/+19
* | | Add support for putting fed user query API on workers (#6873)Erik Johnston2020-02-075-21/+25
* | | Remove unused `get_room_stats_state` method. (#6869)Richard van der Hoff2020-02-072-25/+1
* | | Add a `make_event_from_dict` method (#6858)Richard van der Hoff2020-02-0713-39/+52
* | | Add typing to synapse.federation.sender (#6871)Erik Johnston2020-02-079-107/+138
* | | Allow moving group read APIs to workers (#6866)Erik Johnston2020-02-079-687/+722
* | | Admin api to add an email address (#6789)Dirk Klimpel2020-02-076-2/+78
* | | remove unused room_version_to_event_format (#6857)Richard van der Hoff2020-02-072-23/+2
* | | Merge pull request #6856 from matrix-org/rav/redact_changes/6Richard van der Hoff2020-02-075-60/+51
|\ \ \
| * | | Pass room_version into `event_from_pdu_json`Richard van der Hoff2020-02-065-60/+51
* | | | Limit the number of events that can be requested when backfilling events (#6864)Patrick Cloke2020-02-062-0/+5
|/ / /
* | | pass room version into FederationClient.send_join (#6854)Richard van der Hoff2020-02-063-30/+34
* | | Allow empty federation_certificate_verification_whitelist (#6849)timfi2020-02-062-0/+3
* | | Third party event rules Update (#6781)PeerD2020-02-063-4/+10
* | | Reduce amount of logging at INFO level. (#6862)Erik Johnston2020-02-0612-21/+22
* | | Merge pull request #6823 from matrix-org/rav/redact_changes/5Richard van der Hoff2020-02-063-19/+14
|\ \ \
| * | | NewsfileRichard van der Hoff2020-02-051-0/+1
| * | | 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-068-23/+90
|\ \ \ \ | | |/ / | |/| |
| * | | Update changelog v1.10.0rc2Erik Johnston2020-02-061-1/+1
| * | | Update changelogErik Johnston2020-02-061-2/+2
| * | | Update changelogErik Johnston2020-02-061-1/+1
| * | | 1.10.0rc2Erik Johnston2020-02-065-4/+17
| * | | Check sender_key matches on inbound encrypted events. (#6850)Erik Johnston2020-02-053-14/+67
| * | | Merge pull request #6844 from matrix-org/uhoreg/cross_signing_fix_device_fedHubert Chathi2020-02-052-0/+11
| * | | Fix detecting unknown devices from remote encrypted events. (#6848)Erik Johnston2020-02-046-7/+7
* | | | Merge pull request #6855 from matrix-org/clokep/readme-pip-installPatrick Cloke2020-02-052-1/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Add quotes around pip install target (my shell complained without them).Patrick Cloke2020-02-052-1/+2
* | | | Merge pull request #6840 from matrix-org/rav/federation_client_asyncRichard van der Hoff2020-02-052-136/+143
|\ \ \ \ | |/ / / |/| | |
| * | | 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-047-349/+386
| |\ \ \
| * | | | make FederationClient.send_invite asyncRichard van der Hoff2020-02-031-6/+5
| * | | | newsfileRichard van der Hoff2020-02-031-0/+1
| * | | | 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-052-1/+2
* | | | | Database updates to populate rooms.room_version (#6847)Richard van der Hoff2020-02-043-0/+58
* | | | | Merge pull request #6844 from matrix-org/uhoreg/cross_signing_fix_device_fedHubert Chathi2020-02-042-0/+11
|\ \ \ \ \
| * | | | | add changelogHubert Chathi2020-02-041-0/+1
| * | | | | add device signatures to device key query resultsHubert Chathi2020-02-041-0/+10
* | | | | | Update CONTRIBUTING.md about merging PRs. (#6846)Michael Kaye2020-02-042-0/+15
| |_|/ / / |/| | | |
* | | | | Merge pull request #6837 from matrix-org/rav/federation_asyncRichard van der Hoff2020-02-044-235/+212
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | 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
| * | | changelogRichard van der Hoff2020-02-031-0/+1
| * | | 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-035-349/+381
* | | | Fix stacktraces when using ObservableDeferred and async/await (#6836)Erik Johnston2020-02-032-0/+5
|/ / /
* | | Allow URL-encoded user IDs on user admin api paths (#6825)Andrew Morgan2020-02-032-2/+3
* | | Fix `room_version` in `on_invite_request` flow (#6827)Richard van der Hoff2020-02-033-7/+11
|/ /
* | Update changelog v1.10.0rc1Erik Johnston2020-01-311-1/+4
* | Fix link in upgrade.rstErik Johnston2020-01-311-1/+1
* | 1.10.0rc1Erik Johnston2020-01-3135-35/+47
* | Fix deleting of stale marker for device lists (#6819)Erik Johnston2020-01-312-7/+8
* | pass room_version into compute_event_signature (#6807)Richard van der Hoff2020-01-313-9/+25
* | Merge pull request #6806 from matrix-org/rav/redact_changes/3Richard van der Hoff2020-01-316-41/+49
|\ \
| * | changelogRichard van der Hoff2020-01-301-0/+1
| * | Pass room_version into add_hashes_and_signaturesRichard van der Hoff2020-01-303-10/+21
| * | 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-302-7/+9
* | | Merge pull request #6820 from matrix-org/rav/get_room_version_idRichard van der Hoff2020-01-3114-38/+64
|\ \ \
| * | | newsfileRichard van der Hoff2020-01-311-0/+1
| * | | 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-3112-33/+37
* | | | Fix bug with getting missing auth event during join 500'ed (#6810)Erik Johnston2020-01-312-1/+6
|/ / /
* | | pass room version into FederationHandler.on_invite_request (#6805)Richard van der Hoff2020-01-303-4/+5
* | | Log when we delete room in bg update (#6816)Erik Johnston2020-01-302-0/+3
|/ /
* | MSC2260: Block direct sends of m.room.aliases events (#6794)Richard van der Hoff2020-01-304-33/+28
* | Backgroud update to clean out rooms from current state (#6802)Erik Johnston2020-01-303-2/+126
* | Resync remote device list when detected as stale. (#6786)Erik Johnston2020-01-304-7/+28
* | Fix sending server up commands from workers (#6811)Erik Johnston2020-01-306-13/+36
* | When server leaves room check for stale device lists. (#6801)Erik Johnston2020-01-303-6/+83
* | When a client asks for remote keys check if should resync. (#6797)Erik Johnston2020-01-302-3/+30
* | Type defintions for use in refactoring for redaction changes (#6803)Richard van der Hoff2020-01-305-8/+24
* | Remove unused DeviceRow class (#6800)Erik Johnston2020-01-292-20/+2
* | Merge pull request #6790 from matrix-org/rav/msc2260.1Richard van der Hoff2020-01-295-18/+112
|\ \
| * | changelogRichard van der Hoff2020-01-291-0/+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-293-15/+90
|/ /
* | Fix race in federation sender that delayed device updates. (#6799)Erik Johnston2020-01-293-30/+23
* | Delete current state when server leaves a room (#6792)Erik Johnston2020-01-293-75/+198
* | Fix bug when querying remote user keys that require a resync. (#6796)Erik Johnston2020-01-292-1/+3
* | Fix outbound federation request metrics (#6795)Erik Johnston2020-01-282-0/+5
* | Merge pull request #6787 from matrix-org/rav/msc2260Richard van der Hoff2020-01-283-5/+36
|\ \
| * | fix bad variable refRichard van der Hoff2020-01-281-1/+1
| * | update changelogRichard van der Hoff2020-01-282-1/+1
| * | changelogRichard van der Hoff2020-01-281-0/+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-286-8/+126
|/ /
* | Pass room version object into event_auth.check and check_redaction (#6788)Richard van der Hoff2020-01-288-34/+53
* | Warn if postgres database has non-C locale. (#6734)Erik Johnston2020-01-286-1/+81
* | Merge branch 'master' into developErik Johnston2020-01-284-2/+23
|\|
| * 1.9.1 v1.9.1 github/release-v1.9.1 release-v1.9.1Erik Johnston2020-01-284-2/+16
| * Fix setting `mau_limit_reserved_threepids` config (#6793)Erik Johnston2020-01-282-1/+8
* | Add `rooms.room_version` column (#6729)Erik Johnston2020-01-2711-73/+270
* | Propagate cache invalidates from workers to other workers. (#6748)Erik Johnston2020-01-274-5/+29
* | Merge pull request #6775 from matrix-org/jaywink/worker-docs-tweaksBrendan Abolivier2020-01-272-0/+18
|\ \
| * | Formatting of changelogJason Robinson2020-01-271-1/+1
| * | Fix federation_reader listeners doc as per PR reviewJason Robinson2020-01-271-2/+12
| * | Clarifications to the workers documentationJason Robinson2020-01-242-0/+8
* | | Validate client_secret parameter (#6767)Andrew Morgan2020-01-246-6/+93
|/ /
* | Make 'event.redacts' never raise. (#6771)Erik Johnston2020-01-235-6/+62
* | Merge branch 'master' into developBrendan Abolivier2020-01-234-5/+20
|\|
| * Fixup changelog v1.9.0 github/release-v1.9.0 release-v1.9.0Brendan Abolivier2020-01-231-1/+1
| * Fixup changelogBrendan Abolivier2020-01-231-4/+5
| * Fixup changelogBrendan Abolivier2020-01-232-2/+4
| * Merge branch 'release-v1.9.0' of github.com:matrix-org/synapse into release-v...Brendan Abolivier2020-01-232-4/+5
| |\
| * | 1.9.0Brendan Abolivier2020-01-233-1/+13
* | | a bit of debugging for media storage providers (#6757)Richard van der Hoff2020-01-233-0/+8
* | | Minor fixes to user admin api (#6761)Richard van der Hoff2020-01-232-9/+6