You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/01/28 18:20:32 UTC
[1/3] git commit: ignore files
Updated Branches:
refs/heads/master 551df7809 -> 800c501c4
refs/pull/38/head [created] 9687b651b
ignore files
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4777ab2e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4777ab2e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4777ab2e
Branch: refs/heads/master
Commit: 4777ab2e92690d2be681a5f88c83108380cdc630
Parents: ed3382c
Author: Shawn Feldman <sh...@gmail.com>
Authored: Mon Jan 27 17:18:27 2014 -0700
Committer: Shawn Feldman <sh...@gmail.com>
Committed: Mon Jan 27 17:18:27 2014 -0700
----------------------------------------------------------------------
.gitignore | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4777ab2e/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index e733658..b14275b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,6 @@ Icon
/portal/performance/
/portal/node_modules/
+/portal/dist
+/portal/bower_components
+/portal/.idea
[3/3] git commit: Merge pull request #38 from shawnfeldman/master
Posted by sn...@apache.org.
Merge pull request #38 from shawnfeldman/master
Fix for url rewrite issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/800c501c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/800c501c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/800c501c
Branch: refs/heads/master
Commit: 800c501c48fe61883750bb2dd091da5f60088874
Parents: 551df78 9687b65
Author: Rod Simpson <ro...@rodsimpson.com>
Authored: Tue Jan 28 09:10:35 2014 -0800
Committer: Rod Simpson <ro...@rodsimpson.com>
Committed: Tue Jan 28 09:10:35 2014 -0800
----------------------------------------------------------------------
.gitignore | 3 +++
portal/js/global/page-controller.js | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: patch url rewrite, causes firefox issues
Posted by sn...@apache.org.
patch url rewrite, causes firefox issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9687b651
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9687b651
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9687b651
Branch: refs/heads/master
Commit: 9687b651baddd66525a66b7880cfd4935ff6a2bf
Parents: 4777ab2
Author: Shawn Feldman <sh...@gmail.com>
Authored: Tue Jan 28 10:06:04 2014 -0700
Committer: Shawn Feldman <sh...@gmail.com>
Committed: Tue Jan 28 10:06:04 2014 -0700
----------------------------------------------------------------------
portal/js/global/page-controller.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9687b651/portal/js/global/page-controller.js
----------------------------------------------------------------------
diff --git a/portal/js/global/page-controller.js b/portal/js/global/page-controller.js
index 81aafcb..eb861e4 100644
--- a/portal/js/global/page-controller.js
+++ b/portal/js/global/page-controller.js
@@ -129,8 +129,9 @@ AppServices.Controllers.controller('PageCtrl',
ug.set('token', $routeParams.access_token);
ug.set('email', $routeParams.admin_email);
ug.set('uuid', $routeParams.uuid);
- var clean_uri = location.protocol + "//" + location.host + location.pathname;
- window.history.replaceState({}, document.title, clean_uri);
+ $location.search('access_token', null);
+ $location.search('admin_email', null);
+ $location.search('uuid', null);
}
$scope.deferredLogin = $q.defer();