Merge 44805da27273483d6bf89a7f42e92c87dd214b08 into ab9fdf2e5251a6b79376d7d7c9a89349c108b66a
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b3eae384 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b3eae384 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b3eae384 Branch: refs/pull/70/merge Commit: b3eae3848e4135cec033941268ec2d22e9a25522 Parents: ab9fdf2 44805da Author: Shawn Feldman <[email protected]> Authored: Mon Mar 10 20:07:38 2014 +0000 Committer: Shawn Feldman <[email protected]> Committed: Mon Mar 10 20:07:38 2014 +0000 ---------------------------------------------------------------------- portal/Gruntfile.js | 30 + portal/bower.json | 1 + portal/config.js | 26 +- portal/index-debug.html | 18 +- portal/index-template.html | 2 +- portal/index.html | 18 +- portal/js/app.js | 16 +- portal/js/global/page-controller.js | 66 +- portal/js/global/page-title.html | 2 +- portal/js/global/ug-service.js | 76 +- portal/js/libs/usergrid-libs.min.js | 22 +- portal/js/libs/usergrid.sdk.js | 5 + portal/js/login/forgot-password-controller.js | 1 - portal/js/login/login-controller.js | 8 +- portal/js/login/login.html | 6 + portal/js/menus/appMenu.html | 7 +- portal/js/menus/menu-directives.js | 1 - portal/js/org-overview/org-overview.html | 4 +- portal/js/templates.js | 57 +- portal/js/usergrid-dev.min.js | 187 +- portal/js/usergrid.min.js | 12 +- portal/js/users/users-feed-controller.js | 29 + portal/js/users/users-feed.html | 27 + portal/js/users/users.html | 1 + portal/package.json | 5 +- portal/phantomjsdriver.log | 3869 -------------------- portal/seleniumLog.txt | 0 portal/tests/unit/sample.spec.js | 3 +- 28 files changed, 449 insertions(+), 4050 deletions(-) ----------------------------------------------------------------------
