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/04/10 22:22:55 UTC
[50/63] [abbrv] git commit: Merge pull request #102 from
shawnfeldman/master
Merge pull request #102 from shawnfeldman/master
adding license headers for apache
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1e918e69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1e918e69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1e918e69
Branch: refs/pull/99/merge
Commit: 1e918e6954a0e2bf42d267cbb0f60157feebf9f7
Parents: d8221a1 7eaa535
Author: Rod Simpson <ro...@rodsimpson.com>
Authored: Thu Apr 10 13:27:52 2014 -0600
Committer: Rod Simpson <ro...@rodsimpson.com>
Committed: Thu Apr 10 13:27:52 2014 -0600
----------------------------------------------------------------------
portal/Gruntfile.js | 41 +-
portal/config.js | 29 +-
portal/css/apigeeGlobalNavigation.css | 17 +
portal/css/main.css | 18 +
portal/dist/rel-usergrid-portal.2.0.3.zip | Bin 16313787 -> 0 bytes
portal/dist/usergrid-portal.2.0.3.zip | Bin 0 -> 16277601 bytes
.../angular-intro.js/Gruntfile.js | 40 +
.../angular-intro.js/angular-intro.js | 60 -
.../angular-intro.js/bower.json | 4 +-
.../angular-intro.js/build/angular-intro.min.js | 3 +-
.../angular-intro.js/example/app.js | 86 +-
.../angular-intro.js/lib/app.js | 49 -
.../angular-intro.js/lib/intro.min.js | 20 -
.../angular-intro.js/lib/introjs.css | 216 -
.../angular-intro.js/package.json | 36 +
.../angular-intro.js/src/angular-intro.js | 60 +
.../bower_components/angular/angular-csp.css | 5 -
.../bower_components/angular/angular.js | 276 +-
.../bower_components/angular/angular.min.js | 354 +-
.../angular/angular.min.js.gzip | Bin 38778 -> 38793 bytes
.../bower_components/angular/angular.min.js.map | 4 +-
.../bower_components/angular/bower.json | 2 +-
.../apigee-sdk/samples/books/index.html | 139 +
.../apigee-sdk/samples/collections/index.html | 91 +
.../apigee-sdk/samples/entities/index.html | 86 +
.../apigee-sdk/samples/geolocation/index.html | 75 +
.../apigee-sdk/samples/messagee/index.html | 176 +
.../apigee-sdk/samples/monitoring/index.html | 113 +
.../samples/push/android/assets/www/index.html | 51 +
.../apigee-sdk/samples/push/ios/www/index.html | 48 +
.../apigee-sdk/samples/readmeSample/index.html | 64 +
.../samples/usersAndGroups/index.html | 159 +
.../bower_components/apigee.max.ui/bower.json | 19 -
.../apigee.max.ui/dist/css/max.min.css | 1 -
.../apigee.max.ui/dist/img/no-data1.png | Bin 45300 -> 0 bytes
.../apigee.max.ui/dist/img/phone-small.gif | Bin 1300 -> 0 bytes
.../apigee.max.ui/dist/img/tablet-small.gif | Bin 1390 -> 0 bytes
.../apigee.max.ui/dist/js/max-dev.min.js | 1781 -------
.../apigee.max.ui/dist/js/max.min.js | 4 -
.../intro.js/example/RTL/index.html | 81 +
.../assets/css/bootstrap-responsive.min.css | 9 +
.../example/assets/css/bootstrap.min.css | 9 +
.../intro.js/example/assets/css/demo.css | 36 +
.../assets/img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes
.../example/assets/img/glyphicons-halflings.png | Bin 0 -> 12799 bytes
.../intro.js/example/custom-class/index.html | 84 +
.../intro.js/example/hello-world/index.html | 72 +
.../example/hello-world/withoutBullets.html | 72 +
.../example/hello-world/withoutButtons.html | 72 +
.../intro.js/example/html-tooltip/index.html | 108 +
.../intro.js/example/index.html | 35 +
.../intro.js/example/multi-page/index.html | 73 +
.../intro.js/example/multi-page/second.html | 75 +
.../intro.js/example/programmatic/index.html | 107 +
.../bower_components/jquery/src/var/trim.js | 3 -
.../bower_components/sizzle/test/index.html | 242 +
portal/dist/usergrid-portal/config.js | 29 +-
portal/dist/usergrid-portal/index-debug.html | 31 +-
portal/dist/usergrid-portal/index-template.html | 31 +-
portal/dist/usergrid-portal/index.html | 31 +-
.../js/libs/usergrid-libs.min.js | 4 +-
.../js/libs/usergrid-libs.min.js.orig | 26 -
.../dist/usergrid-portal/js/usergrid-dev.min.js | 14 +-
portal/dist/usergrid-portal/js/usergrid.min.js | 8 +-
portal/index-debug.html | 49 +-
portal/index-template.html | 49 +-
portal/index.html | 49 +-
portal/js/activities/activities-controller.js | 19 +
.../js/app-overview/app-overview-controller.js | 20 +-
.../app-overview/getting-started-controller.js | 20 +-
portal/js/app.js | 21 +-
portal/js/data/data-controller.js | 20 +-
portal/js/data/entity-controller.js | 20 +-
portal/js/data/shell-controller.js | 0
portal/js/data/shell.html | 16 -
portal/js/dialogs/balloon-directive.js | 19 +
portal/js/dialogs/modal-directive.js | 19 +
portal/js/global/alert-controller.js | 20 +-
portal/js/global/alert-directive.js | 18 +
portal/js/global/app-switcher-directive.js | 18 +
portal/js/global/help-service.js | 18 +
portal/js/global/insecure-banner.js | 18 +
portal/js/global/page-constants.js | 19 +
portal/js/global/page-controller.js | 59 +-
portal/js/global/page-title.js | 18 +
portal/js/global/ug-service.js | 18 +
portal/js/global/util-directive.js | 18 +
portal/js/global/utility-service.js | 19 +
portal/js/global/validate-directive.js | 18 +
.../js/groups/groups-activities-controller.js | 20 +-
portal/js/groups/groups-controller.js | 20 +-
portal/js/groups/groups-details-controller.js | 20 +-
portal/js/groups/groups-members-controller.js | 20 +-
portal/js/groups/groups-roles-controller.js | 20 +-
portal/js/login/forgot-password-controller.js | 20 +-
portal/js/login/login-controller.js | 20 +-
portal/js/login/logout-controller.js | 20 +-
portal/js/login/register-controller.js | 20 +-
portal/js/menus/menu-directives.js | 19 +
.../js/org-overview/org-overview-controller.js | 20 +-
portal/js/org-overview/org-overview.html.orig | 188 -
portal/js/profile/account-controller.js | 18 +
portal/js/profile/organizations-controller.js | 18 +
portal/js/profile/profile-controller.js | 18 +
portal/js/roles/roles-controller.js | 19 +
portal/js/roles/roles-groups-controller.js | 18 +
portal/js/roles/roles-settings-controller.js | 18 +
portal/js/roles/roles-users-controller.js | 18 +
portal/js/shell/shell-controller.js | 19 +
portal/js/templates.js | 20 -
portal/js/usergrid-dev.min.js.orig | 4939 ------------------
portal/js/usergrid.min.js.orig | 6 -
portal/js/users/users-activities-controller.js | 20 +-
portal/js/users/users-controller.js | 19 +-
portal/js/users/users-feed-controller.js | 20 +-
portal/js/users/users-graph-controller.js | 19 +-
portal/js/users/users-groups-controller.js | 19 +-
portal/js/users/users-profile-controller.js | 20 +-
portal/js/users/users-roles-controller.js | 19 +
portal/package.json | 2 +-
.../js/usergrid-coverage.min.js.BACKUP.31213.js | 6 -
.../js/usergrid-coverage.min.js.BASE.31213.js | 6 -
.../js/usergrid-coverage.min.js.LOCAL.31213.js | 6 -
.../js/usergrid-coverage.min.js.REMOTE.31213.js | 0
portal/tests/karma.conf.js | 2 +-
125 files changed, 3769 insertions(+), 7868 deletions(-)
----------------------------------------------------------------------