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/28 17:21:32 UTC
[39/50] [abbrv] git commit: Merge branch 'master' into two-dot-o
Merge branch 'master' into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f9d44a91
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f9d44a91
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f9d44a91
Branch: refs/heads/asyncqueue
Commit: f9d44a919fd4df70b116ec77eedb5fba7927804d
Parents: aae2a8d cf814a4
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Mar 25 11:45:36 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Mar 25 11:45:36 2014 -0400
----------------------------------------------------------------------
LICENSE | 65 +-
NOTICE | 11 +
README.md | 64 +-
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 +-
sdks/html5-javascript/README.md | 206 +-
sdks/html5-javascript/changelog.md | 10 +-
sdks/html5-javascript/lib/Usergrid.js | 13 +-
sdks/html5-javascript/lib/modules/Asset.js | 4 +-
sdks/html5-javascript/lib/modules/Client.js | 74 +-
sdks/html5-javascript/lib/modules/Folder.js | 4 +-
sdks/html5-javascript/package.json | 2 +-
sdks/html5-javascript/tests/mocha/test.js | 25 +
sdks/html5-javascript/usergrid.js | 36 +-
sdks/html5-javascript/usergrid.min.js | 6 +-
sdks/ios/UGAPI/UGActivity.h | 17 +
sdks/ios/UGAPI/UGActivity.m | 17 +
sdks/ios/UGAPI/UGClient.h | 17 +
sdks/ios/UGAPI/UGClient.m | 17 +
sdks/ios/UGAPI/UGClientDelegate.h | 17 +
sdks/ios/UGAPI/UGClientResponse.h | 17 +
sdks/ios/UGAPI/UGClientResponse.m | 17 +
sdks/ios/UGAPI/UGHTTPManager.h | 17 +
sdks/ios/UGAPI/UGHTTPManager.m | 17 +
sdks/ios/UGAPI/UGMultiStepAction.h | 17 +
sdks/ios/UGAPI/UGMultiStepAction.m | 17 +
sdks/ios/UGAPI/UGQuery.h | 17 +
sdks/ios/UGAPI/UGQuery.m | 17 +
sdks/ios/UGAPI/UGUser.h | 17 +
sdks/ios/UGAPI/UGUser.m | 23 +-
sdks/ios/UGAPIApp/UGAPIApp-Prefix.pch | 17 +
sdks/ios/UGAPIApp/UGAppAppDelegate.h | 23 +-
sdks/ios/UGAPIApp/UGAppAppDelegate.m | 23 +-
sdks/ios/UGAPIApp/UGAppViewController.h | 23 +-
sdks/ios/UGAPIApp/UGAppViewController.m | 23 +-
sdks/ios/UGAPIApp/main.m | 23 +-
sdks/ios/UGAPIAppTests/UGAPIAppTests.h | 23 +-
sdks/ios/UGAPIAppTests/UGAPIAppTests.m | 23 +-
.../lib/usergrid_ironhorse/query.rb | 30 +-
.../lib/usergrid_ironhorse/version.rb | 2 +-
.../spec/usergrid_ironhorse/base_spec.rb | 8 +-
sdks/ruby-on-rails/usergrid_ironhorse.gemspec | 4 +-
.../1.5.4/AppleJavaExtensions-1.5.4.jar | Bin 0 -> 23531 bytes
.../1.5.4/AppleJavaExtensions-1.5.4.pom | 9 +
.../maven-metadata-local.xml | 12 +
stack/pom.xml | 5 +-
.../applications/ApplicationResource.java | 1 -
.../main/resources/swagger/applications.json | 16 -
.../src/main/resources/swagger/management.json | 16 -
.../src/main/resources/swagger/resources.json | 16 -
stack/services/pom.xml | 6 +-
.../management/export/ExportServiceImpl.java | 59 +-
.../management/export/S3ExportImpl.java | 10 +-
.../cassandra/ManagementServiceIT.java | 290 +-
.../management/cassandra/MockS3ExportImpl.java | 1 -
79 files changed, 1491 insertions(+), 4371 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f9d44a91/stack/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f9d44a91/stack/rest/src/main/resources/swagger/applications.json
----------------------------------------------------------------------