summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Minor update to CHANGES. v1.24.0rc2Patrick Cloke2020-12-041-1/+1
* 1.24.0rc2Patrick Cloke2020-12-044-3/+16
* Fix a regression that mapping providers should be able to redirect users. (#8...Patrick Cloke2020-12-046-8/+60
* Remove version pin prometheus_client dependency (#8875)Jordan Bancino2020-12-043-9/+7
* Minor changes to the CHANGES doc. v1.24.0rc1Patrick Cloke2020-12-021-1/+1
* Minor fixes to changelog.Patrick Cloke2020-12-021-5/+5
* 1.24.0rc1Patrick Cloke2020-12-0255-54/+73
* Fix a regression when grandfathering SAML users. (#8855)Patrick Cloke2020-12-026-48/+94
* Add basic SAML tests for mapping users. (#8800)Patrick Cloke2020-12-025-19/+156
* Create a `PasswordProvider` wrapper object (#8849)Richard van der Hoff2020-12-023-57/+152
* Allow specifying room version in 'RestHelper.create_room_as' and add typing (...Andrew Morgan2020-12-022-2/+26
* Support "identifier" dicts in UIA (#8848)Richard van der Hoff2020-12-015-147/+190
* Add missing `ordering` to background updates (#8850)Richard van der Hoff2020-12-015-12/+13
* Allow Date header through CORS (#8804)Nicolas Chamo2020-12-012-1/+2
* Don't offer password login when it is disabled (#8835)Richard van der Hoff2020-12-013-4/+115
* Add some tests for `password_auth_providers` (#8819)Richard van der Hoff2020-12-013-0/+488
* Fix broken testcase (#8851)Richard van der Hoff2020-12-012-1/+1
* Fix typo in password_auth_providers docAndrew Morgan2020-12-011-0/+1
* Simplify appservice login code (#8847)Richard van der Hoff2020-11-302-6/+22
* Allow per-room profile to be used for server notice user (#8799)Mathieu Velten2020-11-302-1/+10
* Drop (almost) unused index on event_json (#8845)Richard van der Hoff2020-11-303-1/+21
* Add a config option to change whether unread push notification counts are per...Andrew Morgan2020-11-306-9/+207
* Simplify the way the `HomeServer` object caches its internal attributes. (#8...Jonathan de Jong2020-11-3011-35/+39
* Add `force_purge` option to delete-room admin api. (#8843)Richard van der Hoff2020-11-304-12/+34
* Remove special case of pretty printing JSON responses for curl (#8833)Tulir Asokan2020-11-272-24/+6
* Add typing to membership Replication class methods (#8809)Andrew Morgan2020-11-272-22/+45
* Update example prometheus console (#8824)Dirk Klimpel2020-11-262-51/+51
* Defer SIGHUP handlers to reactor. (#8817)Erik Johnston2020-11-262-1/+10
* Strip trailing / from server_url in register_new_matrix_user (#8823)Dmitry Borodaenko2020-11-262-1/+2
* Improve documentation how to configure prometheus for workers (#8822)Dirk Klimpel2020-11-263-20/+65
* Remove deprecated `/_matrix/client/*/admin` endpoints (#8785)Dirk Klimpel2020-11-2516-68/+176
* Fix the formatting of push config section (#8818)Andrew Morgan2020-11-253-29/+40
* Speed up remote invite rejection database call (#8815)Andrew Morgan2020-11-253-6/+45
* Add additional type hints to HTTP client. (#8812)Patrick Cloke2020-11-255-149/+142
* Support trying multiple localparts for OpenID Connect. (#8801)Patrick Cloke2020-11-256-136/+330
* Add type hints to matrix federation client / agent. (#8806)Patrick Cloke2020-11-256-195/+231
* Clarify documentation of the admin list media API (#8795)Dirk Klimpel2020-11-242-0/+2
* Add a script to sign arbitrary json objects. (#8772)Richard van der Hoff2020-11-243-0/+129
* Update turn-howto (#8779)Richard van der Hoff2020-11-242-8/+124
* Properly report user-agent/IP during registration of SSO users. (#8784)Patrick Cloke2020-11-236-122/+173
* Fix synctl and duplicate worker spawning (#8798)Waylon Cude2020-11-232-0/+8
* Improve logging of the mapping from SSO IDs to Matrix IDs. (#8773)Andrew Morgan2020-11-233-5/+13
* INSTALL: Fix setting content-type on well-known (#8793)Daniele Sluijters2020-11-232-1/+2
* fix MDMatthew Hodgson2020-11-221-2/+2
* fix ancient changelog to be MDMatthew Hodgson2020-11-221-150/+146
* Improve error checking for OIDC/SAML mapping providers (#8774)Patrick Cloke2020-11-197-29/+137
* SAML: Allow specifying the IdP entityid to use. (#8630)Ben Banfield-Zanin2020-11-194-1/+21
* Consistently use room_id from federation request body (#8776)Richard van der Hoff2020-11-195-54/+49
* Improve appservice handler to send only the most recent read receipts when no...Will Hunt2020-11-184-3/+10
* Fix tests on develop (#8777)Erik Johnston2020-11-182-16/+1
* SAML: Document allowing a clock/time difference from IdP (#8731)Marcus Schopen2020-11-183-0/+13
* Merge branch 'master' into developErik Johnston2020-11-186-4/+28
|\
| * Update changelog v1.23.0 github/release-v1.23.0 release-v1.23.0Erik Johnston2020-11-181-1/+1
| * Fix formatting in upgradesErik Johnston2020-11-181-1/+1
| * Update changelogErik Johnston2020-11-181-0/+4
| * 1.23.0Erik Johnston2020-11-184-2/+16
| * Cap the version of prometheus_client to <v0.9.0 in the dockerfile (#8767)Andrew Morgan2020-11-173-1/+7
* | Merge pull request #8761 from matrix-org/rav/test_request_renderingRichard van der Hoff2020-11-1759-813/+103
|\ \
| * | changelogRichard van der Hoff2020-11-161-0/+1
| * | Remove redundant `HomeserverTestCase.render`Richard van der Hoff2020-11-1644-629/+0
| * | Remove redundant calls to `render()`Richard van der Hoff2020-11-1613-106/+32
| * | Make `make_request` actually render the requestRichard van der Hoff2020-11-169-68/+57
| * | Fix the URL in the URL preview testsRichard van der Hoff2020-11-161-19/+22
* | | Abstract shared SSO code. (#8765)Patrick Cloke2020-11-176-120/+159
* | | a comma too much (#8771)chagai952020-11-172-1/+2
* | | Use TYPE_CHECKING instead of magic MYPY variable. (#8770)Patrick Cloke2020-11-174-9/+7
* | | Add admin API for logging in as a user (#8617)Erik Johnston2020-11-1725-87/+475
|/ /
* | Merge pull request #8757 from matrix-org/rav/pass_site_to_make_requestRichard van der Hoff2020-11-1617-88/+228
|\ \
| * | fixup testRichard van der Hoff2020-11-161-0/+1
| * | Merge branch 'develop' into rav/pass_site_to_make_requestRichard van der Hoff2020-11-1689-120/+147
| |\ \
| * | | changelogRichard van der Hoff2020-11-151-0/+1
| * | | use global make_request() directly where we have a custom ResourceRichard van der Hoff2020-11-1511-60/+154
| * | | fix dict handling for make_request()Richard van der Hoff2020-11-152-3/+2
| * | | pass a Site into make_requestRichard van der Hoff2020-11-154-20/+68
| * | | pass a Site into RestHelperRichard van der Hoff2020-11-152-6/+7
* | | | Move `wait_until_result` into `FakeChannel` (#8758)Richard van der Hoff2020-11-163-25/+24
* | | | Generalise _locally_reject_invite (#8751)Andrew Morgan2020-11-162-17/+20
| |/ / |/| |
* | | Rename `create_test_json_resource` to `create_test_resource` (#8759)Richard van der Hoff2020-11-167-23/+16
* | | Add a `custom_headers` param to `make_request` (#8760)Richard van der Hoff2020-11-164-11/+24
* | | Clarify the usecase for an msisdn delegate (#8734)Adrian Wannenmacher2020-11-143-4/+7
* | | Generalise _maybe_store_room_on_invite (#8754)Andrew Morgan2020-11-134-13/+18
| |/ |/|
* | Fix changelog v1.23.0rc1Erik Johnston2020-11-131-4/+4
* | Fix changelogErik Johnston2020-11-131-2/+2
* | 1.23.0rc1Erik Johnston2020-11-1371-70/+87
|/
* Migrate documentation `docs/admin_api/event_reports` to markdown (#8742)Dirk Klimpel2020-11-133-165/+173
* SAML: add <mdui:UIInfo> element examples (#8718)Marcus Schopen2020-11-133-0/+45
* Updating README.rst (#8746)chagai952020-11-132-6/+11
* Add metrics for tracking 3PID /requestToken requests. (#8712)Erik Johnston2020-11-134-0/+33
* Fix port script so that it can be run again after failure. (#8755)Erik Johnston2020-11-132-30/+55
* Cache event ID to auth event IDs lookups (#8752)Erik Johnston2020-11-132-12/+71
* Enable reconnection in DB pool (#8726)Erik Johnston2020-11-122-1/+7
* Fix port script fails when DB has no backfilled events. (#8729)Erik Johnston2020-11-112-7/+6
* Fix port script to handle foreign key constraints (#8730)Erik Johnston2020-11-113-6/+63
* Check support room has only two users before sending a notice (#8728)Will Hunt2020-11-112-1/+2
* Better error message when a remote resource uses invalid Content-Type (#8719)Andrew Morgan2020-11-112-2/+9
* Catch exceptions in password_providers (#8636)Nicolai Søborg2020-11-112-4/+10
* Notes on SSO logins and media_repository worker (#8701)Marcus Schopen2020-11-062-0/+6
* Add documentation about documentation to CONTRIBUTING.md (#8714)Andrew Morgan2020-11-062-0/+19
* Fix SIGHUP handler (#8697)Richard van der Hoff2020-11-062-3/+3
* Add an admin API for users' media statistics (#8700)Dirk Klimpel2020-11-056-0/+820
* Add `displayname` to Shared-Secret Registration for admins (#8722)Dirk Klimpel2020-11-055-9/+138
* Consolidate purge table lists to prevent desyncronisation (#8713)Andrew Morgan2020-11-042-67/+39
* Remove the "draft" status of the Room Details Admin API (#8702)Dirk Klimpel2020-11-032-3/+2
* Block clients from sending server ACLs that lock the local server out. (#8708)Erik Johnston2020-11-035-9/+80
* Document how to set up multiple event persisters (#8706)Erik Johnston2020-11-032-0/+13
* grammarMatthew Hodgson2020-11-021-1/+1
* Improve error messages of non-str displayname/avatar_url (#8705)Andrew Morgan2020-11-022-2/+7
* Add base pushrule to notify for jitsi conferences (#8286)David Baker2020-11-022-0/+25
* Use Python 3.8 in Docker images by default (#8698)Dan Callahan2020-11-022-1/+2
* Improve start time by adding index to e2e_cross_signing_keys (#8694)Erik Johnston2020-11-024-2/+36
* typoMatthew Hodgson2020-11-021-1/+1
* Fix typos in systemd-with-workers docAndrew Morgan2020-11-021-2/+2
* Fix typo in workers docAndrew Morgan2020-11-021-1/+1
* Fix error handling around when completing an AS transaction (#8693)Brendan Abolivier2020-10-302-1/+2
* Merge branch 'master' into developErik Johnston2020-10-305-3/+17
|\
| * Fix changelog v1.22.1 github/release-v1.22.1 release-v1.22.1Erik Johnston2020-10-301-2/+2
| * use correct versionErik Johnston2020-10-302-2/+2
| * 1.22.1Erik Johnston2020-10-304-2/+16
* | Merge branch 'release-v1.22.1' into developErik Johnston2020-10-300-0/+0
|\|
| * Merge pull request #8678 from matrix-org/rav/fix_frozen_eventsRichard van der Hoff2020-10-307-40/+32
| * Tie together matches_user_in_member_list and get_users_in_room caches (#8676)Will Hunt2020-10-302-4/+7
* | Improve the sample config for SSO (OIDC, SAML, and CAS). (#8635)Patrick Cloke2020-10-305-104/+157
* | Implement and use an @lru_cache decorator (#8595)Richard van der Hoff2020-10-304-61/+272
* | Fail test cases if they fail to await all awaitables (#8690)Patrick Cloke2020-10-303-2/+39
* | Fix race for concurrent downloads of remote media. (#8682)Erik Johnston2020-10-306-71/+431
* | Fix optional parameter in stripped state storage method (#8688)Andrew Morgan2020-10-302-1/+2
* | Fix unit tests (#8689)Erik Johnston2020-10-292-1/+2
* | Tie together matches_user_in_member_list and get_users_in_room caches (#8676)Will Hunt2020-10-292-4/+7
* | Gracefully handle a pending logging connection during shutdown. (#8685)Patrick Cloke2020-10-295-10/+36
* | Add ability for access tokens to belong to one user but grant access to anoth...Erik Johnston2020-10-2922-138/+197
* | Fix cache call signature to accept `on_invalidate`. (#8684)Erik Johnston2020-10-293-16/+35
* | Use `%r` rather than `%s` for stringifying events (#8679)Richard van der Hoff2020-10-292-2/+3
* | Optimise createRoom with multiple invites (#8559)Richard van der Hoff2020-10-293-13/+25
* | Support generating structured logs in addition to standard logs. (#8607)Patrick Cloke2020-10-2919-1011/+706
* | Don't require hiredis to run unit tests (#8680)Erik Johnston2020-10-292-1/+11
* | Merge pull request #8678 from matrix-org/rav/fix_frozen_eventsRichard van der Hoff2020-10-287-40/+32
|\ \
| * | remove unused importsRichard van der Hoff2020-10-281-2/+0
| * | Remove frozendict_json_encoder and support frozendicts everywhereRichard van der Hoff2020-10-287-38/+32
| |/
* | Add type hints to application services. (#8655)Patrick Cloke2020-10-285-79/+122
* | Add an admin APIs to allow server admins to list users' pushers (#8610)Dirk Klimpel2020-10-285-1/+259
* | Run mypy as part of the lint.sh script. (#8633)kleph2020-10-283-2/+4
* | Don't pull event from DB when handling replication traffic. (#8669)Erik Johnston2020-10-285-31/+87
* | Tell Black to format code for Python 3.5 (#8664)Dan Callahan2020-10-2710-11/+12
* | Minor updates to docs on how to run tests (#8666)Dan Callahan2020-10-273-10/+6
* | Note support for Python 3.9 (#8665)Dan Callahan2020-10-274-2/+4
* | Cross-link documentation to the prometheus recording rules. (#8667)Michael Kaye2020-10-273-1/+4
* | Abstract code for stripping room state into a separate method (#8671)Andrew Morgan2020-10-273-29/+61
* | Don't unnecessarily start bg process in replication sending loop. (#8670)Erik Johnston2020-10-272-0/+11
* | Don't unnecessarily start bg process while handling typing. (#8668)Erik Johnston2020-10-272-8/+14
* | Add admin API to list users' local media (#8647)Dirk Klimpel2020-10-278-1/+494
* | Merge branch 'master' into developErik Johnston2020-10-273-1/+13
|\|
| * 1.22.0 v1.22.0 github/release-v1.22.0 release-v1.22.0Erik Johnston2020-10-273-1/+13
* | e2e: ensure we have both master and self-signing key (#8455)Jonas Jelten2020-10-262-5/+23
* | Add type hints for account validity handler (#8620)Patrick Cloke2020-10-266-12/+31
* | Split admin API for reported events into a detail and a list view (#8539)Dirk Klimpel2020-10-266-86/+411
* | Added basic instructions for Azure AD to OpenId documentation (#8582)Peter Krantz2020-10-262-0/+27
* | Add an admin api to delete local media. (#8519)Dirk Klimpel2020-10-267-3/+868
* | Fix filepath of Dex example config (#8657)Andrew Morgan2020-10-262-3/+3
* | Fix a bug in the joined_rooms admin API (#8643)Dirk Klimpel2020-10-263-4/+20
* | Merge tag 'v1.22.0rc2' into developErik Johnston2020-10-265-4/+10
|\|
| * Fixup changelog v1.22.0rc2Erik Johnston2020-10-261-3/+1
| * Expand changelog entryErik Johnston2020-10-261-1/+1
| * 1.22.0rc2Erik Johnston2020-10-265-4/+12
* | Merge branch 'release-v1.22.0' into developErik Johnston2020-10-264-7/+11
|\|
| * Fix get|set_type_stream_id_for_appservice store functions (#8648)Will Hunt2020-10-264-13/+85
| * Properly handle presence events for application services. (#8656)Patrick Cloke2020-10-262-4/+6
| * Fix user_daily_visits to not have duplicate rows for UA. (#8654)Erik Johnston2020-10-262-4/+6
* | Fix get|set_type_stream_id_for_appservice store functions (#8648)Will Hunt2020-10-264-13/+85
* | Correct the package name in OpenID Connect install instructions (#8634)Andrew Morgan2020-10-262-1/+2
|\ \
| * | ChangelogAndrew Morgan2020-10-221-0/+1
| * | Correct the package name in authlib install instructionsAndrew Morgan2020-10-221-1/+1
* | | Add field `total` to device list in admin API (#8644)Dirk Klimpel2020-10-264-2/+23
* | | Check status codes that profile handler returns (#8580)LEdoian2020-10-262-0/+8
* | | Start fewer opentracing spans (#8640)Erik Johnston2020-10-268-53/+96
* | | Fix typos and spelling errors. (#8639)Patrick Cloke2020-10-2341-60/+63
* | | Fix handling of User-Agent headers with bad utf-8. (#8632)Erik Johnston2020-10-238-28/+33
* | | Fix email notifications for invites without local state. (#8627)Erik Johnston2020-10-233-13/+58
|/ /
* | Merge tag 'v1.22.0rc1' into developErik Johnston2020-10-2289-88/+101
|\|
| * Fixup changelog even more v1.22.0rc1Erik Johnston2020-10-221-2/+1
| * Fixup changelog some moreErik Johnston2020-10-221-7/+3
| * Fixup changelogErik Johnston2020-10-221-4/+4
| * 1.22.0rc1Erik Johnston2020-10-2289-88/+106
* | Remove unused OPTIONS handlers. (#8621)Patrick Cloke2020-10-2214-64/+2
* | Don't 500 for invalid group IDs (#8628)Erik Johnston2020-10-222-1/+5
* | Type hints for RegistrationStore (#8615)Erik Johnston2020-10-224-74/+85
* | Don't instansiate Requester directly (#8614)Erik Johnston2020-10-226-11/+12
|/
* Optimise CacheDescriptor (#8594) github/release-v1.21.3 release-v1.21.3Richard van der Hoff2020-10-212-5/+8
* Merge pull request #8593 from matrix-org/rav/cache_hacking/3Richard van der Hoff2020-10-212-3/+16
|\
| * fix failure caseRichard van der Hoff2020-10-211-1/+4
| * optimise DeferredCache.setRichard van der Hoff2020-10-212-3/+13
|/
* Merge pull request #8572 from matrix-org/rav/cache_hacking/2Richard van der Hoff2020-10-216-271/+441
|\
| * Add some more testsRichard van der Hoff2020-10-212-0/+147
| * Push some deferred wrangling down into DeferredCacheRichard van der Hoff2020-10-215-46/+67
| * Combine the two sets of tests for CacheDescriptorRichard van der Hoff2020-10-212-228/+230
* | Limit AS transactions to 100 events (#8606)Will Hunt2020-10-213-2/+58
* | Separate the TCP and terse JSON formatting code. (#8587)Patrick Cloke2020-10-214-187/+240
* | Pin mypy-zope for compatibility with mypy. (#8600)Patrick Cloke2020-10-212-1/+2
* | Add type hints to profile and base handlers. (#8609)Patrick Cloke2020-10-216-41/+72
|/
* Consistently use wrap_as_background_task in more places (#8599)Patrick Cloke2020-10-205-30/+20
* Update mypy to 0.790, and move dependencies to extras (#8583)Jonathan de Jong2020-10-203-3/+4
* Remove some extraneous @unittest.INFOs on unit tests (#8592)Andrew Morgan2020-10-203-2/+1
* Cast errors generated during synapse_port_db to str (#8585)Andrew Morgan2020-10-202-2/+4
* Move schema file for as_device_stream (#8590)Will Hunt2020-10-202-3/+3
* Fix 'LruCache' object has no attribute '_on_resize' (#8591)Richard van der Hoff2020-10-193-2/+17
* Drop unused `device_max_stream_id` table (#8589)Vasilis Gerakaris2020-10-192-0/+2
* Fix mypy error: auth handler "checkpw" internal function type mismatch (#8569)Jonathan de Jong2020-10-193-4/+6
* Expose the experimental appservice login flow to clients. (#8504)Patrick Cloke2020-10-192-0/+3
* Add `DeferredCache.get_immediate` method (#8568)Richard van der Hoff2020-10-197-27/+53
* Include a simple message in email notifications that include encrypted conten...Patrick Cloke2020-10-199-75/+107
* Support running synmark on macOS. (#8578)Patrick Cloke2020-10-192-2/+6
* Start an opentracing span for background processes. (#8567)Erik Johnston2020-10-192-5/+7
* Replace DeferredCache with LruCache where possible (#8563)Richard van der Hoff2020-10-198-27/+30
* Pre-emptively fix synapse.storage.types.Connection for future mypy release (#...Jonathan de Jong2020-10-173-3/+4
* Fix synmark (#8571)Richard van der Hoff2020-10-162-1/+2
* Type annotations for LruCache (#8562)Richard van der Hoff2020-10-166-31/+95
|\
| * review commentsRichard van der Hoff2020-10-161-3/+8
| * Apply suggestions from code reviewRichard van der Hoff2020-10-162-2/+2
| * changelogRichard van der Hoff2020-10-161-0/+1
| * type annotations for LruCacheRichard van der Hoff2020-10-165-31/+89
* | Clean-up old transaction IDs on the background worker. (#8544)Patrick Cloke2020-10-162-1/+2
* | Add .venv* to .gitignore (#8566)Jonathan de Jong2020-10-162-0/+2
|/
* Make LruCache register its own metrics (#8561)Richard van der Hoff2020-10-168-62/+62
* Fix modifying events in `ThirdPartyRules` modules (#8564)Richard van der Hoff2020-10-163-2/+8
* Merge pull request #8535 from matrix-org/rav/third_party_events_updatesRichard van der Hoff2020-10-156-81/+118
|\
| * changelogRichard van der Hoff2020-10-131-0/+1
| * guard against accidental modificationRichard van der Hoff2020-10-133-3/+30
| * Allow ThirdPartyRules modules to replace event contentRichard van der Hoff2020-10-133-9/+75
| * Move third_party_rules check to event creation timeRichard van der Hoff2020-10-132-52/+13
| * Remove redundant calls to third_party_rules in `on_send_{join,leave}`Richard van der Hoff2020-10-131-19/+1
* | Solidify the HomeServer constructor. (#8515)Jonathan de Jong2020-10-157-25/+33
* | Send some ephemeral events to appservices (#8437)Will Hunt2020-10-1516-122/+563
* | Add option to scripts-dev/lint.sh to only lint files changed since the last g...Andrew Morgan2020-10-154-12/+90
* | Merge branch 'master' into developPatrick Cloke2020-10-154-2/+32
|\ \
| * | Additional tweaks. v1.21.2 github/release-v1.21.2 release-v1.21.2Patrick Cloke2020-10-151-3/+3
| * | Clarify authlib changes.Patrick Cloke2020-10-151-1/+3
| * | Fix typo.Patrick Cloke2020-10-151-1/+1
| * | Add additional release notes.Patrick Cloke2020-10-151-0/+13
| * | 1.21.2Patrick Cloke2020-10-154-2/+17
* | | Merge branch 'release-v1.21.2' into developPatrick Cloke2020-10-150-0/+0
|\| |
| * | Remove racey assertion in MultiWriterIDGenerator (#8530)Erik Johnston2020-10-152-7/+1
* | | Enable mypy for synapse.util.caches (#8547)Richard van der Hoff2020-10-155-10/+185
* | | Merge pull request #8548 from matrix-org/rav/deferred_cacheRichard van der Hoff2020-10-1512-374/+454
|\ \ \
| * | | changelogRichard van der Hoff2020-10-141-0/+1
| * | | Combine the two sets of DeferredCache testsRichard van der Hoff2020-10-142-74/+75
| * | | move DeferredCache into its own moduleRichard van der Hoff2020-10-1410-332/+367
| * | | Rename Cache->DeferredCacheRichard van der Hoff2020-10-148-25/+30
| * | | Add some more type annotations to CacheRichard van der Hoff2020-10-143-24/+62
| | |/ | |/|
* | | Include user agent in user daily visits table (#8503)Neil Johnson2020-10-153-3/+27
* | | Merge pull request #8537 from matrix-org/rav/simplify_locally_reject_inviteRichard van der Hoff2020-10-159-65/+56
|\ \ \
| * | | changelogRichard van der Hoff2020-10-131-0/+1