Skip to content

Commit 200d4c6

Browse files
govynnusgovynnus
committed
Merge branch 'develop' into uia-fallback
To get the flattened synapse.rest.client package of matrix-org#10600
2 parents 70e653e + 1a9f531 commit 200d4c6

File tree

181 files changed

+5078
-3295
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

181 files changed

+5078
-3295
lines changed

‎CONTRIBUTING.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ This document aims to get you started with contributing to this repo!
1313
- [7. Turn coffee and documentation into code and documentation!](#7-turn-coffee-and-documentation-into-code-and-documentation)
1414
- [8. Test, test, test!](#8-test-test-test)
1515
* [Run the linters.](#run-the-linters)
16-
* [Run the unit tests.](#run-the-unit-tests)
17-
* [Run the integration tests.](#run-the-integration-tests)
16+
* [Run the unit tests.](#run-the-unit-tests-twisted-trial)
17+
* [Run the integration tests (SyTest).](#run-the-integration-tests-sytest)
18+
* [Run the integration tests (Complement).](#run-the-integration-tests-complement)
1819
- [9. Submit your patch.](#9-submit-your-patch)
1920
* [Changelog](#changelog)
2021
+ [How do I know what to call the changelog file before I create the PR?](#how-do-i-know-what-to-call-the-changelog-file-before-i-create-the-pr)
@@ -197,7 +198,7 @@ The following command will let you run the integration test with the most common
197198
configuration:
198199

199200
```sh
200-
$ docker run --rm -it -v /path/where/you/have/cloned/the/repository\:/src:ro -v /path/to/where/you/want/logs\:/logs matrixdotorg/sytest-synapse:py37
201+
$ docker run --rm -it -v /path/where/you/have/cloned/the/repository\:/src:ro -v /path/to/where/you/want/logs\:/logs matrixdotorg/sytest-synapse:buster
201202
```
202203

203204
This configuration should generally cover your needs. For more details about other configurations, see [documentation in the SyTest repo](https://github.com/matrix-org/sytest/blob/develop/docker/README.md).

‎changelog.d/10394.feature

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Initial local support for [MSC3266](https://github.com/matrix-org/synapse/pull/10394), Room Summary over the unstable `/rooms/{roomIdOrAlias}/summary` API.

‎changelog.d/10524.feature

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Port the PresenceRouter module interface to the new generic interface.

‎changelog.d/10569.feature

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add pagination to the spaces summary based on updates to [MSC2946](https://github.com/matrix-org/matrix-doc/pull/2946).

‎changelog.d/10570.feature

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update the Synapse Grafana dashboard.

‎changelog.d/10576.misc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Move `/batch_send` endpoint defined by [MSC2716](https://github.com/matrix-org/matrix-doc/pull/2716) to the `/v2_alpha` directory.

‎changelog.d/10578.feature

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add an admin API (`GET /_synapse/admin/username_available`) to check if a username is available (regardless of registration settings).

‎changelog.d/10587.misc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Allow multiple custom directories in `read_templates`.

‎changelog.d/10590.misc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Re-organize the `synapse.federation.transport.server` module to create smaller files.

‎changelog.d/10591.misc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Clean up some of the federation event authentication code for clarity.

‎changelog.d/10598.feature

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Allow editing a user's `external_ids` via the "Edit User" admin API. Contributed by @dklimpel.

‎changelog.d/10599.doc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update CONTRIBUTING.md to fix index links and the instructions for SyTest in docker.

‎changelog.d/10600.misc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Flatten the `synapse.rest.client` package by moving the contents of `v1` and `v2_alpha` into the parent.

‎changelog.d/10602.feature

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
The Synapse manhole no longer needs coroutines to be wrapped in `defer.ensureDeferred`.

‎changelog.d/10606.bugfix

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix errors on /sync when read receipt data is a string. Only affects homeservers with the experimental flag for [MSC2285](https://github.com/matrix-org/matrix-doc/pull/2285) enabled. Contributed by @SimonBrandner.

‎changelog.d/10611.bugfix

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Additional validation for the spaces summary API to avoid errors like `ValueError: Stop argument for islice() must be None or an integer`. The missing validation has existed since v1.31.0.

‎changelog.d/10614.misc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Clean up some of the federation event authentication code for clarity.

‎changelog.d/10620.misc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix up a couple of links to the database schema documentation.

‎changelog.d/10623.bugfix

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Revert behaviour introduced in v1.38.0 that strips `org.matrix.msc2732.device_unused_fallback_key_types` from `/sync` when its value is empty. This field should instead always be present according to [MSC2732](https://github.com/matrix-org/matrix-doc/blob/master/proposals/2732-olm-fallback-keys.md).

0 commit comments

Comments
 (0)