summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Make LoggingContext's name optional (#9857)Richard van der Hoff2021-04-211-3/+12
* 1.32.1Andrew Morgan2021-04-211-1/+1
* 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
* 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
| |\
| | * Fix sharded federation sender sometimes using 100% CPU.Erik Johnston2021-04-081-2/+4
| * | MSC3083: Check for space membership during a local join of restricted rooms. ...Patrick Cloke2021-04-081-1/+74
| |/
| * 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
* | | 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
|/ /
* | 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
|/
* 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
|\
| * 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
* | Add a storage method for returning all current presence from all users (#9650)Andrew Morgan2021-03-252-3/+68
* | 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
* | 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
* 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
* 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
|/
* 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
* 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
* Make deleting stale pushers a background update (#9536)Erik Johnston2021-03-032-1/+54
* 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
* Use the proper Request in type hints. (#9515)Patrick Cloke2021-03-0116-31/+35
* Allow bytecode again (#9502)Jonathan de Jong2021-02-261-2/+0
* Add support for no_proxy and case insensitive env variables (#9372)Tim Leung2021-02-264-20/+40
* SSO: redirect to public URL before setting cookies (#9436)Richard van der Hoff2021-02-262-1/+64
* Test that we require validated email for email pushers (#9496)Erik Johnston2021-02-251-0/+6
* Ensure pushers are deleted for deactivated accounts (#9285)Erik Johnston2021-02-253-0/+69
* Merge branch 'master' into developErik Johnston2021-02-252-2/+7
|\
| * 1.28.0Erik Johnston2021-02-251-1/+1
| * Add back the deprecated SAML endpoint. (#9474)Patrick Cloke2021-02-231-1/+6
* | Add support for X-Forwarded-Proto (#9472)Richard van der Hoff2021-02-241-15/+70
* | Add SQL delta for deleting stale pushers (#9479)Erik Johnston2021-02-241-0/+19
* | Fix #8518 (sync requests being cached wrongly on timeout) (#9358)Jonathan de Jong2021-02-242-3/+34
* | Clean up `ShardedWorkerHandlingConfig` (#9466)Erik Johnston2021-02-249-59/+123
* | Refactor to ensure we call check_consistency (#9470)Erik Johnston2021-02-247-28/+71
* | Add a comment about systemd-python. (#9464)Richard van der Hoff2021-02-231-0/+3
* | Include newly added sequences in the port DB script. (#9449)Patrick Cloke2021-02-232-2/+13
* | Fix deleting pushers when using sharded pushers. (#9465)Erik Johnston2021-02-228-63/+93
* | Remove vestiges of uploads_path config (#9462)Richard van der Hoff2021-02-221-1/+0
* | Add an `order_by` field to list users' media admin API. (#8978)Dirk Klimpel2021-02-222-4/+65
* | Remove cache for get_shared_rooms_for_users (#9416)Andrew Morgan2021-02-221-3/+1
* | Clean up the user directory sample config section (#9385)Andrew Morgan2021-02-221-32/+37
* | Ratelimit cross-user key sharing requests. (#8957)Patrick Cloke2021-02-198-17/+66
* | Regenerate exact thumbnails if missing (#9438)Erik Johnston2021-02-194-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
* | | Add documentation and type hints to parse_duration. (#9432)Patrick Cloke2021-02-191-2/+15
* | | Fix style checking due to updated black.Patrick Cloke2021-02-191-2/+1
* | | Merge tag 'v1.28.0rc1' into developPatrick Cloke2021-02-191-1/+1
|\ \ \ | | |/ | |/|
| * | 1.28.0rc1Patrick Cloke2021-02-181-1/+1
* | | Support not providing an IdP icon when choosing a username. (#9440)Patrick Cloke2021-02-191-1/+1
* | | Be smarter about which hosts to send presence to when processing room joins (...Andrew Morgan2021-02-192-15/+43
* | | Add a config option to prioritise local users in user directory search result...Andrew Morgan2021-02-192-9/+59
* | | Add configs to make profile data more private (#9203)AndrewFerr2021-02-196-6/+46
|/ /
* / 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
* 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
* 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
|\
| * 1.27.0Erik 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
|\|
| * 1.27.0rc2Patrick Cloke2021-02-111-1/+1
| * Backout changes for automatically calculating the public baseurl. (#9313)Patrick Cloke2021-02-1111-29/+74
* | 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
* | Remove unneeded type constraints on 3rd party protocol lookup responsesBrendan Abolivier2021-02-091-3/+0
* | 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 branch 'erikj/media_spam_checker' into developErik Johnston2021-02-043-6/+112
|\ \ \
| * | | Add check_media_file_for_spam spam checker hookErik Johnston2021-02-043-6/+112
| | |/ | |/|
* | | Handle empty rooms when generating email notifications. (#9257)Patrick Cloke2021-02-041-37/+176
* | | 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
| * | | 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
* | | | 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
|/ /
* | 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
|\ \
| * | fix broken HTML tagRichard van der Hoff2021-02-011-1/+1
* | | Merge branch 'social_login' into developRichard van der Hoff2021-02-0115-98/+453
|\| |
| * | 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
* | | Refactor email summary generation. (#9260)Patrick Cloke2021-02-011-122/+173
* | | 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
| * | 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
* | | 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 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
* | | | Add type hints to E2E handler. (#9232)Patrick Cloke2021-01-285-136/+196
| |_|/ |/| |
* | | 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
|\ \ \ \ | | |_|/ | |/| |