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/03/07 17:22:03 UTC
[61/61] [abbrv] git commit: Merge
44805da27273483d6bf89a7f42e92c87dd214b08 into
d565e79879a7bd74b254ddbfa0d04ad5ec6bc043
Merge 44805da27273483d6bf89a7f42e92c87dd214b08 into d565e79879a7bd74b254ddbfa0d04ad5ec6bc043
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/8206b107
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/8206b107
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/8206b107
Branch: refs/pull/70/merge
Commit: 8206b107e24f0997e5400751e0393e090f4a43ec
Parents: d565e79 44805da
Author: Shawn Feldman <sh...@gmail.com>
Authored: Fri Mar 7 16:19:58 2014 +0000
Committer: Shawn Feldman <sh...@gmail.com>
Committed: Fri Mar 7 16:19:58 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(-)
----------------------------------------------------------------------