summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-06-11 00:25:07 +0100
committerGitHub <noreply@github.com>2019-06-11 00:25:07 +0100
commit2ddc13577c93505b887880fa715def9addeafafe (patch)
tree1fde49e429bd6180acf715ed6d79196b3d48790e /changelog.d
parentadd monthly active users to phonehome stats (#5252) (diff)
downloadsynapse-2ddc13577c93505b887880fa715def9addeafafe.tar.xz
Don't warn user about password reset disabling through config code (#5387)
Moves the warning about password resets being disabled to the point where a user actually tries to reset their password. Is this an appropriate place for it to happen?

Also removed the disabling of msisdn password resets when you don't have an email config, as that just doesn't make sense.

Also change the error a user receives upon disabled passwords to specify that only email-based password reset is disabled.
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/5387.bugfix1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/5387.bugfix b/changelog.d/5387.bugfix
new file mode 100644
index 0000000000..2c6c94efc4
--- /dev/null
+++ b/changelog.d/5387.bugfix
@@ -0,0 +1 @@
+Warn about disabling email-based password resets when a reset occurs, and remove warning when someone attempts a phone-based reset.