diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-06-15 16:37:08 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-06-15 16:37:08 +0100 |
| commit | c2b4621630d982a38585c177d7c960c5127620bf (patch) | |
| tree | 8fdd440785ed56531c36e0f34e65fe139e6ce541 /changelog.d | |
| parent | Incorporate review (diff) | |
| parent | Remove "user_id" from GET /presence. (#7606) (diff) | |
| download | synapse-c2b4621630d982a38585c177d7c960c5127620bf.tar.xz | |
Merge branch 'develop' into babolivier/mark_unread
Diffstat (limited to 'changelog.d')
| -rw-r--r-- | changelog.d/7606.bugfix | 1 | ||||
| -rw-r--r-- | changelog.d/7639.feature | 1 | ||||
| -rw-r--r-- | changelog.d/7652.doc | 1 | ||||
| -rw-r--r-- | changelog.d/7657.misc | 1 | ||||
| -rw-r--r-- | changelog.d/7663.bugfix | 1 | ||||
| -rw-r--r-- | changelog.d/7664.misc | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/changelog.d/7606.bugfix b/changelog.d/7606.bugfix new file mode 100644 index 0000000000..6c488c3996 --- /dev/null +++ b/changelog.d/7606.bugfix @@ -0,0 +1 @@ +Remove `user_id` from the response to `GET /_matrix/client/r0/presence/{userId}/status` to match the specification. diff --git a/changelog.d/7639.feature b/changelog.d/7639.feature new file mode 100644 index 0000000000..ca80fc0ca2 --- /dev/null +++ b/changelog.d/7639.feature @@ -0,0 +1 @@ +Add an option to enable encryption by default for new rooms. diff --git a/changelog.d/7652.doc b/changelog.d/7652.doc new file mode 100644 index 0000000000..c3ebbeb262 --- /dev/null +++ b/changelog.d/7652.doc @@ -0,0 +1 @@ +Spelling correction in sample_config.yaml. diff --git a/changelog.d/7657.misc b/changelog.d/7657.misc new file mode 100644 index 0000000000..384c05d2cd --- /dev/null +++ b/changelog.d/7657.misc @@ -0,0 +1 @@ +Clean-up the login fallback code. diff --git a/changelog.d/7663.bugfix b/changelog.d/7663.bugfix new file mode 100644 index 0000000000..b58316b34f --- /dev/null +++ b/changelog.d/7663.bugfix @@ -0,0 +1 @@ +Fix intermittent exception during startup, introduced in Synapse 1.14.0. diff --git a/changelog.d/7664.misc b/changelog.d/7664.misc new file mode 100644 index 0000000000..bbf0908109 --- /dev/null +++ b/changelog.d/7664.misc @@ -0,0 +1 @@ +Increase the default SAML session expirary time to 15 minutes. |