From d7d8bda0a40e82c3e11c4447b5113964a9bd9673 Mon Sep 17 00:00:00 2001
From: Michael Kroes <michael@kroes.email>
Date: Fri, 25 Mar 2016 13:37:55 +0100
Subject: [PATCH 1/3] Instructions on how to create a web site for a domain
 weren't rendered. Users would miss the step about manually creating the
 directory to put files in there and wouldn't see anything happen

---
 management/templates/web.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/management/templates/web.html b/management/templates/web.html
index 6f594eeb..6a09ef0e 100644
--- a/management/templates/web.html
+++ b/management/templates/web.html
@@ -82,7 +82,7 @@ function show_change_web_root(elem) {
   var root = $(elem).parents('tr').attr('data-custom-web-root');
   show_modal_confirm(
     'Change Root Directory for ' + domain,
-    $('<p>You can change the static directory for <tt>' + domain + '</tt> to:</p> <p><tt>' + root + '</tt></p> <p>First create this directory on the server. Then click Update to scan for the directory and update web settings.'),
+    $('<p>You can change the static directory for <tt>' + domain + '</tt> to:</p> <p><tt>' + root + '</tt></p> <p>First create this directory on the server. Then click Update to scan for the directory and update web settings.</p>'),
     'Update',
     function() { do_web_update(); });
 }

From f6e0af124f60ce46f49a2343344d970417dd7e32 Mon Sep 17 00:00:00 2001
From: david <david@socialnerds.org>
Date: Fri, 25 Mar 2016 20:16:51 +0100
Subject: [PATCH 2/3] updated html5_notifier version to 0.6.2 in setup

---
 setup/webmail.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/webmail.sh b/setup/webmail.sh
index 58faad58..053dbacc 100755
--- a/setup/webmail.sh
+++ b/setup/webmail.sh
@@ -38,7 +38,7 @@ VERSION=1.1.4
 HASH=4883c8bb39fadf8af94ffb09ee426cba9f8ef2e3
 VACATION_SIEVE_VERSION=91ea6f52216390073d1f5b70b5f6bea0bfaee7e5
 PERSISTENT_LOGIN_VERSION=1e9d724476a370ce917a2fcd5b3217b0c306c24e
-HTML5_NOTIFIER_VERSION=046eb388dd63b1ec77a3ee485757fc25ae9e684d
+HTML5_NOTIFIER_VERSION=4b370e3cd60dabd2f428a26f45b677ad1b7118d5
 UPDATE_KEY=$VERSION:$VACATION_SIEVE_VERSION:$PERSISTENT_LOGIN_VERSION:$HTML5_NOTIFIER_VERSION:a
 needs_update=0 #NODOC
 if [ ! -f /usr/local/lib/roundcubemail/version ]; then

From f292e8fc5bac5fd1a3e1158c2a34d81ebb650801 Mon Sep 17 00:00:00 2001
From: Michael Kroes <michael@kroes.email>
Date: Sat, 26 Mar 2016 14:06:43 +0100
Subject: [PATCH 3/3] Add generic login failed message

---
 management/daemon.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/management/daemon.py b/management/daemon.py
index 690f8b0f..5400925f 100755
--- a/management/daemon.py
+++ b/management/daemon.py
@@ -43,7 +43,7 @@ def authorized_personnel_only(viewfunc):
 		except ValueError as e:
 			# Authentication failed.
 			privs = []
-			error = str(e)
+			error = "Incorrect username or password"
 
 		# Authorized to access an API view?
 		if "admin" in privs:
@@ -119,7 +119,7 @@ def me():
 	except ValueError as e:
 		return json_response({
 			"status": "invalid",
-			"reason": str(e),
+			"reason": "Incorrect username or password",
 			})
 
 	resp = {