summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
| * | Check postgres version in check_databaseRichard van der Hoff2020-01-091-13/+12
| * | Modify check_database to take a connection rather than a cursorRichard van der Hoff2020-01-093-10/+11
| |/
* | Handle `config` not being set for synapse plugin modulesRichard van der Hoff2020-01-121-1/+1
* | Cleanups and additions to the module APIRichard van der Hoff2020-01-122-6/+59
|/
* Allow admin users to create or modify users without a shared secret (#6495)Manuel Stahl2020-01-094-0/+155
* Merge branch 'master' into developErik Johnston2020-01-091-1/+1
|\
| * 1.8.0Erik Johnston2020-01-091-1/+1
* | Merge pull request #6664 from matrix-org/erikj/media_admin_apisErik Johnston2020-01-082-120/+130
|\ \
| * | Shuffle the codeErik Johnston2020-01-081-25/+16
| * | CommentsErik Johnston2020-01-081-0/+3
| * | Do not rely on streaming events, as media repo doesn'tErik Johnston2020-01-081-12/+26
| * | Import RoomStore in media worker to fix admin APIsErik Johnston2020-01-081-0/+2
| * | Move media admin store functions to worker storeErik Johnston2020-01-081-120/+120
* | | Merge remote-tracking branch 'origin/release-v1.8.0' into developRichard van der Hoff2020-01-082-24/+10
|\ \ \ | | |/ | |/|
| * | Fix GET request on /_synapse/admin/v2/users endpoint (#6563)Manuel Stahl2020-01-081-2/+2
| * | Back out ill-advised notary server hackery (#6657)Richard van der Hoff2020-01-081-22/+8
| |/
* | Correctly proxy remote group HTTP errors. (#6654)Erik Johnston2020-01-071-0/+16
* | Merge pull request #6621 from matrix-org/babolivier/purge_job_config_typoBrendan Abolivier2020-01-071-5/+5
|\ \ | |/ |/|
| * RewordBrendan Abolivier2020-01-071-3/+3
| * Change the example from 5min to 12hBrendan Abolivier2020-01-071-4/+4
| * Fix a typo in the purge jobs configuration exampleBrendan Abolivier2020-01-031-1/+1
* | 1.8.0rc1Erik Johnston2020-01-071-1/+1
* | Merge pull request #6652 from matrix-org/babolivier/depth_missing_eventsBrendan Abolivier2020-01-072-3/+3
|\ \
| * | Fix conditions failing if min_depth = 0Brendan Abolivier2020-01-072-3/+3
| |/
* | Add a background update to clear tombstoned rooms from the directory (#6648)Richard van der Hoff2020-01-074-1/+100
* | Async/await for background updates (#6647)Richard van der Hoff2020-01-071-16/+20
* | Merge pull request #6645 from matrix-org/rav/fix_synchrotron_errorRichard van der Hoff2020-01-072-15/+47
|\ \
| * | Fix exceptions in log when rejected event is replicatedRichard van der Hoff2020-01-061-2/+9
| * | async/await for SyncReplicationHandler.process_and_notifyRichard van der Hoff2020-01-061-5/+4
| * | Clarify documentation on get_event* methodsRichard van der Hoff2020-01-061-9/+35
* | | Merge pull request #6629 from matrix-org/rav/kill_event_reference_hashesRichard van der Hoff2020-01-064-87/+49
|\ \ \ | |/ / |/| |
| * | Remove unused get_latest_event_ids_and_hashes_in_roomRichard van der Hoff2020-01-061-42/+0
| * | Remove unused get_prev_events_and_hashes_for_roomRichard van der Hoff2020-01-061-30/+0
| * | 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-062-12/+26
| * | replace get_prev_events_and_hashes_for_room with get_prev_events_for_room in ...Richard van der Hoff2020-01-062-9/+38
| * | rename get_prev_events_for_room to get_prev_events_and_hashes_for_roomRichard van der Hoff2020-01-063-5/+10
* | | Fix some test failures when frozen_dicts are enabled (#6642)Richard van der Hoff2020-01-064-11/+19
* | | Add experimental 'databases' config (#6580)Erik Johnston2020-01-062-13/+63
* | | Fix an error which was thrown by the PresenceHandler _on_shutdown handler. (#...Richard van der Hoff2020-01-061-7/+2
* | | Fix exception when fetching notary server's old keys (#6625)Richard van der Hoff2020-01-061-6/+7
* | | Workaround for error when fetching notary's own key (#6620)Richard van der Hoff2020-01-061-8/+22
|/ /
* | Fix power levels being incorrectly set in old and new rooms after a room upgr...Andrew Morgan2020-01-061-7/+10
* | Automate generation of the sample and debian log configs (#6627)Richard van der Hoff2020-01-031-1/+8
* | Raise an error if someone tries to use the log_file config option (#6626)Richard van der Hoff2020-01-032-3/+16
* | Remove unused, undocumented "content repo" resource (#6628)Richard van der Hoff2020-01-036-123/+2
* | Kill off redundant SynapseRequestFactory (#6619)Richard van der Hoff2020-01-031-15/+3
* | Reduce the reconnect time when replication fails. (#6617)Richard van der Hoff2020-01-031-1/+2
|/
* Merge branch 'master' into developRichard van der Hoff2019-12-312-16/+38
|\
| * 1.7.3 v1.7.3 github/release-v1.7.3 release-v1.7.3Richard van der Hoff2019-12-311-1/+1
| * Hacks to work around #6605 (#6608)Richard van der Hoff2019-12-311-15/+37
* | Merge branch 'master' into developRichard van der Hoff2019-12-202-2/+5
|\|
| * 1.7.2 v1.7.2 github/release-v1.7.2 release-v1.7.2Richard van der Hoff2019-12-201-1/+1
| * Backport fixes to sqlite upgrade from develop (#6578)Richard van der Hoff2019-12-201-1/+9
| * Fix exceptions when attempting to backfill (#6576)Richard van der Hoff2019-12-201-1/+4
* | Split state groups into a separate data store (#6296)Erik Johnston2019-12-2024-1162/+1152
* | Change EventContext to use the Storage class (#6564)Erik Johnston2019-12-2013-39/+49
* | Explode on duplicate delta file names. (#6565)Erik Johnston2019-12-191-0/+18
* | Port some admin handlers to async/await (#6559)Erik Johnston2019-12-193-56/+45
* | Improve diagnostics on database upgrade failure (#6570)Richard van der Hoff2019-12-192-8/+6
* | Fix sdnotify with acme enabled (#6571)Richard van der Hoff2019-12-191-3/+7
* | Add an export_signing_key script (#6546)Richard van der Hoff2019-12-191-8/+15
* | Clean up startup for the pusher (#6558)Richard van der Hoff2019-12-184-43/+37
* | Add delta file to fix missing default table data (#6555)Andrew Morgan2019-12-183-15/+23
* | Add database config class (#6513)Erik Johnston2019-12-189-73/+160
* | Merge branch 'master' into developRichard van der Hoff2019-12-181-1/+1
|\|
| * 1.7.1Richard van der Hoff2019-12-181-1/+1
* | Merge release-v1.7.1 into developRichard van der Hoff2019-12-184-10/+16
|\|
| * Fix bug where we added duplicate event IDs as auth_events (#6560)Erik Johnston2019-12-171-7/+8
| * Add auth events as per spec. (#6556)Erik Johnston2019-12-161-67/+34
| * Merge pull request #6553 from matrix-org/babolivier/fix-context-filterBrendan Abolivier2019-12-162-3/+7
| |\
| | * Incorporate reviewBrendan Abolivier2019-12-161-1/+1
| | * Update the documentation of the filtering functionBrendan Abolivier2019-12-161-1/+2
| | * 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-162-165/+82
| * | sanity-checking for events used in state res (#6531)Richard van der Hoff2019-12-164-43/+124
| * | Sanity-check room ids in event auth (#6530)Richard van der Hoff2019-12-161-0/+12
| * | 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-162-86/+106
| * | Refactor get_events_from_store_or_dest to return a dict (#6501)Richard van der Hoff2019-12-161-29/+15
| |/
* | Remove unused `get_pagination_rows` methods. (#6557)Erik Johnston2019-12-173-18/+0
* | Add auth events as per spec. (#6556)Erik Johnston2019-12-161-67/+34
* | Add option to allow profile queries without sharing a room (#6523)Will Hunt2019-12-162-1/+18
* | 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-162-169/+82
* | Automatically delete empty groups/communities (#6453)Werner Sembach2019-12-162-0/+34
* | sanity-checking for events used in state res (#6531)Richard van der Hoff2019-12-134-43/+124
* | Sanity-check room ids in event auth (#6530)Richard van der Hoff2019-12-131-0/+12
* | Merge pull request #6537 from matrix-org/erikj/bump_mypy_versionErik Johnston2019-12-136-6/+11
|\ \
| * | Bump version of mypyErik Johnston2019-12-126-6/+11
* | | Merge branch 'master' into developErik Johnston2019-12-131-1/+1
|\ \ \ | | |/ | |/|
| * | 1.7.0Erik Johnston2019-12-131-1/+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-1170-693/+1121
| |\ \ \
| * | | | 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-123-13/+241
* | | | | Fix redacted events being returned in search results ordered by "recent" (#6522)Andrew Morgan2019-12-121-3/+8
| |_|_|/ |/| | |
* | | | Check the room_id of events when fetching room state/auth (#6524)Richard van der Hoff2019-12-121-23/+51
* | | | Merge pull request #6511 from matrix-org/erikj/remove_db_config_from_appsErik Johnston2019-12-1213-62/+12
|\ \ \ \ | |_|/ / |/| | |
| * | | Add new config param to docstring and add typesErik Johnston2019-12-111-1/+3
| * | | Remove database config parsing from apps.Erik Johnston2019-12-1013-62/+10
* | | | 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
* | | | Merge tag 'v1.7.0rc2' into developErik Johnston2019-12-114-8/+18
|\ \ \ \ | | |_|/ | |/| |
| * | | 1.7.0rc2 v1.7.0rc2Erik Johnston2019-12-111-1/+1
| * | | Back out change preventing setting null avatar URLsErik Johnston2019-12-111-6/+6
| * | | Merge branch 'erikj/fix_sqlite_7' of github.com:matrix-org/synapse into relea...Erik Johnston2019-12-116-14/+49
| |\ \ \
| * | | | Give the server config to the RoomWorkerStoreBrendan Abolivier2019-12-101-0/+5
| * | | | Make the PusherSlaveStore inherit from the slave RoomStoreBrendan Abolivier2019-12-101-1/+6
* | | | | Prevent redacted events from appearing in message search (#6377)Andrew Morgan2019-12-115-43/+77
* | | | | Add dev script to generate full SQL schema files (#6394)Andrew Morgan2019-12-112-19/+13
* | | | | Prevent message search in upgraded rooms we're not in (#6385)Andrew Morgan2019-12-113-16/+40
* | | | | Merge pull request #6349 from matrix-org/babolivier/msc1802Brendan Abolivier2019-12-114-28/+140
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' into babolivier/msc1802Brendan Abolivier2019-12-05147-2521/+3950
| |\ \ \ \ \
| * | | | | | 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-102-86/+106
* | | | | | | Allow SAML username provider plugins (#6411)Andrew Morgan2019-12-102-88/+296
* | | | | | | Merge pull request #6510 from matrix-org/erikj/phone_home_stats_dbErik Johnston2019-12-101-2/+4
|\ \ \ \ \ \ \
| * | | | | | | Phone home stats DB reporting should not assume a single DB.Erik Johnston2019-12-101-2/+4
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Fix race which caused deleted devices to reappear (#6514)Richard van der Hoff2019-12-101-3/+5
* | | | | | | Refactor get_events_from_store_or_dest to return a dict (#6501)Richard van der Hoff2019-12-101-29/+15