summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6714 from matrix-org/babolivier/retention_select_eventBrendan Abolivier2020-01-174-7/+8
|\
| * Precise changelogBrendan Abolivier2020-01-161-1/+1
| * 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
| * Rename changelogBrendan Abolivier2020-01-151-0/+0
| * ChangelogBrendan Abolivier2020-01-151-0/+1
| * 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-1711-24/+114
|\ \
| * | changelogRichard van der Hoff2020-01-161-0/+1
| * | Log saml assertions rather than the whole responseRichard van der Hoff2020-01-163-1/+72
| * | 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-173-6/+23
* | | Wake up transaction queue when remote server comes back online (#6706)Erik Johnston2020-01-1711-8/+135
* | | Clarify the `account_validity` and `email` sections of the sample configurati...Richard van der Hoff2020-01-175-272/+320
|/ /
* | Add StateMap type alias (#6715)Erik Johnston2020-01-1614-93/+115
* | Add tips for the changelog to the pull request template (#6663)Andrew Morgan2020-01-163-3/+8
* | Add org.matrix.e2e_cross_signing to unstable_features in /versions as per MSC...Neil Johnson2020-01-162-0/+3
* | Port synapse.replication.tcp to async/await (#6666)Erik Johnston2020-01-1615-105/+80
* | Fix purge_room admin API (#6711)Erik Johnston2020-01-153-4/+3
* | Remove duplicate session check in web fallback servlet (#6702)Andrew Morgan2020-01-152-4/+1
* | Merge pull request #6688 from matrix-org/rav/module_api_extensionsRichard van der Hoff2020-01-154-7/+61
|\ \
| * \ Merge branch 'develop' into rav/module_api_extensionsRichard van der Hoff2020-01-1564-290/+1276
| |\ \ | |/ / |/| |
* | | Implement RedirectException (#6687)Richard van der Hoff2020-01-154-7/+113
* | | Add `local_current_membership` table (#6655)Erik Johnston2020-01-1520-107/+263
| |/ |/|
* | Process EDUs in parallel with PDUs. (#6697)Erik Johnston2020-01-142-12/+59
* | Fixup synapse.replication to pass mypy checks (#6667)Erik Johnston2020-01-1412-86/+105
* | Quarantine media by ID or user ID (#6681)Andrew Morgan2020-01-137-11/+632
* | Document more supported endpoints for workers (#6698)Richard van der Hoff2020-01-132-0/+5
* | Kill off RegistrationError (#6691)Richard van der Hoff2020-01-134-17/+4
* | Don't assign numeric IDs for empty usernames (#6690)Richard van der Hoff2020-01-132-1/+2
* | Merge pull request #6689 from matrix-org/rav/saml_mapping_provider_updatesRichard van der Hoff2020-01-132-6/+17
|\ \
| * | changelogRichard van der Hoff2020-01-121-0/+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 additional_resources to implement Resource directly (#6686)Richard van der Hoff2020-01-132-2/+12
* | | Fix exceptions on requests for non-ascii urls (#6682)Richard van der Hoff2020-01-132-1/+3
* | | comment for run_in_backgroundRichard van der Hoff2020-01-121-0/+3
* | | Merge pull request #6675 from matrix-org/rav/die_sqlite37_die_die_dieRichard van der Hoff2020-01-106-41/+47
|\ \ \
| * | | update install notes for CentOSRichard van der Hoff2020-01-091-0/+5
| * | | changelogRichard van der Hoff2020-01-091-0/+1
| * | | Refuse to start if sqlite is older than 3.11.0Richard van der Hoff2020-01-093-8/+19
| * | | 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-094-28/+18
| |/ /
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2020-01-092-0/+12
|\ \ \ | |/ / |/| |
| * | Add note about log_file no longer be accepted (#6674) github/release-v1.8.0 release-v1.8.0Erik Johnston2020-01-092-0/+12
| | * changelogRichard van der Hoff2020-01-121-0/+1
| | * 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-099-339/+655
* | Merge branch 'master' into developErik Johnston2020-01-095-5/+17
|\|
| * Fixup changelog v1.8.0Erik Johnston2020-01-091-1/+1
| * 1.8.0Erik Johnston2020-01-095-5/+17
* | Merge pull request #6664 from matrix-org/erikj/media_admin_apisErik Johnston2020-01-083-120/+131
|\ \
| * | 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
| * | NewsfileErik Johnston2020-01-081-0/+1
| * | 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 pull request #6665 from matrix-org/babolivier/retention_doc_typoBrendan Abolivier2020-01-082-1/+2
|\ \ \
| * | | ChangelogBrendan Abolivier2020-01-081-0/+1
| * | | Fix typo in message retention policies docBrendan Abolivier2020-01-081-1/+1
* | | | Merge remote-tracking branch 'origin/release-v1.8.0' into developRichard van der Hoff2020-01-088-28/+184
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Fix GET request on /_synapse/admin/v2/users endpoint (#6563)Manuel Stahl2020-01-083-2/+44
| * | Back out ill-advised notary server hackery (#6657)Richard van der Hoff2020-01-085-26/+140
| |/
* | Merge pull request #6624 from matrix-org/babolivier/retention_docBrendan Abolivier2020-01-082-0/+192
|\ \
| * | Fix referenceBrendan Abolivier2020-01-071-1/+1
| * | Incorporate reviewBrendan Abolivier2020-01-071-27/+28
| * | Merge branch 'develop' into babolivier/retention_docBrendan Abolivier2020-01-0783-491/+788
| |\|
| * | Apply suggestions from code reviewBrendan Abolivier2020-01-071-5/+4
| * | Update changelog.d/6624.docBrendan Abolivier2020-01-071-1/+1
| * | Fix vacuum instructions for sqliteBrendan Abolivier2020-01-031-2/+2
| * | Rename changelogBrendan Abolivier2020-01-031-0/+0
| * | Add a complete documentation of the message retention policies supportBrendan Abolivier2020-01-032-0/+192
* | | contrib/docker-compose: fixing mount that overrides containers' /etc (#6656)Fabian Meyer2020-01-082-1/+2
* | | typoMatthew Hodgson2020-01-071-1/+1
* | | Correctly proxy remote group HTTP errors. (#6654)Erik Johnston2020-01-072-0/+17
* | | Merge pull request #6621 from matrix-org/babolivier/purge_job_config_typoBrendan Abolivier2020-01-073-10/+11
|\ \ \ | |_|/ |/| |
| * | RewordBrendan Abolivier2020-01-072-6/+6
| * | Change the example from 5min to 12hBrendan Abolivier2020-01-072-8/+8
| * | ChangelogBrendan Abolivier2020-01-031-0/+1
| * | Update sample configBrendan Abolivier2020-01-031-1/+1
| * | Fix a typo in the purge jobs configuration exampleBrendan Abolivier2020-01-031-1/+1
| |/
* | Fixup changelog v1.8.0rc1Erik Johnston2020-01-071-3/+3
* | Fixup changelogErik Johnston2020-01-071-1/+1
* | Fixup changelogErik Johnston2020-01-071-21/+11
* | 1.8.0rc1Erik Johnston2020-01-0756-55/+81
* | Merge pull request #6652 from matrix-org/babolivier/depth_missing_eventsBrendan Abolivier2020-01-073-3/+4
|\ \
| * | ChangelogBrendan Abolivier2020-01-071-0/+1
| * | 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-076-1/+106
* | Async/await for background updates (#6647)Richard van der Hoff2020-01-072-16/+21
* | port BackgroundUpdateTestCase to HomeserverTestCase (#6653)Richard van der Hoff2020-01-072-35/+38
* | Merge pull request #6645 from matrix-org/rav/fix_synchrotron_errorRichard van der Hoff2020-01-073-15/+48
|\ \
| * | changelogRichard van der Hoff2020-01-061-0/+1
| * | 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-067-103/+55
|\ \ \ | |/ / |/| |
| * | changelogRichard van der Hoff2020-01-061-0/+1
| * | 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-062-43/+6
| * | 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-063-22/+13
| * | 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-064-7/+12
* | | Fix some test failures when frozen_dicts are enabled (#6642)Richard van der Hoff2020-01-065-11/+20
* | | Add experimental 'databases' config (#6580)Erik Johnston2020-01-063-13/+64
* | | Fix an error which was thrown by the PresenceHandler _on_shutdown handler. (#...Richard van der Hoff2020-01-062-7/+3
* | | Fix exception when fetching notary server's old keys (#6625)Richard van der Hoff2020-01-063-50/+103
* | | Workaround for error when fetching notary's own key (#6620)Richard van der Hoff2020-01-064-9/+163
|/ /
* | Fix power levels being incorrectly set in old and new rooms after a room upgr...Andrew Morgan2020-01-062-7/+11
* | Automate generation of the sample and debian log configs (#6627)Richard van der Hoff2020-01-039-40/+73
* | Raise an error if someone tries to use the log_file config option (#6626)Richard van der Hoff2020-01-033-3/+17
* | Remove unused, undocumented "content repo" resource (#6628)Richard van der Hoff2020-01-039-128/+3
* | Kill off redundant SynapseRequestFactory (#6619)Richard van der Hoff2020-01-033-17/+8
* | Reduce the reconnect time when replication fails. (#6617)Richard van der Hoff2020-01-032-1/+3
|/
* Added the section 'Configuration' in /docs/turn-howto.md (#6614)ewaf12020-01-022-0/+3
* Reword sections of federate.md that explained delegation at time of Synapse 1...Aaron Raimist2020-01-022-21/+4
* Merge branch 'master' into developRichard van der Hoff2019-12-315-16/+98
|\
| * 1.7.3 v1.7.3 github/release-v1.7.3 release-v1.7.3Richard van der Hoff2019-12-314-2/+18
| * Hacks to work around #6605 (#6608)Richard van der Hoff2019-12-312-15/+38
| * sample log config 1.7.2Richard van der Hoff2019-12-241-0/+43
| * Update reverse proxy file name (#6590)dopple2019-12-221-1/+1
* | Update reverse proxy file name (#6590)dopple2019-12-221-1/+1
* | Merge branch 'master' into developRichard van der Hoff2019-12-204-2/+23
|\|
| * Merge tag 'v1.7.2'Richard van der Hoff2019-12-205-3/+32
| |\
| | * 1.7.2 v1.7.2 github/release-v1.7.2 release-v1.7.2Richard van der Hoff2019-12-205-3/+19
| | * Backport fixes to sqlite upgrade from develop (#6578)Richard van der Hoff2019-12-202-1/+10
| | * Fix exceptions when attempting to backfill (#6576)Richard van der Hoff2019-12-202-1/+5
* | | Split state groups into a separate data store (#6296)Erik Johnston2019-12-2028-1168/+1159
* | | Change EventContext to use the Storage class (#6564)Erik Johnston2019-12-2015-53/+64
* | | Explode on duplicate delta file names. (#6565)Erik Johnston2019-12-192-0/+19
* | | Port some admin handlers to async/await (#6559)Erik Johnston2019-12-194-56/+46
* | | Improve diagnostics on database upgrade failure (#6570)Richard van der Hoff2019-12-193-8/+7
* | | Fix sdnotify with acme enabled (#6571)Richard van der Hoff2019-12-192-3/+8
* | | Add an export_signing_key script (#6546)Richard van der Hoff2019-12-195-22/+130
* | | Clean up startup for the pusher (#6558)Richard van der Hoff2019-12-187-43/+45
* | | Add delta file to fix missing default table data (#6555)Andrew Morgan2019-12-184-15/+24
* | | Add database config class (#6513)Erik Johnston2019-12-1819-209/+287
* | | Merge branch 'master' into developRichard van der Hoff2019-12-1814-15/+25
|\| |
| * | Merge tag 'v1.7.1'Richard van der Hoff2019-12-1815-373/+547
| |\|
| | * too many parens v1.7.1 github/release-v1.7.1 release-v1.7.1Richard van der Hoff2019-12-181-1/+1
| | * 1.7.1Richard van der Hoff2019-12-1814-15/+25
* | | Merge release-v1.7.1 into developRichard van der Hoff2019-12-187-10/+145
|\ \ \ | | |/ | |/|
| * | Fix bug where we added duplicate event IDs as auth_events (#6560)Erik Johnston2019-12-172-7/+9
| * | Add auth events as per spec. (#6556)Erik Johnston2019-12-162-67/+35
| * | Merge pull request #6553 from matrix-org/babolivier/fix-context-filterBrendan Abolivier2019-12-164-3/+135
| |\ \
| | * \ Merge branch 'babolivier/fix-context-filter' of github.com:matrix-org/synapse...Brendan Abolivier2019-12-161-1/+1
| | |\ \
| | | * | Update changelog.d/6553.bugfixBrendan Abolivier2019-12-161-1/+1
| | * | | Incorporate reviewBrendan Abolivier2019-12-162-6/+1
| | |/ /
| | * | LintBrendan Abolivier2019-12-161-2/+1
| | * | Add test caseBrendan Abolivier2019-12-161-0/+133
| | * | ChangelogBrendan Abolivier2019-12-161-0/+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-162-1/+2
| * | | Persist auth/state events at backwards extremities when we fetch them (#6526)Richard van der Hoff2019-12-163-165/+83
| * | | sanity-checking for events used in state res (#6531)Richard van der Hoff2019-12-166-43/+128
| * | | Sanity-check room ids in event auth (#6530)Richard van der Hoff2019-12-162-0/+14
| * | | Check the room_id of events when fetching room state/auth (#6524)Richard van der Hoff2019-12-162-24/+56
| * | | Add `include_event_in_state` to _get_state_for_room (#6521)Richard van der Hoff2019-12-162-18/+22
| * | | Move get_state methods into FederationHandler (#6503)Richard van der Hoff2019-12-163-86/+107
| * | | Refactor get_events_from_store_or_dest to return a dict (#6501)Richard van der Hoff2019-12-162-29/+16
| |/ /
* | | Remove unused `get_pagination_rows` methods. (#6557)Erik Johnston2019-12-174-18/+1
* | | Add auth events as per spec. (#6556)Erik Johnston2019-12-162-67/+35
* | | Add option to allow profile queries without sharing a room (#6523)Will Hunt2019-12-165-1/+28
* | | Exclude rejected state events when calculating state at backwards extrems (#6...Richard van der Hoff2019-12-162-1/+2
* | | Persist auth/state events at backwards extremities when we fetch them (#6526)Richard van der Hoff2019-12-163-169/+83
* | | Automatically delete empty groups/communities (#6453)Werner Sembach2019-12-164-0/+38
* | | Document Shutdown Room admin API (#6541)Andrew Morgan2019-12-132-0/+73
* | | sanity-checking for events used in state res (#6531)Richard van der Hoff2019-12-136-43/+128
* | | Sanity-check room ids in event auth (#6530)Richard van der Hoff2019-12-132-0/+14
* | | Merge pull request #6537 from matrix-org/erikj/bump_mypy_versionErik Johnston2019-12-138-7/+13
|\ \ \
| * | | NewsfileErik Johnston2019-12-121-0/+1
| * | | Bump version of mypyErik Johnston2019-12-127-7/+12
* | | | Merge branch 'master' into developErik Johnston2019-12-134-2/+32
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge tag 'v1.7.0'Erik Johnston2019-12-13228-4794/+7883
| |\ \ \ | | | |/ | | |/|
| | * | More rewording of changelog. v1.7.0 github/release-v1.7.0 release-v1.7.0Erik Johnston2019-12-131-1/+1
| | * | Reword changelogErik Johnston2019-12-131-2/+2
| | * | Add deprecation notesErik Johnston2019-12-131-1/+7
| | * | 1.7.0Erik Johnston2019-12-133-1/+13
| * | | Update workers.md to make media_repository work (again) (#6519)Mark Nowiasz2019-12-111-1/+13
| * | | Remove #6369 changelogAndrew Morgan2019-12-051-1/+0
* | | | Adjust the sytest blacklist for worker mode (#6538)Richard van der Hoff2019-12-132-29/+5
* | | | Merge pull request #6496 from matrix-org/erikj/initial_sync_asnycErik Johnston2019-12-132-52/+45
|\ \ \ \
| * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/initial_sy...Erik Johnston2019-12-11156-850/+1627
| |\ \ \ \
| * | | | | NewsfileErik Johnston2019-12-091-0/+1
| * | | | | Port synapse.handlers.initial_sync to async/awaitErik Johnston2019-12-091-52/+44
* | | | | | Merge pull request #6534 from matrix-org/erikj/extend_mypyErik Johnston2019-12-122-1/+14
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | NewsfileErik Johnston2019-12-121-0/+1
| * | | | | Include more folders in mypyErik Johnston2019-12-121-1/+13
* | | | | | look up cross-signing keys from the DB in bulk (#6486)Hubert Chathi2019-12-125-21/+242
* | | | | | Fix redacted events being returned in search results ordered by "recent" (#6522)Andrew Morgan2019-12-122-3/+9
|/ / / / /
* | | | | Check the room_id of events when fetching room state/auth (#6524)Richard van der Hoff2019-12-122-23/+53
* | | | | Merge pull request #6511 from matrix-org/erikj/remove_db_config_from_appsErik Johnston2019-12-1217-102/+27
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add new config param to docstring and add typesErik Johnston2019-12-111-1/+3
| * | | | NewsfileErik Johnston2019-12-101-0/+1
| * | | | Fix upgrade db scriptErik Johnston2019-12-101-27/+6
| * | | | Remove database config parsing from apps.Erik Johnston2019-12-1015-75/+18
* | | | | Add `include_event_in_state` to _get_state_for_room (#6521)Richard van der Hoff2019-12-112-22/+29
* | | | | Merge pull request #6517 from matrix-org/rav/event_auth/13Richard van der Hoff2019-12-114-103/+98
|\ \ \ \ \
| * | | | | changelogRichard van der Hoff2019-12-111-0/+1
| * | | | | 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-112-32/+31
| * | | | | 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-114-57/+47
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | NewsfileErik Johnston2019-12-101-0/+1
| * | | | | Port handlers.account_validity to async/await.Erik Johnston2019-12-103-49/+42
| * | | | | Port handlers.account_data to async/await.Erik Johnston2019-12-101-9/+5
| |/ / / /
* | | | | Clean up some logging (#6515)Richard van der Hoff2019-12-112-18/+20
* | | | | Merge tag 'v1.7.0rc2' into developErik Johnston2019-12-117-21/+34
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | 1.7.0rc2 v1.7.0rc2Erik Johnston2019-12-116-5/+12
| * | | | Back out change preventing setting null avatar URLsErik Johnston2019-12-112-7/+7
| * | | | Merge branch 'erikj/fix_sqlite_7' of github.com:matrix-org/synapse into relea...Erik Johnston2019-12-118-14/+51
| |\ \ \ \
| * | | | | Fixup changelogsBrendan Abolivier2019-12-102-2/+2
| * | | | | Merge pull request #6509 from matrix-org/babolivier/fix-room-store-configErik Johnston2019-12-102-0/+6
| |\ \ \ \ \
| | * | | | | ChangelogBrendan Abolivier2019-12-101-0/+1
| | * | | | | Give the server config to the RoomWorkerStoreBrendan Abolivier2019-12-101-0/+5
| |/ / / / /
| * | | | | Merge pull request #6507 from matrix-org/babolivier/pusher-room-storeErik Johnston2019-12-102-1/+7
| |\ \ \ \ \
| | * | | | | ChangelogBrendan Abolivier2019-12-101-0/+1
| | * | | | | Make the PusherSlaveStore inherit from the slave RoomStoreBrendan Abolivier2019-12-101-1/+6
| |/ / / / /
| * | | | | Fix erroneous reference for new room directory defaults.Neil Johnson2019-12-101-1/+1
| * | | | | Update CHANGES.mdNeil Johnson2019-12-091-11/+5
* | | | | | Prevent redacted events from appearing in message search (#6377)Andrew Morgan2019-12-116-43/+78
* | | | | | Add dev script to generate full SQL schema files (#6394)Andrew Morgan2019-12-114-19/+198
* | | | | | Prevent message search in upgraded rooms we're not in (#6385)Andrew Morgan2019-12-114-16/+41
* | | | | | Merge pull request #6349 from matrix-org/babolivier/msc1802Brendan Abolivier2019-12-115-28/+141
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into babolivier/msc1802Brendan Abolivier2019-12-05300-3004/+6193
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into babolivier/msc1802Brendan Abolivier2019-11-142-0/+3
| |\ \ \ \ \ \ \
| * | | | | | | | LintBrendan Abolivier2019-11-111-3/+2
| * | | | | | | | ChangelogBrendan Abolivier2019-11-111-0/+1
| * | | | | | | | 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
* | | | | | | | | Merge pull request #6512 from matrix-org/erikj/silence_mypyErik Johnston2019-12-112-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | NewsfileErik Johnston2019-12-101-0/+1
| * | | | | | | | | Silence mypy errors for files outside those specifiedErik Johnston2019-12-101-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Move get_state methods into FederationHandler (#6503)Richard van der Hoff2019-12-103-86/+107
* | | | | | | | | Allow SAML username provider plugins (#6411)Andrew Morgan2019-12-105-106/+417
* | | | | | | | | Merge pull request #6510 from matrix-org/erikj/phone_home_stats_dbErik Johnston2019-12-102-2/+5
|\ \ \ \ \ \ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-14 21:20:23 +0000