Upgrade to v26 (#172)

* A bunch of new updates from icehrm pro

* Push changes to frontend
This commit is contained in:
Thilina Hasantha
2019-02-03 14:00:34 +01:00
committed by GitHub
parent a75325fb52
commit 16014bb38e
734 changed files with 131230 additions and 17430 deletions

View File

@@ -302,14 +302,13 @@ $csrfToken = sha1(rand(4500, 100000) . time(). CLIENT_BASE_URL);
var password = $("#password").val();
var passwordValidation = function (str) {
var val = /^[a-zA-Z0-9]\w{6,}$/;
return str != null && val.test(str);
return str.length > 7;
};
if(!passwordValidation(password)){
$("#newPasswordFormAlert").show();
$("#newPasswordFormAlert").html("Password may contain only letters, numbers and should be longer than 6 characters");
$("#newPasswordFormAlert").html("Password should be longer than 7 characters");
return;
}
@@ -331,6 +330,10 @@ $csrfToken = sha1(rand(4500, 100000) . time(). CLIENT_BASE_URL);
$("#loginForm").submit();
}
function authGoogle() {
window.location.href = window.location.href.split('login.php')[0] + "login.php?google=1";
}
</script>
<div class="container">
<?php if (defined('DEMO_MODE')) {?>