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 2016/02/09 21:34:06 UTC
[4/4] usergrid git commit: Merge branch 'master' into asf-site
Merge branch 'master' into asf-site
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/8a26365e
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/8a26365e
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/8a26365e
Branch: refs/heads/asf-site
Commit: 8a26365ecba81b91076c4ffb99c662324fb28f0c
Parents: 619aff3 ab6df53
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Feb 9 15:33:50 2016 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Feb 9 15:33:50 2016 -0500
----------------------------------------------------------------------
content/docs/README.html | 4 ++
content/docs/_sources/index.txt | 1 +
.../file-storage-configuration.html | 4 ++
content/docs/assets-and-files/folders.html | 4 ++
.../assets-and-files/legacy-asset-support.html | 4 ++
.../assets-and-files/retrieving-assets.html | 4 ++
.../docs/assets-and-files/uploading-assets.html | 4 ++
.../creating-and-incrementing-counters.html | 4 ++
.../events-and-counters.html | 4 ++
.../retrieving-counters.html | 4 ++
.../docs/data-queries/advanced-query-usage.html | 4 ++
.../docs/data-queries/operators-and-types.html | 4 ++
content/docs/data-queries/query-parameters.html | 4 ++
.../docs/data-queries/querying-your-data.html | 4 ++
content/docs/data-storage/collections.html | 4 ++
content/docs/data-storage/data-store-dbms.html | 4 ++
content/docs/data-storage/entities.html | 4 ++
.../docs/data-storage/optimizing-access.html | 4 ++
.../entity-connections/connecting-entities.html | 4 ++
.../disconnecting-entities.html | 4 ++
.../entity-connections/retrieving-entities.html | 4 ++
content/docs/genindex.html | 4 ++
content/docs/geolocation/geolocation.html | 4 ++
content/docs/index.html | 19 +++++++++
content/docs/installation/deployment-guide.html | 40 ++++++++++++++++++-
.../docs/installation/ug1-deploy-to-tomcat.html | 4 ++
.../installation/ug1-launcher-quick-start.html | 4 ++
.../docs/installation/ug2-deploy-to-tomcat.html | 4 ++
content/docs/introduction/async-vs-sync.html | 4 ++
content/docs/introduction/data-model.html | 4 ++
content/docs/introduction/overview.html | 4 ++
.../docs/introduction/usergrid-features.html | 4 ++
content/docs/jersey2skeleton/README.html | 4 ++
content/docs/objects.inv | Bin 673 -> 686 bytes
content/docs/orgs-and-apps/admin-user.html | 4 ++
content/docs/orgs-and-apps/application.html | 4 ++
content/docs/orgs-and-apps/managing.html | 4 ++
content/docs/orgs-and-apps/organization.html | 4 ++
.../push-notifications/adding-push-support.html | 4 ++
.../creating-and-managing-notifications.html | 4 ++
.../push-notifications/creating-notifiers.html | 4 ++
.../push-notifications/getting-started.html | 4 ++
.../managing-users-and-devices.html | 4 ++
content/docs/push-notifications/overview.html | 4 ++
.../docs/push-notifications/registering.html | 4 ++
content/docs/push-notifications/tbd.html | 4 ++
.../push-notifications/troubleshooting.html | 4 ++
content/docs/push-notifications/tutorial.html | 4 ++
.../docs/push-notifications/users-devices.html | 4 ++
content/docs/reference/contribute-code.html | 4 ++
content/docs/reference/presos-and-videos.html | 8 +++-
content/docs/rest-endpoints/api-docs.html | 4 ++
content/docs/sdks/ios-new.html | 4 ++
content/docs/sdks/sdk-outline.html | 4 ++
content/docs/sdks/tbd.html | 8 +++-
content/docs/search.html | 4 ++
content/docs/searchindex.js | 2 +-
.../docs/security-and-auth/app-security.html | 4 ++
.../authenticating-api-requests.html | 4 ++
...nticating-users-and-application-clients.html | 4 ++
.../changing-token-time-live-ttl.html | 4 ++
.../docs/security-and-auth/facebook-sign.html | 4 ++
.../revoking-tokens-logout.html | 4 ++
.../security-and-auth/securing-your-app.html | 4 ++
.../user-authentication-types.html | 4 ++
.../security-and-auth/using-permissions.html | 4 ++
content/docs/security-and-auth/using-roles.html | 4 ++
content/docs/user-management/activity.html | 4 ++
content/docs/user-management/group.html | 4 ++
content/docs/user-management/groups.html | 4 ++
.../docs/user-management/messagee-example.html | 4 ++
.../docs/user-management/user-connections.html | 4 ++
.../docs/user-management/user-management.html | 4 ++
.../docs/user-management/working-user-data.html | 4 ++
.../creating-a-new-application.html | 4 ++
.../docs/using-usergrid/creating-account.html | 4 ++
.../using-usergrid/using-a-sandbox-app.html | 4 ++
content/docs/using-usergrid/using-the-api.html | 4 ++
docs/index.rst | 1 +
79 files changed, 357 insertions(+), 6 deletions(-)
----------------------------------------------------------------------