You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ro...@apache.org on 2014/12/11 02:50:56 UTC
[11/11] incubator-usergrid git commit: Merge remote-tracking branch
'apps4u/master' into apache_usergrid/master
Merge remote-tracking branch 'apps4u/master' into apache_usergrid/master
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3032dfaa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3032dfaa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3032dfaa
Branch: refs/heads/master
Commit: 3032dfaa18fbb59f64309e57f5d53db21f879987
Parents: cad90cd 9ffe2b0
Author: Rod Simpson <ro...@apigee.com>
Authored: Wed Dec 10 18:50:38 2014 -0700
Committer: Rod Simpson <ro...@apigee.com>
Committed: Wed Dec 10 18:50:38 2014 -0700
----------------------------------------------------------------------
.../Examples/attrubites/attributes.php | 122 +
.../Examples/collections/books.php | 26 +-
.../Examples/collections/data.php | 40 +-
.../Examples/collections/users.php | 29 +-
sdks/php5/apache-usergrid/Examples/examples.php | 5 +-
.../Examples/management/management.php | 4 +-
.../Examples/messages/messages.php | 2 +-
.../Examples/notifications/notifications.php | 2 +-
.../Examples/notifications/notifiers.php | 7 +-
sdks/php5/apache-usergrid/README.md | 28 +-
sdks/php5/apache-usergrid/composer.json | 2 +-
sdks/php5/apache-usergrid/composer.lock | 183 +-
.../src/Api/Exception/BadRequestException.php | 3 +-
.../src/Api/Exception/NotFoundException.php | 3 +-
.../src/Api/Exception/ServerErrorException.php | 3 +-
.../src/Api/Exception/UnauthorizedException.php | 3 +-
.../src/Api/Exception/UsergridException.php | 15 +-
.../src/Api/Models/BaseCollection.php | 66 +-
.../apache-usergrid/src/Api/Models/Device.php | 15 +-
.../apache-usergrid/src/Api/Models/Group.php | 54 +
.../src/Api/Models/GuzzleCommandTrait.php | 9 +
.../apache-usergrid/src/Api/Models/Notifier.php | 36 +
.../src/Api/Models/Organization.php | 22 -
.../apache-usergrid/src/Api/Models/Receipt.php | 36 +
.../apache-usergrid/src/Api/Models/Role.php | 54 +
.../apache-usergrid/src/Api/Models/User.php | 42 +-
.../apache-usergrid/src/Api/QueryAggregator.php | 2 +-
.../src/Api/ResourceIterator.php | 2 +-
sdks/php5/apache-usergrid/src/Api/Usergrid.php | 319 +-
.../Oauth2/GrantType/AuthorizationCode.php | 4 +-
.../Oauth2/GrantType/ClientCredentials.php | 1 -
.../GrantType/HWIOAuthBundleRefreshToken.php | 2 +-
.../Oauth2/GrantType/PasswordCredentials.php | 5 +-
.../Plugin/Oauth2/GrantType/RefreshToken.php | 1 -
.../src/Guzzle/Plugin/Oauth2/Oauth2Plugin.php | 104 +-
.../Laravel/ApacheUsergridServiceProvider.php | 40 +-
.../src/Manifests/1.0.0/Errors.php | 71 +-
.../src/Manifests/1.0.1/Application.php | 3 -
.../src/Manifests/1.0.1/Custom.php | 3 +-
.../src/Manifests/1.0.1/Devices.php | 88 +-
.../src/Manifests/1.0.1/Groups.php | 19 +-
.../src/Manifests/1.0.1/Notifiers.php | 39 +-
.../src/Manifests/1.0.1/Roles.php | 15 +-
.../src/Manifests/1.0.1/Users.php | 3 +-
.../src/Manifests/Application.php | 985 ----
.../src/Manifests/Management.php | 1381 ------
.../apache-usergrid/src/Manifests/Manifest.php | 23 -
.../apache-usergrid/src/Manifests/Usergrid.php | 4689 ------------------
.../src/Manifests/applications.json | 1262 -----
.../src/Manifests/management.json | 1905 -------
.../src/Manifests/resources.json | 15 -
.../Manifests/swagger-json/applications.json | 1262 +++++
.../src/Manifests/swagger-json/management.json | 1905 +++++++
.../src/Manifests/swagger-json/resources.json | 15 +
.../src/Native/Facades/Usergrid.php | 63 +-
.../src/Native/UsergridBootstrapper.php | 25 +-
sdks/php5/apache-usergrid/src/config/config.php | 12 -
.../tests/Api/ApplicationTest.php | 2 +-
.../apache-usergrid/tests/Api/AttributeTest.php | 59 +
.../Api/Exception/BadRequestExceptionTest.php | 4 +-
.../Api/Exception/InvalidIdExceptionTest.php | 4 +-
.../Api/Exception/NotFoundExceptionTest.php | 4 +-
.../Api/Exception/ServerErrorExceptionTest.php | 4 +-
.../Api/Exception/UnauthorizedExceptionTest.php | 4 +-
.../tests/Api/Filters/BooleanTest.php | 2 +-
.../tests/Api/Filters/DateTest.php | 2 +-
.../tests/Api/ManagementTest.php | 2 +-
.../tests/Api/QueryAggregatorTest.php | 2 -
.../apache-usergrid/tests/Api/UsergridTest.php | 8 +-
.../tests/Laravel/Facades/UsergridTest.php | 2 +-
sdks/php5/apache-usergrid/tests/bootstrap.php | 14 +-
71 files changed, 4389 insertions(+), 10798 deletions(-)
----------------------------------------------------------------------