summary refs log tree commit diff
path: root/synapse/handlers (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-221-9/+139
|\
| * Query missing cross-signing keys on local sig upload (#7289)Andrew Morgan2020-04-221-9/+139
* | import urllib.parse when using urllib.parse.quote (#7319)Andrew Morgan2020-04-221-1/+1
* | Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-201-129/+9
|\|
| * Revert "Query missing cross-signing keys on local sig upload"Richard van der Hoff2020-04-201-129/+9
* | Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-201-9/+129
|\|
| * Always send the user updates to their own device list (#7160)David Baker2020-04-202-3/+18
| * Query missing cross-signing keys on local sig uploadAndrew Morgan2020-04-171-9/+129
| * Only register devices edu handler on the master process (#7255)Andrew Morgan2020-04-141-7/+11
* | Reject unknown UI auth sessions (instead of silently generating a new one) (#...Patrick Cloke2020-04-201-65/+94
* | Use a template for the SSO success page to allow for customization. (#7279)Patrick Cloke2020-04-171-32/+12
* | Convert auth handler to async/await (#7261)Patrick Cloke2020-04-154-111/+115
* | Only register devices edu handler on the master process (#7255)Andrew Morgan2020-04-141-7/+11
* | Check on room creation if the user is allowed to publish the room to the room...PeerD2020-04-131-0/+7
* | typosMatthew Hodgson2020-04-111-1/+1
* | Default PL100 to enable encryption in a room (#7230)Andrew Morgan2020-04-091-0/+1
* | Do not allow a deactivated user to login via SSO. (#7240)Patrick Cloke2020-04-093-6/+32
* | Improve error responses when a remote server doesn't allow you to access its ...Andrew Morgan2020-04-061-11/+12
* | Support CAS in UI Auth flows. (#7186)Patrick Cloke2020-04-032-74/+91
* | Support SAML in the user interactive authentication workflow. (#7102)Patrick Cloke2020-04-012-14/+153
* | Allow admins to create aliases when they are not in the room (#7191)Patrick Cloke2020-04-011-1/+5
* | Rewrite prune_old_outbound_device_pokes for efficiency (#7159)Richard van der Hoff2020-03-301-23/+2
* | Transfer alias mappings when joining an upgraded room (#6946)Andrew Morgan2020-03-301-0/+3
* | Merge pull request #7160 from matrix-org/dbkr/always_send_own_device_list_upd...David Baker2020-03-302-3/+18
|\ \
| * | Add explanatory commentAndrew Morgan2020-03-302-1/+4
| * | blackDavid Baker2020-03-301-1/+3
| * | Just add own user ID to the list we track device changes forDavid Baker2020-03-302-7/+11
| * | Fix undefined variable & remove debug loggingDavid Baker2020-03-271-10/+2
| * | blackDavid Baker2020-03-271-4/+4
| * | Always send the user updates to their own device listDavid Baker2020-03-272-6/+20
* | | Add options to prevent users from changing their profile. (#7096)Dirk Klimpel2020-03-271-0/+16
|/ /
* | Merge pull request #7151 from matrix-org/jaywink/saml-redirect-fixJason Robinson2020-03-261-0/+4
|\ \
| * | Allow RedirectResponse in SAML response handlerJason Robinson2020-03-261-0/+4
* | | Refactor the CAS code (move the logic out of the REST layer to a handler) (#7...Patrick Cloke2020-03-261-0/+204
* | | Allow server admins to define and enforce a password policy (MSC2000). (#7118)Dirk Klimpel2020-03-262-0/+95
|/ /
* | Validate that the session is not modified during UI-Auth (#7068)Patrick Cloke2020-03-261-4/+33
* | Clean up some LoggingContext stuff (#7120)Richard van der Hoff2020-03-241-2/+2
* | Use the proper error code when a canonical alias that does not exist is used....Patrick Cloke2020-03-231-19/+38
* | Remove concept of a non-limited stream. (#7011)Erik Johnston2020-03-202-4/+11
|/
* Add an option to the set password API to choose whether to logout other devic...Patrick Cloke2020-03-181-16/+25
* Remove special casing of `m.room.aliases` events (#7034)Patrick Cloke2020-03-171-15/+1
* Revert "Add options to disable setting profile info for prevent changes. (#70...Richard van der Hoff2020-03-171-16/+0
* Fix buggy condition in account validity handler (#7074)Brendan Abolivier2020-03-161-1/+5
* Add type annotations and comments to auth handler (#7063)Patrick Cloke2020-03-121-89/+104
* Don't filter out dummy events when we're checking the visibility of stateBrendan Abolivier2020-03-111-1/+1
* Add options to disable setting profile info for prevent changes. (#7053)Brendan Abolivier2020-03-101-0/+16
|\
| * lint, fix testsdklimpel2020-03-091-1/+3
| * updates after reviewdklimpel2020-03-091-4/+4
| * lintdklimpel2020-03-081-4/+2
| * changelogdklimpel2020-03-081-2/+8
| * Add options to disable setting profile info for prevent changes.dklimpel2020-03-081-0/+10
* | SAML2: render a comprehensible error page if something goes wrongBrendan Abolivier2020-03-101-1/+19
* | LintBrendan Abolivier2020-03-061-2/+1
* | Mention the session ID in the error messageBrendan Abolivier2020-03-061-2/+3
* | LintBrendan Abolivier2020-03-061-1/+2
* | Make sure that is_verified is a boolean when processing room keysBrendan Abolivier2020-03-061-0/+6
* | Allow deleting an alias if the user has sufficient power level (#6986)Patrick Cloke2020-03-041-33/+74
* | Merge branch 'master' into developBrendan Abolivier2020-03-032-3/+76
|\ \
| * | Fix wrong handler being used in SAML handlerBrendan Abolivier2020-03-031-3/+2
| * | Factor out complete_sso_login and expose it to the Module APIBrendan Abolivier2020-03-031-0/+74
* | | Validate the alt_aliases property of canonical alias events (#6971)Patrick Cloke2020-03-032-10/+51
| |/ |/|
* | Store room version on invite (#6983)Richard van der Hoff2020-02-261-0/+12
* | Port PresenceHandler to async/await (#6991)Erik Johnston2020-02-262-108/+89
* | 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-241-10/+12
* | 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
* | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Patrick Cloke2020-02-219-35/+33
* | Merge branch 'master' into developRichard van der Hoff2020-02-211-5/+5
|\|
| * 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
|/
* Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekableRichard van der Hoff2020-02-195-33/+22
|\
| * 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-193-6/+14
| * Refactor the membership check methods in AuthRichard van der Hoff2020-02-182-28/+7
* | 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
* | Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939)Richard van der Hoff2020-02-181-1/+16
* | Merge pull request #6907 from matrix-org/babolivier/acme-configBrendan Abolivier2020-02-181-1/+15
|\ \ | |/ |/|
| * 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
| * LintBrendan Abolivier2020-02-131-6/+7
| * LintBrendan Abolivier2020-02-131-7/+6
| * Add a comprehensive error when failing to register for an ACME accountBrendan Abolivier2020-02-131-1/+13
* | Stop sending events when creating or deleting aliases (#6904)Patrick Cloke2020-02-182-40/+41
* | Raise the default power levels for invites, tombstones and server acls (#6834)Andrew Morgan2020-02-171-1/+9
* | Filter the results of user directory searching via the spam checker (#6888)Patrick Cloke2020-02-141-2/+12
|/
* Merge branch 'release-v1.10.0' into developRichard van der Hoff2020-02-111-0/+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
* | Add support for putting fed user query API on workers (#6873)Erik Johnston2020-02-071-19/+16
* | Allow moving group read APIs to workers (#6866)Erik Johnston2020-02-071-131/+139
* | Admin api to add an email address (#6789)Dirk Klimpel2020-02-072-0/+10
* | 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-061-2/+1
* | Third party event rules Update (#6781)PeerD2020-02-061-1/+5
* | Reduce amount of logging at INFO level. (#6862)Erik Johnston2020-02-064-11/+11
* | Merge pull request #6823 from matrix-org/rav/redact_changes/5Richard van der Hoff2020-02-061-6/+2
|\ \
| * | Pass room version object into `FederationClient.get_pdu`Richard van der Hoff2020-02-051-6/+2
* | | Merge tag 'v1.10.0rc2' into developErik Johnston2020-02-064-17/+69
|\ \ \ | |/ / |/| / | |/
| * Check sender_key matches on inbound encrypted events. (#6850)Erik Johnston2020-02-052-14/+66
| * Fix detecting unknown devices from remote encrypted events. (#6848)Erik Johnston2020-02-043-3/+3
* | 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-031-341/+364
|/
* pass room_version into compute_event_signature (#6807)Richard van der Hoff2020-01-311-1/+4
* Merge pull request #6820 from matrix-org/rav/get_room_version_idRichard van der Hoff2020-01-314-14/+16
|\
| * s/get_room_version/get_room_version_id/Richard van der Hoff2020-01-314-14/+16
* | 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-301-3/+3
* Resync remote device list when detected as stale. (#6786)Erik Johnston2020-01-302-4/+24
* 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-291-2/+15
* Factor out a `copy_power_levels_contents` methodRichard van der Hoff2020-01-291-12/+11
* Fix bug when querying remote user keys that require a resync. (#6796)Erik Johnston2020-01-291-1/+2
* Detect unknown remote devices and mark cache as stale (#6776)Erik Johnston2020-01-282-2/+75
* Pass room version object into event_auth.check and check_redaction (#6788)Richard van der Hoff2020-01-282-9/+17
* Add `rooms.room_version` column (#6729)Erik Johnston2020-01-272-35/+82
* Validate client_secret parameter (#6767)Andrew Morgan2020-01-241-1/+3
* Remove unnecessary abstractions in admin handler (#6751)Andrew Morgan2020-01-221-62/+0
* Add more logging around message retention policies support (#6717)Brendan Abolivier2020-01-171-0/+13
* Merge pull request #6714 from matrix-org/babolivier/retention_select_eventBrendan Abolivier2020-01-171-1/+1
|\
| * Fix instantiation of message retention purge jobsBrendan Abolivier2020-01-151-1/+1
* | Merge pull request #6724 from matrix-org/rav/log_saml_attributesRichard van der Hoff2020-01-171-1/+12
|\ \
| * | Log saml assertions rather than the whole responseRichard van der Hoff2020-01-161-1/+12
* | | Delegate remote_user_id mapping to the saml mapping provider (#6723)Richard van der Hoff2020-01-171-6/+21
|/ /
* | Add StateMap type alias (#6715)Erik Johnston2020-01-163-28/+31
* | Port synapse.replication.tcp to async/await (#6666)Erik Johnston2020-01-161-1/+1
* | Add `local_current_membership` table (#6655)Erik Johnston2020-01-156-6/+6
|/
* Kill off RegistrationError (#6691)Richard van der Hoff2020-01-131-9/+3
* Don't assign numeric IDs for empty usernames (#6690)Richard van der Hoff2020-01-131-1/+1
* 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 admin users to create or modify users without a shared secret (#6495)Manuel Stahl2020-01-091-0/+9
* Correctly proxy remote group HTTP errors. (#6654)Erik Johnston2020-01-071-0/+16
* Merge pull request #6652 from matrix-org/babolivier/depth_missing_eventsBrendan Abolivier2020-01-071-2/+2
|\
| * Fix conditions failing if min_depth = 0Brendan Abolivier2020-01-071-2/+2
* | Merge pull request #6629 from matrix-org/rav/kill_event_reference_hashesRichard van der Hoff2020-01-062-34/+20
|\ \
| * | Remove unused hashes and depths from _update_membership paramsRichard van der Hoff2020-01-061-13/+4
| * | Remove unused hashes and depths from create_event paramsRichard van der Hoff2020-01-062-17/+12
| * | Remove unused hashes and depths from create_new_client_event paramsRichard van der Hoff2020-01-061-12/+14
| * | replace get_prev_events_and_hashes_for_room with get_prev_events_for_room in ...Richard van der Hoff2020-01-061-9/+3
| * | rename get_prev_events_for_room to get_prev_events_and_hashes_for_roomRichard van der Hoff2020-01-062-3/+7
* | | Fix some test failures when frozen_dicts are enabled (#6642)Richard van der Hoff2020-01-062-6/+11
* | | Fix an error which was thrown by the PresenceHandler _on_shutdown handler. (#...Richard van der Hoff2020-01-061-7/+2
|/ /
* / Fix power levels being incorrectly set in old and new rooms after a room upgr...Andrew Morgan2020-01-061-7/+10
|/
* Merge branch 'master' into developRichard van der Hoff2019-12-201-1/+4
|\
| * Fix exceptions when attempting to backfill (#6576)Richard van der Hoff2019-12-201-1/+4
* | Change EventContext to use the Storage class (#6564)Erik Johnston2019-12-205-16/+16
* | Port some admin handlers to async/await (#6559)Erik Johnston2019-12-192-54/+41
* | Add database config class (#6513)Erik Johnston2019-12-181-1/+1
* | Merge release-v1.7.1 into developRichard van der Hoff2019-12-182-2/+6
|\|
| * Merge pull request #6553 from matrix-org/babolivier/fix-context-filterBrendan Abolivier2019-12-161-2/+5
| |\
| | * Incorporate reviewBrendan Abolivier2019-12-161-1/+1
| | * Use the filtered version of an event when responding to /context requests for...Brendan Abolivier2019-12-161-1/+4
| * | Exclude rejected state events when calculating state at backwards extrems (#6...Richard van der Hoff2019-12-161-1/+1
| * | Persist auth/state events at backwards extremities when we fetch them (#6526)Richard van der Hoff2019-12-161-163/+80
| * | sanity-checking for events used in state res (#6531)Richard van der Hoff2019-12-161-0/+1
| * | Check the room_id of events when fetching room state/auth (#6524)Richard van der Hoff2019-12-161-24/+54
| * | Add `include_event_in_state` to _get_state_for_room (#6521)Richard van der Hoff2019-12-161-18/+21
| * | Move get_state methods into FederationHandler (#6503)Richard van der Hoff2019-12-161-6/+95
| |/
* | Remove unused `get_pagination_rows` methods. (#6557)Erik Johnston2019-12-173-18/+0
* | Add option to allow profile queries without sharing a room (#6523)Will Hunt2019-12-161-1/+5
* | Exclude rejected state events when calculating state at backwards extrems (#6...Richard van der Hoff2019-12-161-1/+1
* | Persist auth/state events at backwards extremities when we fetch them (#6526)Richard van der Hoff2019-12-161-167/+80
* | sanity-checking for events used in state res (#6531)Richard van der Hoff2019-12-131-0/+1
* | Merge pull request #6496 from matrix-org/erikj/initial_sync_asnycErik Johnston2019-12-131-52/+44
|\ \
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/initial_sy...Erik Johnston2019-12-118-236/+452
| |\ \
| * | | Port synapse.handlers.initial_sync to async/awaitErik Johnston2019-12-091-52/+44
* | | | look up cross-signing keys from the DB in bulk (#6486)Hubert Chathi2019-12-121-8/+27
* | | | Check the room_id of events when fetching room state/auth (#6524)Richard van der Hoff2019-12-121-23/+51
| |/ / |/| |
* | | Add `include_event_in_state` to _get_state_for_room (#6521)Richard van der Hoff2019-12-111-22/+28
* | | Merge pull request #6517 from matrix-org/rav/event_auth/13Richard van der Hoff2019-12-112-98/+88
|\ \ \
| * | | convert to async: FederationHandler._process_received_pduRichard van der Hoff2019-12-111-11/+10
| * | | convert to async: FederationHandler._get_state_for_roomRichard van der Hoff2019-12-111-21/+21
| * | | convert to async: FederationHandler.on_receive_pduRichard van der Hoff2019-12-111-27/+22
| * | | Convert federation backfill to asyncRichard van der Hoff2019-12-112-39/+35
* | | | Merge pull request #6504 from matrix-org/erikj/account_validity_async_awaitErik Johnston2019-12-112-55/+45
|\ \ \ \ | |/ / / |/| | |
| * | | Port handlers.account_validity to async/await.Erik Johnston2019-12-102-47/+41
| * | | Port handlers.account_data to async/await.Erik Johnston2019-12-101-9/+5
| | |/ | |/|
* | | Clean up some logging (#6515)Richard van der Hoff2019-12-111-18/+19
* | | Prevent redacted events from appearing in message search (#6377)Andrew Morgan2019-12-112-4/+8
* | | Prevent message search in upgraded rooms we're not in (#6385)Andrew Morgan2019-12-112-11/+27
* | | Move get_state methods into FederationHandler (#6503)Richard van der Hoff2019-12-101-6/+95
* | | Allow SAML username provider plugins (#6411)Andrew Morgan2019-12-101-28/+170
* | | Merge pull request #6506 from matrix-org/erikj/remove_snapshot_cacheErik Johnston2019-12-101-11/+8
|\ \ \ | |/ / |/| / | |/
| * Remove SnapshotCache in favour of ResponseCacheErik Johnston2019-12-091-11/+8
* | Back out perf regression from get_cross_signing_keys_from_cache. (#6494)Neil Johnson2019-12-091-30/+8
|/
* Merge pull request #6493 from matrix-org/erikj/invite_state_configErik Johnston2019-12-091-1/+3
|\
| * Pull out room_invite_state_types config option once.Erik Johnston2019-12-091-1/+3
* | Merge pull request #6484 from matrix-org/erikj/port_sync_handlerErik Johnston2019-12-093-152/+131
|\ \ | |/ |/|
| * Fixup functions to consistently return deferredsErik Johnston2019-12-062-4/+4
| * Port SyncHandler to async/awaitErik Johnston2019-12-052-151/+130
* | Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925)Manuel Stahl2019-12-051-9/+12
|/
* Stronger typing in the federation handler (#6480)Richard van der Hoff2019-12-051-24/+57
* Sanity-check the rooms of auth events before pulling them in. (#6472)Richard van der Hoff2019-12-051-9/+25
* get rid of (most of) have_events from _update_auth_events_and_context_for_aut...Richard van der Hoff2019-12-041-38/+24
* Merge pull request #6441 from syamgk/fix-parameter-mismatchErik Johnston2019-12-041-1/+1
|\
| * Issue #6406 Fix parameter mismatchSyam G Krishnan2019-12-041-1/+1
* | Merge pull request #6329 from matrix-org/babolivier/context_filtersBrendan Abolivier2019-12-041-2/+12
|\ \
| * \ Merge branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-12-0414-192/+395
| |\ \
| * | | Incorporate reviewBrendan Abolivier2019-12-041-2/+1
| * | | Also filter state eventsBrendan Abolivier2019-11-061-1/+7
| * | | Only filter if a filter was providedBrendan Abolivier2019-11-051-4/+6
| * | | Update copyrightBrendan Abolivier2019-11-051-1/+2
| * | | Filter events_before and events_after in /context requestsBrendan Abolivier2019-11-051-2/+4
* | | | Add ephemeral messages support (MSC2228) (#6409)Brendan Abolivier2019-12-032-1/+130
| |/ / |/| |
* | | Transfer power level state events on room upgrade (#6237)Andrew Morgan2019-12-021-5/+31
| |/ |/|
* | Merge pull request #6434 from matrix-org/erikj/msc2367_membership_reasonsErik Johnston2019-11-293-7/+15
|\ \
| * | Propagate reason in remotely rejected invitesErik Johnston2019-11-283-7/+15
* | | Discard retention policies when retrieving stateBrendan Abolivier2019-11-281-1/+1
|/ /
* | Remove local threepids on account deactivation (#6426)Andrew Morgan2019-11-281-0/+3
* | add etag and count to key backup endpoints (#5858)Hubert Chathi2019-11-271-50/+80
* | Merge pull request #6358 from matrix-org/babolivier/message_retentionBrendan Abolivier2019-11-273-4/+110
|\ \
| * \ Merge branch 'develop' into babolivier/message_retentionBrendan Abolivier2019-11-269-88/+111
| |\ \
| * | | Fix 3PID invite exchangeBrendan Abolivier2019-11-191-1/+1
| * | | LintBrendan Abolivier2019-11-191-11/+6
| * | | Implement per-room message retention policiesBrendan Abolivier2019-11-043-3/+114
| | |/ | |/|
* | | Merge pull request #6343 from matrix-org/rav/event_auth/4Richard van der Hoff2019-11-261-37/+44
|\ \ \ | |_|/ |/| |
| * | remove confusing fixmeRichard van der Hoff2019-11-261-6/+0
| * | Merge remote-tracking branch 'origin/develop' into rav/event_auth/4Richard van der Hoff2019-11-186-11/+11
| |\ \
| * | | Use get_events_as_list rather than lots of calls to get_eventRichard van der Hoff2019-11-081-16/+8
| * | | Update some docstrings and commentsRichard van der Hoff2019-11-081-8/+31
| * | | Simplify _update_auth_events_and_context_for_authRichard van der Hoff2019-11-081-11/+9
* | | | Merge pull request #6332 from matrix-org/erikj/query_devices_fixErik Johnston2019-11-261-3/+16
|\ \ \ \