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/19 20:21:44 UTC
[34/55] [abbrv] git commit: Merge pull request #70 from
shawnfeldman/master
Merge pull request #70 from shawnfeldman/master
USERGRID-86: Remove restriction on 10 apps in the portal
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/51ad0923
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/51ad0923
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/51ad0923
Branch: refs/pull/76/head
Commit: 51ad0923126f14d7c90533575b98d1164b05620f
Parents: ab9fdf2 f6c3d4a
Author: Dave Johnson <da...@rollerweblogger.org>
Authored: Tue Mar 11 09:26:55 2014 -0400
Committer: Dave Johnson <da...@rollerweblogger.org>
Committed: Tue Mar 11 09:26:55 2014 -0400
----------------------------------------------------------------------
portal/config.js | 11 +-
portal/index-debug.html | 18 +-
portal/index-template.html | 2 +-
portal/index.html | 18 +-
portal/js/app.js | 7 +-
portal/js/global/page-controller.js | 58 +-
portal/js/global/page-title.html | 2 +-
portal/js/global/ug-service.js | 74 +-
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 | 171 +-
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 +-
26 files changed, 371 insertions(+), 4047 deletions(-)
----------------------------------------------------------------------