Merge remote-tracking branch 'origin/develop'

Serubin · May 2, 2015 · a89554d · a89554d
2 parents 27e5319 + cab4df9
commit a89554d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/web/js/app.js b/web/js/app.js
@@ -36,7 +36,7 @@ $(function() {
 
 		//log.debug("App", "No start page, redirecting");
 		// redirect to landing intro page
-		ph.pageRequest("/about");
+		ph.pageRequest("/dashboard");
 		return;
 	}
 

diff --git a/web/js/login.js b/web/js/login.js
@@ -15,7 +15,7 @@ function login() {
 	$(document).foundation({
 		abide: {
 			patterns: {
-				password: /^([a-zA-Z0-9@*#&.^!]{8,64})$/
+				password: /^([a-zA-Z0-9@*#&$.^!]{8,64})$/
 			}
 		}
 	});

diff --git a/web/js/register.js b/web/js/register.js
@@ -18,7 +18,7 @@ function register() {
 	$(document).foundation({
 		abide: {
 			patterns: {
-				password: /^([a-zA-Z0-9@*#&.^!]{8,64})$/
+				password: /^([a-zA-Z0-9@*#&$.^!]{8,64})$/
 			}
 		}
 	});