summary refs log tree commit diff
path: root/CHANGES.md
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-06-25 18:08:41 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2019-06-25 18:08:41 +0100
commit52a4a90d053022de142f0688f3edf866d261870e (patch)
tree624a72cf72c9e6ea639988bb776757bb8f6b4081 /CHANGES.md
parentFix broken link in MSC1711 FAQ (diff)
parentUpdate changelog to better expain password reset change (#5545) (diff)
downloadsynapse-52a4a90d053022de142f0688f3edf866d261870e.tar.xz
Merge branch 'release-v1.0.0'
* release-v1.0.0:
  Update changelog to better expain password reset change (#5545)
Diffstat (limited to 'CHANGES.md')
-rw-r--r--CHANGES.md6
1 files changed, 5 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 1b827c8079..284e89b266 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -52,7 +52,11 @@ Features
 - Add a script to generate new signing-key files. ([\#5361](https://github.com/matrix-org/synapse/issues/5361))
 - Update upgrade and installation guides ahead of 1.0. ([\#5371](https://github.com/matrix-org/synapse/issues/5371))
 - Replace the `perspectives` configuration section with `trusted_key_servers`, and make validating the signatures on responses optional (since TLS will do this job for us). ([\#5374](https://github.com/matrix-org/synapse/issues/5374))
-- Add ability to perform password reset via email without trusting the identity server. ([\#5377](https://github.com/matrix-org/synapse/issues/5377))
+- Add ability to perform password reset via email without trusting the identity server. **As a result of this PR, password resets will now be disabled on the default configuration.**
+
+  Password reset emails are now sent from the homeserver by default, instead of the identity server. To enable this functionality, ensure `email` and `public_baseurl` config options are filled out.
+
+  If you would like to re-enable password resets being sent from the identity server (warning: this is dangerous! See [#5345](https://github.com/matrix-org/synapse/pull/5345)), set `email.trust_identity_server_for_password_resets` to true. ([\#5377](https://github.com/matrix-org/synapse/issues/5377))
 - Set default room version to v4. ([\#5379](https://github.com/matrix-org/synapse/issues/5379))