Merge branch 'master' into lars

2017-01-25 16:19:07 +01:00
parent 91fae80326 c23b8bd8e5
commit 9046b397a1
7 changed files with 28 additions and 23 deletions
--- a/website/public/js/registerAndLogin.js
+++ b/website/public/js/registerAndLogin.js
@@ -8,4 +8,8 @@ function checkLoggedIn() {

 function bannedAlert(){
    alert("Your account is banned");
+}
+
+function emailNotConfirmed(){
+    alert("Your account has not been verified yet!\nAnother email has been sent to you")
 }