summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Prevent bundling aggregations for state events github/anoa/bundle_aggregations_state anoa/bundle_aggregations_stateAndrew Morgan2021-03-151-1/+4
* Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2021-03-0981-350/+1220
|\
| * Link to the List user's media admin API from media Admin API docs (#9571)Andrew Morgan2021-03-092-2/+15
| * JWT OIDC secrets for Sign in with Apple (#9549)Richard van der Hoff2021-03-0911-47/+444
| * Retry 5xx errors in federation client (#9567)Erik Johnston2021-03-092-3/+5
| * Fix additional type hints. (#9543)Patrick Cloke2021-03-099-18/+32
| * Handle image transparency better when thumbnailing. (#9473)Patrick Cloke2021-03-093-11/+30
| * Add a list of hashes to ignore during git blame. (#9560)Patrick Cloke2021-03-093-0/+10
| * Fixup sample configErik Johnston2021-03-091-2/+1
| * Prevent the config-lint script erroring out on any sample_config changes (#9562)Andrew Morgan2021-03-092-2/+8
| * Add logging to ObservableDeferred callbacks (#9523)Jonathan de Jong2021-03-092-8/+19
| * quick config comment tweak to clarify allow_profile_lookup_over_federationMatthew Hodgson2021-03-081-2/+1
| * Add ResponseCache tests. (#9458)Jonathan de Jong2021-03-0810-20/+156
| * Warn that /register will soon require a type when called with an access token...Will Hunt2021-03-082-0/+7
| * Add type hints to purge room and server notice admin API. (#9520)Dirk Klimpel2021-03-083-15/+24
| * Add a basic test for purging rooms. (#9541)Patrick Cloke2021-03-082-26/+46
| * Merge branch 'master' into developErik Johnston2021-03-083-5/+14
| |\
| | * Fixup changelog v1.29.0 github/release-v1.29.0 release-v1.29.0Erik Johnston2021-03-081-0/+3
| | * 1.29.0Erik Johnston2021-03-083-5/+11
| * | Create a SynapseReactor type which incorporates the necessary reactor interfa...Patrick Cloke2021-03-088-12/+32
| * | Update reverse proxy to add OpenBSD relayd example configuration. (#9508)Leo Bärring2021-03-063-4/+53
| * | Add additional SAML2 upgrade notes (#9550)Ben Banfield-Zanin2021-03-052-0/+8
| * | Replace `last_*_pdu_age` metrics with timestamps (#9540)Richard van der Hoff2021-03-044-12/+11
| * | Prometheus metrics for logins and registrations (#9511)Richard van der Hoff2021-03-044-4/+43
| * | Record the SSO Auth Provider in the login token (#9510)Richard van der Hoff2021-03-0413-151/+258
| |/
| * Fix link in UPGRADES v1.29.0rc1Erik Johnston2021-03-041-3/+3
| * Fix changelogErik Johnston2021-03-041-6/+3
* | Merge remote-tracking branch 'origin/release-v1.29.0' into matrix-org-hotfixesErik Johnston2021-03-0452-102/+163
|\|
| * 1.29.0rc1Erik Johnston2021-03-0442-41/+55
| * Fix additional type hints from Twisted upgrade. (#9518)Patrick Cloke2021-03-0312-61/+96
| * Set X-Forwarded-Proto header when frontend-proxy proxies a request (#9539)Richard van der Hoff2021-03-032-2/+14
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-03-0313-49/+109
|\|
| * Fix 'rejected_events_metadata' background update (#9537)Erik Johnston2021-03-032-1/+4
| * Purge chain cover tables when purging events. (#9498)Patrick Cloke2021-03-033-10/+38
| * Add type hints to user admin API. (#9521)Dirk Klimpel2021-03-034-35/+63
| * Bump the mypy and mypy-zope versions. (#9529)Patrick Cloke2021-03-034-3/+4
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-03-035-1/+58
|\|
| * Make deleting stale pushers a background update (#9536)Erik Johnston2021-03-033-1/+55
| * Update nginx reverse-proxy docs (#9512)Richard van der Hoff2021-03-032-0/+3
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-03-0349-271/+459
|\|
| * Prevent presence background jobs from running when presence is disabled (#9530)Aaron Raimist2021-03-032-14/+18
| * Revert "Fix #8518 (sync requests being cached wrongly on timeout) (#9358)"Patrick Cloke2021-03-023-35/+3
| * Re-run rejected metadata background update. (#9503)Erik Johnston2021-03-022-0/+10
| * Fix SQL delta file taking a long time to run (#9516)Erik Johnston2021-03-024-5/+60
| * Add type hints to device and event report admin API (#9519)Dirk Klimpel2021-03-023-16/+40
| * Fix a bug when a room alias is given to the admin join endpoint (#9506)Patrick Cloke2021-03-012-58/+75
| * (Hopefully) stop leaking file descriptors in media repo. (#9497)Patrick Cloke2021-03-013-38/+85
| * Use the proper Request in type hints. (#9515)Patrick Cloke2021-03-0118-31/+38
| * Allow bytecode again (#9502)Jonathan de Jong2021-02-268-10/+16
| * Add support for no_proxy and case insensitive env variables (#9372)Tim Leung2021-02-266-64/+114
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2021-02-2678-315/+1161
|\|
| * SSO: redirect to public URL before setting cookies (#9436)Richard van der Hoff2021-02-267-28/+130
| * Call out the need for an X-Forwarded-Proto in the upgrade notes (#9501)Richard van der Hoff2021-02-264-1/+28
| * Test that we require validated email for email pushers (#9496)Erik Johnston2021-02-253-2/+39
| * Ensure pushers are deleted for deactivated accounts (#9285)Erik Johnston2021-02-254-0/+70
| * Merge branch 'master' into developErik Johnston2021-02-254-5/+26
| |\
| | * Fixup changelog v1.28.0 github/release-v1.28.0 release-v1.28.0Erik Johnston2021-02-251-1/+1
| | * Fixup changelogErik Johnston2021-02-251-4/+5
| | * 1.28.0Erik Johnston2021-02-254-2/+16
| | * Add back the deprecated SAML endpoint. (#9474)Patrick Cloke2021-02-232-1/+7
| * | Add support for X-Forwarded-Proto (#9472)Richard van der Hoff2021-02-243-28/+94
| * | Fix typo in spam checker documentationAndrew Morgan2021-02-241-1/+1
| * | Add SQL delta for deleting stale pushers (#9479)Erik Johnston2021-02-242-0/+20
| * | Fix #8518 (sync requests being cached wrongly on timeout) (#9358)Jonathan de Jong2021-02-243-3/+35
| * | Clean up `ShardedWorkerHandlingConfig` (#9466)Erik Johnston2021-02-2414-63/+128
| * | Refactor to ensure we call check_consistency (#9470)Erik Johnston2021-02-248-28/+72
| * | Add a comment about systemd-python. (#9464)Richard van der Hoff2021-02-232-0/+4
| * | Include newly added sequences in the port DB script. (#9449)Patrick Cloke2021-02-234-26/+55
| * | Fix deleting pushers when using sharded pushers. (#9465)Erik Johnston2021-02-2210-67/+94
| * | Remove vestiges of uploads_path config (#9462)Richard van der Hoff2021-02-225-4/+1
| * | Add an `order_by` field to list users' media admin API. (#8978)Dirk Klimpel2021-02-225-29/+325
| * | example systemd config: propagate reloads to units (#9463)Richard van der Hoff2021-02-223-0/+3
| * | Remove cache for get_shared_rooms_for_users (#9416)Andrew Morgan2021-02-223-37/+43
* | | Revert "Redirect redirect requests if they arrive on the wrong URI"Richard van der Hoff2021-02-261-23/+0
* | | Revert "more login hacking"Richard van der Hoff2021-02-261-17/+3
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-02-2238-109/+551
|\| |
| * | Clean up the user directory sample config section (#9385)Andrew Morgan2021-02-223-50/+67
| * | Ratelimit cross-user key sharing requests. (#8957)Patrick Cloke2021-02-199-17/+67
| * | Regenerate exact thumbnails if missing (#9438)Erik Johnston2021-02-196-15/+133
| |\ \
| | * | Add testErik Johnston2021-02-191-3/+66
| | * | Return a 404 if we don't have the original fileErik Johnston2021-02-192-1/+8
| | * | NewsfileErik Johnston2021-02-181-0/+1
| | * | Regenerate exact thumbnails if missingErik Johnston2021-02-183-11/+58
| * | | Add documentation and type hints to parse_duration. (#9432)Patrick Cloke2021-02-192-2/+16
| * | | Fix style checking due to updated black.Patrick Cloke2021-02-192-3/+5
| * | | Merge tag 'v1.28.0rc1' into developPatrick Cloke2021-02-1945-47/+74
| |\ \ \ | | | |/ | | |/|
| | * | Update release date. v1.28.0rc1Patrick Cloke2021-02-191-1/+1
| * | | Support not providing an IdP icon when choosing a username. (#9440)Patrick Cloke2021-02-192-1/+2
| * | | Be smarter about which hosts to send presence to when processing room joins (...Andrew Morgan2021-02-194-19/+54
| * | | Add a config option to prioritise local users in user directory search result...Andrew Morgan2021-02-195-9/+159
| * | | Add configs to make profile data more private (#9203)AndrewFerr2021-02-199-7/+66
* | | | Merge remote-tracking branch 'origin/release-v1.28.0' into matrix-org-hotfixesErik Johnston2021-02-1949-87/+148
|\ \ \ \ | | |/ / | |/| |
| * | | Update the CHANGES document.Patrick Cloke2021-02-181-7/+7
| * | | 1.28.0rc1Patrick Cloke2021-02-1845-46/+73
| |/ /
| * | Merge branch 'master' into developPatrick Cloke2021-02-181-1/+1
| |\ \
| | * | Clarify the release notes around SAML2 for v1.27.0. github/release-v1.27.0 release-v1.27.0Patrick Cloke2021-02-182-12/+13
| * | | Remove deprecated SAML2 callback URL since it does not work. (#9434)Patrick Cloke2021-02-184-16/+16
| | |/ | |/|
| * | Revert "Newsfragment", which was meant to be part of #9434.Patrick Cloke2021-02-181-1/+0
| * | NewsfragmentPatrick Cloke2021-02-181-0/+1
| * | Drop ARMv7 from docker (#9433)Erik Johnston2021-02-183-2/+5
| * | Parse ui_auth.session_timeout as a duration (instead of treating it as ms) (#...Rishabh Arya2021-02-184-8/+11
| * | Deprecate old admin API `GET /_synapse/admin/v1/users/<user_id>` (#9429)Dirk Klimpel2021-02-182-0/+16
| * | Reduce the memory usage of previewing media files. (#9421)Patrick Cloke2021-02-183-18/+18
| * | Add http2 to the nginx example config (#9390)David Vo2021-02-182-4/+5
| * | Add back the guard against the user directory stream position not existing. (...Patrick Cloke2021-02-183-1/+12
* | | more login hackingRichard van der Hoff2021-02-181-3/+17
* | | Merge branch 'rav/fix_cookie_path' into matrix-org-hotfixesRichard van der Hoff2021-02-1811-20/+48
|\ \ \
| * | | Redirect redirect requests if they arrive on the wrong URIRichard van der Hoff2021-02-181-0/+23
| |/ /
| * | Revert "Update workers.md"Richard van der Hoff2021-02-181-1/+1
| * | Add the shadow-banning status to the display user admin API. (#9400)Dirk Klimpel2021-02-176-6/+16
| * | Remove dead notify_for_states presence method (#9408)Andrew Morgan2021-02-172-11/+1
| * | Fix only handling the last presence state for each user (#9425)Andrew Morgan2021-02-172-2/+6
| * | Update workers.mdRichard van der Hoff2021-02-171-1/+2
| * | Update workers.mdRichard van der Hoff2021-02-171-1/+1
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2021-02-17357-3319/+6187
|\| |
| * | Reorganize CONTRIBUTING.md documentation. (#9281)David Teller2021-02-172-82/+190
| * | Add type hints to groups code. (#9393)Patrick Cloke2021-02-179-124/+341
| * | Support for form_post in OIDC responses (#9376)Richard van der Hoff2021-02-174-36/+78
| * | Allow OIDC config to override discovered values (#9384)Richard van der Hoff2021-02-162-9/+19
| * | Update black, and run auto formatting over the codebase (#9381)Eric Eastwood2021-02-16271-1713/+2802
| * | Fix OIDC gitiea redirect URL. (#9404)Marcus2021-02-162-1/+2
| * | Clean up caching/locking of OIDC metadata load (#9362)Richard van der Hoff2021-02-165-62/+389
| * | Merge branch 'master' into developErik Johnston2021-02-164-10/+25
| |\|
| | * Fixup CHANGES v1.27.0Erik Johnston2021-02-161-3/+3
| | * 1.27.0Erik Johnston2021-02-164-11/+23
| | * Add rustc to Docker image build environment (#9405)Dan Callahan2021-02-152-0/+3
| * | Handle missing data in power levels events during room upgrade. (#9395)Patrick Cloke2021-02-163-5/+162
| * | Document that pusher instances are shardable (#9407)Erik Johnston2021-02-162-1/+10
| * | Convert additional test-cases to homeserver test case. (#9396)Patrick Cloke2021-02-165-331/+214
| * | Fix sample configAndrew Morgan2021-02-121-1/+1
| * | Remove dead handled_events set in invite_join (#9394)Andrew Morgan2021-02-122-6/+1
| * | Fix some typos.Patrick Cloke2021-02-1223-34/+34
| * | Merge tag 'v1.27.0rc2' into developPatrick Cloke2021-02-1120-46/+120
| |\|
| * | Ensure that we never stop reconnecting to redis (#9391)Erik Johnston2021-02-112-2/+25
| * | Convert some test cases to use HomeserverTestCase. (#9377)Patrick Cloke2021-02-116-516/+302
| * | Combine the CAS & SAML implementations for required attributes. (#9326)Patrick Cloke2021-02-119-77/+245
| * | Remove conflicting sqlite tables that are "reserved" (shadow fts4 tables) (#9...Eric Eastwood2021-02-103-10/+12
| * | Merge pull request #9361 from matrix-org/babolivier/third_party_validationBrendan Abolivier2021-02-092-3/+1
| |\ \
| | * | Remove unneeded type constraints on 3rd party protocol lookup responsesBrendan Abolivier2021-02-092-3/+1
| * | | Add XWiki OIDC provider example. (#9324)Thomas Mortagne2021-02-091-0/+22
| |/ /
| * | Type hints and validation improvements. (#9321)Patrick Cloke2021-02-086-79/+177
| * | Handle additional errors when previewing URLs. (#9333)Patrick Cloke2021-02-083-30/+145
| * | Merge pull request #9150 from Yoric/develop-contextDavid Teller2021-02-088-6/+289
| |\ \
| | * | FIXUP: linterDavid Teller2021-01-283-2/+9
| | * | FIXUP: Making get_event_context a bit more paranoidDavid Teller2021-01-283-4/+10
| | * | FIXUP: Removing awaitableDavid Teller2021-01-281-3/+3
| | * | FIXUP: DocDavid Teller2021-01-281-0/+6
| | * | FIXUP: Now testing that the user is admin!David Teller2021-01-283-6/+38
| | * | FIXUP: Don't filter events at all for admin/v1/rooms/.../context/...David Teller2021-01-282-25/+10
| | * | FIXUP: Documenting /_synapse/admin/v1/rooms/<room_id>/context/<event_id>David Teller2021-01-281-0/+119
| | * | New API /_synapse/admin/rooms/{roomId}/context/{eventId}David Teller2021-01-286-8/+136
| * | | Update type hints for Cursor to match PEP 249. (#9299)Jonathan de Jong2021-02-055-17/+47
| * | | Update installation instructions on Fedora (#9322)Dan Callahan2021-02-052-17/+4
| * | | Merge branch 'erikj/media_spam_checker' into developErik Johnston2021-02-046-6/+210
| |\ \ \
| * | | | Correct `matrix-synapse.service` reference in TURN howto docs. (#9308)dykstranet2021-02-042-1/+2
| * | | | Handle empty rooms when generating email notifications. (#9257)Patrick Cloke2021-02-043-39/+226
| * | | | Fix escaping of braces in OIDC sample config. (#9317)Patrick Cloke2021-02-043-10/+11
| * | | | Add experimental support for PyPy. (#9123)Jonathan de Jong2021-02-044-8/+15
| * | | | Add debug logging to DNS SRV requests. (#9305)Marcus2021-02-032-0/+8
| * | | | Merge branch 'social_login_hotfixes' into developRichard van der Hoff2021-02-0325-141/+379
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/release-v1.27.0' into social_login_hotfixesRichard van der Hoff2021-02-0310-92/+107
| | |\ \ \ \
| | * | | | | Social login UI polish (#9301)Richard van der Hoff2021-02-0315-81/+240
| | * | | | | Add debug for OIDC flow (#9307)Richard van der Hoff2021-02-032-15/+26
| | * | | | | Fix formatting for "bad session" error during sso registration flow (#9296)Richard van der Hoff2021-02-032-3/+17
| | * | | | | social login: add noopener to terms link (#9300)Richard van der Hoff2021-02-022-1/+2
| * | | | | | config: Add detail to auto_join_rooms comment (#9291)dykstranet2021-02-033-0/+5
| * | | | | | Typo fix in a comment: subequently -> subsequently. (#8988)Tim Gates2021-02-031-1/+1
| * | | | | | Convert blacklisted IPv4 addresses to compatible IPv6 addresses. (#9240)Patrick Cloke2021-02-035-28/+160
* | | | | | | Ensure that we never stop reconnecting to redis (#9391)Erik Johnston2021-02-112-2/+25
* | | | | | | Merge branch 'release-v1.27.0' into matrix-org-hotfixesPatrick Cloke2021-02-1120-46/+120
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Clarify when new ratelimiting was added. v1.27.0rc2Patrick Cloke2021-02-111-1/+1
| * | | | | | Update changelog.Patrick Cloke2021-02-111-2/+2
| * | | | | | 1.27.0rc2Patrick Cloke2021-02-116-5/+23
| * | | | | | Backout changes for automatically calculating the public baseurl. (#9313)Patrick Cloke2021-02-1116-41/+97
| | |_|/ / / | |/| | | |
* | | | | | Revert "block groups requests to fosdem"Richard van der Hoff2021-02-061-3/+0
* | | | | | block groups requests to fosdemRichard van der Hoff2021-02-061-0/+3
* | | | | | Merge branch 'erikj/media_spam_checker' into matrix-org-hotfixesErik Johnston2021-02-0516-98/+317
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Add check_media_file_for_spam spam checker hookErik Johnston2021-02-046-6/+210
| |/ / / /
| * | | | Clarify documentation about escaping URLs in templates. (#9310)Patrick Cloke2021-02-033-20/+9
| * | | | social login Fix username validation javascript (#9297)Richard van der Hoff2021-02-033-21/+85
| |/ / /
| * / / Honour ratelimit flag for application services for invite ratelimiting (#9302)Erik Johnston2021-02-034-51/+13
| |/ /
* | | Merge remote-tracking branch 'origin/release-v1.27.0' into matrix-org-hotfixesErik Johnston2021-02-02126-1074/+3142
|\| |
| * | Update changelog v1.27.0rc1Erik Johnston2021-02-021-0/+2
| * | 1.27.0rc1Erik Johnston2021-02-0253-58/+71
| * | Add an admin API to get the current room state (#9168)Travis Ralston2021-02-026-1/+88
| * | Put SAML callback URI under /_synapse/client. (#9289)Richard van der Hoff2021-02-0210-13/+25
| * | Put OIDC callback URI under /_synapse/client. (#9288)Richard van der Hoff2021-02-0111-28/+46
| * | Add an OpenID example config for Gitea. (#9134)Oliver Hanikel2021-02-012-0/+35
| * | Merge branch 'social_login' into developRichard van der Hoff2021-02-011-1/+1
| |\ \
| | * | fix broken HTML tagRichard van der Hoff2021-02-011-1/+1
| * | | Merge branch 'social_login' into developRichard van der Hoff2021-02-0121-98/+495
| |\| |
| | * | make primary button not wider than viewportBruno Windels2021-02-011-0/+1
| | * | Collect terms consent from the user during SSO registration (#9276)Richard van der Hoff2021-02-019-0/+230
| | * | Improve styling and wording of SSO UIA templates (#9286)Richard van der Hoff2021-02-016-25/+81
| | * | Improve styling and wording of SSO error templates (#9287)Richard van der Hoff2021-02-015-60/+101
| | * | Make importing display name and email optional (#9277)Richard van der Hoff2021-02-015-13/+82
| * | | Refactor email summary generation. (#9260)Patrick Cloke2021-02-013-122/+204
| * | | Merge branch 'social_login' into developRichard van der Hoff2021-02-0133-318/+860
| |\| |
| | * | Replace username picker with a template (#9275)Richard van der Hoff2021-02-0115-204/+429
| | * | Improve styling and wording of SSO redirect confirm template (#9272)Richard van der Hoff2021-02-0111-30/+200
| | * | Fix SSO on workers (#9271)Richard van der Hoff2021-02-018-65/+93
| | * | Split out a separate endpoint to complete SSO registration (#9262)Richard van der Hoff2021-02-017-26/+145
| * | | Add phone home stats for encrypted messages. (#9283)Jan Christian Grünhage2021-02-013-2/+64
| * | | Prevent email UIA failures from raising a LoginError (#9265)Andrew Morgan2021-02-012-10/+1
| * | | Fixes for PyPy compatibility (#9270)Ivan Shapovalov2021-01-302-1/+3
| * | | Ratelimit invites by room and target user (#9258)Erik Johnston2021-01-299-4/+192
| * | | Fix Debian builds on Xenial (#9254)Dan Callahan2021-01-294-1/+11
| * | | Fix typo in UPGRADE.rstDenis Kasak2021-01-291-2/+2
| * | | Merge branch 'social_login' into developRichard van der Hoff2021-01-2811-62/+108
| |\| |
| | * | Add 'brand' field to MSC2858 response (#9242)Richard van der Hoff2021-01-2710-32/+55
| | * | Support for scraping email addresses from OIDC providers (#9245)Richard van der Hoff2021-01-274-30/+53
| * | | Ratelimit 3PID /requestToken API (#9238)Erik Johnston2021-01-2811-14/+159
| * | | Cache config options in SSL verification (#9255)Erik Johnston2021-01-282-4/+10
| * | | Add type hints to E2E handler. (#9232)Patrick Cloke2021-01-287-177/+198
| | |/ | |/|
| * | Add notes on integrating with Facebook for SSO login. (#9244)Richard van der Hoff2021-01-272-5/+49
| * | Merge branch 'master' into developPatrick Cloke2021-01-271-2/+6
| |\ \
| | * | Update debian changelog. v1.26.0-deb github/release-v1.26.0 release-v1.26.0Patrick Cloke2021-01-271-2/+6
| * | | Check if a user is in the room before sending a PowerLevel event on their beh...Pankaj Yadav2021-01-272-1/+12
| * | | Merge branch 'social_login' into developRichard van der Hoff2021-01-270-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | Merge tag 'v1.26.0' into social_loginRichard van der Hoff2021-01-272-3/+13
| | |\|
| * | | Merge branch 'social_login' into developRichard van der Hoff2021-01-279-21/+230
| |\| |
| | * | Implement MSC2858 support (#9183)Richard van der Hoff2021-01-279-21/+230
| * | | Merge branch 'master' into developPatrick Cloke2021-01-272-3/+13
| |\ \ \ | | | |/ | | |/|
| | * | Move note above changes. v1.26.0Patrick Cloke2021-01-271-2/+2
| | * | Copy the upgrade note to 1.26.0.Patrick Cloke2021-01-271-3/+7
| | * | 1.26.0Patrick Cloke2021-01-272-1/+7
| * | | Clean-up the template loading code. (#9200)Patrick Cloke2021-01-2712-38/+96
| * | | Add a note to changelog about redis usage (#9227)Erik Johnston2021-01-273-1/+11
| * | | Merge branch 'social_login' into developRichard van der Hoff2021-01-270-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | Fix Python 3.5 old deps build by using a compatible pip version. (#9217)Patrick Cloke2021-01-253-8/+11
| | * | Merge tag 'v1.26.0rc2' into social_loginRichard van der Hoff2021-01-2512-13/+113
| | |\|
| * | | Pass a dict, instead of None, to modules if a None config is specified in the...Andrew Morgan2021-01-272-1/+3
| * | | Add type hints to various handlers. (#9223)Patrick Cloke2021-01-2614-138/+205
| * | | Do not require the CAS service URL setting (use public_baseurl instead). (#9199)Patrick Cloke2021-01-265-16/+10
* | | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-01-2677-434/+1801
|\| | |
| * | | Precompute joined hosts and store in Redis (#9198)Erik Johnston2021-01-2611-49/+265
| * | | Try to recover from unknown encodings when previewing media. (#9164)Patrick Cloke2021-01-263-10/+64
| * | | Update isort to v5.7.0 (#9222)Andrew Morgan2021-01-262-1/+2
| * | | Merge pull request #9062 from matrix-org/jaywink/admin-forward-extremitiesJason Robinson2021-01-266-2/+220
| |\ \ \
| | * | | Fix get forward extremities queryJason Robinson2021-01-261-1/+1
| | * | | Merge branch 'develop' into jaywink/admin-forward-extremitiesJason Robinson2021-01-2610-8/+168
| | |\ \ \
| | * | | | Make natural join inner joinJason Robinson2021-01-261-2/+2
| | * | | | Merge remote-tracking branch 'origin/develop' into jaywink/admin-forward-extr...Patrick Cloke2021-01-253-8/+11
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/develop' into jaywink/admin-forward-extr...Jason Robinson2021-01-2513-24/+276
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'develop' into jaywink/admin-forward-extremitiesJason Robinson2021-01-23209-2405/+7802
| | |\ \ \ \ \ \
| | * | | | | | | Add depth and received_ts to forward_extremities admin API responseJason Robinson2021-01-232-2/+9
| | * | | | | | | Remove trailing whitespace to appease the linterJason Robinson2021-01-111-2/+2
| | * | | | | | | Simplify delete_forward_extremities_for_room_txn SQLJason Robinson2021-01-111-10/+4
| | * | | | | | | Address pr feedbackJason Robinson2021-01-115-36/+46
| | * | | | | | | Clarify rooms.mdJason Robinson2021-01-111-1/+1