summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '3d2acc930' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-234-12/+66
|\
| * Return a 404 if we don't have the original fileErik Johnston2021-02-192-1/+8
| * Regenerate exact thumbnails if missingErik Johnston2021-02-183-11/+58
* | Merge commit '1381cd05b' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-233-10/+8
|\ \
| * | 1.28.0rc1Patrick Cloke2021-02-181-1/+1
| * | Remove deprecated SAML2 callback URL since it does not work. (#9434)Patrick Cloke2021-02-181-5/+1
| |/
| * Parse ui_auth.session_timeout as a duration (instead of treating it as ms) (#...Rishabh Arya2021-02-181-4/+6
* | Merge commit '8ec221710' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-236-31/+34
|\|
| * Reduce the memory usage of previewing media files. (#9421)Patrick Cloke2021-02-181-14/+12
| * Add back the guard against the user directory stream position not existing. (...Patrick Cloke2021-02-182-1/+11
| * Add the shadow-banning status to the display user admin API. (#9400)Dirk Klimpel2021-02-172-3/+6
| * Remove dead notify_for_states presence method (#9408)Andrew Morgan2021-02-171-11/+0
| * Fix only handling the last presence state for each user (#9425)Andrew Morgan2021-02-171-2/+5
* | Merge commit 'd2f0ec12d' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-23189-1321/+2127
|\|
| * Add type hints to groups code. (#9393)Patrick Cloke2021-02-176-123/+338
| * Support for form_post in OIDC responses (#9376)Richard van der Hoff2021-02-172-23/+64
| * Allow OIDC config to override discovered values (#9384)Richard van der Hoff2021-02-161-9/+18
| * Update black, and run auto formatting over the codebase (#9381)Eric Eastwood2021-02-16177-1006/+1330
| * Clean up caching/locking of OIDC metadata load (#9362)Richard van der Hoff2021-02-162-36/+182
| * Merge branch 'master' into developErik Johnston2021-02-161-1/+1
| |\
| * | Handle missing data in power levels events during room upgrade. (#9395)Patrick Cloke2021-02-161-5/+8
| * | Remove dead handled_events set in invite_join (#9394)Andrew Morgan2021-02-121-6/+0
| * | Fix some typos.Patrick Cloke2021-02-1223-34/+34
| * | Merge tag 'v1.27.0rc2' into developPatrick Cloke2021-02-1112-30/+75
| |\ \
| * | | Ensure that we never stop reconnecting to redis (#9391)Erik Johnston2021-02-111-2/+24
| * | | Combine the CAS & SAML implementations for required attributes. (#9326)Patrick Cloke2021-02-116-74/+139
| * | | Remove conflicting sqlite tables that are "reserved" (shadow fts4 tables) (#9...Eric Eastwood2021-02-101-10/+0
* | | | Merge commit 'a27c1fd74' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-221-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | 1.27.0Erik Johnston2021-02-161-1/+1
| | |/ | |/|
| * | 1.27.0rc2Patrick Cloke2021-02-111-1/+1
* | | Merge commit 'e40d88cff' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2211-26/+68
|\| |
| * | Backout changes for automatically calculating the public baseurl. (#9313)Patrick Cloke2021-02-1111-29/+74
* | | Merge commit 'fb0e14ee9' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-221-3/+0
|\ \ \ | | |/ | |/|
| * | Remove unneeded type constraints on 3rd party protocol lookup responsesBrendan Abolivier2021-02-091-3/+0
* | | Merge commit '3f58fc848' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2215-122/+360
|\| |
| * | Type hints and validation improvements. (#9321)Patrick Cloke2021-02-085-79/+176
| * | Handle additional errors when previewing URLs. (#9333)Patrick Cloke2021-02-081-19/+52
| * | Merge pull request #9150 from Yoric/develop-contextDavid Teller2021-02-085-6/+85
| |\ \
| | * | FIXUP: linterDavid Teller2021-01-282-1/+6
| | * | 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-281-1/+2
| | * | FIXUP: Don't filter events at all for admin/v1/rooms/.../context/...David Teller2021-01-282-25/+10
| | * | New API /_synapse/admin/rooms/{roomId}/context/{eventId}David Teller2021-01-284-8/+84
| * | | Update type hints for Cursor to match PEP 249. (#9299)Jonathan de Jong2021-02-054-17/+46
* | | | Merge commit '5a9cdaa6e' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-221-37/+176
|\| | |
| * | | Merge branch 'erikj/media_spam_checker' into developErik Johnston2021-02-043-6/+112
| |\ \ \
| * | | | Handle empty rooms when generating email notifications. (#9257)Patrick Cloke2021-02-041-37/+176
* | | | | Merge commit '7e8083eb4' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-223-6/+112
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Add check_media_file_for_spam spam checker hookErik Johnston2021-02-043-6/+112
| | |_|/ | |/| |
* | | | Merge commit '2ab6e67ab' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2214-76/+220
|\ \ \ \ | | |/ / | |/| |
| * | | Fix escaping of braces in OIDC sample config. (#9317)Patrick Cloke2021-02-041-5/+5
| * | | Add experimental support for PyPy. (#9123)Jonathan de Jong2021-02-043-8/+14
| * | | Add debug logging to DNS SRV requests. (#9305)Marcus2021-02-031-0/+7
| * | | Merge branch 'social_login_hotfixes' into developRichard van der Hoff2021-02-0317-127/+357
| |\ \ \
| | * | | Merge remote-tracking branch 'origin/release-v1.27.0' into social_login_hotfixesRichard van der Hoff2021-02-035-35/+100
| | |\| |
| | | * | Clarify documentation about escaping URLs in templates. (#9310)Patrick Cloke2021-02-031-10/+4
| | | * | social login Fix username validation javascript (#9297)Richard van der Hoff2021-02-032-21/+84
| * | | | config: Add detail to auto_join_rooms comment (#9291)dykstranet2021-02-031-0/+2
| * | | | 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-032-27/+91
| | |/ / | |/| |
| * | | Honour ratelimit flag for application services for invite ratelimiting (#9302)Erik Johnston2021-02-032-4/+12
* | | | Merge commit 'e288499c6' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2215-96/+269
|\ \ \ \ | | |/ / | |/| |
| * | | Social login UI polish (#9301)Richard van der Hoff2021-02-0313-77/+227
| * | | Add debug for OIDC flow (#9307)Richard van der Hoff2021-02-031-15/+25
| * | | Fix formatting for "bad session" error during sso registration flow (#9296)Richard van der Hoff2021-02-031-3/+16
| * | | social login: add noopener to terms link (#9300)Richard van der Hoff2021-02-021-1/+1
| |/ /
* | | Merge commit '261093072' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2217-146/+249
|\| |
| * | 1.27.0rc1Erik Johnston2021-02-021-1/+1
| * | Add an admin API to get the current room state (#9168)Travis Ralston2021-02-023-1/+42
| * | Put SAML callback URI under /_synapse/client. (#9289)Richard van der Hoff2021-02-026-10/+17
| * | Put OIDC callback URI under /_synapse/client. (#9288)Richard van der Hoff2021-02-015-8/+12
| * | Merge branch 'social_login' into developRichard van der Hoff2021-02-011-1/+1
| |\ \
| * \ \ Merge branch 'social_login' into developRichard van der Hoff2021-02-0115-98/+453
| |\ \ \
| * | | | Refactor email summary generation. (#9260)Patrick Cloke2021-02-011-122/+173
* | | | | Merge commit '351845452' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2215-98/+453
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | fix broken HTML tagRichard van der Hoff2021-02-011-1/+1
| | |/ / | |/| |
| * | | 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-016-0/+206
| * | | Improve styling and wording of SSO UIA templates (#9286)Richard van der Hoff2021-02-014-25/+65
| * | | Improve styling and wording of SSO error templates (#9287)Richard van der Hoff2021-02-014-60/+100
| * | | Make importing display name and email optional (#9277)Richard van der Hoff2021-02-014-13/+81
* | | | Merge commit '18ab35284' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2224-216/+677
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'social_login' into developRichard van der Hoff2021-02-0122-272/+762
| |\| |
| | * | Replace username picker with a template (#9275)Richard van der Hoff2021-02-0112-200/+395
| | * | Improve styling and wording of SSO redirect confirm template (#9272)Richard van der Hoff2021-02-016-11/+164
| * | | Add phone home stats for encrypted messages. (#9283)Jan Christian Grünhage2021-02-012-2/+63
| * | | Prevent email UIA failures from raising a LoginError (#9265)Andrew Morgan2021-02-011-10/+0
| * | | Fixes for PyPy compatibility (#9270)Ivan Shapovalov2021-01-301-1/+2
| * | | Ratelimit invites by room and target user (#9258)Erik Johnston2021-01-295-3/+54
* | | | Merge commit '9c715a5f1' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-228-64/+206
|\ \ \ \ | | |/ / | |/| |
| * | | Fix SSO on workers (#9271)Richard van der Hoff2021-02-014-41/+77
| * | | Split out a separate endpoint to complete SSO registration (#9262)Richard van der Hoff2021-02-015-25/+131
* | | | Merge commit 'e19396d62' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2212-63/+146
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'social_login' into developRichard van der Hoff2021-01-286-54/+81
| |\| |
| | * | Add 'brand' field to MSC2858 response (#9242)Richard van der Hoff2021-01-276-27/+41
| | * | Support for scraping email addresses from OIDC providers (#9245)Richard van der Hoff2021-01-272-27/+40
| | * | Merge tag 'v1.26.0' into social_loginRichard van der Hoff2021-01-271-1/+1
| | |\ \
| * | | | Ratelimit 3PID /requestToken API (#9238)Erik Johnston2021-01-285-5/+56
| * | | | Cache config options in SSL verification (#9255)Erik Johnston2021-01-281-4/+9
* | | | | Merge commit 'a78016dad' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-225-136/+196
|\| | | |
| * | | | Add type hints to E2E handler. (#9232)Patrick Cloke2021-01-285-136/+196
| | |_|/ | |/| |
* | | | Merge commit '2e537a028' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2216-59/+177
|\| | |
| * | | Check if a user is in the room before sending a PowerLevel event on their beh...Pankaj Yadav2021-01-271-1/+11
| * | | Merge branch 'social_login' into developRichard van der Hoff2021-01-276-19/+136
| |\| |
| | * | Implement MSC2858 support (#9183)Richard van der Hoff2021-01-276-19/+136
| | * | Merge tag 'v1.26.0rc2' into social_loginRichard van der Hoff2021-01-258-11/+83
| | |\ \
| * | \ \ Merge branch 'master' into developPatrick Cloke2021-01-271-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Clean-up the template loading code. (#9200)Patrick Cloke2021-01-2710-38/+58
| * | | | Pass a dict, instead of None, to modules if a None config is specified in the...Andrew Morgan2021-01-271-1/+2
* | | | | Merge commit '73ed289bd' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-221-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 1.26.0Patrick Cloke2021-01-271-1/+1
| | |_|/ | |/| |
* | | | Merge commit '1baab2035' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2226-245/+559
|\ \ \ \ | | |/ / | |/| |
| * | | Add type hints to various handlers. (#9223)Patrick Cloke2021-01-2612-138/+190
| * | | Do not require the CAS service URL setting (use public_baseurl instead). (#9199)Patrick Cloke2021-01-263-12/+9
| * | | Precompute joined hosts and store in Redis (#9198)Erik Johnston2021-01-268-32/+228
| * | | Try to recover from unknown encodings when previewing media. (#9164)Patrick Cloke2021-01-261-10/+34
| * | | Merge pull request #9062 from matrix-org/jaywink/admin-forward-extremitiesJason Robinson2021-01-264-2/+166
| |\ \ \
| | * | | Fix get forward extremities queryJason Robinson2021-01-261-1/+1
| * | | | Periodically send pings to detect dead Redis connections (#9218)Erik Johnston2021-01-262-53/+98
* | | | | Merge commit 'cee4010f9' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-225-3/+72
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'develop' into jaywink/admin-forward-extremitiesJason Robinson2021-01-264-1/+70
| |\| | |
| | * | | Don't error if deleting a non-existent pusher. (#9121)Patrick Cloke2021-01-251-1/+3
| | * | | Add an admin API for shadow-banning users. (#9209)Patrick Cloke2021-01-253-0/+67
| * | | | Make natural join inner joinJason Robinson2021-01-261-2/+2
* | | | | Merge commit 'fdf834694' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2210-161/+508
|\| | | |
| * | | | Merge remote-tracking branch 'origin/develop' into jaywink/admin-forward-extr...Jason Robinson2021-01-254-19/+15
| |\| | |
| | * | | Merge tag 'v1.26.0rc2' into developPatrick Cloke2021-01-253-4/+4
| | |\| |
| | * | | Handle missing content keys when calculating presentable names. (#9165)Patrick Cloke2021-01-251-15/+11
| * | | | Merge branch 'develop' into jaywink/admin-forward-extremitiesJason Robinson2021-01-23118-1737/+4528
| |\| | |
| | * | | Return a 404 if no valid thumbnail is found. (#9163)Patrick Cloke2021-01-212-81/+158
| | * | | Speed up chain cover calculation (#9176)Erik Johnston2021-01-212-55/+160
| | * | | Increase perf of handling concurrent use of StreamIDGenerators. (#9190)Erik Johnston2021-01-211-8/+13
| * | | | Add depth and received_ts to forward_extremities admin API responseJason Robinson2021-01-231-1/+2
| * | | | 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-114-27/+43
| * | | | Don't try to use f-stringsJason Robinson2021-01-111-1/+1
| * | | | Merge branch 'develop' into jaywink/admin-forward-extremitiesJason Robinson2021-01-095-55/+47
| |\ \ \ \
| * | | | | Implement clearing cache after deleting forward extremitiesJason Robinson2021-01-092-20/+42
| * | | | | Add Rooms admin forward extremities DELETE endpointJason Robinson2021-01-082-1/+53
| * | | | | Move unknown room ID error into resolve_room_idJason Robinson2021-01-071-7/+9
| * | | | | Add forward extremities endpoint to rooms admin APIJason Robinson2021-01-074-0/+77
* | | | | | Merge commit 'a01605c13' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-222-2/+2
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | 1.26.0rc2Patrick Cloke2021-01-251-1/+1
| * | | | | Fix chain cover update to handle events with duplicate auth events (#9210)Erik Johnston2021-01-221-1/+1
* | | | | | Merge commit '28f255d5f' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-221-2/+2
|\| | | | |
| * | | | | Bump psycopg2 version (#9204)Erik Johnston2021-01-221-2/+2
* | | | | | Merge commit '939ef657c' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2214-35/+62
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge remote-tracking branch 'origin/release-v1.26.0' into developErik Johnston2021-01-212-1/+19
| |\| | | |
| | * | | | Add schema update to fix existing DBs affected by #9193 (#9195)Erik Johnston2021-01-212-1/+19
| * | | | | Merge remote-tracking branch 'origin/release-v1.26.0' into developErik Johnston2021-01-214-7/+61
| |\| | | |
| * | | | | Use execute_batch in more places (#9188)Erik Johnston2021-01-2111-31/+25
| * | | | | Add tests for List Users Admin API (#9045)Dirk Klimpel2021-01-211-3/+18
| | |_|_|/ | |/| | |
* | | | | Merge commit '2506074ef' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-224-7/+61
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix receipts or account data not being sent down sync (#9193)Erik Johnston2021-01-214-7/+61
* | | | | Merge commit '42a8e8137' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-224-74/+113
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Add a check for duplicate IdP ids (#9184)Richard van der Hoff2021-01-211-0/+11
| * | | | Merge remote-tracking branch 'origin/release-v1.26.0' into developRichard van der Hoff2021-01-211-4/+24
| |\| | |
| | * | | Prefix idp_id with "oidc-" (#9189)Richard van der Hoff2021-01-211-4/+24
| * | | | Use execute_batch instead of executemany in places (#9181)Erik Johnston2021-01-212-12/+11
| * | | | Merge tag 'v1.26.0rc1' into developPatrick Cloke2021-01-2015-93/+148
| |\| | |
| * | | | Various improvements to the federation client. (#9129)Patrick Cloke2021-01-201-58/+67
* | | | | Merge commit 'c8e6e0584' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-221-3/+9
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Tighten the restrictions on `idp_id` (#9177)Richard van der Hoff2021-01-201-3/+9
* | | | | Merge commit '0cd2938bc' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2215-90/+139
|\| | | |
| * | | | 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
| |\ \ \
* | \ \ \ Merge commit 'fa50e4bf4' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2210-53/+27
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Give `public_baseurl` a default value (#9159)Richard van der Hoff2021-01-2010-59/+30
* | | | | Merge commit '72822e60b' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-224-5/+22
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 1.26.0rc1Patrick Cloke2021-01-201-1/+1
| |/ / /
| * | | 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
* | | | Merge commit '73b03722f' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2227-280/+764
|\| | |
| * | | Fix error messages from OIDC config parsing (#9153)Richard van der Hoff2021-01-191-10/+15
| * | | 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
* | | | Merge commit '2b467d0b6' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-228-160/+190
|\| | |
| * | | 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
| * | | 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
* | | | Merge commit '9de6b9411' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-223-150/+208
|\| | |
| * | | Land support for multiple OIDC providers (#9110)Richard van der Hoff2021-01-153-150/+208
* | | | Merge commit '3e4cdfe5d' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-225-24/+86
|\| | |
| * | | 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
* | | | Merge commit 'd34c6e127' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2214-174/+324
|\| | |
| * | | Add type hints to media rest resources. (#9093)Patrick Cloke2021-01-1512-165/+285
| * | | Store an IdP ID in the OIDC session (#9109)Richard van der Hoff2021-01-152-9/+39
* | | | Merge commit '20af31088' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-226-43/+66
|\| | |
| * | | Merge pull request #9091 from matrix-org/rav/error_on_bad_ssoRichard van der Hoff2021-01-154-31/+67
| |\ \ \
| * | | | 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
| * | | | Fix chain cover background update to work with split out event persisters (#9...Erik Johnston2021-01-144-29/+37
* | | | | Merge commit '631dd06f2' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-226-128/+402
|\| | | |
| * | | | Fix get destinations to catch up query. (#9114)Erik Johnston2021-01-141-13/+11
| * | | | 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
* | | | | Merge commit '12702be95' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-221-1/+0
|\| | | |
| * | | | Fix wrong arguments being passed to BlacklistingAgentWrapper (#9098)Tim Leung2021-01-141-1/+0
* | | | | Merge commit '420031906' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-224-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
| |/ / /
* | | | Merge commit '233c8b9fc' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-223-16/+37
|\| | |
| * | | Merge pull request #9105 from matrix-org/rav/multi_idp/oidc_provider_configRichard van der Hoff2021-01-132-62/+190
| |\ \ \
| * | | | 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
* | | | | Merge commit 'dc3c83a93' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-222-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
| |/ / /
* | | | Fix mypy check failAndrew Morgan2021-04-221-3/+1
* | | | Merge commit '98a64b7f7' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2237-548/+1660
|\| | |
| * | | 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
| |\ \ \
| * | | | 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
* | | | | Merge commit '3dd6ba135' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-211-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 1.25.0Erik Johnston2021-01-131-1/+1
| * | | | Don't apply the IP range blacklist to proxy connections (#9084)Marcus2021-01-122-3/+14
* | | | | Merge commit '2fb1c2b6e' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-213-22/+78
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
| | |_|/ | |/| |
* | | | Merge commit 'a03d71dc9' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2115-169/+279
|\| | |
| * | | 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
| | |_|/ | |/| |
| * | | 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
* | | | Merge commit '63593134a' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-212-57/+58
|\| | |
| * | | Some cleanups to device inbox store. (#9041)Erik Johnston2021-01-072-57/+58
* | | | Merge commit '23d701864' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-215-42/+194
|\| | |
| * | | Improve the performance of calculating ignored users in large rooms (#9024)Patrick Cloke2021-01-074-34/+183
| |/ /