summary refs log tree commit diff
path: root/tests (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '18ab35284' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-226-22/+151
|\
| * Merge branch 'social_login' into developRichard van der Hoff2021-02-015-36/+40
| |\
| | * Replace username picker with a template (#9275)Richard van der Hoff2021-02-011-3/+2
| | * Improve styling and wording of SSO redirect confirm template (#9272)Richard van der Hoff2021-02-013-18/+22
| * | Ratelimit invites by room and target user (#9258)Erik Johnston2021-01-292-1/+127
* | | Merge commit '9c715a5f1' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-222-15/+16
|\ \ \ | | |/ | |/|
| * | Fix SSO on workers (#9271)Richard van der Hoff2021-02-012-16/+5
| * | Split out a separate endpoint to complete SSO registration (#9262)Richard van der Hoff2021-02-011-1/+13
* | | Merge commit 'e19396d62' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-224-8/+97
|\ \ \ | | |/ | |/|
| * | Ratelimit 3PID /requestToken API (#9238)Erik Johnston2021-01-284-8/+97
* | | Merge commit '2e537a028' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-222-2/+93
|\| |
| * | Merge branch 'social_login' into developRichard van der Hoff2021-01-272-2/+93
| |\|
| | * Implement MSC2858 support (#9183)Richard van der Hoff2021-01-272-2/+93
* | | Merge commit '1baab2035' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-222-16/+54
|\| |
| * | Precompute joined hosts and store in Redis (#9198)Erik Johnston2021-01-261-16/+25
| * | Try to recover from unknown encodings when previewing media. (#9164)Patrick Cloke2021-01-261-0/+29
* | | Merge commit 'cee4010f9' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-222-6/+66
|\| |
| * | Add an admin API for shadow-banning users. (#9209)Patrick Cloke2021-01-252-6/+66
* | | Merge commit 'fdf834694' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-223-2/+254
|\| |
| * | Merge tag 'v1.26.0rc2' into developPatrick Cloke2021-01-251-0/+12
| |\|
| * | Handle missing content keys when calculating presentable names. (#9165)Patrick Cloke2021-01-252-1/+230
| * | Return a 404 if no valid thumbnail is found. (#9163)Patrick Cloke2021-01-211-1/+24
* | | Merge commit 'a01605c13' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-221-0/+12
|\ \ \ | | |/ | |/|
| * | Fix chain cover update to handle events with duplicate auth events (#9210)Erik Johnston2021-01-221-0/+12
* | | Merge commit '939ef657c' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-221-27/+196
|\ \ \ | | |/ | |/|
| * | Add tests for List Users Admin API (#9045)Dirk Klimpel2021-01-211-27/+196
| |/
* | Merge commit '42a8e8137' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-221-1/+1
|\|
| * Prefix idp_id with "oidc-" (#9189)Richard van der Hoff2021-01-211-1/+1
* | Merge commit '0cd2938bc' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-221-1/+1
|\|
| * Support icons for Identity Providers (#9154)Richard van der Hoff2021-01-201-1/+1
* | Merge commit 'fa50e4bf4' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-222-10/+0
|\|
| * Give `public_baseurl` a default value (#9159)Richard van der Hoff2021-01-202-10/+0
* | Merge commit '73b03722f' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-221-6/+106
|\|
| * Allow moving account data and receipts streams off master (#9104)Erik Johnston2021-01-181-6/+106
* | Merge commit '2b467d0b6' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-226-114/+370
|\|
| * Fix bugs in handling clientRedirectUrl, and improve OIDC tests (#9127, #9128)Richard van der Hoff2021-01-184-82/+181
| * Fix test failure due to bad mergeRichard van der Hoff2021-01-151-1/+3
| * Make chain cover index bg update go faster (#9124)Erik Johnston2021-01-151-31/+186
* | Merge commit '9de6b9411' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-222-3/+3
|\|
| * Land support for multiple OIDC providers (#9110)Richard van der Hoff2021-01-151-2/+2
* | Merge commit '3e4cdfe5d' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-223-5/+108
|\|
| * Add an admin API endpoint to protect media. (#9086)Patrick Cloke2021-01-151-3/+5
| * Avoid raising the body exceeded error multiple times. (#9108)Patrick Cloke2021-01-152-2/+103
* | Merge commit 'd34c6e127' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-224-126/+115
|\|
| * Improve UsernamePickerTestCase (#9112)Richard van der Hoff2021-01-154-125/+113
| * Store an IdP ID in the OIDC session (#9109)Richard van der Hoff2021-01-151-1/+2
* | Merge commit '20af31088' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-222-0/+35
|\|
| * Merge pull request #9091 from matrix-org/rav/error_on_bad_ssoRichard van der Hoff2021-01-151-0/+27
| |\
| | * Add a test for wrong user returned by SSORichard van der Hoff2021-01-131-0/+27
| * | Fix event chain bg update. (#9118)Erik Johnston2021-01-141-0/+8
* | | Merge commit '631dd06f2' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-222-45/+162
|\| |
| * | Add background update for add chain cover index (#9029)Erik Johnston2021-01-141-0/+114
| * | Split OidcProvider out of OidcHandler (#9107)Richard van der Hoff2021-01-141-45/+48
| |/
* | Merge commit '233c8b9fc' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-223-42/+226
|\|
| * Add a test for UI-Auth-via-SSO (#9082)Richard van der Hoff2021-01-133-42/+226
* | Merge commit '98a64b7f7' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2219-170/+1135
|\|
| * Add basic domain validation for `DomainSpecificString.is_valid`. (#9071)Patrick Cloke2021-01-131-0/+4
| * Merge branch 'master' into developErik Johnston2021-01-131-0/+130
| |\
| * | Preparatory refactors of OidcHandler (#9067)Richard van der Hoff2021-01-131-24/+37
| * | Remove user's avatar URL and displayname when deactivated. (#8932)Dirk Klimpel2021-01-125-3/+284
| * | Handle bad JSON data being returned from the federation API. (#9070)Patrick Cloke2021-01-121-1/+1
| * | Remove SynapseRequest.get_user_agent (#9069)Richard van der Hoff2021-01-123-4/+3
| * | Also support remote users on the joined_rooms admin API. (#8948)David Teller2021-01-111-6/+52
| * | Removes unnecessary declarations in the tests for the admin API. (#9063)Dirk Klimpel2021-01-116-17/+0
| * | Use a chain cover index to efficiently calculate auth chain difference (#8868)Erik Johnston2021-01-113-25/+737
* | | Merge commit '3dd6ba135' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-211-0/+128
|\ \ \ | | |/ | |/|
| * | Don't apply the IP range blacklist to proxy connections (#9084)Marcus2021-01-121-0/+130
* | | Merge commit 'a03d71dc9' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-213-36/+302
|\ \ \ | | |/ | |/|
| * | Merge pull request #9036 from matrix-org/rav/multi_idp/testsRichard van der Hoff2021-01-082-36/+249
| |\ \
| | * | Add some tests for the IDP picker flowRichard van der Hoff2021-01-072-3/+191
| | * | Fix type hints in test_login.pyRichard van der Hoff2021-01-071-24/+54
| | * | black-format tests/rest/client/v1/test_login.pyRichard van der Hoff2021-01-071-11/+6
| * | | Fix validate_config on nested objects (#9054)Richard van der Hoff2021-01-081-0/+53
* | | | Merge commit '23d701864' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-218-36/+259
|\| | |
| * | | Improve the performance of calculating ignored users in large rooms (#9024)Patrick Cloke2021-01-071-0/+120
| |/ /
| * | Skip unit tests which require optional dependencies (#9031)Richard van der Hoff2021-01-076-13/+89
| * | Empty iterables should count towards cache usage. (#9028)Patrick Cloke2021-01-061-23/+50
* | | Merge commit '0312266ee' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-212-22/+165
|\| |
| * | Implement MSC2176: Updated redaction rules (#8984)Patrick Cloke2021-01-051-21/+164
| * | Combine the SSO Redirect Servlets (#9015)Richard van der Hoff2021-01-041-1/+1
| |/
* | Merge commit '1c9a85056' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-214-26/+144
|\|
| * Add type hints to the crypto module. (#8999)Patrick Cloke2021-01-041-5/+5
| * Use the SSO handler helpers for CAS registration/login. (#8856)Patrick Cloke2021-01-031-0/+121
| * Fix RoomDirectoryFederationTests and make them actually run (#8998)Andrew Morgan2020-12-302-21/+18
* | Merge commit '9999eb2d0' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-211-1/+0
|\|
| * Drop the unused local_invites table. (#8979)Patrick Cloke2020-12-291-1/+0
| * Support PyJWT v2.0.0. (#8986)Patrick Cloke2020-12-221-4/+12
* | Merge commit '4218473f9' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-212-1/+194
|\|
| * Allow server admin to get admin bit in rooms where local user is an admin (#8...Erik Johnston2020-12-181-0/+138
| * Fix mainline ordering in state res v2 (#8971)Erik Johnston2020-12-181-1/+56
* | Merge commit '28877fade' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-213-33/+212
|\|
| * Implement a username picker for synapse (#8942)Richard van der Hoff2020-12-182-2/+149
| * Allow re-using a UI auth validation for a period of time (#8970)Patrick Cloke2020-12-181-31/+63
* | Merge commit 'a7a913918' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-202-2/+378
|\|
| * Merge remote-tracking branch 'origin/erikj/as_mau_block' into developErik Johnston2020-12-181-2/+44
| |\
| | * Update tests/test_mau.pyErik Johnston2020-12-171-1/+2
| | * Correctly handle AS registerations and add testErik Johnston2020-12-171-2/+43
| * | Try and drop stale extremities. (#8929)Erik Johnston2020-12-181-0/+334
* | | Merge commit 'c9c1c9d82' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-205-5/+221
|\| |
| * | Fix `UsersListTestCase` (#8964)Richard van der Hoff2020-12-171-6/+4
| * | Use the simple dictionary in full text search for the user directory (#8959)Brendan Abolivier2020-12-171-0/+23
| * | Fix a bug that deactivated users appear in the directory (#8933)Dirk Klimpel2020-12-172-2/+88
| * | Make search statement in List Room and User Admin API case-insensitive (#8931)Dirk Klimpel2020-12-173-3/+112
* | | Merge commit 'ff5c4da12' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-202-4/+31
|\| |
| * | Add a maximum size for well-known lookups. (#8950)Patrick Cloke2020-12-161-0/+27
| * | Push login completion down into SsoHandler (#8941)Richard van der Hoff2020-12-161-4/+4
* | | Fix old-style uses of self.make_request in dinum test codeAndrew Morgan2021-04-168-73/+43
* | | Merge commit 'bd30cfe86' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-1660-1036/+783
|\| |
| * | Convert internal pusher dicts to attrs classes. (#8940)Patrick Cloke2020-12-163-9/+9
| * | Merge pull request #8951 from matrix-org/rav/username_picker_2Richard van der Hoff2020-12-162-82/+105
| |\ \
| * | | lintRichard van der Hoff2020-12-155-7/+3
| * | | Remove spurious "SynapseRequest" result from `make_request"Richard van der Hoff2020-12-1559-983/+742
| * | | Remove redundant reading of SynapseRequest.argsRichard van der Hoff2020-12-151-9/+1
| * | | Skip redundant check on `request.args`Richard van der Hoff2020-12-151-2/+1
| * | | remove 'response' result from `_get_shared_rooms`Richard van der Hoff2020-12-151-8/+9
| * | | Replace `request.code` with `channel.code`Richard van der Hoff2020-12-158-22/+22
* | | | Merge commit '8388a7fb3' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-162-82/+105
|\ \ \ \ | | |/ / | |/| |
| * | | Make `_make_callback_with_userinfo` asyncRichard van der Hoff2020-12-151-68/+83
| * | | Remove spurious mocking of complete_sso_loginRichard van der Hoff2020-12-151-2/+0
| * | | Test `get_extra_attributes` fallbackRichard van der Hoff2020-12-152-12/+22
| |/ /
* | | Merge commit '01333681b' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-168-204/+276
|\| |
| * | Preparatory refactoring of the SamlHandlerTestCase (#8938)Richard van der Hoff2020-12-153-54/+102
| * | Fix startup failure with localdb_enabled: False (#8937)Richard van der Hoff2020-12-141-0/+23
| * | Various clean-ups to the logging context code (#8935)Patrick Cloke2020-12-144-10/+7
| * | Preparatory refactoring of the OidcHandlerTestCase (#8911)Richard van der Hoff2020-12-141-141/+145
* | | lintAndrew Morgan2021-04-161-1/+3
* | | Merge commit 'f14428b25' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-165-29/+124
|\| |
| * | Allow spam-checker modules to be provide async methods. (#8890)David Teller2020-12-111-2/+2
| * | Improve tests for structured logging. (#8916)Patrick Cloke2020-12-111-27/+46
| * | Add number of local devices to Room Details Admin API (#8886)Dirk Klimpel2020-12-112-0/+60
| * | Don't ratelimit autojoining of rooms (#8921)Erik Johnston2020-12-111-0/+16
* | | Merge commit 'c64002e1c' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-161-1/+1
|\| |
| * | Default to blacklisting reserved IP ranges and add a whitelist. (#8870)Patrick Cloke2020-12-091-1/+1
* | | Merge commit '6ff34e00d' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-161-0/+23
|\| |
| * | Skip the SAML tests if xmlsec1 isn't available. (#8905)Patrick Cloke2020-12-091-0/+23
* | | Merge commit 'cf7d3c90d' into dinsicAndrew Morgan2021-04-1625-281/+679
|\| |
| * | Add X-Robots-Tag header to stop crawlers from indexing media (#8887)Aaron Raimist2020-12-081-0/+13
| * | Call set_avatar_url with target_user, not user_id (#8872)Will Hunt2020-12-071-1/+6
| * | Do not raise a 500 exception when previewing empty media. (#8883)Patrick Cloke2020-12-071-11/+16
| * | Add authentication to replication endpoints. (#8853)Patrick Cloke2020-12-042-8/+120
| * | Pass room_id to get_auth_chain_difference (#8879)Erik Johnston2020-12-042-12/+20
| * | Add additional validation to pusher URLs. (#8865)Patrick Cloke2020-12-043-27/+89
| * | Merge tag 'v1.24.0rc2' into developPatrick Cloke2020-12-042-2/+29
| |\|
| * | Fix errorcode for disabled registration (#8867)Richard van der Hoff2020-12-031-0/+1
| * | Merge remote-tracking branch 'origin/develop' into rav/remove_unused_mocksRichard van der Hoff2020-12-029-95/+279
| |\ \
| | * \ Merge pull request #8858 from matrix-org/rav/sso_uiaRichard van der Hoff2020-12-028-57/+279
| | |\ \
| | | * | UIA: offer only available auth flowsRichard van der Hoff2020-12-023-18/+193
| | | * | Factor out FakeResponse from test_oidcRichard van der Hoff2020-12-022-16/+28
| | | * | fix up various test casesRichard van der Hoff2020-12-024-16/+37
| | | * | Add `create_resource_dict` method to HomeserverTestCaseRichard van der Hoff2020-12-021-7/+21
| | * | | remove unused FakeResponse (#8864)Richard van der Hoff2020-12-021-26/+0
| * | | | remove unused DeferredMockCallableRichard van der Hoff2020-12-021-90/+1
| * | | | remove unused `resource_for_federation`Richard van der Hoff2020-12-022-18/+13
| * | | | Remove redundant mockingRichard van der Hoff2020-12-025-36/+5
| |/ / /
| * | | Apply an IP range blacklist to push and key revocation requests. (#8821)Patrick Cloke2020-12-0228-40/+52
| * | | Correctly handle unpersisted events when calculating auth chain difference. (...Erik Johnston2020-12-022-1/+132
| |/ /
* | | Port "Allow providing credentials to HTTPS_PROXY (#9657)" from mainline (#95)Andrew Morgan2021-03-231-0/+39
* | | Stabilise all knock-related unstable identifiers that would be in state (#96)Andrew Morgan2021-03-231-3/+8
* | | Port "Add support for no_proxy and case insensitive env variables" from mainl...Andrew Morgan2021-03-2229-59/+224
* | | Change knock room version to v7 (#88)Andrew Morgan2021-03-182-6/+7
* | | Add a config option to prioritise local users in user directory search result...Andrew Morgan2021-02-191-0/+94
* | | Send a ver query parameter for make_knock (#83)Andrew Morgan2021-02-171-2/+9
* | | Add knocking support (#81)Andrew Morgan2021-02-092-2/+370
* | | Add a parameter to enable/disable freeze feature (#78)Mathieu Velten2021-01-211-0/+1
* | | Ensure we read account validity templates from custom template dir if provide...Andrew Morgan2021-01-191-0/+51
* | | Merge commit '693dab487' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-312-2/+29
|\ \ \ | | |/ | |/|
| * | Fix a regression that mapping providers should be able to redirect users. (#8...Patrick Cloke2020-12-042-2/+29
| |/
* | Merge commit '53b12688d' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-312-17/+193
|\|
| * Fix a regression when grandfathering SAML users. (#8855)Patrick Cloke2020-12-022-1/+41
| * Add basic SAML tests for mapping users. (#8800)Patrick Cloke2020-12-022-17/+153
* | Merge commit 'd3ed93504' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-313-10/+630
|\|
| * Create a `PasswordProvider` wrapper object (#8849)Richard van der Hoff2020-12-021-2/+3
| * Allow specifying room version in 'RestHelper.create_room_as' and add typing (...Andrew Morgan2020-12-021-2/+25
| * Support "identifier" dicts in UIA (#8848)Richard van der Hoff2020-12-012-18/+26
| * Don't offer password login when it is disabled (#8835)Richard van der Hoff2020-12-011-3/+105
| * Add some tests for `password_auth_providers` (#8819)Richard van der Hoff2020-12-011-0/+486
* | Merge commit '09ac0569f' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-317-17/+178
|\|
| * Fix broken testcase (#8851)Richard van der Hoff2020-12-011-1/+0
| * Add a config option to change whether unread push notification counts are per...Andrew Morgan2020-11-301-2/+161
| * Simplify the way the `HomeServer` object caches its internal attributes. (#8...Jonathan de Jong2020-11-305-14/+17
* | Merge commit '7c4344747' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-318-15/+209
|\|
| * Remove deprecated `/_matrix/client/*/admin` endpoints (#8785)Dirk Klimpel2020-11-256-10/+118
| * Support trying multiple localparts for OpenID Connect. (#8801)Patrick Cloke2020-11-251-1/+87
* | Merge commit '8ca120df7' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-312-21/+69
|\|
| * Improve error checking for OIDC/SAML mapping providers (#8774)Patrick Cloke2020-11-191-20/+69
| * Consistently use room_id from federation request body (#8776)Richard van der Hoff2020-11-191-1/+0
| * Fix tests on develop (#8777)Erik Johnston2020-11-181-16/+0
| * Merge pull request #8761 from matrix-org/rav/test_request_renderingRichard van der Hoff2020-11-1758-813/+102
| |\
| * | Abstract shared SSO code. (#8765)Patrick Cloke2020-11-171-7/+7
| * | Add admin API for logging in as a user (#8617)Erik Johnston2020-11-176-42/+265
* | | Merged commit 'deff8f628' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-319-74/+261
* | | Merge commit 'acfe3b306' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-3158-765/+44
|\ \ \ | | |/ | |/|
| * | 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
* | | Merge commit '129ae841e' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-3115-141/+226
|\| |
| * | 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
| |/
| * Merge pull request #8757 from matrix-org/rav/pass_site_to_make_requestRichard van der Hoff2020-11-1616-88/+227
| |\
| | * fixup testRichard van der Hoff2020-11-161-0/+1
| | * Merge branch 'develop' into rav/pass_site_to_make_requestRichard van der Hoff2020-11-169-33/+33
| | |\
| | * | 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
* | | | Merge commit 'f12589547' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-3110-58/+58
|\| | |
| * | | Move `wait_until_result` into `FakeChannel` (#8758)Richard van der Hoff2020-11-162-25/+23
| | |/ | |/|
| * | Rename `create_test_json_resource` to `create_test_resource` (#8759)Richard van der Hoff2020-11-166-23/+15
| * | Add a `custom_headers` param to `make_request` (#8760)Richard van der Hoff2020-11-163-11/+23
* | | Merge commit '9debe657a' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-314-26/+75
|\ \ \ | | |/ | |/|
| * | 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
| |/
* | Merge commit 'c3119d153' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-315-75/+712
|\|
| * Add an admin API for users' media statistics (#8700)Dirk Klimpel2020-11-051-0/+485
| * Add `displayname` to Shared-Secret Registration for admins (#8722)Dirk Klimpel2020-11-052-8/+132
| * Consolidate purge table lists to prevent desyncronisation (#8713)Andrew Morgan2020-11-041-67/+38
| * Block clients from sending server ACLs that lock the local server out. (#8708)Erik Johnston2020-11-031-0/+57
* | Merge commit 'f27a78969' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-315-4/+375
|\|
| * Implement and use an @lru_cache decorator (#8595)Richard van der Hoff2020-10-301-1/+59
| * Fail test cases if they fail to await all awaitables (#8690)Patrick Cloke2020-10-302-2/+38
| * Fix race for concurrent downloads of remote media. (#8682)Erik Johnston2020-10-302-1/+278
* | Merge commit 'ef2d62701' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-3117-435/+315
|\|
| * Fix unit tests (#8689)Erik Johnston2020-10-291-1/+1
| * Gracefully handle a pending logging connection during shutdown. (#8685)Patrick Cloke2020-10-291-0/+16
| * Add ability for access tokens to belong to one user but grant access to anoth...Erik Johnston2020-10-2910-33/+30
| * Support generating structured logs in addition to standard logs. (#8607)Patrick Cloke2020-10-295-400/+258
| * Don't require hiredis to run unit tests (#8680)Erik Johnston2020-10-291-1/+10
* | Merge commit 'c97da1e45' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-316-6/+130
|\|
| * Add an admin APIs to allow server admins to list users' pushers (#8610)Dirk Klimpel2020-10-281-0/+124
| * Tell Black to format code for Python 3.5 (#8664)Dan Callahan2020-10-275-6/+6
* | Merge commit '88e1d0c52' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-311-0/+282
|\|
| * Add admin API to list users' local media (#8647)Dirk Klimpel2020-10-271-0/+282
* | Merge commit '24229fac0' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-314-14/+783
|\|
| * Split admin API for reported events into a detail and a list view (#8539)Dirk Klimpel2020-10-261-13/+183
| * Add an admin api to delete local media. (#8519)Dirk Klimpel2020-10-261-0/+568
| * Fix a bug in the joined_rooms admin API (#8643)Dirk Klimpel2020-10-261-1/+15
| * Fix get|set_type_stream_id_for_appservice store functions (#8648)Will Hunt2020-10-261-0/+56
| * Add field `total` to device list in admin API (#8644)Dirk Klimpel2020-10-261-0/+17
* | Merge commit '7a3adbd7a' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-311-0/+56
|\ \
| * | Fix get|set_type_stream_id_for_appservice store functions (#8648)Will Hunt2020-10-261-0/+56
* | | Merge commit '2b7c18087' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-313-18/+55
|\ \ \ | | |/ | |/|
| * | Start fewer opentracing spans (#8640)Erik Johnston2020-10-261-12/+8
| * | Fix handling of User-Agent headers with bad utf-8. (#8632)Erik Johnston2020-10-231-6/+18
| * | Fix email notifications for invites without local state. (#8627)Erik Johnston2020-10-231-0/+29
* | | Merge commit 'b19b63e6b' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-315-11/+11
|\| |
| * | Don't instansiate Requester directly (#8614)Erik Johnston2020-10-225-11/+11
| |/
* | Merge commit '9146a8a69' into dinsicAndrew Morgan2020-12-313-237/+385
|\|
| * Merge pull request #8572 from matrix-org/rav/cache_hacking/2Richard van der Hoff2020-10-213-237/+385
| |\
| | * Add some more testsRichard van der Hoff2020-10-212-0/+147
| | * Push some deferred wrangling down into DeferredCacheRichard van der Hoff2020-10-212-12/+11
| | * Combine the two sets of tests for CacheDescriptorRichard van der Hoff2020-10-212-228/+230
* | | Merge commit '70259d8c' into dinsicAndrew Morgan2020-12-312-1/+42
|\| |
| * | Limit AS transactions to 100 events (#8606)Will Hunt2020-10-211-0/+41