Merge branch 'soon' into staging

2018-08-07 11:40:50 +02:00
parent a65e083fca 24c7ce57e1
commit f5172fd05f
3 changed files with 6 additions and 0 deletions
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -428,6 +428,10 @@ define([
                return;
            }

+            if (oldPassword === newPassword) {
+                return void UI.alert(Messages.settings_changePasswordNewPasswordSameAsOld);
+            }
+
            UI.confirm(Messages.settings_changePasswordConfirm,
            function (yes) {
                if (!yes) { return; }