summary refs log tree commit diff
path: root/tests (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * Deal with mypy errors w/ type-hinted pynacl 1.5.0 (#11714)David Robertson2022-01-121-1/+7
* | Remove the 'password_hash' from the Users Admin API endpoint response diction...Andrew Morgan2022-01-141-17/+33
* | Replace uses of simple_insert_many with simple_insert_many_values. (#11742)Patrick Cloke2022-01-132-21/+20
* | Include bundled aggregations in the sync response cache. (#11659)Patrick Cloke2022-01-131-5/+5
* | Allow tracking puppeted users for MAU (#11561)Jason Robinson2022-01-121-0/+33
* | Deal with mypy errors w/ type-hinted pynacl 1.5.0 (#11714)David Robertson2022-01-101-1/+7
* | Support spaces with > 50 rooms in the /hierarchy endpoint. (#11695)Patrick Cloke2022-01-071-0/+32
* | Optionally use an on-disk sqlite db in tests (#11702)David Robertson2022-01-072-1/+22
* | Test that bans win a join against a race when computing `/sync` response (#1...David Robertson2022-01-072-3/+104
* | Bundle aggregations outside of the serialization method. (#11612)Patrick Cloke2022-01-071-1/+1
* | Remove the /send_relation endpoint. (#11682)Patrick Cloke2022-01-061-13/+13
* | Strip unauthorized fields from `unsigned` object in events received over fede...Shay2022-01-061-0/+72
* | Fix get federation status of destination if no error occured (#11593)Dirk Klimpel2022-01-051-18/+57
* | Cache empty responses from `/user/devices` (#11587)David Robertson2022-01-052-2/+98
|/
* Refactor the way we set `outlier` (#11634)Richard van der Hoff2022-01-051-3/+1
* Add admin API to get users' account data (#11664)Dirk Klimpel2022-01-051-0/+90
* Re-apply: Move glob_to_regex and re_word_boundary to matrix-python-common #11...reivilibre2022-01-051-59/+0
* Include the topic event in the prejoin state, per MSC3173. (#11666)Patrick Cloke2022-01-041-0/+9
* Convert all namedtuples to attrs. (#11665)Patrick Cloke2021-12-301-1/+5
* Fix a type annotation in `test_account_data.py` and remove it from the Mypy e...reivilibre2021-12-291-2/+2
* Refactor `tests.util.setup_test_homeserver` and `tests.server.setup_test_home...reivilibre2021-12-214-185/+194
* Add type hints to event_push_actions. (#11594)Patrick Cloke2021-12-212-8/+11
* Improve opentracing support for `ResponseCache` (#11607)Richard van der Hoff2021-12-201-11/+34
* Merge remote-tracking branch 'origin/release-v1.49' into developRichard van der Hoff2021-12-201-5/+5
|\
| * Disable aggregation bundling on `/sync` responses (#11583)Richard van der Hoff2021-12-201-5/+5
* | Use mock from standard library (#11588)V024602021-12-201-9/+8
* | Add type hints to `synapse/tests/rest/admin` (#11590)Dirk Klimpel2021-12-165-57/+70
* | Add experimental support for MSC3202: allowing application services to masque...reivilibre2021-12-151-0/+64
* | Add type hints to `synapse/storage/databases/main/e2e_room_keys.py` (#11549)Sean Quah2021-12-141-1/+3
* | Add missing type hints to `synapse.logging.context` (#11556)Sean Quah2021-12-141-35/+0
* | Add missing type hints to `synapse.appservice` (#11360)Patrick Cloke2021-12-141-8/+3
* | Remove redundant `COALESCE()`s around `COUNT()`s in database queries (#11570)Sean Quah2021-12-141-1/+1
* | Move HTML parsing to a separate file for URL previews. (#11566)Patrick Cloke2021-12-132-23/+24
* | Allow events to be created with no `prev_events` (MSC2716) (#11243)Eric Eastwood2021-12-101-0/+103
* | Test to ensure we share the same `state_group` across the whole historical ba...Eric Eastwood2021-12-101-0/+180
* | Ensure emails are canonicalized before fetching associated user. (#11547)Patrick Cloke2021-12-101-1/+2
* | Do not allow cross-room relations, per MSC2674. (#11516)Patrick Cloke2021-12-091-0/+115
* | Support unprefixed versions of fallback key property names. (#11541)Hubert Chathi2021-12-091-5/+25
* | Add missing `errcode` to `parse_string` and `parse_boolean` (#11542)Dirk Klimpel2021-12-094-10/+10
* | Clean up `synapse.rest.admin` (#11535)Dirk Klimpel2021-12-081-1/+1
* | Use HTTPStatus constants in place of literals in `tests.rest.client.test_auth...reivilibre2021-12-081-47/+87
* | Send and handle cross-signing messages using the stable prefix. (#10520)Hubert Chathi2021-12-081-2/+3
* | Fix case in `wait_for_background_updates` where `self.store` does not exist (...Andrew Morgan2021-12-071-7/+4
|/
* Revert "Move `glob_to_regex` and `re_word_boundary` to `matrix-python-common`...Sean Quah2021-12-071-0/+59
* Fix 'delete room' admin api to work on incomplete rooms (#11523)Richard van der Hoff2021-12-071-17/+25
* Fix the test breakage introduced by #11435 as a result of concurrent PRs (#11...reivilibre2021-12-071-1/+1
* Stabilise support for MSC2918 refresh tokens as they have now been merged int...reivilibre2021-12-061-15/+15
* Save the OIDC session ID (sid) with the device on login (#11482)Quentin Gliech2021-12-064-33/+188
* Add admin API to get some information about federation status (#11407)Dirk Klimpel2021-12-061-0/+456
* Include bundled aggregations in /sync and related fixes (#11478)Patrick Cloke2021-12-061-39/+96
* Move `glob_to_regex` and `re_word_boundary` to `matrix-python-common` (#11505)Sean Quah2021-12-061-59/+0
* Support configuring the lifetime of non-refreshable access tokens separately ...reivilibre2021-12-032-0/+154
* Add type hints to `synapse/tests/rest/admin` (#11501)Dirk Klimpel2021-12-039-225/+256
* Revert accidental commits to develop.Olivier Wilkinson (reivilibre)2021-12-034-194/+185
* Give `tests.server.setup_test_homeserver` (nominally!) the same behaviourOlivier Wilkinson (reivilibre)2021-12-031-0/+3
* Move `tests.utils.setup_test_homeserver` to `tests.server`Olivier Wilkinson (reivilibre)2021-12-034-177/+188
* Convert one of the `setup_test_homeserver`s to `make_test_homeserver_synchron...Olivier Wilkinson (reivilibre)2021-12-031-8/+3
* Clean up tests.storage.test_appservice (#11492)reivilibre2021-12-021-177/+168
* Clean up `tests.storage.test_main` to remove use of legacy code. (#11493)reivilibre2021-12-021-17/+10
* Clean up `tests.test_visibility` to remove legacy code. (#11495)reivilibre2021-12-021-202/+39
* Fix media repository failing when media store path contains symlinks (#11446)Sean Quah2021-12-021-1/+108
* Add type annotations to `tests.storage.test_appservice`. (#11488)reivilibre2021-12-021-48/+92
* Add a license header and comment. (#11479)Patrick Cloke2021-12-011-0/+15
* Don't start Synapse master process if `worker_app` is set (#11416)Shay2021-11-301-0/+31
* Bundle relations of relations into the `/relations` result. (#11284)Patrick Cloke2021-11-301-0/+118
* Fix `LruCache` corruption bug with a `size_callback` that can return 0 (#11454)Sean Quah2021-11-301-0/+12
* Remove unnecessary `json.dumps` from `tests.rest.admin` (#11461)Dirk Klimpel2021-11-301-41/+20
* Add missing copyright header. (#11460)Patrick Cloke2021-11-301-0/+14
* Convert status codes to `HTTPStatus` in `tests.rest.admin` (#11455)Dirk Klimpel2021-11-3011-557/+886
* Support the stable /hierarchy endpoint from MSC2946 (#11329)Patrick Cloke2021-11-291-29/+65
* Make background updates controllable via a plugin (#11306)Erik Johnston2021-11-296-30/+104
* Fix perspectives requests for multiple keys for the same server (#11440)Richard van der Hoff2021-11-291-0/+71
* Add a test case for the SendJoinParser (#11441)David Robertson2021-11-291-0/+50
* Update MSC2918 refresh token support to confirm with the latest revision: acc...reivilibre2021-11-261-14/+44
* Add type hints to `synapse/storage/databases/main/events_worker.py` (#11411)Sean Quah2021-11-261-1/+5
* Support expiry of refresh tokens and expiry of the overall session when refre...reivilibre2021-11-261-1/+124
* Track ongoing event fetches correctly (again) (#11376)Sean Quah2021-11-261-1/+138
* Improve performance of `remove_{hidden,deleted}_devices_from_device_inbox` (#...Brendan Abolivier2021-11-251-2/+2
* Lower minumum batch size to 1 for background updates (#11422)Brendan Abolivier2021-11-242-12/+21
* Rename unstable `access_token_lifetime` configuration option to `refreshable_...reivilibre2021-11-231-1/+1
* Add missing type hints to config base classes (#11377)Patrick Cloke2021-11-231-8/+14
* Remove code invalidated by deprecated config flag 'trust_identity_servers_for...Shay2021-11-231-1/+0
* Merge branch 'master' into developSean Quah2021-11-232-0/+253
|\
| * Prevent the media store from writing outside of the configured directorySean Quah2021-11-192-0/+253
* | Add config for customizing the claim used for JWT logins. (#11361)Kostas2021-11-221-32/+36
* | Store arbitrary relations from events. (#11391)Patrick Cloke2021-11-222-1/+117
* | Add an admin API to run background jobs. (#11352)Dirk Klimpel2021-11-191-8/+146
* | Fix checking whether a room can be published on creation. (#11392)Patrick Cloke2021-11-191-33/+62
* | Keep fallback key marked as used if it's re-uploaded (#11382)Hubert Chathi2021-11-191-1/+31
* | Fix verification of objects signed with old local keys (#11379)Richard van der Hoff2021-11-191-3/+53
* | Remove legacy code related to deprecated `trust_identity_server_for_password_...Shay2021-11-181-0/+9
* | Add dedicated admin API for blocking a room (#11324)Dirk Klimpel2021-11-181-0/+228
* | Do not allow MSC3440 threads to fork threads (#11161)Patrick Cloke2021-11-181-0/+62
* | Rename `get_access_token_for_user_id` method to `create_access_token_for_user...reivilibre2021-11-173-11/+11
* | Fix incorrect return value in tests. (#11359)Patrick Cloke2021-11-161-1/+1
* | Merge tag 'v1.47.0rc3' into developDavid Robertson2021-11-161-1/+51
|\|
| * Run _upgrade_existing_database on workers if at current schema_version (#11346)Andrew Morgan2021-11-151-1/+51
* | Avoid sharing room hierarchy responses between users (#11355)Sean Quah2021-11-161-0/+55
* | Add ability to un-shadow-ban via the admin API. (#11347)Patrick Cloke2021-11-161-6/+20
* | Misc typing fixes for tests, part 2 of N (#11330)David Robertson2021-11-164-29/+65
* | Database storage profile passes mypy (#11342)David Robertson2021-11-151-3/+6
* | Add support for the stable version of MSC2778 (#11335)Tulir Asokan2021-11-152-2/+8
* | Test room alias deletion (#11327)David Robertson2021-11-121-28/+77
* | Change display names/avatar URLs to None if they contain null bytes before st...Shay2021-11-121-0/+48
* | Misc typing fixes for `tests`, part 1 of N (#11323)David Robertson2021-11-124-27/+47
* | Convert delete room admin API to async endpoint (#11223)Dirk Klimpel2021-11-122-65/+709
* | Remove redundant parameters on `_check_event_auth` (#11292)Richard van der Hoff2021-11-101-2/+0
* | Clarifications and small fixes to to-device related code (#11247)Andrew Morgan2021-11-091-2/+6
* | Allow admins to proactively block rooms (#11228)David Robertson2021-11-091-0/+28
* | Support filtering by relations per MSC3440 (#11236)Patrick Cloke2021-11-094-35/+438
|/
* Include cross-signing signatures when syncing remote devices for the first ti...Erik Johnston2021-11-091-0/+151
* Require body for read receipts with user-agent exceptions (#11157)rogersheu2021-11-091-2/+28
* Add some background update admin APIs (#11263)Erik Johnston2021-11-081-0/+218
* Default value for `public_baseurl` (#11210)Richard van der Hoff2021-11-083-3/+1
* Fix rolling back when using workers (#11255)Erik Johnston2021-11-051-0/+69
* Additional test for `cachedList` (#11246)Richard van der Hoff2021-11-041-0/+43
* Add a linearizer on (appservice, stream) when handling ephemeral events. (#11...Nick Barrett2021-11-031-0/+51
* Remove a debug statement from tests. (#11239)Patrick Cloke2021-11-031-1/+0
* Merge remote-tracking branch 'origin/master' into developErik Johnston2021-11-021-0/+15
|\
| * Fix URL preview errors when previewing XML documents. (#11196)Patrick Cloke2021-10-271-0/+15
* | Delete messages for hidden devices from `device_inbox` (#11199)Dirk Klimpel2021-11-021-0/+74
* | Add search by room ID and room alias to List Room admin API (#11099)Dirk Klimpel2021-11-021-39/+49
* | ObservableDeferred: run observers in order (#11229)Richard van der Hoff2021-11-022-4/+69
* | Handle missing Content-Type header when accessing remote media (#11200)Shay2021-11-011-2/+16
* | Fix a bug in unit test `test_block_room_and_not_purge` (#11226)Dirk Klimpel2021-11-011-2/+2
* | Make `check_event_allowed` module API callback not fail open (accept events) ...reivilibre2021-11-011-13/+3
* | Remove deprecated delete room admin API (#11213)Dirk Klimpel2021-11-011-24/+15
* | Support for serving server well-known files (#11211)Richard van der Hoff2021-11-011-6/+26
* | Test that `ClientIpStore` combines database and in-memory data correctly (#11...Sean Quah2021-11-011-0/+206
* | Add a module API method to retrieve state from a room (#11204)Brendan Abolivier2021-10-291-1/+24
* | Add knock information in admin exported data (#11171)Rafael Gonçalves2021-10-282-2/+62
* | Fetch verify key locally rather than trying to do so over federation if origi...Shay2021-10-281-0/+12
* | Add a ModuleApi method to update a user's membership in a room (#11147)Brendan Abolivier2021-10-281-1/+125
* | Delete messages from `device_inbox` table when deleting device (#10969)Dirk Klimpel2021-10-272-0/+121
* | Implement an `on_new_event` callback (#11126)Brendan Abolivier2021-10-261-3/+90
|/
* Enable changing user type via users admin API (#11174)Jason Robinson2021-10-261-0/+51
* Don't set new room alias before potential 403 (#10930)AndrewFerr2021-10-251-1/+101
* Fix synapse.config module "read" command (#11145)Jason Robinson2021-10-223-55/+104
* Add a thread relation type per MSC3440. (#11088)Patrick Cloke2021-10-211-6/+34
* Fix adding excluded users to the private room sharing tables when joining a r...David Robertson2021-10-211-14/+53
* Fix setting a user's external_id via the admin API returns 500 and deletes us...Dirk Klimpel2021-10-211-3/+212
* Show error when timestamp in seconds is provided to the /purge_media_cache AP...Aaron R2021-10-201-4/+102
* Merge branch 'master' into developSean Quah2021-10-201-34/+3
|\
| * Revert change to counting of deactivated users towards the monthly active use...Sean Quah2021-10-201-34/+3
* | Check *all* auth events for room id and rejection (#11009)Richard van der Hoff2021-10-181-48/+90
* | Don't remove local users from dir when the leave their last room (#11103)David Robertson2021-10-181-0/+50
* | Correctly exclude users when making a room public or private (#11075)David Robertson2021-10-152-79/+140
* | Fix 500 error on `/messages` when we accumulate more than 5 backward extremit...Eric Eastwood2021-10-141-0/+64
* | Ensure each charset is attempted only once during media preview. (#11089)Patrick Cloke2021-10-141-8/+35
* | Attempt different character encodings when previewing a URL. (#11077)Patrick Cloke2021-10-141-26/+40
* | Fix-up some type hints in the relations tests. (#11076)Patrick Cloke2021-10-143-51/+62
* | Add a test for a workaround concerning the behaviour of third-party rule modu...reivilibre2021-10-141-6/+50
* | Merge remote-tracking branch 'origin/release-v1.45' into developDavid Robertson2021-10-132-8/+74
|\|
| * Stop user directory from failing if it encounters users not in the `users` ta...David Robertson2021-10-134-10/+628
* | Port the Password Auth Providers module interface to the new generic interfac...Azrenbeth2021-10-131-26/+197
* | Be more lenient when parsing the version for oEmbed responses. (#11065)Patrick Cloke2021-10-131-0/+51
* | Simplify the user admin API tests (#11048)Dirk Klimpel2021-10-121-255/+146
* | Add tests for `MediaFilePaths` (#11057)Sean Quah2021-10-121-0/+238
* | Merge remote-tracking branch 'origin/release-v1.45' into developErik Johnston2021-10-121-13/+11
|\|
| * Reset global cache state before cache tests. (#11036)Patrick Cloke2021-10-121-13/+11
* | Fix inconsistent behavior of `get_last_client_by_ip` (#10970)Sean Quah2021-10-121-0/+43
* | Add an approximate difference method to StateFilters (#10825)reivilibre2021-10-121-2/+511
|/
* Autodiscover oEmbed endpoint from returned HTML (#10822)Patrick Cloke2021-10-082-17/+123
* Fix overwriting profile when making room public (#11003)David Robertson2021-10-081-2/+69
* Include exception in json logging (#11028)Nick Barrett2021-10-081-0/+28
* Ensure each cache config test uses separate state. (#11019)Patrick Cloke2021-10-071-8/+12
* Don't alter directory entries for local users when setting a per-room nicknam...David Robertson2021-10-071-0/+34
* Add a spamchecker method to allow or deny 3pid invites (#10894)Brendan Abolivier2021-10-061-0/+70
* Require direct references to configuration variables. (#10985)Patrick Cloke2021-10-066-65/+60
* Add a spamchecker callback to allow or deny room joins (#10910)Brendan Abolivier2021-10-061-0/+101
* Don't drop user dir deltas when server leaves room (#10982)David Robertson2021-10-069-78/+61
* Fix potential leak of per-room profiles when the user dir is rebuilt. (#10981)David Robertson2021-10-051-16/+78
* Add functionality to remove deactivated users from the monthly_active_users t...Hillery Shay2021-10-041-3/+34
* Make is_public Optional[bool] for create_room_as test util (#10951) (#10963)AndrewFerr2021-10-041-6/+7
* Merge tag 'v1.44.0rc3' into developBrendan Abolivier2021-10-041-0/+34
|\
| * Fix error in `get_user_ip_and_agents` when fetching from the database (#10968)Sean Quah2021-10-011-0/+34
| * Strip "join_authorised_via_users_server" from join events which do not need i...Patrick Cloke2021-10-012-7/+9
* | Consistently exclude from user_directory (#10960)David Robertson2021-10-044-26/+366
* | Use direct references for configuration variables (part 7). (#10959)Patrick Cloke2021-10-047-13/+13
* | type-hint `HomeserverTestcase.setup_test_homeserver` (#10961)David Robertson2021-10-013-9/+20
* | Clean-up registration tests (#10945)Patrick Cloke2021-09-301-37/+52
* | Strip "join_authorised_via_users_server" from join events which do not need i...Patrick Cloke2021-09-302-7/+9
* | Fix errors in Synapse logs from unit tests. (#10939)Patrick Cloke2021-09-304-26/+34
* | Pass str to twisted's IReactorTCP (#10895)David Robertson2021-09-302-6/+6
* | Refactor user directory tests (#10935)David Robertson2021-09-303-199/+280
* | Split `event_auth.check` into two parts (#10940)Richard van der Hoff2021-09-291-72/+36
* | Use direct references for configuration variables (part 6). (#10916)Patrick Cloke2021-09-2913-34/+34
* | Implement MSC3069: Guest support on whoami (#9655)Travis Ralston2021-09-291-5/+44
* | Fix empty `url_cache_thumbnails/yyyy-mm-dd/` directories being left behind (#...Sean Quah2021-09-291-0/+31
* | Inline `_check_event_auth` for outliers (#10926)Richard van der Hoff2021-09-281-1/+0
|/
* Avoid storing URL cache files in storage providers (#10911)Sean Quah2021-09-271-0/+130
* Add a spamchecker callback to allow or deny room creation based on invites (#...Brendan Abolivier2021-09-241-2/+117
* Use direct references for configuration variables (part 5). (#10897)Patrick Cloke2021-09-247-13/+15
* Factor out common code for persisting fetched auth events (#10896)Richard van der Hoff2021-09-241-1/+6
* Add reactor to `SynapseRequest` and fix up types. (#10868)Erik Johnston2021-09-2413-37/+69
* Fix AuthBlocking check when requester is appservice (#10881)Jason Robinson2021-09-241-0/+62
* Improve typing in user_directory files (#10891)David Robertson2021-09-241-2/+3
* Allow `.` and `~` chars in registration tokens (#10887)Callum Brown2021-09-231-3/+5
* Use direct references for configuration variables (part 4). (#10893)Patrick Cloke2021-09-2310-20/+19
* Fix reactivated users not being added to the user directory (#10782)David Robertson2021-09-231-1/+41
* Use direct references for some configuration variables (part 3) (#10885)Patrick Cloke2021-09-234-12/+8
* Remove unnecessary parentheses around tuples returned from methods (#10889)Andrew Morgan2021-09-232-2/+2
* Treat "\u0000" as "\u0020" for the purposes of message search (message indexi...Hillery Shay2021-09-221-0/+74
* Include more information in oEmbed previews. (#10819)Patrick Cloke2021-09-221-9/+21
* Extend ModuleApi with the methods we'll need to reject spam based on …IP - ...David Teller2021-09-221-0/+72
* Add type hints for event streams. (#10856)Patrick Cloke2021-09-214-13/+55
* Refactor oEmbed previews (#10814)Patrick Cloke2021-09-211-13/+13
* Test that state events sent by modules correctly end up in the room's state (...Brendan Abolivier2021-09-211-0/+84
* Allow Synapse Admin API's Room Search to accept non-ASCII characters (#10859)Hillery Shay2021-09-211-0/+27
* Always add local users to the user directory (#10796)David Robertson2021-09-212-8/+11
* Allow sending a membership event to unban a user (#10807)Aaron Raimist2021-09-212-1/+97
* Create a constant for a small png image in tests. (#10834)Patrick Cloke2021-09-167-94/+44
* Make StateFilter frozen so we can hash it (#10816)reivilibre2021-09-141-17/+29
* Use direct references for some configuration variables (#10798)Patrick Cloke2021-09-131-6/+12
* Add types to synapse.util. (#10601)reivilibre2021-09-101-2/+2
* Handle room upgrades for spaces (#10774)Patrick Cloke2021-09-101-4/+63
* Easy refactors of the user directory (#10789)David Robertson2021-09-101-3/+3
* Remove unstable MSC2858 API, including `experimental.msc2858_enabled` config ...Sean2021-09-091-58/+7
* Get rid of `_auth_and_persist_event` (#10781)Richard van der Hoff2021-09-081-3/+12
* Skip handling of push actions for outlier events (#10780)Erik Johnston2021-09-081-0/+1
* Request JSON for oEmbed requests (and ignore XML only providers). (#10759)Patrick Cloke2021-09-081-1/+54
* Merge tag 'v1.42.0rc2' into developBrendan Abolivier2021-09-061-1/+45
|\
| * Support MSC3375: room version 9. (#10747)Patrick Cloke2021-09-031-1/+45
* | Add config option to use non-default manhole password and keys (#10643)Azrenbeth2021-09-061-4/+4
* | Pull out encrypted_by_default tests from user_directory tests (#10752)David Robertson2021-09-062-95/+109
* | Ignore rooms with unknown room versions in the spaces summary. (#10727)Patrick Cloke2021-09-011-0/+25
* | Consider the `origin_server_ts` of the `m.space.child` event when ordering ro...Patrick Cloke2021-09-011-5/+13
* | Populate `rooms.creator` field for easy lookup (#10697)Eric Eastwood2021-09-011-0/+98
* | Merge tag 'v1.42.0rc1' into developOlivier Wilkinson (reivilibre)2021-09-011-0/+44
|\|
| * Fix iteration in _remove_deleted_email_pushers background job. (#10734)Andrew Morgan2021-09-011-0/+44
* | Correctly include room avatars in email notifications (#10658)David Robertson2021-09-011-5/+47
* | Allow configuration of the oEmbed URLs. (#10714)Patrick Cloke2021-08-311-110/+102
|/
* Merge branch 'master' into developRichard van der Hoff2021-08-312-1/+139
|\
| * Fix up unit tests (#10723)Richard van der Hoff2021-08-311-2/+15
| * Merge pull request from GHSA-jj53-8fmw-f2w2reivilibre2021-08-311-0/+43
| * Merge pull request from GHSA-3x4c-pq33-4w3qreivilibre2021-08-311-1/+83
* | Merge remote-tracking branch 'origin/release-v1.41' into developRichard van der Hoff2021-08-272-3/+124
|\|
| * Fix incompatibility with Twisted < 21. (#10713)Richard van der Hoff2021-08-272-3/+124
* | Improve ServerNoticeServlet to avoid duplicate requests (#10679)Dirk Klimpel2021-08-271-0/+450
* | Split `FederationHandler` in half (#10692)Richard van der Hoff2021-08-265-11/+23
* | Validate new m.room.power_levels events (#10232)Aaron Raimist2021-08-261-0/+78
* | Remove pushers when deleting 3pid from account (#10581)Azrenbeth2021-08-261-0/+39
* | Fix error when selecting between thumbnails with the same quality (#10684)Sean2021-08-251-1/+38
* | Merge branch 'master' into developErik Johnston2021-08-241-2/+2
|\|
| * Set room version 8 as preferred for restricted rooms. (#10571)Patrick Cloke2021-08-201-2/+2
* | Implement MSC3231: Token authenticated registration (#10142)Callum Brown2021-08-212-0/+1144
* | Flatten tests/rest/client/{v1,v2_alpha} too (#10667)David Robertson2021-08-2025-16/+3
* | Simplify tests for the device admin rest API. (#10664)Dirk Klimpel2021-08-201-81/+18
* | Follow-up: format changelog, add licence (#10593)David Robertson2021-08-201-0/+14
* | Validate device_keys for C-S /keys/query requests (#10593)David Robertson2021-08-201-0/+77