Merge branch 'joey-testing' into 'master'

Joey testing See merge request !119
2017-01-25 13:44:11 +01:00
parent 13c575179d e840def733
commit c23b8bd8e5
2 changed files with 6 additions and 7 deletions
--- a/website/public/js/registerAndLogin.js
+++ b/website/public/js/registerAndLogin.js
@@ -10,9 +10,6 @@ function bannedAlert(){
    alert("Your account is banned");
 }

-function emailNotConfirmed(userID){
-    if (confirm("Your email is not confirmed.\nPress ok to send another confirmation.") == true) {
-        sendConfirmEmail(userID);
-    } 
-
+function emailNotConfirmed(){
+    alert("Your account has not been verified yet!\nAnother email has been sent to you")
 }