You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ro...@apache.org on 2014/11/13 02:19:31 UTC
[1/2] incubator-usergrid git commit: Fix USERGRID-225 by allowing
${blah} expressions in paths.
Repository: incubator-usergrid
Updated Branches:
refs/heads/master 3e0ab8d3a -> ed0c9dcec
Fix USERGRID-225 by allowing ${blah} expressions in paths.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d0877962
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d0877962
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d0877962
Branch: refs/heads/master
Commit: d087796277bb96d90e895284a987273852451852
Parents: a367a5f
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Oct 3 14:28:04 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Oct 3 14:28:04 2014 -0400
----------------------------------------------------------------------
portal/config.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d0877962/portal/config.js
----------------------------------------------------------------------
diff --git a/portal/config.js b/portal/config.js
index e04ba9d..eab37c2 100644
--- a/portal/config.js
+++ b/portal/config.js
@@ -52,7 +52,7 @@ Usergrid.regex = {
roleNameRegex: new RegExp("^([0-9a-zA-Z./-]{3,25})+$"),
emailRegex: new RegExp("^(([0-9a-zA-Z]+[_\+.-]?)+@[0-9a-zA-Z]+[0-9,a-z,A-Z,.,-]*(.){1}[a-zA-Z]{2,4})+$"),
passwordRegex: /(?=^.{8,}$)((?=.*\d)|(?=.*\W+))(?![.\n])(?=.*[A-Z])(?=.*[a-z]).*$/,
- pathRegex: new RegExp("^/[a-zA-Z0-9\.\*_~-]+(\/[a-zA-Z0-9\.\*_~-]+)*$"),
+ pathRegex: new RegExp("^/[a-zA-Z0-9\.\*_\$\{\}~-]+(\/[a-zA-Z0-9\.\*_\$\{\}~-]+)*$"),
titleRegex: new RegExp("[a-zA-Z0-9.!-?]+[\/]?"),
urlRegex: new RegExp("^(http?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$"),
zipRegex: new RegExp("^[0-9]{5}(?:-[0-9]{4})?$"),
[2/2] incubator-usergrid git commit: Merge remote-tracking branch
'snoopdave/usergrid-225' into apache_usergrid/master
Posted by ro...@apache.org.
Merge remote-tracking branch 'snoopdave/usergrid-225' into apache_usergrid/master
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ed0c9dce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ed0c9dce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ed0c9dce
Branch: refs/heads/master
Commit: ed0c9dcec070afbbed2e62ee5d0c300a0726a90f
Parents: 3e0ab8d d087796
Author: Rod Simpson <ro...@apigee.com>
Authored: Wed Nov 12 18:18:46 2014 -0700
Committer: Rod Simpson <ro...@apigee.com>
Committed: Wed Nov 12 18:18:46 2014 -0700
----------------------------------------------------------------------
portal/config.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ed0c9dce/portal/config.js
----------------------------------------------------------------------