usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [02/40] usergrid git commit: Merge branch 'apache/master'
Date Thu, 19 May 2016 17:18:35 GMT
Merge branch 'apache/master'

Upstream merge.


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

Branch: refs/heads/master
Commit: cba1364d4fb829b891d5688c0d41f60459851ef1
Parents: 645bef1 60d60fe
Author: Robert Walsh <rjwalsh1985@gmail.com>
Authored: Tue Feb 16 12:43:56 2016 -0600
Committer: Robert Walsh <rjwalsh1985@gmail.com>
Committed: Tue Feb 16 12:43:56 2016 -0600

----------------------------------------------------------------------
 README.md                                       |   8 +-
 content/docs/README.html                        |  18 +-
 content/docs/_sources/index.txt                 |  20 +-
 .../_sources/installation/deployment-guide.txt  | 142 +++---
 content/docs/_sources/introduction/overview.txt |  32 +-
 .../_sources/introduction/usergrid-features.txt |   4 +-
 .../docs/_sources/reference/contribute-code.txt |  41 +-
 .../creating-a-new-application.txt              |  16 +
 .../using-usergrid/creating-account.txt         |  21 +
 .../using-usergrid/using-a-sandbox-app.txt      |  39 ++
 .../_sources/using-usergrid/using-the-api.txt   | 150 ++++++
 .../file-storage-configuration.html             |  18 +-
 content/docs/assets-and-files/folders.html      |  18 +-
 .../assets-and-files/legacy-asset-support.html  |  18 +-
 .../assets-and-files/retrieving-assets.html     |  18 +-
 .../docs/assets-and-files/uploading-assets.html |  18 +-
 .../creating-and-incrementing-counters.html     |  18 +-
 .../events-and-counters.html                    |  18 +-
 .../retrieving-counters.html                    |  18 +-
 .../docs/data-queries/advanced-query-usage.html |  18 +-
 .../docs/data-queries/operators-and-types.html  |  18 +-
 content/docs/data-queries/query-parameters.html |  18 +-
 .../docs/data-queries/querying-your-data.html   |  18 +-
 content/docs/data-storage/collections.html      |  18 +-
 content/docs/data-storage/data-store-dbms.html  |  22 +-
 content/docs/data-storage/entities.html         |  18 +-
 .../docs/data-storage/optimizing-access.html    |  18 +-
 .../entity-connections/connecting-entities.html |  18 +-
 .../disconnecting-entities.html                 |  18 +-
 .../entity-connections/retrieving-entities.html |  18 +-
 content/docs/genindex.html                      |  18 +-
 content/docs/geolocation/geolocation.html       |  18 +-
 content/docs/index.html                         | 108 ++--
 content/docs/installation/deployment-guide.html | 192 ++++---
 .../docs/installation/ug1-deploy-to-tomcat.html |  46 +-
 .../installation/ug1-launcher-quick-start.html  |  45 +-
 .../docs/installation/ug2-deploy-to-tomcat.html |  18 +-
 content/docs/introduction/async-vs-sync.html    |  22 +-
 content/docs/introduction/data-model.html       |  18 +-
 content/docs/introduction/overview.html         |  82 +--
 .../docs/introduction/usergrid-features.html    |  32 +-
 content/docs/jersey2skeleton/README.html        |  18 +-
 content/docs/objects.inv                        | Bin 692 -> 686 bytes
 content/docs/orgs-and-apps/admin-user.html      |  18 +-
 content/docs/orgs-and-apps/application.html     |  18 +-
 content/docs/orgs-and-apps/managing.html        |  18 +-
 content/docs/orgs-and-apps/organization.html    |  18 +-
 .../push-notifications/adding-push-support.html |  18 +-
 .../creating-and-managing-notifications.html    |  18 +-
 .../push-notifications/creating-notifiers.html  |  18 +-
 .../push-notifications/getting-started.html     |  18 +-
 .../managing-users-and-devices.html             |  18 +-
 content/docs/push-notifications/overview.html   |  18 +-
 .../docs/push-notifications/registering.html    |  18 +-
 content/docs/push-notifications/tbd.html        |  18 +-
 .../push-notifications/troubleshooting.html     |  18 +-
 content/docs/push-notifications/tutorial.html   |  18 +-
 .../docs/push-notifications/users-devices.html  |  18 +-
 content/docs/reference/contribute-code.html     |  86 ++--
 content/docs/reference/presos-and-videos.html   |  18 +-
 content/docs/rest-endpoints/api-docs.html       |  18 +-
 content/docs/sdks/ios-new.html                  |  18 +-
 content/docs/sdks/sdk-outline.html              |  18 +-
 content/docs/sdks/tbd.html                      |  22 +-
 content/docs/search.html                        |  18 +-
 content/docs/searchindex.js                     |   2 +-
 .../docs/security-and-auth/app-security.html    |  18 +-
 .../authenticating-api-requests.html            |  18 +-
 ...nticating-users-and-application-clients.html |  18 +-
 .../changing-token-time-live-ttl.html           |  18 +-
 .../docs/security-and-auth/facebook-sign.html   |  18 +-
 .../revoking-tokens-logout.html                 |  18 +-
 .../security-and-auth/securing-your-app.html    |  18 +-
 .../user-authentication-types.html              |  18 +-
 .../security-and-auth/using-permissions.html    |  18 +-
 content/docs/security-and-auth/using-roles.html |  18 +-
 content/docs/user-management/activity.html      |  18 +-
 content/docs/user-management/group.html         |  18 +-
 content/docs/user-management/groups.html        |  18 +-
 .../docs/user-management/messagee-example.html  |  18 +-
 .../docs/user-management/user-connections.html  |  18 +-
 .../docs/user-management/user-management.html   |  18 +-
 .../docs/user-management/working-user-data.html |  18 +-
 .../creating-a-new-application.html             | 336 ++++++++++++
 .../docs/using-usergrid/creating-account.html   | 347 +++++++++++++
 .../using-usergrid/using-a-sandbox-app.html     | 372 ++++++++++++++
 content/docs/using-usergrid/using-the-api.html  | 506 +++++++++++++++++++
 .../creating-a-new-application.md               |  16 -
 docs/getting-started/creating-account.md        |  21 -
 docs/getting-started/using-a-sandbox-app.md     |  39 --
 docs/getting-started/using-the-api.md           | 150 ------
 docs/index.rst                                  |  20 +-
 docs/installation/deployment-guide.md           | 132 +++--
 docs/introduction/overview.md                   |  32 +-
 docs/introduction/usergrid-features.md          |   4 +-
 docs/reference/contribute-code.md               |  41 +-
 .../creating-a-new-application.md               |  16 +
 docs/using-usergrid/creating-account.md         |  21 +
 docs/using-usergrid/using-a-sandbox-app.md      |  39 ++
 docs/using-usergrid/using-the-api.md            | 150 ++++++
 stack/README.md                                 |  35 +-
 tests/integration/test/main.js                  |   6 +-
 tests/integration/test/teardown.js              |  16 +-
 103 files changed, 3086 insertions(+), 1443 deletions(-)
----------------------------------------------------------------------



Mime
View raw message