summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-05-1411-39/+68
|\
| * Minor `@cachedList` enhancements (#9975)Richard van der Hoff2021-05-144-17/+16
| * Remove unnecessary SystemRandom from SQLBaseStore (#9987)Dan Callahan2021-05-142-3/+2
| * Remove superfluous call to bool() (#9986)Dan Callahan2021-05-141-1/+1
| * Simplify exception handling in is_ascii. (#9985)Dan Callahan2021-05-141-3/+1
| * Use Python's secrets module instead of random (#9984)Dan Callahan2021-05-141-8/+11
| * Support enabling opentracing by user (#9978)Richard van der Hoff2021-05-142-6/+36
| * 1.34.0rc1Brendan Abolivier2021-05-121-1/+1
* | Merge branch 'release-v1.34.0' into matrix-org-hotfixesBrendan Abolivier2021-05-127-27/+144
|\|
| * Correctly ratelimit invites when creating a room (#9968)Brendan Abolivier2021-05-123-12/+62
| * Change the format of access tokens away from macaroons (#5588)Richard van der Hoff2021-05-123-10/+42
| * Run cache_joined_hosts_for_event in background (#9951)Erik Johnston2021-05-121-5/+40
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2021-05-12302-149/+517
|\|
| * Sort child events according to MSC1772 for the spaces summary API. (#9954)Patrick Cloke2021-05-111-2/+69
| * Support fetching the spaces summary via GET over federation. (#9947)Patrick Cloke2021-05-113-0/+28
| * Send the `m.room.create` stripped event with invites (support MSC1772). (#9966)Patrick Cloke2021-05-111-4/+2
| * Merge branch 'master' into developBrendan Abolivier2021-05-114-69/+53
| |\
| | * 1.33.2Brendan Abolivier2021-05-111-1/+1
| * | Add config option to hide device names over federation (#9945)Aaron Raimist2021-05-112-1/+13
| * | Add debug logging for issue #9533 (#9959)Richard van der Hoff2021-05-115-2/+41
| * | Fix `m.room_key_request` to-device messages (#9961)Richard van der Hoff2021-05-113-26/+31
| * | Improve performance of backfilling in large rooms. (#9935)Erik Johnston2021-05-101-69/+54
| * | Always cache 'event_to_prev_state_group' (#9950)Erik Johnston2021-05-071-6/+7
| * | Merge remote-tracking branch 'origin/release-v1.33.2' into developErik Johnston2021-05-071-1/+1
| |\ \
| * | | Reorganise the database schema directories (#9932)Richard van der Hoff2021-05-07282-44/+79
| * | | Export jemalloc stats to prometheus when used (#9882)Erik Johnston2021-05-063-0/+199
* | | | Merge branch 'release-v1.33.2' into matrix-org-hotfixesBrendan Abolivier2021-05-114-69/+53
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request from GHSA-x345-32rc-8h85Richard van der Hoff2021-05-113-68/+52
| | |/ | |/|
| * | Unpin attrs dep after new version has been released (#9946)Erik Johnston2021-05-071-1/+1
* | | Revert "improve efficiency of _glob_to_re"Brendan Abolivier2021-05-111-2/+1
* | | Always cache 'event_to_prev_state_group'Erik Johnston2021-05-071-6/+7
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-05-063-46/+21
|\ \ \ | | |/ | |/|
| * | Revert "Leave out optional keys from /sync (#9919)" (#9940)Erik Johnston2021-05-061-44/+18
| * | Merge remote-tracking branch 'origin/master' into developErik Johnston2021-05-062-2/+3
| |\|
| | * 1.33.1 v1.33.1 github/release-v1.33.1 release-v1.33.1Erik Johnston2021-05-061-1/+1
| | * Pin attrs to <21.1.0 (#9937)Erik Johnston2021-05-061-1/+2
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-05-0631-314/+685
|\| |
| * | Follow-up to #9915 to correct the identifier for room types.Patrick Cloke2021-05-051-1/+1
| * | Include the time of the create event in Spaces Summary. (#9928)Patrick Cloke2021-05-051-0/+1
| * | Increase perf of handling presence when joining large rooms. (#9916)Erik Johnston2021-05-051-72/+82
| * | Support stable MSC1772 spaces identifiers. (#9915)Patrick Cloke2021-05-052-2/+9
| * | Optionally track memory usage of each LruCache (#9881)Erik Johnston2021-05-056-1/+93
| * | Limit how often GC happens by time. (#9902)Erik Johnston2021-05-054-3/+52
| * | Don't set the external cache if its been done recently (#9905)Erik Johnston2021-05-052-5/+33
| * | Use get_current_users_in_room from store and not StateHandler (#9910)Erik Johnston2021-05-0510-17/+24
| * | Leave out optional keys from /sync (#9919)DeepBlueV7.X2021-05-051-18/+44
| * | Merge branch 'master' into developBrendan Abolivier2021-05-051-1/+1
| |\|
| | * 1.33.0 v1.33.0 github/release-v1.33.0 release-v1.33.0Brendan Abolivier2021-05-051-1/+1
| * | Time external cache response time (#9904)Erik Johnston2021-05-041-10/+26
| * | Add port parameter to the sample config for psycopg2 args (#9911)Andrew Morgan2021-05-041-0/+1
| * | Merge tag 'v1.33.0rc2' into developAndrew Morgan2021-04-291-1/+1
| |\|
| | * 1.33.0rc2Andrew Morgan2021-04-291-1/+1
| * | Add missing type hints to handlers and fix a Spam Checker type hint. (#9896)Patrick Cloke2021-04-296-54/+80
| * | Delete room endpoint (#9889)ThibF2021-04-291-44/+90
| * | Merge remote-tracking branch 'origin/release-v1.33.0' into developErik Johnston2021-04-281-1/+23
| |\|
| * | Use the parent's logging context name for runWithConnection. (#9895)Patrick Cloke2021-04-281-1/+3
| * | Merge tag 'v1.33.0rc1' into developAndrew Morgan2021-04-284-115/+75
| |\ \
| * | | Reduce memory footprint of caches (#9886)Erik Johnston2021-04-281-18/+59
| * | | Add type hints to presence handler (#9885)Erik Johnston2021-04-281-70/+89
* | | | Merge branch 'release-v1.33.0' of github.com:matrix-org/synapse into matrix-o...Andrew Morgan2021-04-293-16/+26
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix tight loop handling presence replication. (#9900)Erik Johnston2021-04-281-1/+23
| | |/ | |/|
| * | 1.33.0rc1Andrew Morgan2021-04-281-1/+1
| * | Revert "Experimental Federation Speedup (#9702)"Andrew Morgan2021-04-283-114/+74
| |/
* | Revert "Experimental Federation Speedup (#9702)"Andrew Morgan2021-04-273-104/+76
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesAndrew Morgan2021-04-2796-973/+1754
|\|
| * Remove various bits of compatibility code for Python <3.6 (#9879)Andrew Morgan2021-04-2710-80/+16
| * Pass errors back to the client when trying multiple federation destinations. ...Patrick Cloke2021-04-271-58/+60
| * Use current state table for `presence.get_interested_remotes` (#9887)Erik Johnston2021-04-271-7/+2
| * Improved validation for received requests (#9817)Richard van der Hoff2021-04-2310-31/+87
| * Allow OIDC cookies to work on non-root public baseurls (#9726)Andrew Morgan2021-04-232-9/+21
| * pass a reactor into SynapseSite (#9874)Richard van der Hoff2021-04-233-24/+39
| * Add type hints to auth and auth_blocking. (#9876)Patrick Cloke2021-04-233-44/+47
| * Make DomainSpecificString an attrs class (#9875)Erik Johnston2021-04-233-8/+23
| * Split presence out of master (#9820)Erik Johnston2021-04-2313-158/+236
| * Check for space membership during a remote join of a restricted room (#9814)Patrick Cloke2021-04-235-68/+130
| * Only store data in caches, not "smart" objects (#9845)Erik Johnston2021-04-232-141/+181
| * Limit the size of HTTP responses read over federation. (#9833)Richard van der Hoff2021-04-232-8/+50
| * Limit length of accepted email addresses (#9855)Erik Johnston2021-04-224-7/+48
| * Clear the resync bit after resyncing device lists (#9867)Richard van der Hoff2021-04-222-10/+16
| * Remove `synapse.types.Collection` (#9856)Richard van der Hoff2021-04-2225-62/+76
| * Merge branch 'master' into developAndrew Morgan2021-04-222-4/+13
| |\
| | * 1.32.2Andrew Morgan2021-04-211-1/+1
| * | Merge branch 'master' into developAndrew Morgan2021-04-213-6/+18
| |\ \
| * | | Rename handler and config modules which end in handler/config. (#9816)Patrick Cloke2021-04-2012-27/+34
| * | | Merge branch 'master' into developAndrew Morgan2021-04-205-28/+19
| |\ \ \
| * | | | Add presence federation stream (#9819)Erik Johnston2021-04-204-23/+254
| * | | | Fix bug where we sent remote presence states to remote servers (#9850)Erik Johnston2021-04-202-3/+12
| * | | | Fix (final) Bugbear violations (#9838)Jonathan de Jong2021-04-208-22/+19
| * | | | Port "Allow users to click account renewal links multiple times without hitti...Andrew Morgan2021-04-1914-185/+350
| * | | | Sanity check identity server passed to bind/unbind. (#9802)Denis Kasak2021-04-192-3/+58
* | | | | Merge remote-tracking branch 'origin/release-v1.32.2' into matrix-org-hotfixesRichard van der Hoff2021-04-211-3/+12
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Make LoggingContext's name optional (#9857)Richard van der Hoff2021-04-211-3/+12
| | |_|/ | |/| |
* | | | Merge branch 'release-v1.32.2' into matrix-org-hotfixesRichard van der Hoff2021-04-211-1/+1
|\| | |
| * | | 1.32.1Andrew Morgan2021-04-211-1/+1
* | | | Merge branch 'release-v1.32.1' into matrix-org-hotfixesAndrew Morgan2021-04-214-27/+30
|\| | |
| * | | Stop BackgroundProcessLoggingContext making new prometheus timeseries (#9854)Richard van der Hoff2021-04-212-5/+17
| | |/ | |/|
| * | 1.32.0Andrew Morgan2021-04-201-1/+1
| * | Always use the name as the log ID. (#9829)Patrick Cloke2021-04-204-27/+18
* | | improve efficiency of _glob_to_reRichard van der Hoff2021-04-191-1/+2
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesAndrew Morgan2021-04-19430-1278/+858
|\ \ \ | | |/ | |/|
| * | Don't send normal presence updates over federation replication stream (#9828)Erik Johnston2021-04-194-183/+74
| * | User directory: use calculated room membership state instead (#9821)Andrew Morgan2021-04-162-7/+35
| * | Small speed up joining large remote rooms (#9825)Erik Johnston2021-04-161-21/+33
| * | remove `HomeServer.get_config` (#9815)Richard van der Hoff2021-04-147-17/+14
| * | Separate creating an event context from persisting it in the federation handl...Patrick Cloke2021-04-141-65/+113
| * | Revert "Check for space membership during a remote join of a restricted room....Patrick Cloke2021-04-144-232/+129
| * | Check for space membership during a remote join of a restricted room. (#9763)Patrick Cloke2021-04-144-129/+232
| * | Experimental Federation Speedup (#9702)Jonathan de Jong2021-04-143-78/+105
| * | Move some replication processing out of generic_worker (#9796)Erik Johnston2021-04-144-478/+482
| * | More robust handling of the Content-Type header for thumbnail generation (#9788)rkfg2021-04-142-0/+4
| * | Remove redundant "coding: utf-8" lines (#9786)Jonathan de Jong2021-04-14430-431/+0
| |/
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesAndrew Morgan2021-04-1341-213/+423
|\|
| * 1.32.0rc1Andrew Morgan2021-04-131-1/+1
| * Bump black configuration to target py36 (#9781)Dan Callahan2021-04-135-8/+8
| * Add an admin API to manage ratelimit for a specific user (#9648)Dirk Klimpel2021-04-133-5/+172
| * Require AppserviceRegistrationType (#9548)Will Hunt2021-04-122-7/+21
| * Fix duplicate logging of exceptions in transaction processing (#9780)Richard van der Hoff2021-04-091-7/+3
| * Remove old admin API `GET /_synapse/admin/v1/users/<user_id>` (#9401)Dirk Klimpel2021-04-092-25/+0
| * Bugbear: Add Mutable Parameter fixes (#9682)Jonathan de Jong2021-04-0823-72/+130
| * Merge remote-tracking branch 'origin/develop' into rav/drop_py35Richard van der Hoff2021-04-0826-250/+904
| |\
| | * Merge branch 'erikj/fix_stalled_catchup' into developErik Johnston2021-04-081-2/+4
| | |\
| | * | MSC3083: Check for space membership during a local join of restricted rooms. ...Patrick Cloke2021-04-081-1/+74
| * | | remove unused param on `make_tuple_comparison_clause`Richard van der Hoff2021-04-084-7/+2
| * | | Drop support for sqlite<3.22 as wellRichard van der Hoff2021-04-084-80/+12
| * | | Require py36 and Postgres 9.6Richard van der Hoff2021-04-081-2/+2
* | | | Merge branch 'erikj/fix_stalled_catchup' into matrix-org-hotfixesErik Johnston2021-04-081-2/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix sharded federation sender sometimes using 100% CPU.Erik Johnston2021-04-081-2/+4
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesPatrick Cloke2021-04-0857-416/+1319
|\| |
| * | Record more information into structured logs. (#9654)Patrick Cloke2021-04-084-43/+162
| * | Don't report anything from GaugeBucketCollector metrics until data is present...Andrew Morgan2021-04-061-3/+13
| * | Add a Synapse Module for configuring presence update routing (#9491)Andrew Morgan2021-04-067-48/+450
| * | Add type hints to expiring cache. (#9730)Patrick Cloke2021-04-067-54/+64
| * | Remove outdated constraint on remote_media_cache_thumbnails (#9725)Richard van der Hoff2021-04-062-3/+40
| * | Merge branch 'master' into developErik Johnston2021-04-061-1/+1
| |\ \
| | * | 1.31.0 v1.31.0 github/release-v1.31.0 release-v1.31.0Erik Johnston2021-04-061-1/+1
| * | | Add type hints to the federation handler and server. (#9743)Patrick Cloke2021-04-063-95/+96
| | |/ | |/|
| * | Update mypy configuration: `no_implicit_optional = True` (#9742)Jonathan de Jong2021-04-057-9/+14
| * | Improve tracing for to device messages (#9686)Erik Johnston2021-04-016-19/+101
| * | Add `order_by` to list user admin API (#9691)Dirk Klimpel2021-04-013-8/+64
| * | Add an experimental room version to support restricted join rules. (#9717)Patrick Cloke2021-03-314-8/+53
| * | Make sample config allowed_local_3pids regex stricter. (#9719)Denis Kasak2021-03-311-2/+2
| * | Deprecate imp (#9718)Cristina2021-03-311-3/+8
| * | Include m.room.create in invite_room_state for Spaces (#9710)Richard van der Hoff2021-03-301-0/+4
| * | Replace `room_invite_state_types` with `room_prejoin_state` (#9700)Richard van der Hoff2021-03-303-26/+115
| * | Make RateLimiter class check for ratelimit overrides (#9711)Erik Johnston2021-03-3014-94/+132
| |/
* | Merge remote-tracking branch 'origin/release-v1.31.0' into matrix-org-hotfixesErik Johnston2021-03-3028-169/+403
|\|
| * 1.31.0rc1Erik Johnston2021-03-301-1/+1
| * Add type hints to DictionaryCache and TTLCache. (#9442)Patrick Cloke2021-03-294-52/+84
| * Add type hints for the federation sender. (#9681)Patrick Cloke2021-03-296-59/+176
| * Update the OIDC sample config (#9695)Richard van der Hoff2021-03-291-31/+3
| * Fix `re.Pattern` mypy error on 3.6 (#9703)Jonathan de Jong2021-03-291-2/+2
| * Fix the suggested pip incantation for cryptography (#9699)Richard van der Hoff2021-03-291-2/+15
| * Suppress CryptographyDeprecationWarning (#9698)Richard van der Hoff2021-03-263-14/+25
| * Make it possible to use dmypy (#9692)Erik Johnston2021-03-2611-6/+30
| * Merge branch 'master' into developErik Johnston2021-03-262-1/+4
| |\
| * | Add a storage method for returning all current presence from all users (#9650)Andrew Morgan2021-03-252-3/+68
* | | Merge tag 'v1.30.1' into matrix-org-hotfixesErik Johnston2021-03-262-1/+4
|\ \ \ | | |/ | |/|
| * | 1.30.1Erik Johnston2021-03-261-1/+1
| * | Explicitly upgrade openssl in docker file and enforce new version of cryptogr...Erik Johnston2021-03-261-0/+3
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-03-246-5/+7
|\ \ \ | | |/ | |/|
| * | Fixed undefined variable error in catchup (#9664)Erik Johnston2021-03-241-0/+2
| * | Enable addtional flake8-bugbear linting checks. (#9659)Jonathan de Jong2021-03-245-5/+5
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2021-03-24107-348/+1386
|\| |
| * | Spaces summary: call out to other servers (#9653)Richard van der Hoff2021-03-243-27/+323
| * | Add type hints to misc. files. (#9676)Patrick Cloke2021-03-244-53/+52
| * | Add a type hints for service notices to the HomeServer object. (#9675)Patrick Cloke2021-03-2410-40/+51
| * | Increase default join burst ratelimiting (#9674)Erik Johnston2021-03-231-4/+4
| * | Fix federation stall on concurrent access errors (#9639)Jonathan de Jong2021-03-231-36/+9
| * | Federation API for Space summary (#9652)Richard van der Hoff2021-03-232-54/+196
| * | Import HomeServer from the proper module. (#9665)Patrick Cloke2021-03-2358-58/+58
| * | Allow providing credentials to HTTPS_PROXY (#9657)Andrew Morgan2021-03-222-34/+143
| * | Fixed code misc. quality issues (#9649)Ankit Dobhal2021-03-222-2/+2
| * | Merge branch 'master' into developErik Johnston2021-03-221-1/+1
| |\|
| | * 1.30.0 v1.30.0 github/release-v1.30.0 release-v1.30.0Erik Johnston2021-03-221-1/+1
| * | Incorporate reviewBrendan Abolivier2021-03-192-2/+2
| * | Merge branch 'develop' into babolivier/msc3026Brendan Abolivier2021-03-1910-43/+372
| |\ \
| | * | fix mypyRichard van der Hoff2021-03-191-4/+7
| | * | Fix type-hints from bad merge.Patrick Cloke2021-03-181-2/+2
| | * | Initial spaces summary API (#9643)Richard van der Hoff2021-03-185-3/+276
| | * | Consistently check whether a password may be set for a user. (#9636)Dirk Klimpel2021-03-183-2/+3
| | * | Make federation catchup send last event from any server. (#9640)Erik Johnston2021-03-182-38/+91
| * | | Fix lintBrendan Abolivier2021-03-192-11/+10
| * | | Move support for MSC3026 behind an experimental flagBrendan Abolivier2021-03-183-3/+18
| * | | Implement MSC3026: busy presence stateBrendan Abolivier2021-03-184-1/+6
| |/ /
| * | Ensure we use a copy of the event content dict before modifying it in seriali...Andrew Morgan2021-03-171-2/+12
| * | Fix up types for the typing handler. (#9638)Patrick Cloke2021-03-173-14/+29
| * | only save remote cross-signing keys if they're different from the current one...Hubert Chathi2021-03-171-4/+18
| * | Fix bad naming of storage function (#9637)Erik Johnston2021-03-173-4/+6
| * | Prep work for removing `outlier` from `internal_metadata` (#9411)Richard van der Hoff2021-03-176-7/+35
| * | Add type hints to the room member handler. (#9631)Patrick Cloke2021-03-174-6/+16
| * | Enable flake8-bugbear, but disable most checks. (#9499)Jonathan de Jong2021-03-168-8/+24
| * | Add SSO attribute requirements for OIDC providers (#9609)Hubbe2021-03-162-1/+52
| * | Return m.change_password.enabled=false if local database is disabled (#9588)Dirk Klimpel2021-03-162-11/+25
| |/
| * 1.30.0rc1Andrew Morgan2021-03-161-1/+1
* | Revert "Patch to temporarily drop cross-user m.key_share_requests (#8675)" (#...Andrew Morgan2021-03-231-4/+0
* | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2021-03-1642-529/+1118
|\|
| * Pass SSO IdP information to spam checker's registration function (#9626)Andrew Morgan2021-03-162-5/+28
| * Handle an empty cookie as an invalid macaroon. (#9620)Patrick Cloke2021-03-161-1/+2
| * Add support for stable MSC2858 API (#9617)Richard van der Hoff2021-03-166-7/+55
| * Clean up config settings for stats (#9604)Richard van der Hoff2021-03-161-17/+28
| * Prevent bundling aggregations for state events (#9619)Andrew Morgan2021-03-162-2/+8
| * Fix Internal Server Error on `GET /saml2/authn_response` (#9623)Richard van der Hoff2021-03-161-2/+8
| * Fix remaining mypy issues due to Twisted upgrade. (#9608)Patrick Cloke2021-03-154-5/+22
| * Don't go into federation catch up mode so easily (#9561)Erik Johnston2021-03-153-158/+187
| * Optimise missing prev_event handling (#9601)Richard van der Hoff2021-03-152-28/+136
| * Fix additional type hints from Twisted 21.2.0. (#9591)Patrick Cloke2021-03-1216-116/+181
| * Reject concurrent transactions (#9597)Richard van der Hoff2021-03-121-35/+42
| * Improve logging when processing incoming transactions (#9596)Richard van der Hoff2021-03-122-73/+50
| * Add logging for redis connection setup (#9590)Richard van der Hoff2021-03-111-0/+35
| * Add tests for blacklisting reactor/agent. (#9563)Patrick Cloke2021-03-111-12/+14
| * Re-Activating account when local passwords are disabled (#9587)Dirk Klimpel2021-03-111-1/+4
| * Convert Requester to attrs (#9586)Richard van der Hoff2021-03-104-35/+36
| * Fix the auth provider on the logins metric (#9573)Richard van der Hoff2021-03-102-18/+32
| * Use the chain cover index in get_auth_chain_ids. (#9576)Patrick Cloke2021-03-103-8/+152
| * Fix a bug in the background task for purging chain cover. (#9583)Patrick Cloke2021-03-101-1/+1
| * Add a background task to purge unused chain IDs. (#9542)Patrick Cloke2021-03-093-6/+98
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2021-03-0937-202/+587
|\|
| * JWT OIDC secrets for Sign in with Apple (#9549)Richard van der Hoff2021-03-094-16/+214
| * Retry 5xx errors in federation client (#9567)Erik Johnston2021-03-091-3/+4
| * Fix additional type hints. (#9543)Patrick Cloke2021-03-095-6/+12
| * Handle image transparency better when thumbnailing. (#9473)Patrick Cloke2021-03-091-3/+8
| * Add logging to ObservableDeferred callbacks (#9523)Jonathan de Jong2021-03-091-8/+18
| * quick config comment tweak to clarify allow_profile_lookup_over_federationMatthew Hodgson2021-03-081-2/+1
| * Add ResponseCache tests. (#9458)Jonathan de Jong2021-03-088-20/+24
| * Add type hints to purge room and server notice admin API. (#9520)Dirk Klimpel2021-03-082-15/+23
| * Merge branch 'master' into developErik Johnston2021-03-081-1/+1
| |\
| | * 1.29.0Erik Johnston2021-03-081-1/+1
| * | Create a SynapseReactor type which incorporates the necessary reactor interfa...Patrick Cloke2021-03-087-12/+31
| * | Replace `last_*_pdu_age` metrics with timestamps (#9540)Richard van der Hoff2021-03-042-12/+9
| * | Prometheus metrics for logins and registrations (#9511)Richard van der Hoff2021-03-043-4/+42
| * | Record the SSO Auth Provider in the login token (#9510)Richard van der Hoff2021-03-047-101/+201
| |/
* | Merge remote-tracking branch 'origin/release-v1.29.0' into matrix-org-hotfixesErik Johnston2021-03-0412-53/+85
|\|
| * 1.29.0rc1Erik Johnston2021-03-041-1/+1
| * Fix additional type hints from Twisted upgrade. (#9518)Patrick Cloke2021-03-0310-50/+71
| * Set X-Forwarded-Proto header when frontend-proxy proxies a request (#9539)Richard van der Hoff2021-03-031-2/+13
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-03-038-48/+104
|\|
| * Fix 'rejected_events_metadata' background update (#9537)Erik Johnston2021-03-031-1/+3
| * Purge chain cover tables when purging events. (#9498)Patrick Cloke2021-03-032-10/+37
| * Add type hints to user admin API. (#9521)Dirk Klimpel2021-03-033-35/+62
| * Bump the mypy and mypy-zope versions. (#9529)Patrick Cloke2021-03-032-2/+2
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-03-032-1/+54
|\|
| * Make deleting stale pushers a background update (#9536)Erik Johnston2021-03-032-1/+54
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-03-0329-182/+303
|\|
| * Prevent presence background jobs from running when presence is disabled (#9530)Aaron Raimist2021-03-031-14/+17
| * Revert "Fix #8518 (sync requests being cached wrongly on timeout) (#9358)"Patrick Cloke2021-03-022-34/+3
| * Re-run rejected metadata background update. (#9503)Erik Johnston2021-03-021-0/+9
| * Fix SQL delta file taking a long time to run (#9516)Erik Johnston2021-03-022-5/+57
| * Add type hints to device and event report admin API (#9519)Dirk Klimpel2021-03-022-16/+39
| * Fix a bug when a room alias is given to the admin join endpoint (#9506)Patrick Cloke2021-03-011-58/+74
| * (Hopefully) stop leaking file descriptors in media repo. (#9497)Patrick Cloke2021-03-011-2/+29