summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/release-v1.26.0' into matrix-org-hotfixesErik Johnston2021-01-2129-163/+281
|\
| * Add schema update to fix existing DBs affected by #9193 (#9195)Erik Johnston2021-01-212-1/+19
| * Fix receipts or account data not being sent down sync (#9193)Erik Johnston2021-01-214-7/+61
| * Prefix idp_id with "oidc-" (#9189)Richard van der Hoff2021-01-211-4/+24
| * Tighten the restrictions on `idp_id` (#9177)Richard van der Hoff2021-01-201-3/+9
| * Support icons for Identity Providers (#9154)Richard van der Hoff2021-01-2015-90/+139
| * Merge remote-tracking branch 'origin/develop' into release-v1.26.0Richard van der Hoff2021-01-2010-59/+30
| |\
| | * Give `public_baseurl` a default value (#9159)Richard van der Hoff2021-01-2010-59/+30
| * | 1.26.0rc1Patrick Cloke2021-01-201-1/+1
| |/
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-01-204-14/+36
|\|
| * Use the account handler in additional places. (#9166)Patrick Cloke2021-01-202-2/+4
| * Validate the server name for the /publicRooms endpoint. (#9161)Patrick Cloke2021-01-191-2/+17
| * Fix error messages from OIDC config parsing (#9153)Richard van der Hoff2021-01-191-10/+15
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-01-1931-281/+757
|\|
| * Allow moving account data and receipts streams off master (#9104)Erik Johnston2021-01-1825-274/+748
| * Enforce all replication HTTP clients calls use kwargs (#9144)Erik Johnston2021-01-181-1/+1
| * Properly raise an exception when the body exceeds the max size. (#9145)Patrick Cloke2021-01-182-2/+2
| * Fix bugs in handling clientRedirectUrl, and improve OIDC tests (#9127, #9128)Richard van der Hoff2021-01-183-4/+6
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-01-1823-492/+761
|\|
| * Ensure the user ID is serialized in the payload instead of used as an instanc...Patrick Cloke2021-01-181-1/+1
| * Make chain cover index bg update go faster (#9124)Erik Johnston2021-01-151-150/+179
| * Ensure we store pusher data as text (#9117)Richard van der Hoff2021-01-151-3/+2
| * Land support for multiple OIDC providers (#9110)Richard van der Hoff2021-01-153-150/+208
| * Add an admin API endpoint to protect media. (#9086)Patrick Cloke2021-01-151-15/+49
| * Avoid raising the body exceeded error multiple times. (#9108)Patrick Cloke2021-01-151-1/+11
| * Remote dependency on distutils (#9125)Richard van der Hoff2021-01-153-7/+26
| * Add type hints to media rest resources. (#9093)Patrick Cloke2021-01-1512-165/+285
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-01-158-54/+135
|\|
| * Store an IdP ID in the OIDC session (#9109)Richard van der Hoff2021-01-152-9/+39
| * Merge pull request #9091 from matrix-org/rav/error_on_bad_ssoRichard van der Hoff2021-01-154-31/+67
| |\
| | * Move `complete_sso_ui_auth` into SSOHandlerRichard van der Hoff2021-01-132-28/+13
| | * Give the user a better error when they present bad SSO credsRichard van der Hoff2021-01-133-5/+56
| * | Fix event chain bg update. (#9118)Erik Johnston2021-01-141-1/+1
| * | Fix perf of get_cross_signing_keys (#9116)Erik Johnston2021-01-141-13/+28
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-01-145-42/+48
|\| |
| * | Fix chain cover background update to work with split out event persisters (#9...Erik Johnston2021-01-144-29/+37
| * | Fix get destinations to catch up query. (#9114)Erik Johnston2021-01-141-13/+11
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-01-1450-793/+2389
|\| |
| * | Add background update for add chain cover index (#9029)Erik Johnston2021-01-143-16/+243
| * | Split OidcProvider out of OidcHandler (#9107)Richard van der Hoff2021-01-142-99/+148
| * | Fix wrong arguments being passed to BlacklistingAgentWrapper (#9098)Tim Leung2021-01-141-1/+0
| |/
| * Merge pull request #9105 from matrix-org/rav/multi_idp/oidc_provider_configRichard van der Hoff2021-01-132-62/+190
| |\
| | * Add jsonschema verification for the oidc provider configRichard van der Hoff2021-01-131-0/+50
| | * Extract OIDCProviderConfig objectRichard van der Hoff2021-01-132-62/+140
| * | Reduce scope of exception handler. (#9106)Patrick Cloke2021-01-131-5/+5
| * | Register the /devices endpoint on workers. (#9092)Patrick Cloke2021-01-132-11/+32
| |/
| * Add basic domain validation for `DomainSpecificString.is_valid`. (#9071)Patrick Cloke2021-01-131-1/+7
| * Merge branch 'master' into developErik Johnston2021-01-133-4/+15
| |\
| | * 1.25.0Erik Johnston2021-01-131-1/+1
| | * Don't apply the IP range blacklist to proxy connections (#9084)Marcus2021-01-122-3/+14
| * | Preparatory refactors of OidcHandler (#9067)Richard van der Hoff2021-01-131-141/+163
| * | Remove user's avatar URL and displayname when deactivated. (#8932)Dirk Klimpel2021-01-126-14/+45
| * | UI Auth via SSO: redirect the user to an appropriate SSO. (#9081)Richard van der Hoff2021-01-126-60/+132
| * | Handle bad JSON data being returned from the federation API. (#9070)Patrick Cloke2021-01-121-0/+10
| * | Kill off `HomeServer.get_ip_from_request()` (#9080)Richard van der Hoff2021-01-128-52/+14
| * | Remove SynapseRequest.get_user_agent (#9069)Richard van der Hoff2021-01-125-22/+25
| * | Also support remote users on the joined_rooms admin API. (#8948)David Teller2021-01-111-7/+0
| * | Move more encryption endpoints off master (#9068)Erik Johnston2021-01-112-46/+54
| * | Use a chain cover index to efficiently calculate auth chain difference (#8868)Erik Johnston2021-01-117-23/+891
| * | Clean up exception handling in the startup code (#9059)Richard van der Hoff2021-01-113-100/+119
| * | Remove old tables after schema version bump (#9055)Erik Johnston2021-01-115-59/+36
| * | Ensure rejected events get added to some metadata tables (#9016)Erik Johnston2021-01-113-24/+166
| * | Remove unused SynapseService (#9058)Richard van der Hoff2021-01-111-22/+0
| * | Drop last_used column from access_tokens (#9025)Jerin J Titus2021-01-112-0/+78
| * | Fix "Starting metrics collection from sentinel context" errors (#9053)Erik Johnston2021-01-082-21/+21
| * | Merge pull request #9036 from matrix-org/rav/multi_idp/testsRichard van der Hoff2021-01-081-2/+2
| |\ \
| | * | Add some tests for the IDP picker flowRichard van der Hoff2021-01-071-2/+2
| * | | Fix validate_config on nested objects (#9054)Richard van der Hoff2021-01-081-1/+1
| * | | Fix error handling during insertion of client IPs (#9051)Erik Johnston2021-01-081-31/+23
* | | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-01-0810-170/+289
|\| | |
| * | | Allow running sendToDevice on workers (#9044)Erik Johnston2021-01-079-105/+203
| * | | Support routing edu's to multiple instances (#9042)Erik Johnston2021-01-071-5/+16
| * | | Ensure that remote users' device list resyncing always happens on master (#9043)Erik Johnston2021-01-071-4/+13
| * | | Some cleanups to device inbox store. (#9041)Erik Johnston2021-01-072-57/+58
* | | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-01-074-41/+193
|\| | |
| * | | Improve the performance of calculating ignored users in large rooms (#9024)Patrick Cloke2021-01-074-34/+183
| |/ /
| * | Handle updating schema version without any deltas. (#9033)Erik Johnston2021-01-071-7/+10
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-01-0720-148/+429
|\| |
| * | Empty iterables should count towards cache usage. (#9028)Patrick Cloke2021-01-061-1/+1
| * | Merge tag 'v1.25.0rc1' into developPatrick Cloke2021-01-065-15/+8
| |\|
| | * 1.25.0rc1Patrick Cloke2021-01-061-1/+1
| * | Handle a display name / avatar URL not included in a federation request. (#9023)Patrick Cloke2021-01-061-2/+2
| * | Add type hints to the logging context code. (#8939)Patrick Cloke2021-01-053-22/+46
| * | Implement MSC2176: Updated redaction rules (#8984)Patrick Cloke2021-01-053-9/+41
| * | Add initial support for a "pick your IdP" page (#9017)Richard van der Hoff2021-01-059-3/+168
| * | Combine the SSO Redirect Servlets (#9015)Richard van der Hoff2021-01-046-112/+172
* | | Merge branch 'release-v1.25.0' of github.com:matrix-org/synapse into matrix-o...Patrick Cloke2021-01-054-14/+7
|\ \ \ | | |/ | |/|
| * | Fix-up assertions about last stream token in push (#9020)Patrick Cloke2021-01-054-14/+7
| |/
* | Remove cache from room directory query resultsRichard van der Hoff2021-01-051-1/+1
* | Merge remote-tracking branch 'origin/release-v1.25.0' into matrix-org-hotfixesRichard van der Hoff2021-01-0581-907/+2334
|\|
| * Add type hints to the receipts and user directory handlers. (#8976)Patrick Cloke2021-01-042-32/+61
| * Add type hints to the crypto module. (#8999)Patrick Cloke2021-01-046-108/+150
| * Use the SSO handler helpers for CAS registration/login. (#8856)Patrick Cloke2021-01-032-39/+77
| * Check if group IDs are valid before using them. (#8977)Patrick Cloke2020-12-302-4/+46
| * Add additional type hints to the storage module. (#8980)Patrick Cloke2020-12-3010-148/+213
| * Add type hints to admin and room list handlers. (#8973)Patrick Cloke2020-12-293-70/+94
| * Validate input parameters for the sendToDevice API. (#8975)Patrick Cloke2020-12-291-1/+2
| * Update the value of group_creation_prefix in sample config. (#8992)Jerin J Titus2020-12-291-1/+1
| * Allow redacting events on workers (#8994)Patrick Cloke2020-12-292-34/+14
| * Drop the unused local_invites table. (#8979)Patrick Cloke2020-12-291-0/+18
| * Refactor the CAS handler in prep for using the abstracted SSO code. (#8958)Patrick Cloke2020-12-182-66/+158
| * Send the location of the web client to the IS when inviting via 3PIDs. (#8930)Patrick Cloke2020-12-182-0/+27
| * Allow server admin to get admin bit in rooms where local user is an admin (#8...Erik Johnston2020-12-182-2/+136
| * Fix mainline ordering in state res v2 (#8971)Erik Johnston2020-12-181-1/+1
| * Implement a username picker for synapse (#8942)Richard van der Hoff2020-12-189-45/+512
| * Allow re-using a UI auth validation for a period of time (#8970)Patrick Cloke2020-12-187-18/+114
| * Ensure that a URL exists in the content during push. (#8965)Patrick Cloke2020-12-182-2/+6
| * Merge remote-tracking branch 'origin/erikj/as_mau_block' into developErik Johnston2020-12-185-7/+41
| |\
| | * Correctly handle AS registerations and add testErik Johnston2020-12-174-7/+34
| | * Don't MAU limit AS ghost usersErik Johnston2020-12-171-0/+7
| * | Try and drop stale extremities. (#8929)Erik Johnston2020-12-184-18/+188
| * | Use the simple dictionary in full text search for the user directory (#8959)Brendan Abolivier2020-12-171-12/+12
| * | Fix a bug that deactivated users appear in the directory (#8933)Dirk Klimpel2020-12-171-2/+6
| * | Make search statement in List Room and User Admin API case-insensitive (#8931)Dirk Klimpel2020-12-172-5/+6
| * | Add a maximum size for well-known lookups. (#8950)Patrick Cloke2020-12-163-18/+52
| * | Push login completion down into SsoHandler (#8941)Richard van der Hoff2020-12-163-82/+75
| * | Fix the sample config location for the ip_range_whitelist setting. (#8954)Patrick Cloke2020-12-162-12/+12
| * | Convert internal pusher dicts to attrs classes. (#8940)Patrick Cloke2020-12-1612-195/+255
| * | Do not assume that the contents dictionary includes history_visibility. (#8945)Patrick Cloke2020-12-168-28/+57
| * | Preparatory refactoring of the SamlHandlerTestCase (#8938)Richard van der Hoff2020-12-151-0/+23
* | | Allow redacting events on workers (#8994)Patrick Cloke2020-12-292-34/+14
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesPatrick Cloke2020-12-155-50/+17
|\| |
| * | Fix handling of stream tokens for push. (#8943)Patrick Cloke2020-12-155-50/+17
* | | Merge branch 'develop' into matrix-org-hotfixesPatrick Cloke2020-12-1583-624/+1436
|\| |
| * | Fix startup failure with localdb_enabled: False (#8937)Richard van der Hoff2020-12-141-14/+12
| * | Various clean-ups to the logging context code (#8935)Patrick Cloke2020-12-145-28/+11
| * | Allow spam-checker modules to be provide async methods. (#8890)David Teller2020-12-1116-65/+82
| * | Add type hints to the push module. (#8901)Patrick Cloke2020-12-116-80/+155
| * | Honour AS ratelimit settings for /login requests (#8920)Erik Johnston2020-12-113-10/+26
| * | Add number of local devices to Room Details Admin API (#8886)Dirk Klimpel2020-12-112-16/+64
| * | Don't ratelimit autojoining of rooms (#8921)Erik Johnston2020-12-112-11/+17
| * | Fix deadlock on SIGHUP (#8918)Erik Johnston2020-12-101-1/+5
| * | Refactor `SsoHandler.get_mxid_from_sso` (#8900)Richard van der Hoff2020-12-102-28/+50
| * | Fix buglet in DirectRenderJsonResource (#8897)Richard van der Hoff2020-12-101-3/+5
| * | Default to blacklisting reserved IP ranges and add a whitelist. (#8870)Patrick Cloke2020-12-094-62/+100
| * | Merge branch 'master' into developErik Johnston2020-12-092-2/+6
| |\|
| | * 1.24.0 v1.24.0Erik Johnston2020-12-091-1/+1
| | * Fix installing pysaml2 on Python 3.5. (#8898)Patrick Cloke2020-12-081-1/+5
| * | Add X-Robots-Tag header to stop crawlers from indexing media (#8887)Aaron Raimist2020-12-081-0/+5
| * | Better formatting for config errors from modules (#8874)Richard van der Hoff2020-12-0812-37/+159
| * | Simplify the flow for SSO UIA (#8881)Richard van der Hoff2020-12-085-40/+142
| * | Clarify config template comments (#8891)Richard van der Hoff2020-12-082-8/+4
| * | Call set_avatar_url with target_user, not user_id (#8872)Will Hunt2020-12-071-2/+2
| * | Do not raise a 500 exception when previewing empty media. (#8883)Patrick Cloke2020-12-071-1/+5
| * | Add type hints for HTTP and email pushers. (#8880)Patrick Cloke2020-12-076-101/+164
| * | Add type hints to the push mailer module. (#8882)Patrick Cloke2020-12-071-40/+83
| * | Add authentication to replication endpoints. (#8853)Patrick Cloke2020-12-042-6/+51
| * | Pass room_id to get_auth_chain_difference (#8879)Erik Johnston2020-12-043-5/+12
| * | Add additional validation to pusher URLs. (#8865)Patrick Cloke2020-12-042-3/+16
| * | Do not 500 if the content-length is not provided when uploading media. (#8862)Patrick Cloke2020-12-041-1/+1
| * | Merge tag 'v1.24.0rc2' into developPatrick Cloke2020-12-044-15/+29
| |\|
| * | Fix errorcode for disabled registration (#8867)Richard van der Hoff2020-12-031-1/+1
| * | Merge pull request #8858 from matrix-org/rav/sso_uiaRichard van der Hoff2020-12-024-16/+86
| |\ \
| | * | UIA: offer only available auth flowsRichard van der Hoff2020-12-023-15/+85
| | * | fix up various test casesRichard van der Hoff2020-12-021-1/+1
| * | | Apply an IP range blacklist to push and key revocation requests. (#8821)Patrick Cloke2020-12-0213-69/+115
| * | | Correctly handle unpersisted events when calculating auth chain difference. (...Erik Johnston2020-12-021-4/+83
| * | | Add additional validation for the admin register endpoint. (#8837)David Florness2020-12-021-0/+3
* | | | Merge branch 'release-v1.24.0' of github.com:matrix-org/synapse into matrix-o...Patrick Cloke2020-12-044-15/+29
|\ \ \ \ | | |_|/ | |/| |
| * | | 1.24.0rc2Patrick Cloke2020-12-041-1/+1
| * | | Fix a regression that mapping providers should be able to redirect users. (#8...Patrick Cloke2020-12-042-6/+23
| * | | Remove version pin prometheus_client dependency (#8875)Jordan Bancino2020-12-041-8/+5
| |/ /
| * / 1.24.0rc1Patrick Cloke2020-12-021-1/+1
| |/
* | Merge branch 'release-v1.24.0' of github.com:matrix-org/synapse into matrix-o...Patrick Cloke2020-12-0224-334/+564
|\|
| * Fix a regression when grandfathering SAML users. (#8855)Patrick Cloke2020-12-023-47/+52
| * Add basic SAML tests for mapping users. (#8800)Patrick Cloke2020-12-021-1/+1
| * Create a `PasswordProvider` wrapper object (#8849)Richard van der Hoff2020-12-021-55/+148
| * Support "identifier" dicts in UIA (#8848)Richard van der Hoff2020-12-012-129/+163
| * Add missing `ordering` to background updates (#8850)Richard van der Hoff2020-12-014-12/+12
| * Allow Date header through CORS (#8804)Nicolas Chamo2020-12-011-1/+1
| * Don't offer password login when it is disabled (#8835)Richard van der Hoff2020-12-011-1/+9
| * Simplify appservice login code (#8847)Richard van der Hoff2020-11-301-6/+21
| * Allow per-room profile to be used for server notice user (#8799)Mathieu Velten2020-11-301-1/+9
| * Drop (almost) unused index on event_json (#8845)Richard van der Hoff2020-11-302-1/+20
| * Add a config option to change whether unread push notification counts are per...Andrew Morgan2020-11-303-7/+35
| * Simplify the way the `HomeServer` object caches its internal attributes. (#8...Jonathan de Jong2020-11-305-21/+21
| * Add `force_purge` option to delete-room admin api. (#8843)Richard van der Hoff2020-11-302-11/+28
| * Remove special case of pretty printing JSON responses for curl (#8833)Tulir Asokan2020-11-271-24/+5
| * Add typing to membership Replication class methods (#8809)Andrew Morgan2020-11-271-22/+44
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2020-11-2749-885/+1320
|\|
| * Defer SIGHUP handlers to reactor. (#8817)Erik Johnston2020-11-261-1/+9
| * Strip trailing / from server_url in register_new_matrix_user (#8823)Dmitry Borodaenko2020-11-261-1/+1
| * Remove deprecated `/_matrix/client/*/admin` endpoints (#8785)Dirk Klimpel2020-11-257-58/+28
| * Fix the formatting of push config section (#8818)Andrew Morgan2020-11-251-15/+20
| * Speed up remote invite rejection database call (#8815)Andrew Morgan2020-11-252-6/+44
| * Add additional type hints to HTTP client. (#8812)Patrick Cloke2020-11-252-147/+138
| * Support trying multiple localparts for OpenID Connect. (#8801)Patrick Cloke2020-11-253-134/+232
| * Add type hints to matrix federation client / agent. (#8806)Patrick Cloke2020-11-254-195/+228
| * Properly report user-agent/IP during registration of SSO users. (#8784)Patrick Cloke2020-11-234-122/+171
| * Improve logging of the mapping from SSO IDs to Matrix IDs. (#8773)Andrew Morgan2020-11-232-5/+12
| * Improve error checking for OIDC/SAML mapping providers (#8774)Patrick Cloke2020-11-193-8/+29
| * SAML: Allow specifying the IdP entityid to use. (#8630)Ben Banfield-Zanin2020-11-192-1/+12
| * Consistently use room_id from federation request body (#8776)Richard van der Hoff2020-11-193-53/+48
| * Improve appservice handler to send only the most recent read receipts when no...Will Hunt2020-11-183-3/+9
| * SAML: Document allowing a clock/time difference from IdP (#8731)Marcus Schopen2020-11-181-0/+6
| * Merge branch 'master' into developErik Johnston2020-11-182-1/+5
| |\
| | * 1.23.0Erik Johnston2020-11-181-1/+1
| | * Cap the version of prometheus_client to <v0.9.0 in the dockerfile (#8767)Andrew Morgan2020-11-171-0/+4
| * | Abstract shared SSO code. (#8765)Patrick Cloke2020-11-174-113/+151
| * | Use TYPE_CHECKING instead of magic MYPY variable. (#8770)Patrick Cloke2020-11-173-9/+6
| * | Add admin API for logging in as a user (#8617)Erik Johnston2020-11-1717-45/+174
| * | Generalise _locally_reject_invite (#8751)Andrew Morgan2020-11-161-17/+19
| * | Clarify the usecase for an msisdn delegate (#8734)Adrian Wannenmacher2020-11-141-2/+3
| * | Generalise _maybe_store_room_on_invite (#8754)Andrew Morgan2020-11-133-13/+17
| |/
| * 1.23.0rc1Erik Johnston2020-11-131-1/+1
| * SAML: add <mdui:UIInfo> element examples (#8718)Marcus Schopen2020-11-131-0/+22
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2020-11-1318-33/+463
|\|
| * Add metrics for tracking 3PID /requestToken requests. (#8712)Erik Johnston2020-11-133-0/+32
| * Cache event ID to auth event IDs lookups (#8752)Erik Johnston2020-11-131-12/+70
| * Enable reconnection in DB pool (#8726)Erik Johnston2020-11-121-1/+6
| * Check support room has only two users before sending a notice (#8728)Will Hunt2020-11-111-1/+1
| * Better error message when a remote resource uses invalid Content-Type (#8719)Andrew Morgan2020-11-111-2/+8
| * Catch exceptions in password_providers (#8636)Nicolai Søborg2020-11-111-4/+9
| * Fix SIGHUP handler (#8697)Richard van der Hoff2020-11-061-3/+2
| * Add an admin API for users' media statistics (#8700)Dirk Klimpel2020-11-053-0/+251
| * Add `displayname` to Shared-Secret Registration for admins (#8722)Dirk Klimpel2020-11-051-0/+2
| * Block clients from sending server ACLs that lock the local server out. (#8708)Erik Johnston2020-11-032-9/+21
| * Improve error messages of non-str displayname/avatar_url (#8705)Andrew Morgan2020-11-021-2/+6
| * Add base pushrule to notify for jitsi conferences (#8286)David Baker2020-11-021-0/+24
| * Improve start time by adding index to e2e_cross_signing_keys (#8694)Erik Johnston2020-11-022-2/+33
* | Merge branch 'rav/fix_sighup' into matrix-org-hotfixesRichard van der Hoff2020-10-316-59/+84
|\ \
| * | Fix SIGHUP handlerRichard van der Hoff2020-10-311-3/+2
| |/
| * Fix error handling around when completing an AS transaction (#8693)Brendan Abolivier2020-10-301-1/+1
| * Merge branch 'master' into developErik Johnston2020-10-301-1/+1
| |\
| | * use correct versionErik Johnston2020-10-301-1/+1
| | * Merge pull request #8678 from matrix-org/rav/fix_frozen_eventsRichard van der Hoff2020-10-306-40/+31
| | * Tie together matches_user_in_member_list and get_users_in_room caches (#8676)Will Hunt2020-10-301-4/+6
| * | Improve the sample config for SSO (OIDC, SAML, and CAS). (#8635)Patrick Cloke2020-10-303-54/+80
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2020-10-3043-952/+1205
|\| |
| * | Implement and use an @lru_cache decorator (#8595)Richard van der Hoff2020-10-302-60/+212
| * | Fix race for concurrent downloads of remote media. (#8682)Erik Johnston2020-10-303-70/+152
| * | Fix optional parameter in stripped state storage method (#8688)Andrew Morgan2020-10-301-1/+1
| * | Tie together matches_user_in_member_list and get_users_in_room caches (#8676)Will Hunt2020-10-291-4/+6
| * | Gracefully handle a pending logging connection during shutdown. (#8685)Patrick Cloke2020-10-291-9/+18
| * | Add ability for access tokens to belong to one user but grant access to anoth...Erik Johnston2020-10-2911-105/+166
| * | Fix cache call signature to accept `on_invalidate`. (#8684)Erik Johnston2020-10-291-5/+7
| * | Use `%r` rather than `%s` for stringifying events (#8679)Richard van der Hoff2020-10-291-2/+2
| * | Optimise createRoom with multiple invites (#8559)Richard van der Hoff2020-10-292-13/+24
| * | Support generating structured logs in addition to standard logs. (#8607)Patrick Cloke2020-10-296-501/+266
| * | Merge pull request #8678 from matrix-org/rav/fix_frozen_eventsRichard van der Hoff2020-10-286-40/+31
| |\ \
| | * | remove unused importsRichard van der Hoff2020-10-281-2/+0
| | * | Remove frozendict_json_encoder and support frozendicts everywhereRichard van der Hoff2020-10-286-38/+31
| | |/
| * | Add type hints to application services. (#8655)Patrick Cloke2020-10-283-79/+117
| * | Add an admin APIs to allow server admins to list users' pushers (#8610)Dirk Klimpel2020-10-282-1/+55
| * | Don't pull event from DB when handling replication traffic. (#8669)Erik Johnston2020-10-284-31/+86
| * | Tell Black to format code for Python 3.5 (#8664)Dan Callahan2020-10-273-4/+4
| * | Abstract code for stripping room state into a separate method (#8671)Andrew Morgan2020-10-272-29/+60
* | | Merge branch 'develop' into matrix-org-hotfixesAndrew Morgan2020-10-282-8/+23
|\| |
| * | Don't unnecessarily start bg process in replication sending loop. (#8670)Erik Johnston2020-10-271-0/+10
| * | Don't unnecessarily start bg process while handling typing. (#8668)Erik Johnston2020-10-271-8/+13