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/27 23:21:34 UTC
[40/50] [abbrv] git commit: Merge pull request #83 from
shawnfeldman/master
Merge pull request #83 from shawnfeldman/master
USERGRID-105 - Add contextual help to usergrid 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/3090ddcd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3090ddcd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3090ddcd
Branch: refs/pull/80/merge
Commit: 3090ddcdfc57fff5d0e7237464b90c2ef7d27242
Parents: 8fc27ea 6d1e26b
Author: Rod Simpson <ro...@rodsimpson.com>
Authored: Thu Mar 27 13:17:17 2014 -0600
Committer: Rod Simpson <ro...@rodsimpson.com>
Committed: Thu Mar 27 13:17:17 2014 -0600
----------------------------------------------------------------------
.gitignore | 1 +
portal/Gruntfile.js | 138 +++++++-
portal/appsvc-ui.2.0.1.zip | Bin 0 -> 17166385 bytes
portal/archive/index.html | 21 ++
portal/archive/js/app/console.js | 4 +
portal/bower.json | 7 +-
portal/config.js | 16 +
portal/css/dash.min.css | 2 +-
portal/css/main.css | 259 +++++++++++++-
portal/img/introjs_arrow_step_next.png | Bin 0 -> 219 bytes
portal/img/introjs_arrow_step_next_disabled.png | Bin 0 -> 220 bytes
portal/img/introjs_arrow_step_prev.png | Bin 0 -> 217 bytes
portal/img/introjs_arrow_step_prev_disabled.png | Bin 0 -> 218 bytes
portal/img/introjs_close.png | Bin 0 -> 274 bytes
portal/index-debug.html | 46 +--
portal/index-template.html | 34 +-
portal/index.html | 46 +--
portal/js/app.js | 255 ++++++++++----
portal/js/data/shell-controller.js | 9 -
portal/js/global/help-service.js | 140 ++++++++
portal/js/global/page-controller.js | 348 ++++++++++---------
portal/js/global/ug-service.js | 17 +-
.../libs/bootstrap/custom/css/bootstrap.min.css | 2 +-
portal/js/libs/usergrid-libs.min.js | 22 +-
portal/js/libs/usergrid.sdk.js | 4 +-
portal/js/login/login-controller.js | 10 +-
portal/js/login/login.html | 3 +-
.../js/org-overview/org-overview-controller.js | 4 +-
portal/js/org-overview/org-overview.html | 149 ++++----
portal/js/org-overview/org-overview.html.orig | 188 ++++++++++
portal/js/roles/roles.html | 9 +-
portal/js/shell/shell-controller.js | 5 +-
portal/js/shell/shell.html | 1 +
portal/js/templates.js | 163 +++++----
portal/js/usergrid-dev.min.js | 161 +++++++--
portal/js/usergrid.min.js | 10 +-
portal/package.json | 17 +-
.../instrument/js/usergrid-coverage.min.js | 6 +
.../test/coverage/instrument/js/usergrid.min.js | 3 +
portal/tests/protractor/applications.spec.js | 2 +-
.../tests/protractor/coverage/coverage.spec.js | 7 +
portal/tests/protractor/data.spec.js | 2 +-
portal/tests/protractor/forgotPassword.spec.js | 4 +-
portal/tests/protractor/login.spec.js | 45 +++
portal/tests/protractor/organization.spec.js | 2 +-
portal/tests/protractor/profile.spec.js | 6 +-
portal/tests/protractor/roles.spec.js | 40 +++
portal/tests/protractor/shell.spec.js | 121 +++++++
portal/tests/protractor/users.spec.js | 45 +--
portal/tests/protractor/util.js | 81 ++++-
portal/tests/protractorConf.js | 3 +-
portal/tests/unit/sample.spec.js | 1 +
52 files changed, 1883 insertions(+), 576 deletions(-)
----------------------------------------------------------------------