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 2015/08/07 23:07:06 UTC
[29/29] incubator-usergrid git commit: Merge branch 'master' into
asf-site
Merge branch 'master' into asf-site
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c207d3f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c207d3f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c207d3f4
Branch: refs/heads/asf-site
Commit: c207d3f481e7fdd7859d34a6c736f2b835344b76
Parents: 891578f 7662bc9
Author: Dave Johnson <sn...@apache.org>
Authored: Fri Aug 7 17:06:09 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Fri Aug 7 17:06:09 2015 -0400
----------------------------------------------------------------------
content/docs/README.html | 22 +-
content/docs/_sources/README.txt | 11 +-
.../file-storage-configuration.txt | 39 +
.../docs/_sources/assets-and-files/folders.txt | 85 +
.../assets-and-files/legacy-asset-support.txt | 0
.../assets-and-files/retrieving-assets.txt | 27 +
.../assets-and-files/uploading-assets.txt | 86 +
.../data-queries/operators-and-types.txt | 2 +-
.../_sources/data-queries/query-parameters.txt | 2 +-
.../data-queries/querying-your-data.txt | 2 +-
.../docs/_sources/data-storage/collections.txt | 8 +-
.../_sources/data-storage/data-store-dbms.txt | 12 +-
content/docs/_sources/data-storage/entities.txt | 10 +-
.../entity-connections/retrieving-entities.txt | 9 +-
.../docs/_sources/geolocation/geolocation.txt | 2 +-
.../creating-a-new-application.txt | 6 +-
.../getting-started/creating-account.txt | 6 +-
.../getting-started/using-a-sandbox-app.txt | 2 +-
.../_sources/getting-started/using-the-api.txt | 2 +-
content/docs/_sources/index.txt | 14 +-
.../docs/_sources/introduction/data-model.txt | 30 +-
content/docs/_sources/introduction/overview.txt | 17 +
.../_sources/introduction/usergrid-features.txt | 28 +-
.../docs/_sources/orgs-and-apps/admin-user.txt | 2 +-
.../docs/_sources/orgs-and-apps/application.txt | 2 +-
.../docs/_sources/rest-endpoints/api-docs.txt | 1162 ++++-----
content/docs/_sources/sdks/ios-new.txt | 982 ++++++++
content/docs/_sources/sdks/ios.txt | 108 +-
content/docs/_sources/sdks/sdk-outline.txt | 111 +
.../authenticating-api-requests.txt | 6 +-
...enticating-users-and-application-clients.txt | 6 +-
.../security-and-auth/facebook-sign.txt | 2 +-
.../user-authentication-types.txt | 6 +-
.../security-and-auth/using-permissions.txt | 4 +-
.../_sources/security-and-auth/using-roles.txt | 304 +++
.../docs/_sources/user-management/activity.txt | 17 +-
content/docs/_sources/user-management/group.txt | 12 +-
.../user-management/messagee-example.txt | 2 +-
.../user-management/working-user-data.txt | 12 +-
content/docs/_static/css/theme.css | 168 +-
.../file-storage-configuration.html | 322 +++
content/docs/assets-and-files/folders.html | 391 +++
.../assets-and-files/legacy-asset-support.html | 280 +++
.../assets-and-files/retrieving-assets.html | 359 +++
.../docs/assets-and-files/uploading-assets.html | 419 ++++
.../creating-and-incrementing-counters.html | 11 +-
.../events-and-counters.html | 15 +-
.../retrieving-counters.html | 11 +-
.../docs/data-queries/advanced-query-usage.html | 11 +-
.../docs/data-queries/operators-and-types.html | 15 +-
content/docs/data-queries/query-parameters.html | 14 +-
.../docs/data-queries/querying-your-data.html | 15 +-
content/docs/data-storage/collections.html | 35 +-
content/docs/data-storage/data-store-dbms.html | 31 +-
content/docs/data-storage/entities.html | 38 +-
.../docs/data-storage/optimizing-access.html | 11 +-
.../entity-connections/connecting-entities.html | 11 +-
.../disconnecting-entities.html | 11 +-
.../entity-connections/retrieving-entities.html | 25 +-
content/docs/genindex.html | 11 +-
content/docs/geolocation/geolocation.html | 17 +-
.../creating-a-new-application.html | 29 +-
.../docs/getting-started/creating-account.html | 28 +-
.../getting-started/using-a-sandbox-app.html | 26 +-
content/docs/getting-started/using-the-api.html | 14 +-
content/docs/index.html | 91 +-
.../docs/installation/ug1-deploy-to-tomcat.html | 11 +-
.../installation/ug1-launcher-quick-start.html | 11 +-
.../docs/installation/ug2-deploy-to-tomcat.html | 11 +-
content/docs/introduction/async-vs-sync.html | 15 +-
content/docs/introduction/data-model.html | 41 +-
content/docs/introduction/overview.html | 320 +++
.../docs/introduction/usergrid-features.html | 78 +-
content/docs/objects.inv | Bin 663 -> 666 bytes
content/docs/orgs-and-apps/admin-user.html | 91 +-
content/docs/orgs-and-apps/application.html | 26 +-
content/docs/orgs-and-apps/managing.html | 11 +-
content/docs/orgs-and-apps/organization.html | 11 +-
content/docs/push-notifications/tbd.html | 11 +-
.../docs/push-notifications/users-devices.html | 11 +-
content/docs/reference/contribute-code.html | 11 +-
content/docs/reference/presos-and-videos.html | 11 +-
content/docs/rest-endpoints/api-docs.html | 1226 ++++-----
content/docs/rest-endpoints/api-reference.html | 2350 +++++++-----------
content/docs/sdks/ios-new.html | 1310 ++++++++++
content/docs/sdks/ios.html | 133 +-
content/docs/sdks/sdk-outline.html | 503 ++++
content/docs/sdks/tbd.html | 11 +-
content/docs/search.html | 11 +-
content/docs/searchindex.js | 2 +-
.../docs/security-and-auth/app-security.html | 11 +-
.../authenticating-api-requests.html | 23 +-
...nticating-users-and-application-clients.html | 33 +-
.../changing-token-time-live-ttl.html | 11 +-
.../docs/security-and-auth/facebook-sign.html | 13 +-
.../revoking-tokens-logout.html | 11 +-
.../security-and-auth/securing-your-app.html | 11 +-
.../user-authentication-types.html | 32 +-
.../security-and-auth/using-permissions.html | 23 +-
content/docs/security-and-auth/using-roles.html | 740 ++++++
content/docs/user-management/activity.html | 50 +-
content/docs/user-management/group.html | 38 +-
content/docs/user-management/groups.html | 11 +-
.../docs/user-management/messagee-example.html | 15 +-
.../docs/user-management/user-connections.html | 11 +-
.../docs/user-management/user-management.html | 11 +-
.../docs/user-management/working-user-data.html | 46 +-
docs/README.md | 2 +-
docs/_static/css/theme.css | 168 +-
docs/asset-and-files/assets.md | 20 -
.../file-storage-configuration.md | 39 -
docs/asset-and-files/folders.md | 85 -
docs/asset-and-files/legacy-asset-support.md | 0
docs/asset-and-files/retrieving-assets.md | 27 -
docs/asset-and-files/uploading-assets.md | 86 -
.../file-storage-configuration.md | 39 +
docs/assets-and-files/folders.md | 85 +
docs/assets-and-files/legacy-asset-support.md | 0
docs/assets-and-files/retrieving-assets.md | 27 +
docs/assets-and-files/uploading-assets.md | 86 +
docs/data-queries/operators-and-types.md | 2 +-
docs/data-queries/query-language.md | 427 ----
docs/data-queries/query-parameters.md | 2 +-
docs/data-queries/querying-your-data.md | 2 +-
docs/data-storage/collections.md | 8 +-
docs/data-storage/data-store-dbms.md | 12 +-
docs/data-storage/entities.md | 10 +-
docs/entity-connections/relationships.md | 98 -
docs/entity-connections/retrieving-entities.md | 9 +-
docs/geolocation/geolocation.md | 2 +-
docs/geolocation/tbd.md | 1 -
.../creating-a-new-application.md | 6 +-
docs/getting-started/creating-account.md | 6 +-
docs/getting-started/using-a-sandbox-app.md | 2 +-
docs/getting-started/using-the-api.md | 2 +-
docs/index.rst | 14 +-
docs/introduction/data-model.md | 30 +-
docs/introduction/overview.md | 17 +
docs/introduction/usergrid-features.md | 28 +-
docs/orgs-and-apps/admin-user.md | 2 +-
docs/orgs-and-apps/application.md | 2 +-
docs/rest-endpoints/api-docs.md | 1162 ++++-----
docs/sdks/ios-new.md | 982 ++++++++
docs/sdks/java.md | 1 -
docs/sdks/javascript.md | 3 -
docs/sdks/sdk-outline.md | 111 +
docs/sdks/usage.md | 16 -
.../authenticating-api-requests.md | 6 +-
...henticating-users-and-application-clients.md | 6 +-
docs/security-and-auth/facebook-sign.md | 2 +-
.../user-authentication-types.md | 6 +-
docs/security-and-auth/using-permissions.md | 4 +-
docs/security-and-auth/using-roles.md | 304 +++
.../main/groovy/usergrid/ApiDocGenerator.groovy | 49 +-
docs/src/main/resources/file-end-html.mustache | 13 -
.../src/main/resources/file-start-html.mustache | 21 -
docs/src/main/resources/html/file-end.mustache | 13 +
.../src/main/resources/html/file-start.mustache | 21 +
docs/src/main/resources/html/model.mustache | 38 +
docs/src/main/resources/html/operation.mustache | 43 +
.../main/resources/markdown/file-start.mustache | 13 +
docs/src/main/resources/markdown/model.mustache | 21 +
.../main/resources/markdown/operation.mustache | 21 +
docs/src/main/resources/model-html.mustache | 38 -
docs/src/main/resources/model.mustache | 21 -
docs/src/main/resources/operation-html.mustache | 43 -
docs/src/main/resources/operation.mustache | 21 -
docs/src/main/resources/usergrid-swagger.yaml | 818 +++---
docs/update-api-docs.sh | 2 +-
docs/user-management/activity.md | 17 +-
docs/user-management/group.md | 12 +-
docs/user-management/messagee-example.md | 2 +-
docs/user-management/working-user-data.md | 12 +-
sdks/android/README.md | 3 +-
sdks/html5-javascript/README.md | 2 +
sdks/ios/README.md | 3 +-
sdks/nodejs/readme.md | 2 +
sdks/ruby/README.md | 2 +-
178 files changed, 12195 insertions(+), 5880 deletions(-)
----------------------------------------------------------------------