usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [03/17] git commit: Merging from usergrid/usergrid
Date Thu, 13 Mar 2014 15:20:51 GMT
Merging from usergrid/usergrid


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/dee2ca98
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/dee2ca98
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/dee2ca98

Branch: refs/pull/71/merge
Commit: dee2ca98330294101c4a5258910cb75fbac7205b
Parents: c0ba7b0 7ea7503
Author: ryan bridges <rbridges@apigee.com>
Authored: Thu Mar 13 10:28:40 2014 -0400
Committer: ryan bridges <rbridges@apigee.com>
Committed: Thu Mar 13 10:28:40 2014 -0400

----------------------------------------------------------------------
 .gitignore                                      |    9 +-
 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/lib/modules/Folder.js     |    4 +-
 sdks/html5-javascript/usergrid.js               |    4 +-
 sdks/html5-javascript/usergrid.min.js           |    2 +-
 .../org/apache/usergrid/persistence/Query.java  |    5 +-
 .../usergrid/persistence/entities/Export.java   |  158 +
 .../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                                   |    7 +-
 .../rest/management/ManagementResource.java     |   15 +-
 .../applications/ApplicationResource.java       |  181 +-
 .../rest/management/ManagementResourceIT.java   |  497 ++-
 .../usergrid/management/export/ExportJob.java   |   81 +
 .../management/export/ExportService.java        |   48 +
 .../management/export/ExportServiceImpl.java    |  608 +++
 .../usergrid/management/export/S3Export.java    |   35 +
 .../management/export/S3ExportImpl.java         |  109 +
 .../services/AbstractCollectionService.java     |    3 +
 .../resources/usergrid-services-context.xml     |   10 +
 .../org/apache/usergrid/ServiceITSetup.java     |    3 +
 .../org/apache/usergrid/ServiceITSetupImpl.java |    6 +
 .../cassandra/ManagementServiceIT.java          |  707 +++-
 .../management/cassandra/MockS3ExportImpl.java  |   72 +
 .../RepairingMismatchedApplicationMetadata.java |   73 +
 51 files changed, 3001 insertions(+), 4075 deletions(-)
----------------------------------------------------------------------



Mime
View raw message