summary refs log tree commit diff
diff options
context:
space:
mode:
authorOlivier Wilkinson (reivilibre) <oliverw@matrix.org>2022-08-02 11:56:02 +0100
committerOlivier Wilkinson (reivilibre) <oliverw@matrix.org>2022-08-02 11:56:02 +0100
commita2a867b521015ae544f3dbaa4cf2c8fda71bbd67 (patch)
tree395bcb3e83324a2b847de21d3d156b667196aed1
parentFaster Room Joins: don't leave a stuck room partial state flag if the join fa... (diff)
parentMention specific version in rc2 notes (diff)
downloadsynapse-a2a867b521015ae544f3dbaa4cf2c8fda71bbd67.tar.xz
Merge branch 'master' into develop
-rw-r--r--CHANGES.md17
-rw-r--r--debian/changelog6
-rw-r--r--docs/upgrade.md10
-rw-r--r--pyproject.toml2
4 files changed, 33 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 78c5d3038a..0e69f25e0e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,7 +1,22 @@
+Synapse 1.64.0 (2022-08-02)
+===========================
+
+No significant changes since 1.64.0rc2.
+
+
+Deprecation Warning
+-------------------
+
+Synapse v1.66.0 will remove the ability to delegate the tasks of verifying email address ownership, and password reset confirmation, to an identity server.
+
+If you require your homeserver to verify e-mail addresses or to support password resets via e-mail, please configure your homeserver with SMTP access so that it can send e-mails on its own behalf.
+[Consult the configuration documentation for more information.](https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#email)
+
+
 Synapse 1.64.0rc2 (2022-07-29)
 ==============================
 
-This RC reintroduces support for `account_threepid_delegates.email`, which was removed in 1.64.0rc1. It remains deprecated and will be removed altogether in a future release. ([\#13406](https://github.com/matrix-org/synapse/issues/13406))
+This RC reintroduces support for `account_threepid_delegates.email`, which was removed in 1.64.0rc1. It remains deprecated and will be removed altogether in Synapse v1.66.0. ([\#13406](https://github.com/matrix-org/synapse/issues/13406))
 
 
 Synapse 1.64.0rc1 (2022-07-26)
diff --git a/debian/changelog b/debian/changelog
index 6a2dbdf322..9efcb4f132 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.64.0) stable; urgency=medium
+
+  * New Synapse release 1.64.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 02 Aug 2022 10:32:30 +0100
+
 matrix-synapse-py3 (1.64.0~rc2) stable; urgency=medium
 
   * New Synapse release 1.64.0rc2.
diff --git a/docs/upgrade.md b/docs/upgrade.md
index 73ed209975..47a74b67de 100644
--- a/docs/upgrade.md
+++ b/docs/upgrade.md
@@ -91,6 +91,16 @@ process, for example:
 
 # Upgrading to v1.64.0
 
+## Deprecation of the ability to delegate e-mail verification to identity servers
+
+Synapse v1.66.0 will remove the ability to delegate the tasks of verifying email address ownership, and password reset confirmation, to an identity server.
+
+If you require your homeserver to verify e-mail addresses or to support password resets via e-mail, please configure your homeserver with SMTP access so that it can send e-mails on its own behalf.
+[Consult the configuration documentation for more information.](https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#email)
+
+The option that will be removed is `account_threepid_delegates.email`.
+
+
 ## Changes to the event replication streams
 
 Synapse now includes a flag indicating if an event is an outlier when
diff --git a/pyproject.toml b/pyproject.toml
index 4e8f7ae4f1..af7def0c53 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ skip_gitignore = true
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.64.0rc2"
+version = "1.64.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"