Merge branch 'joey-testing' into 'master'

redesigned code See merge request !115
2017-01-25 11:20:15 +01:00
parent d19639d1c3 981e34c950
commit 93ddefa42f
8 changed files with 55 additions and 28 deletions
--- a/website/public/js/registerAndLogin.js
+++ b/website/public/js/registerAndLogin.js
@@ -4,5 +4,8 @@ function checkLoggedIn() {
    } else {
        window.location.href = "profile.php";
    }
-    document.getElementById("demo").innerHTML = x;
 }
+
+function bannedAlert(){
+    alert("Your account is banned");
+}