You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/08/26 17:40:12 UTC
[01/36] usergrid git commit: Adding operation and model
cross-references to Markdown representation
Repository: usergrid
Updated Branches:
refs/heads/entity-size c47b02d41 -> c08ad5125
http://git-wip-us.apache.org/repos/asf/usergrid/blob/f9a354b2/docs/rest-endpoints/api-docs.md
----------------------------------------------------------------------
diff --git a/docs/rest-endpoints/api-docs.md b/docs/rest-endpoints/api-docs.md
index a21be09..3a1b748 100644
--- a/docs/rest-endpoints/api-docs.md
+++ b/docs/rest-endpoints/api-docs.md
@@ -31,7 +31,7 @@ Login with Admin-User or Organization credentials.
<h3>Parameters</h3>
-* __login-credentials__ ([LoginCredentials](#LoginCredentials))
+* __login-credentials__ ([LoginCredentials](#logincredentials))
Login credentials either username/password or id/secret. (Specified in body).
<h3>Responses</h3>
@@ -53,7 +53,7 @@ Login with App-User or Application credentials.
<h3>Parameters</h3>
-* __login-credentials__ ([LoginCredentials](#LoginCredentials))
+* __login-credentials__ ([LoginCredentials](#logincredentials))
Login credentials either username/password or id/secret. (Specified in body).
<h3>Responses</h3>
@@ -110,7 +110,7 @@ One of the organization's identification which includes name or uuid. (Speci
One of the application's identification which includes name or uuid. (Specified in path).
* __userId-3__ (string)
One of the user's identification which includes username or UUID. (Specified in path).
-* __CreateActivity__ ([CreateActivity](#CreateActivity))
+* __CreateActivity__ ([CreateActivity](#createactivity))
One or more sets of activity properties. (Specified in body).
<h3>Responses</h3>
@@ -207,7 +207,7 @@ Create a whole new admin user.
<h3>Parameters</h3>
-* __CreateAdminUser__ ([CreateAdminUser](#CreateAdminUser))
+* __CreateAdminUser__ ([CreateAdminUser](#createadminuser))
User entity with fields required for User creation. (Specified in body).
<h3>Responses</h3>
@@ -249,7 +249,7 @@ Complete the password reset through getting the newpassword and the old one for
<h3>Parameters</h3>
-* __ResetPWMsg__ ([ResetPWMsg](#ResetPWMsg))
+* __ResetPWMsg__ ([ResetPWMsg](#resetpwmsg))
Parameters and value for the Captcha challenge, the admin user's response to the Captcha challenge, and the admin user's email address. (Specified in body).
<h3>Responses</h3>
@@ -343,7 +343,7 @@ Update an admin user's password through getting the newpassword and the old
* __userId__ (string)
One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
-* __ResetPW__ ([ResetPW](#ResetPW))
+* __ResetPW__ ([ResetPW](#resetpw))
The user's old and new password. (Specified in body).
<h3>Responses</h3>
@@ -420,7 +420,7 @@ Create a user in the users collection through providing all the identifications.
One of the organization's identification which includes name or uuid. (Specified in path).
* __appId__ (string)
One of the application's identification which includes name or uuid. (Specified in path).
-* __CreateUser__ ([CreateUser](#CreateUser))
+* __CreateUser__ ([CreateUser](#createuser))
The properties of the user. (Specified in body).
<h3>Responses</h3>
@@ -526,7 +526,7 @@ One of the organization's identification which includes name or uuid. (Speci
One of the application's identification which includes name or uuid. (Specified in path).
* __username__ (string)
The username of the user. (Specified in path).
-* __ResetPW__ ([ResetPW](#ResetPW))
+* __ResetPW__ ([ResetPW](#resetpw))
The user's old and new password. (Specified in body).
<h3>Responses</h3>
@@ -737,7 +737,7 @@ One of the application's identification which includes name or uuid. (Specif
One of the collection's identification which includes name or uuid. (Specified in path).
* __entityId__ (string)
One of the entity's identification which includes name or uuid. (Specified in path).
-* __entityproperty__ ([CreateEntities](#CreateEntities))
+* __entityproperty__ ([CreateEntities](#createentities))
The properties of the entity. (Specified in body).
<h3>Responses</h3>
@@ -793,7 +793,7 @@ One of the organization's identification which includes name or uuid. (Speci
One of the application's identification which includes name or uuid. (Specified in path).
* __entitytype__ (string)
The entity type to create. (Specified in path).
-* __entityproperty__ ([CreateEntities](#CreateEntities))
+* __entityproperty__ ([CreateEntities](#createentities))
The properties of the entity. (Specified in body).
<h3>Responses</h3>
@@ -822,7 +822,7 @@ Create an event through providing both Id of organization and application.
One of the organization's identification which includes name or uuid. (Specified in path).
* __appId__ (string)
One of the application's identification which includes name or uuid. (Specified in path).
-* __CreateEvent__ ([CreateEvent](#CreateEvent))
+* __CreateEvent__ ([CreateEvent](#createevent))
The required property of the event. (Specified in body).
<h3>Responses</h3>
@@ -851,7 +851,7 @@ Create a new group through providing both Id of organization and application.
One of the organization's identification which includes name or uuid. (Specified in path).
* __appId__ (string)
One of the application's identification which includes name or uuid. (Specified in path).
-* __groupproperty__ ([CreateGroup](#CreateGroup))
+* __groupproperty__ ([CreateGroup](#creategroup))
The property of the created group. (Specified in body).
<h3>Responses</h3>
@@ -879,7 +879,7 @@ One of the organization's identification which includes name or uuid. (Speci
One of the application's identification which includes name or uuid. (Specified in path).
* __groupId__ (string)
One of the group's identification which includes name or uuid. (Specified in path).
-* __CreateActivity__ ([CreateActivity](#CreateActivity))
+* __CreateActivity__ ([CreateActivity](#createactivity))
One or more sets of activity properties. (Specified in body).
<h3>Responses</h3>
@@ -1016,7 +1016,7 @@ Create notifications for user through targeting by location and providing all th
One of the organization's identification which includes name or uuid. (Specified in path).
* __applicationId__ (string)
One of the application's identification which includes name or uuid (same as appId). (Specified in path).
-* __notification__ ([CreateNotifications](#CreateNotifications))
+* __notification__ ([CreateNotifications](#createnotifications))
These parameters are used when forming the notification portion of the request. (Specified in body).
* __queryStatement__ (string)
The query statement of the location of the user. (Specified in query).
@@ -1044,7 +1044,7 @@ Create notifications for all devices. This request will target all device entiti
One of the organization's identification which includes name or uuid. (Specified in path).
* __applicationId__ (string)
One of the application's identification which includes name or uuid (same as appId). (Specified in path).
-* __notification__ ([CreateNotifications](#CreateNotifications))
+* __notification__ ([CreateNotifications](#createnotifications))
These parameters are used when forming the notification portion of the request. (Specified in body).
<h3>Responses</h3>
@@ -1072,7 +1072,7 @@ One of the organization's identification which includes name or uuid. (Speci
One of the application's identification which includes name or uuid (same as appId). (Specified in path).
* __deviceId__ (string)
One of the device's identification which includes name or uuid. (Specified in path).
-* __notification__ ([CreateNotifications](#CreateNotifications))
+* __notification__ ([CreateNotifications](#createnotifications))
These parameters are used when forming the notification portion of the request. (Specified in body).
<h3>Responses</h3>
@@ -1100,7 +1100,7 @@ One of the organization's identification which includes name or uuid. (Speci
One of the application's identification which includes name or uuid. (Specified in path).
* __path__ (string)
The path of the group. (Specified in path).
-* __notification__ ([CreateNotifications](#CreateNotifications))
+* __notification__ ([CreateNotifications](#createnotifications))
These parameters are used when forming the notification portion of the request. (Specified in body).
<h3>Responses</h3>
@@ -1152,7 +1152,7 @@ One of the organization's identification which includes name or uuid. (Speci
One of the application's identification which includes name or uuid (same as appId). (Specified in path).
* __notificationId__ (string)
One of the notification's identification which includes name or uuid. (Specified in path).
-* __notificationUpdate__ ([NotificationUpdate](#NotificationUpdate))
+* __notificationUpdate__ ([NotificationUpdate](#notificationupdate))
Object with Notification fields to be updated. (Specified in body).
<h3>Responses</h3>
@@ -1230,7 +1230,7 @@ One of the organization's identification which includes name or uuid. (Speci
One of the application's identification which includes name or uuid (same as appId). (Specified in path).
* __userId-3__ (string)
One of the user's identification which includes username or UUID. (Specified in path).
-* __notification__ ([CreateNotifications](#CreateNotifications))
+* __notification__ ([CreateNotifications](#createnotifications))
These parameters are used when forming the notification portion of the request. (Specified in body).
<h3>Responses</h3>
@@ -1359,7 +1359,7 @@ Create an organization through a form post.
<h3>Parameters</h3>
-* __CreateOrg__ ([CreateOrg](#CreateOrg))
+* __CreateOrg__ ([CreateOrg](#createorg))
A set of organization properties supplied through a form. (Specified in body).
<h3>Responses</h3>
@@ -1664,7 +1664,7 @@ Create a new role through providing all the identifications.
One of the organization's identification which includes name or uuid. (Specified in path).
* __appId__ (string)
One of the application's identification which includes name or uuid. (Specified in path).
-* __roleproperty__ ([AddRole](#AddRole))
+* __roleproperty__ ([AddRole](#addrole))
The required properties of the role. (Specified in body).
<h3>Responses</h3>
@@ -1692,7 +1692,7 @@ One of the organization's identification which includes name or uuid. (Speci
One of the application's identification which includes name or uuid. (Specified in path).
* __roleId__ (string)
One of the role's identification which includes name or uuid. (Specified in path).
-* __Permissions__ ([Permissions](#Permissions))
+* __Permissions__ ([Permissions](#permissions))
The query statement of the url pattern. (Specified in body).
<h3>Responses</h3>
@@ -1854,7 +1854,7 @@ One of the organization's identification which includes name or uuid. (Speci
One of the application's identification which includes name or uuid. (Specified in path).
* __roleId__ (string)
One of the role's identification which includes name or uuid. (Specified in path).
-* __Permissions__ ([Permissions](#Permissions))
+* __Permissions__ ([Permissions](#permissions))
Permissions object with array of Usergrid Permission strings to be added. (Specified in body).
<h3>Responses</h3>
@@ -1875,1465 +1875,2170 @@ This section lists the properties for the Usergrid Default Entities:
### AccessTokenResponse
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>access_token</td>
- <td>string</td>
- <td>Access-token that may be used on subsequent requests.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>expires_in</td>
- <td>number</td>
- <td>Time (in milliseconds) until access-token expires.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>user</td>
- <td>ref</td>
- <td>User object if login was done as a user.</td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>access_token</td>
+ <td>
+ string
+ </td>
+ <td>Access-token that may be used on subsequent requests.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>expires_in</td>
+ <td>
+ number
+ </td>
+ <td>Time (in milliseconds) until access-token expires.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>user</td>
+ <td>
+ [User](#user)
+ </td>
+ <td>User object if login was done as a user.</td>
+ <td>false</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/management/token](#op-MhD5hWgRwK)
+* [/{orgId}/{appId}/token](#op-9TDlDc0BL3)
+
+
+
### Action
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>action</td>
- <td>string</td>
- <td>The requested action.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>status</td>
- <td>string</td>
- <td>The status of the requested action.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>timestamp</td>
- <td>number</td>
- <td>The timestamp of the requested action.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>duration</td>
- <td>number</td>
- <td>The duration of the requested action.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>token</td>
- <td>string</td>
- <td>The token required for getting an AdminUser.</td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>action</td>
+ <td>
+ string
+ </td>
+ <td>The requested action.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>status</td>
+ <td>
+ string
+ </td>
+ <td>The status of the requested action.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>timestamp</td>
+ <td>
+ number
+ </td>
+ <td>The timestamp of the requested action.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>duration</td>
+ <td>
+ number
+ </td>
+ <td>The duration of the requested action.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>token</td>
+ <td>
+ string
+ </td>
+ <td>The token required for getting an AdminUser.</td>
+ <td>false</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/management/users/resetpw](#op-AiNhPeeyiq)
+* [/{orgId}/{appId}/users/{user}/password](#op-d0NWF6YZuK)
+* [/management/orgs/{orgId}/activate](#op-5138i0P1q8)
+* [/management/users/{userId}/activate](#op-c9LsV7Ulbr)
+* [/management/orgs/{orgId}/reactivate](#op-RIuF55JkgX)
+* [/management/users/{userId}/reactivate](#op-jk8tbzHamj)
+* [/management/users/{userId}/password](#op-yjg1hntm4R)
+
+
+__Referring Definitions__
+
+* [Receipt](#receipt)
+* [Device](#device)
+* [Notification](#notification)
+* [Role](#role)
+* [Event](#event)
+* [Group](#group)
+* [Credential](#credential)
+* [Organization](#organization)
+* [AppData](#appdata)
+* [User](#user)
+* [ActivityFeed](#activityfeed)
+
+
### ActivityFeed
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>entityproperty</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>category</td>
- <td>string</td>
- <td>The category of the activity.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>metadataproperty</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>objectproperty</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>title</td>
- <td>string</td>
- <td>The title of the activity.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>verb</td>
- <td>string</td>
- <td>The verb of the activity.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>published</td>
- <td>number</td>
- <td>UTC timestamp of the feed publish time.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>completeMsg</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>entityproperty</td>
+ <td>
+ [Entity](#entity)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>category</td>
+ <td>
+ string
+ </td>
+ <td>The category of the activity.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>metadataproperty</td>
+ <td>
+ [Metadata](#metadata)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>objectproperty</td>
+ <td>
+ [Object](#object)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>title</td>
+ <td>
+ string
+ </td>
+ <td>The title of the activity.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>verb</td>
+ <td>
+ string
+ </td>
+ <td>The verb of the activity.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>published</td>
+ <td>
+ number
+ </td>
+ <td>UTC timestamp of the feed publish time.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>completeMsg</td>
+ <td>
+ [Action](#action)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/{orgId}/{appId}/users/{userId}/activities](#op-SgbcdXdHSq)
+* [/{orgId}/{appId}/users/{userId}/feed](#op-JOpALhJR9x)
+* [/management/orgs/{orgId}/feed](#op-FsWAA6TQ6j)
+* [/{orgId}/{appId}/groups/{groupId}/feed](#op-vjWBovszxD)
+* [/management/users/{userId}/feed](#op-oyQqxIeMTj)
+* [/{orgId}/{appId}/groups/{groupId}/activities](#op-Y8sHuGSnUK)
+
+
+
### AddRole
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>title</td>
- <td>string</td>
- <td>The title of the role.</td>
- <td>true</td>
- </tr>
- <tr>
- <td>role name</td>
- <td>string</td>
- <td>The name of the role.</td>
- <td>true</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>title</td>
+ <td>
+ string
+ </td>
+ <td>The title of the role.</td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td>role name</td>
+ <td>
+ string
+ </td>
+ <td>The name of the role.</td>
+ <td>true</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/{orgId}/{appId}/roles](#op-77UvdX1AKS)
+
+
+
### AppData
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>tester/sandbox</td>
- <td>string</td>
- <td>The UUID of tester/sandbox.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>tester/app1</td>
- <td>string</td>
- <td>The UUID of tester/app1.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>tester/app2</td>
- <td>string</td>
- <td>The UUID of tester/app2.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>completeMsg</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>tester/sandbox</td>
+ <td>
+ string
+ </td>
+ <td>The UUID of tester/sandbox.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>tester/app1</td>
+ <td>
+ string
+ </td>
+ <td>The UUID of tester/app1.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>tester/app2</td>
+ <td>
+ string
+ </td>
+ <td>The UUID of tester/app2.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>completeMsg</td>
+ <td>
+ [Action](#action)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/management/orgs/{orgId}/apps](#op-FxESea37Iw)
+* [/management/orgs/{orgId}/apps/{appId}](#op-dfDXMn6FHh)
+
+
+__Referring Definitions__
+
+* [Organization](#organization)
+
+
### CreateActivity
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>displayName</td>
- <td>string</td>
- <td></td>
- <td>true</td>
- </tr>
- <tr>
- <td>uuid</td>
- <td>string</td>
- <td></td>
- <td>true</td>
- </tr>
- <tr>
- <td>username</td>
- <td>string</td>
- <td></td>
- <td>true</td>
- </tr>
- <tr>
- <td>image</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>verb</td>
- <td>string</td>
- <td></td>
- <td>true</td>
- </tr>
- <tr>
- <td>content</td>
- <td>string</td>
- <td></td>
- <td>true</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>displayName</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td>uuid</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td>username</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td>image</td>
+ <td>
+ [ImageModel](#imagemodel)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>verb</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td>content</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>true</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/{orgId}/{appId}/users/{userId}/activities](#op-SgbcdXdHSq)
+* [/{orgId}/{appId}/groups/{groupId}/activities](#op-Y8sHuGSnUK)
+
+
+
### CreateAdminUser
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>username</td>
- <td>string</td>
- <td></td>
- <td>true</td>
- </tr>
- <tr>
- <td>email</td>
- <td>string</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>name</td>
- <td>string</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>password</td>
- <td>string</td>
- <td></td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>username</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td>email</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>name</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>password</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/management/users](#op-OrsKI3OblZ)
+
+
+
### CreateEntities
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/{orgId}/{appId}/{entitytype}](#op-vhYugcLtOU)
+* [/{orgId}/{appId}/{collectionId}/{entityId}](#op-rIFHtzBMnq)
+
+
+
### CreateEvent
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>timestamp</td>
- <td>string</td>
- <td></td>
- <td>true</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>timestamp</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>true</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/{orgId}/{appId}/events](#op-tbL4sW2gO4)
+
+
+
### CreateGroup
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>title</td>
- <td>string</td>
- <td>The title of the group.</td>
- <td>true</td>
- </tr>
- <tr>
- <td>path</td>
- <td>string</td>
- <td>The path of the group.</td>
- <td>true</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>title</td>
+ <td>
+ string
+ </td>
+ <td>The title of the group.</td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td>path</td>
+ <td>
+ string
+ </td>
+ <td>The path of the group.</td>
+ <td>true</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/{orgId}/{appId}/groups](#op-cSFYOwc349)
+
+
+
### CreateNotifications
+An array of Notifications to be created.
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/{orgId}/{applicationId}/groups/{path}/notifications](#op-HcxsWWHJuW)
+* [/{orgId}/{applicationId}/devices](#op-tHQHlcVc6O)
+* [/{orgId}/{applicationId}/devices/{deviceId}/notifications](#op-DhaimEfP36)
+* [/{orgId}/{applicationId}/users/{userId}/notifications](#op-GqqUlXEpw0)
+* [/{orgId}/{applicationId}/devices/*/notifications](#op-9Av28Sb6xD)
+
+
+
### CreateOrg
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>organization</td>
- <td>string</td>
- <td></td>
- <td>true</td>
- </tr>
- <tr>
- <td>username</td>
- <td>string</td>
- <td></td>
- <td>true</td>
- </tr>
- <tr>
- <td>name</td>
- <td>string</td>
- <td></td>
- <td>true</td>
- </tr>
- <tr>
- <td>email</td>
- <td>string</td>
- <td></td>
- <td>true</td>
- </tr>
- <tr>
- <td>password</td>
- <td>string</td>
- <td></td>
- <td>true</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>organization</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td>username</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td>name</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td>email</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td>password</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>true</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/management/orgs](#op-10Xly2uR81)
+
+
+
### CreateUser
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>username</td>
- <td>string</td>
- <td></td>
- <td>true</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>username</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>true</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/{orgId}/{appId}/users](#op-B3JxnPdQnX)
+
+
+
### Credential
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>client_Id</td>
- <td>string</td>
- <td>The Id of the client.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>client_secret</td>
- <td>string</td>
- <td>The secret of the client.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>completeMsg</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>client_Id</td>
+ <td>
+ string
+ </td>
+ <td>The Id of the client.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>client_secret</td>
+ <td>
+ string
+ </td>
+ <td>The secret of the client.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>completeMsg</td>
+ <td>
+ [Action](#action)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/management/orgs/{orgId}/credentials](#op-yvf6XFwT9U)
+* [/management/orgs/{orgId}/apps/{appId}/credentials](#op-BQVtNYKbr6)
+* [/management/orgs/{orgId}/credentials](#op-x2rOvoWwdu)
+* [/management/orgs/{orgId}/apps/{appId}/credentials](#op-l2sf6CY3kb)
+
+
+
### Device
+Represents a single Device that is registered for recieving of Push Notifications.
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>uuid</td>
- <td>string</td>
- <td>Unique entity Id.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>type</td>
- <td>string</td>
- <td>Type of entity.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>name</td>
- <td>string</td>
- <td>Notifier display name.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>created</td>
- <td>number</td>
- <td>UTC timestamp in milliseconds of when the entity was created.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>modified</td>
- <td>number</td>
- <td>UTC timestamp in milliseconds of when the entity was last modified.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>metadata</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>completeMsg</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>uuid</td>
+ <td>
+ string
+ </td>
+ <td>Unique entity Id.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>type</td>
+ <td>
+ string
+ </td>
+ <td>Type of entity.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>name</td>
+ <td>
+ string
+ </td>
+ <td>Notifier display name.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>created</td>
+ <td>
+ number
+ </td>
+ <td>UTC timestamp in milliseconds of when the entity was created.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>modified</td>
+ <td>
+ number
+ </td>
+ <td>UTC timestamp in milliseconds of when the entity was last modified.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>metadata</td>
+ <td>
+ [Metadata](#metadata)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>completeMsg</td>
+ <td>
+ [Action](#action)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/{orgId}/{applicationId}/{notificationId}/*/queue](#op-813WAQfcPn)
+
+
+
### Entity
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>uuid</td>
- <td>string</td>
- <td>The UUID of the entity.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>type</td>
- <td>string</td>
- <td>The type of the entity.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>created</td>
- <td>number</td>
- <td>UTC timestamp of entity creation time.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>modified</td>
- <td>ref</td>
- <td>UTC timestamp of entity modified time.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>metadata</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>name</td>
- <td>string</td>
- <td>The name of the entity.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>message</td>
- <td>string</td>
- <td></td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>uuid</td>
+ <td>
+ string
+ </td>
+ <td>The UUID of the entity.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>type</td>
+ <td>
+ string
+ </td>
+ <td>The type of the entity.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>created</td>
+ <td>
+ number
+ </td>
+ <td>UTC timestamp of entity creation time.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>modified</td>
+ <td>
+ [Actor](#actor)
+ </td>
+ <td>UTC timestamp of entity modified time.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>metadata</td>
+ <td>
+ [Metadata](#metadata)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>name</td>
+ <td>
+ string
+ </td>
+ <td>The name of the entity.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>message</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/{orgId}/{appId}/{collectionId}/{entityId}](#op-6bY9NIsNDh)
+* [/{orgId}/{appId}/{collectionId}](#op-uUIPNDp91Q)
+* [/{orgId}/{appId}/users/{userId}/{relation}](#op-p76OEoqzeq)
+* [/{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2}](#op-fqEhlK2uYz)
+* [/{orgId}/{appId}/{collectionId}/{entityId}](#op-gMtdxV5Km7)
+* [/{orgId}/{appId}/{collectionId}](#op-JNUUZzf2XB)
+* [/{orgId}/{appId}/{entitytype}](#op-vhYugcLtOU)
+* [/{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2}](#op-HEKlO2fyjg)
+* [/{orgId}/{appId}/{collectionId}/{entityId}](#op-rIFHtzBMnq)
+
+
+__Referring Definitions__
+
+* [Role](#role)
+* [Event](#event)
+* [ActivityFeed](#activityfeed)
+
+
### Error
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>code</td>
- <td>integer</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>message</td>
- <td>string</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>fields</td>
- <td>object</td>
- <td></td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>code</td>
+ <td>
+ integer
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>message</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>fields</td>
+ <td>
+ object
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
</table>
+
+
### Event
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>applicationName</td>
- <td>string</td>
- <td>The application name of the event.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>entity</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>url</td>
- <td>string</td>
- <td>The url of the event.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>applicationId</td>
- <td>string</td>
- <td>The application UUID of the event.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>parameters</td>
- <td>string</td>
- <td>The parameters of the event.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>organization</td>
- <td>string</td>
- <td>The title of the organization.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>completeMsg</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>applicationName</td>
+ <td>
+ string
+ </td>
+ <td>The application name of the event.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>entity</td>
+ <td>
+ [Entity](#entity)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>url</td>
+ <td>
+ string
+ </td>
+ <td>The url of the event.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>applicationId</td>
+ <td>
+ string
+ </td>
+ <td>The application UUID of the event.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>parameters</td>
+ <td>
+ string
+ </td>
+ <td>The parameters of the event.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>organization</td>
+ <td>
+ string
+ </td>
+ <td>The title of the organization.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>completeMsg</td>
+ <td>
+ [Action](#action)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/{orgId}/{appId}/events](#op-tbL4sW2gO4)
+
+
+
### Group
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>uuid</td>
- <td>string</td>
- <td>The UUID of the group.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>type</td>
- <td>string</td>
- <td>The type of the group.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>created</td>
- <td>string</td>
- <td>The created Id for the group.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>modified</td>
- <td>string</td>
- <td>The modified Id for the group.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>path</td>
- <td>string</td>
- <td>The path of the group.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>metadata</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>title</td>
- <td>string</td>
- <td>The title of the group.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>completeMsg</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>uuid</td>
+ <td>
+ string
+ </td>
+ <td>The UUID of the group.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>type</td>
+ <td>
+ string
+ </td>
+ <td>The type of the group.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>created</td>
+ <td>
+ string
+ </td>
+ <td>The created Id for the group.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>modified</td>
+ <td>
+ string
+ </td>
+ <td>The modified Id for the group.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>path</td>
+ <td>
+ string
+ </td>
+ <td>The path of the group.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>metadata</td>
+ <td>
+ [Metadata](#metadata)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>title</td>
+ <td>
+ string
+ </td>
+ <td>The title of the group.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>completeMsg</td>
+ <td>
+ [Action](#action)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/{orgId}/{appId}/groups](#op-cSFYOwc349)
+* [/{org_Id}/{app_Id}/groups/{groupId}](#op-DN1sgDsfHL)
+* [/{org_Id}/{app_Id}/groups/{groupId}](#op-WJCUsLbpoy)
+
+
+
### LoginCredentials
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>grant_type</td>
- <td>string</td>
- <td>Grant-type must be 'password' or 'client_credentials'.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>username</td>
- <td>string</td>
- <td>Username of user attempting login, required only if grant_type is 'password'.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>password</td>
- <td>string</td>
- <td>Password of user attempting login, required only if grant_type is 'password'.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>client_id</td>
- <td>string</td>
- <td>Client-ID portion of credentials, required only if grant_type is 'client_credentials'.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>client_secret</td>
- <td>string</td>
- <td>Client-Secret portion of credentials, required only if grant_type is 'client_credentials'.</td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>grant_type</td>
+ <td>
+ string
+ </td>
+ <td>Grant-type must be 'password' or 'client_credentials'.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>username</td>
+ <td>
+ string
+ </td>
+ <td>Username of user attempting login, required only if grant_type is 'password'.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>password</td>
+ <td>
+ string
+ </td>
+ <td>Password of user attempting login, required only if grant_type is 'password'.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>client_id</td>
+ <td>
+ string
+ </td>
+ <td>Client-ID portion of credentials, required only if grant_type is 'client_credentials'.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>client_secret</td>
+ <td>
+ string
+ </td>
+ <td>Client-Secret portion of credentials, required only if grant_type is 'client_credentials'.</td>
+ <td>false</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/management/token](#op-MhD5hWgRwK)
+* [/{orgId}/{appId}/token](#op-9TDlDc0BL3)
+
+
+
### Notification
+Represents a Push Notification that is either scheduled, finished or cancelled.
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>uuid</td>
- <td>string</td>
- <td>Unique entity Id.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>type</td>
- <td>string</td>
- <td>Type of entity.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>created</td>
- <td>number</td>
- <td>UTC timestamp in milliseconds of when the entity was created.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>modified</td>
- <td>number</td>
- <td>UTC timestamp in milliseconds of when the entity was last modified.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>payloads</td>
- <td>string</td>
- <td>The push notifications to be delivered.</td>
- <td>true</td>
- </tr>
- <tr>
- <td>errorMessage</td>
- <td>string</td>
- <td>Error message returned by the notification service (APNs or GCM) if the notification fails entirely.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>scheduled</td>
- <td>boolean</td>
- <td>Whether the notification is currently scheduled for delivery.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>state</td>
- <td>string</td>
- <td>The current delivery status of the notification 'FINISHED', 'SCHEDULED' or 'CANCELED'.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>metadata</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>completeMsg</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>uuid</td>
+ <td>
+ string
+ </td>
+ <td>Unique entity Id.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>type</td>
+ <td>
+ string
+ </td>
+ <td>Type of entity.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>created</td>
+ <td>
+ number
+ </td>
+ <td>UTC timestamp in milliseconds of when the entity was created.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>modified</td>
+ <td>
+ number
+ </td>
+ <td>UTC timestamp in milliseconds of when the entity was last modified.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>payloads</td>
+ <td>
+ string
+ </td>
+ <td>The push notifications to be delivered.</td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td>errorMessage</td>
+ <td>
+ string
+ </td>
+ <td>Error message returned by the notification service (APNs or GCM) if the notification fails entirely.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>scheduled</td>
+ <td>
+ boolean
+ </td>
+ <td>Whether the notification is currently scheduled for delivery.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>state</td>
+ <td>
+ string
+ </td>
+ <td>The current delivery status of the notification 'FINISHED', 'SCHEDULED' or 'CANCELED'.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>metadata</td>
+ <td>
+ [Metadata](#metadata)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>completeMsg</td>
+ <td>
+ [Action](#action)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/{orgId}/{applicationId}/notifications/{notificationId}](#op-xHUyW9SEKp)
+* [/{orgId}/{applicationId}/notifications/{notificationId}](#op-p1JCjxXaT6)
+* [/{orgId}/{applicationId}/{receiptId}/*/notifications](#op-tMb27wddix)
+* [/{orgId}/{applicationId}/groups/{path}/notifications](#op-HcxsWWHJuW)
+* [/{orgId}/{applicationId}/devices](#op-tHQHlcVc6O)
+* [/{orgId}/{applicationId}/notifications](#op-EVJZ1t5REk)
+* [/{orgId}/{applicationId}/devices/{deviceId}/notifications](#op-DhaimEfP36)
+* [/{orgId}/{applicationId}/users/{userId}/notifications](#op-GqqUlXEpw0)
+* [/{orgId}/{applicationId}/devices/*/notifications](#op-9Av28Sb6xD)
+
+
+
### NotificationUpdate
+Represents fields that may be updated on a Notification to cause changes in Push Notification processing.
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>canceled</td>
- <td>boolean</td>
- <td>Setting this field to true will cancel a Notification, if it has not yet been sent.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>deliver</td>
- <td>number</td>
- <td>Specifies the UNIX timestamp time at which the Notification should be sent.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>expired</td>
- <td>number</td>
- <td>Specifies the UNIX timestamp time at which this Notification has expired.</td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>canceled</td>
+ <td>
+ boolean
+ </td>
+ <td>Setting this field to true will cancel a Notification, if it has not yet been sent.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>deliver</td>
+ <td>
+ number
+ </td>
+ <td>Specifies the UNIX timestamp time at which the Notification should be sent.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>expired</td>
+ <td>
+ number
+ </td>
+ <td>Specifies the UNIX timestamp time at which this Notification has expired.</td>
+ <td>false</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/{orgId}/{applicationId}/notifications/{notificationId}](#op-xHUyW9SEKp)
+
+
+
### Organization
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>applicationId</td>
- <td>string</td>
- <td>The application Id of the owner.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>username</td>
- <td>string</td>
- <td>The username of the owner.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>name</td>
- <td>string</td>
- <td>The name of the owner.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>email</td>
- <td>string</td>
- <td>The email of the owner.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>activated</td>
- <td>boolean</td>
- <td>Indicate whether the account is activated or not.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>disabled</td>
- <td>boolean</td>
- <td>Indicate whether the account is disabled or not.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>uuid</td>
- <td>string</td>
- <td>The UUID of the owner.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>adminUser</td>
- <td>boolean</td>
- <td>Indicate whether the use is a adminUser or not.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>displayEmail</td>
- <td>string</td>
- <td>The display of the email of the owner.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>htmldisplayEmail</td>
- <td>string</td>
- <td>The HTML display of the email of the owner.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>orgname</td>
- <td>string</td>
- <td>The name of the organization.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>orguuId</td>
- <td>string</td>
- <td>The UUID of the organization.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>applicationdata</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>completeMsg</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>applicationId</td>
+ <td>
+ string
+ </td>
+ <td>The application Id of the owner.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>username</td>
+ <td>
+ string
+ </td>
+ <td>The username of the owner.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>name</td>
+ <td>
+ string
+ </td>
+ <td>The name of the owner.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>email</td>
+ <td>
+ string
+ </td>
+ <td>The email of the owner.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>activated</td>
+ <td>
+ boolean
+ </td>
+ <td>Indicate whether the account is activated or not.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>disabled</td>
+ <td>
+ boolean
+ </td>
+ <td>Indicate whether the account is disabled or not.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>uuid</td>
+ <td>
+ string
+ </td>
+ <td>The UUID of the owner.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>adminUser</td>
+ <td>
+ boolean
+ </td>
+ <td>Indicate whether the use is a adminUser or not.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>displayEmail</td>
+ <td>
+ string
+ </td>
+ <td>The display of the email of the owner.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>htmldisplayEmail</td>
+ <td>
+ string
+ </td>
+ <td>The HTML display of the email of the owner.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>orgname</td>
+ <td>
+ string
+ </td>
+ <td>The name of the organization.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>orguuId</td>
+ <td>
+ string
+ </td>
+ <td>The UUID of the organization.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>applicationdata</td>
+ <td>
+ [AppData](#appdata)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>completeMsg</td>
+ <td>
+ [Action](#action)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/management/orgs](#op-10Xly2uR81)
+* [/management/orgs/{orgId}](#op-fMZQcXXAv8)
+
+
+
### Permissions
+Represents a set of Permissions associated with a User or a Role, each being a Usergrid Permission String.
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>application</td>
- <td>string</td>
- <td>The UUID of the associated application.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>applicationName</td>
- <td>string</td>
- <td>The name of the associated application.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>organization</td>
- <td>string</td>
- <td>The name of the associated organization.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>data</td>
- <td>array</td>
- <td>Array of strings each being a Usergrid Permission String.</td>
- <td>true</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>application</td>
+ <td>
+ string
+ </td>
+ <td>The UUID of the associated application.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>applicationName</td>
+ <td>
+ string
+ </td>
+ <td>The name of the associated application.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>organization</td>
+ <td>
+ string
+ </td>
+ <td>The name of the associated organization.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>data</td>
+ <td>
+ array
+ </td>
+ <td>Array of strings each being a Usergrid Permission String.</td>
+ <td>true</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/{orgId}/{applicationId}/roles/{roleId}/permissions](#op-fB9nGqslMj)
+* [/{orgId}/{appId}/roles/{roleId}/permissions](#op-kaaoh5SC55)
+* [/{orgId}/{applicationId}/roles/{roleId}/permissions](#op-9VeULLNiHw)
+
+
+
### Receipt
+Represents response received from Notification service indicating success or failure.
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>uuid</td>
- <td>string</td>
- <td>Unique entity Id.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>type</td>
- <td>string</td>
- <td>Type of entity.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>created</td>
- <td>number</td>
- <td>UTC timestamp in milliseconds of when the entity was created.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>modified</td>
- <td>number</td>
- <td>UTC timestamp in milliseconds of when the entity was last modified.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>payloads</td>
- <td>string</td>
- <td>The push notifications to be delivered.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>errorMessage</td>
- <td>string</td>
- <td>Error message returned by the notification service (APNs or GCM) if the notification fails entirely.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>errorCode</td>
- <td>string</td>
- <td>Error code returned by the notification service.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>sent</td>
- <td>number</td>
- <td>UTC timestamp in milliseconds for when the notification was sent.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>metadata</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>completeMsg</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>uuid</td>
+ <td>
+ string
+ </td>
+ <td>Unique entity Id.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>type</td>
+ <td>
+ string
+ </td>
+ <td>Type of entity.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>created</td>
+ <td>
+ number
+ </td>
+ <td>UTC timestamp in milliseconds of when the entity was created.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>modified</td>
+ <td>
+ number
+ </td>
+ <td>UTC timestamp in milliseconds of when the entity was last modified.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>payloads</td>
+ <td>
+ string
+ </td>
+ <td>The push notifications to be delivered.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>errorMessage</td>
+ <td>
+ string
+ </td>
+ <td>Error message returned by the notification service (APNs or GCM) if the notification fails entirely.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>errorCode</td>
+ <td>
+ string
+ </td>
+ <td>Error code returned by the notification service.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>sent</td>
+ <td>
+ number
+ </td>
+ <td>UTC timestamp in milliseconds for when the notification was sent.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>metadata</td>
+ <td>
+ [Metadata](#metadata)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>completeMsg</td>
+ <td>
+ [Action](#action)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/{orgId}/{applicationId}/{notificationId}/*/receipts](#op-4ltskxwFlh)
+* [/{orgId}/{applicationId}/receipts](#op-Jrx6MJpfDT)
+* [/{orgId}/{applicationId}/{deviceId}/*/receipts](#op-dcBSAaCDdl)
+
+
+
### ResetPW
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>password</td>
- <td>string</td>
- <td></td>
- <td>true</td>
- </tr>
- <tr>
- <td>newpassword</td>
- <td>string</td>
- <td></td>
- <td>true</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>password</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td>newpassword</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>true</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/{orgId}/{appId}/users/{user}/password](#op-d0NWF6YZuK)
+* [/management/users/{userId}/password](#op-yjg1hntm4R)
+
+
+
### ResetPWMsg
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>recaptcha_response</td>
- <td>string</td>
- <td>Parameters and value for the Captcha challenge.</td>
- <td>true</td>
- </tr>
- <tr>
- <td>recaptcha_challenge</td>
- <td>string</td>
- <td>The admin user's response to the Captcha challenge.</td>
- <td>true</td>
- </tr>
- <tr>
- <td>email</td>
- <td>string</td>
- <td></td>
- <td>true</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>recaptcha_response</td>
+ <td>
+ string
+ </td>
+ <td>Parameters and value for the Captcha challenge.</td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td>recaptcha_challenge</td>
+ <td>
+ string
+ </td>
+ <td>The admin user's response to the Captcha challenge.</td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td>email</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>true</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/management/users/resetpw](#op-XfnvemSsD8)
+
+
+
### Role
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>applicationName</td>
- <td>string</td>
- <td>The application name of the event.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>count</td>
- <td>number</td>
- <td>The numebr of the roles.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>entity</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>url</td>
- <td>string</td>
- <td>The url of the event.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>applicationId</td>
- <td>string</td>
- <td>The application UUID of the event.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>parameters</td>
- <td>string</td>
- <td>The parameters of the event.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>organization</td>
- <td>string</td>
- <td>The title of the organization.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>completeMsg</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>path</td>
- <td>string</td>
- <td>The path of the role.</td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>applicationName</td>
+ <td>
+ string
+ </td>
+ <td>The application name of the event.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>count</td>
+ <td>
+ number
+ </td>
+ <td>The numebr of the roles.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>entity</td>
+ <td>
+ [Entity](#entity)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>url</td>
+ <td>
+ string
+ </td>
+ <td>The url of the event.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>applicationId</td>
+ <td>
+ string
+ </td>
+ <td>The application UUID of the event.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>parameters</td>
+ <td>
+ string
+ </td>
+ <td>The parameters of the event.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>organization</td>
+ <td>
+ string
+ </td>
+ <td>The title of the organization.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>completeMsg</td>
+ <td>
+ [Action](#action)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>path</td>
+ <td>
+ string
+ </td>
+ <td>The path of the role.</td>
+ <td>false</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/{orgId}/{appId}/roles](#op-Xs9X9TSi8B)
+* [/{orgId}/{appId}/roles](#op-77UvdX1AKS)
+* [/{orgId}/{appId}/roles/{rolename}](#op-OVMDaZHUiZ)
+
+
+
### User
+Represents a User account which may be a user within an Application's User collection, or may be an Admin User.
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>applicationId</td>
- <td>string</td>
- <td>The application Id of a user.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>username</td>
- <td>string</td>
- <td>The username of a user.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>name</td>
- <td>string</td>
- <td>The name of a user.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>email</td>
- <td>string</td>
- <td>The email of a user.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>activated</td>
- <td>boolean</td>
- <td>Indicate whether the account is activated or not.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>disabled</td>
- <td>boolean</td>
- <td>Indicate whether the account is disabled or not.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>uuid</td>
- <td>string</td>
- <td>The UUID of a user.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>adminUser</td>
- <td>boolean</td>
- <td>Indicate whether the use is a adminUser or not.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>displayEmail</td>
- <td>string</td>
- <td>The display of the email of a user.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>htmldisplayEmail</td>
- <td>string</td>
- <td>The HTML display of the email of a user.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>organization</td>
- <td>string</td>
- <td>The organization of the user.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>picture</td>
- <td>string</td>
- <td>The uri of the user's picture.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>uri</td>
- <td>string</td>
- <td>The uri of the user.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>path</td>
- <td>string</td>
- <td>The path of the user.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>completeMsg</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>applicationId</td>
+ <td>
+ string
+ </td>
+ <td>The application Id of a user.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>username</td>
+ <td>
+ string
+ </td>
+ <td>The username of a user.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>name</td>
+ <td>
+ string
+ </td>
+ <td>The name of a user.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>email</td>
+ <td>
+ string
+ </td>
+ <td>The email of a user.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>activated</td>
+ <td>
+ boolean
+ </td>
+ <td>Indicate whether the account is activated or not.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>disabled</td>
+ <td>
+ boolean
+ </td>
+ <td>Indicate whether the account is disabled or not.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>uuid</td>
+ <td>
+ string
+ </td>
+ <td>The UUID of a user.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>adminUser</td>
+ <td>
+ boolean
+ </td>
+ <td>Indicate whether the use is a adminUser or not.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>displayEmail</td>
+ <td>
+ string
+ </td>
+ <td>The display of the email of a user.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>htmldisplayEmail</td>
+ <td>
+ string
+ </td>
+ <td>The HTML display of the email of a user.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>organization</td>
+ <td>
+ string
+ </td>
+ <td>The organization of the user.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>picture</td>
+ <td>
+ string
+ </td>
+ <td>The uri of the user's picture.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>uri</td>
+ <td>
+ string
+ </td>
+ <td>The uri of the user.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>path</td>
+ <td>
+ string
+ </td>
+ <td>The path of the user.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>completeMsg</td>
+ <td>
+ [Action](#action)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/management/orgs/{orgId}/users](#op-z7AQVyIzPn)
+* [/{orgId}/{appId}/users](#op-Rq1TkYSvPN)
+* [/management/users/{userId}](#op-Vh6g9ZgYMh)
+* [/{orgId}/{appId}/groups/{groupId}/users/{userId}](#op-tTRCEhAz0z)
+* [/{orgId}/{appId}/roles/{roleId}/users/{userId}](#op-Hscxz1kxfu)
+* [/{orgId}/{appId}/groups/{groupId}/users/{userId}](#op-EeS4c1jZT1)
+* [/management/users/{userId}](#op-SrpcXlZC86)
+* [/{orgId}/{appId}/users/{userId}](#op-0bju5bw1ZH)
+* [/{orgId}/{appId}/users/{userId}](#op-tRnoDrscSy)
+* [/{orgId}/{appId}/roles/{roleId}/users/{userId}](#op-D4YceDJCBp)
+* [/{orgId}/{appId}/users](#op-B3JxnPdQnX)
+* [/management/orgs/{orgId}/users/{userId}](#op-XQZui6aKiZ)
+* [/{orgId}/{appId}/roles/{roleId}/users](#op-UG5vx2zh0S)
+* [/{orgId}/{appId}/users/{userId}](#op-RDt20tQoio)
+* [/management/users](#op-OrsKI3OblZ)
+
+
+__Referring Definitions__
+
+* [AccessTokenResponse](#accesstokenresponse)
+
+
## Sub-Types
This section lists the properties for sub-types used in Usergrid Default Entities.
### Collections
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>activities</td>
- <td>string</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>feed</td>
- <td>string</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>roles</td>
- <td>string</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>users</td>
- <td>string</td>
- <td></td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>activities</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>feed</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>roles</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>users</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
</table>
+
+__Referring Definitions__
+
+* [Metadata](#metadata)
+
+
### ImageModel
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>duration</td>
- <td>number</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>height</td>
- <td>number</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>url</td>
- <td>string</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>wIdth</td>
- <td>integer</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>email</td>
- <td>string</td>
- <td></td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>duration</td>
+ <td>
+ number
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>height</td>
+ <td>
+ number
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>url</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>wIdth</td>
+ <td>
+ integer
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>email</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
</table>
+
+__Referring Definitions__
+
+* [CreateActivity](#createactivity)
+
+
### Metadata
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>cursor</td>
- <td>string</td>
- <td>The cursor of the metadata.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>path</td>
- <td>string</td>
- <td>The path of the metadata.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>sets</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>collections</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>cursor</td>
+ <td>
+ string
+ </td>
+ <td>The cursor of the metadata.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>path</td>
+ <td>
+ string
+ </td>
+ <td>The path of the metadata.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>sets</td>
+ <td>
+ [Sets](#sets)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>collections</td>
+ <td>
+ [Collections](#collections)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
</table>
+
+__Referring Definitions__
+
+* [Receipt](#receipt)
+* [Device](#device)
+* [Notification](#notification)
+* [Notifier](#notifier)
+* [Group](#group)
+* [Entity](#entity)
+* [ActivityFeed](#activityfeed)
+
+
### Object
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>displayname</td>
- <td>string</td>
- <td>The display of the name of the object.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>objecttype</td>
- <td>string</td>
- <td>The type of the object.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>objectuuId</td>
- <td>string</td>
- <td>The UUID of the object.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>entitytype</td>
- <td>string</td>
- <td>The entitytype of the object.</td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>displayname</td>
+ <td>
+ string
+ </td>
+ <td>The display of the name of the object.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>objecttype</td>
+ <td>
+ string
+ </td>
+ <td>The type of the object.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>objectuuId</td>
+ <td>
+ string
+ </td>
+ <td>The UUID of the object.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>entitytype</td>
+ <td>
+ string
+ </td>
+ <td>The entitytype of the object.</td>
+ <td>false</td>
+ </tr>
</table>
+
+__Referring Definitions__
+
+* [ActivityFeed](#activityfeed)
+
+
### Sets
+
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>rolenames</td>
- <td>string</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>permissions</td>
- <td>string</td>
- <td></td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>rolenames</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>permissions</td>
+ <td>
+ string
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
</table>
+
+
+__Referring Definitions__
+
+* [Metadata](#metadata)
+
http://git-wip-us.apache.org/repos/asf/usergrid/blob/f9a354b2/docs/src/main/groovy/usergrid/ApiDocGenerator.groovy
----------------------------------------------------------------------
diff --git a/docs/src/main/groovy/usergrid/ApiDocGenerator.groovy b/docs/src/main/groovy/usergrid/ApiDocGenerator.groovy
index 6946f99..523cdd4 100644
--- a/docs/src/main/groovy/usergrid/ApiDocGenerator.groovy
+++ b/docs/src/main/groovy/usergrid/ApiDocGenerator.groovy
@@ -200,7 +200,10 @@ public class ApiDocGenerator {
list = [];
modelsBySchema[ propertyEntity.value.ref ] = list;
}
- list.add(name);
+ def modelNames = [:];
+ modelNames.refName = name;
+ modelNames.refName_lc = name.toLowerCase();
+ list.add(modelNames);
}
};
}
@@ -243,6 +246,7 @@ public class ApiDocGenerator {
op.getParameters().each { parameter ->
def param = [:];
param.name = parameter.name;
+ param.name_lc = parameter.name.toLowerCase();
param.required = parameter.required;
param.description = parameter.description;
param.in = parameter.in;
@@ -250,11 +254,8 @@ public class ApiDocGenerator {
// assume that body parameters have a schema that is a reference
if (parameter.in == "body") {
- if ( parameter.schema == null ) {
- def a = 5;
- }
param.schemaRef = parameter.schema.ref;
- param.schemaAnchor = parameter.schema.ref;
+ param.schemaAnchor = parameter.schema.ref.toLowerCase();
// keep track of paths that use each schema definition
def list = urlOpsBySchema[parameter.schema.ref];
@@ -264,9 +265,7 @@ public class ApiDocGenerator {
}
list.add(urlOp);
- } else if ( parameter instanceof RefParameter ) {
- param.type = "booger";
- } else {
+ } else if ( !(parameter instanceof RefParameter) ) {
param.type = parameter.type;
}
params.add(param);
@@ -309,10 +308,12 @@ public class ApiDocGenerator {
prop.position = property.value.position;
if ( property.value instanceof RefProperty ) {
prop.ref = property.value.ref;
+ prop.ref_lc = property.value.ref.toLowerCase();
}
props.add(prop);
};
scope.name = name;
+ scope.name_lc = name.toLowerCase();
scope.description = model.description;
scope.properties = props;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/f9a354b2/docs/src/main/resources/html/model.mustache
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/html/model.mustache b/docs/src/main/resources/html/model.mustache
index fa21399..9077e4e 100644
--- a/docs/src/main/resources/html/model.mustache
+++ b/docs/src/main/resources/html/model.mustache
@@ -1,7 +1,7 @@
<div>
- <a name="{{name}}"/>
+ <a name="{{name_lc}}"/>
</div>
<div class="panel panel-default">
@@ -30,7 +30,7 @@
<tr>
<td>{{name}}</td>
<td>
- {{#ref}}<a href="#{{ref}}">{{ref}}</a>{{/ref}}
+ {{#ref}}<a href="#{{ref_lc}}">{{ref}}</a>{{/ref}}
{{^ref}}{{type}}{{/ref}}
</td>
<td>{{description}}</td>
@@ -55,7 +55,7 @@
<table width="80%" class="table table-striped">
{{#modelRefs}}
<tr>
- <td><p><a href="#{{.}}">{{.}}</a></p></td>
+ <td><p><a href="#{{refName_lc}}">{{refName}}</a></p></td>
</tr>
{{/modelRefs}}
</table>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/f9a354b2/docs/src/main/resources/markdown/model.mustache
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/markdown/model.mustache b/docs/src/main/resources/markdown/model.mustache
index b58788b..2a41a00 100644
--- a/docs/src/main/resources/markdown/model.mustache
+++ b/docs/src/main/resources/markdown/model.mustache
@@ -1,21 +1,43 @@
### {{name}}
+{{description}}
+
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- {{#properties}}
- <tr>
- <td>{{name}}</td>
- <td>{{type}}</td>
- <td>{{description}}</td>
- <td>{{required}}</td>
- </tr>
- {{/properties}}
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ {{#properties}}
+ <tr>
+ <td>{{name}}</td>
+ <td>
+ {{#ref}} [{{ref}}](#{{ref_lc}}) {{/ref}} {{^ref}}{{type}}{{/ref}}
+ </td>
+ <td>{{description}}</td>
+ <td>{{required}}</td>
+ </tr>
+ {{/properties}}
</table>
+
+{{#hasReferrers}}
+__Referring API Paths__
+
+{{#referrers}}
+* [{{url}}](#op-{{opId}})
+{{/referrers}}
+
+{{/hasReferrers}}
+
+{{#hasModelRefs}}
+__Referring Definitions__
+
+{{#modelRefs}}
+* [{{refName}}](#{{refName_lc}})
+{{/modelRefs}}
+
+{{/hasModelRefs}}
[14/36] usergrid git commit: Update generated website content.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/sdks/sdk-outline.html
----------------------------------------------------------------------
diff --git a/content/docs/sdks/sdk-outline.html b/content/docs/sdks/sdk-outline.html
new file mode 100644
index 0000000..365dbd5
--- /dev/null
+++ b/content/docs/sdks/sdk-outline.html
@@ -0,0 +1,516 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>Usergrid SDK Documentation outline — Apache Usergrid 1.0 documentation</title>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+
+
+
+
+
+ <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+
+
+ <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+ <div class="wy-grid-for-nav">
+
+
+ <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+ <div class="wy-side-nav-search">
+
+
+
+ <a href="../index.html" class="icon icon-home"> Apache Usergrid
+
+
+
+ </a>
+
+
+
+
+ <div class="version">
+ 1.0
+ </div>
+
+
+
+
+<div role="search">
+ <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+ <input type="text" name="q" placeholder="Search docs" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+
+
+ </div>
+
+ <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+
+
+
+ <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters & clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators & data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security & Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management & Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management & social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets & Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters & Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters & events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating & incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations & Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations & Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code & Docs</a></li>
+</ul>
+
+
+
+ </div>
+
+ </nav>
+
+ <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+ <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+ <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+ <a href="../index.html">Apache Usergrid</a>
+ </nav>
+
+
+
+ <div class="wy-nav-content">
+ <div class="rst-content">
+ <div role="navigation" aria-label="breadcrumbs navigation">
+ <ul class="wy-breadcrumbs">
+ <li><a href="../index.html">Docs</a> »</li>
+
+ <li>Usergrid SDK Documentation outline</li>
+ <li class="wy-breadcrumbs-aside">
+
+
+ <a href="../_sources/sdks/sdk-outline.txt" rel="nofollow"> View page source</a>
+
+
+ </li>
+ </ul>
+ <hr/>
+</div>
+ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+ <div itemprop="articleBody">
+
+ <div class="section" id="usergrid-sdk-documentation-outline">
+<h1>Usergrid SDK Documentation outline<a class="headerlink" href="#usergrid-sdk-documentation-outline" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="getting-started">
+<h2>Getting Started<a class="headerlink" href="#getting-started" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="installing-the-sdk">
+<h3>Installing the SDK<a class="headerlink" href="#installing-the-sdk" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="building-from-source">
+<h3>Building from Source<a class="headerlink" href="#building-from-source" title="Permalink to this headline">¶</a></h3>
+</div>
+</div>
+</div>
+<div class="section" id="usergrid-sdk-reference-with-examples">
+<h1>Usergrid SDK Reference with Examples<a class="headerlink" href="#usergrid-sdk-reference-with-examples" title="Permalink to this headline">¶</a></h1>
+<p>The 66 topics listed below are each documented in the Usergrid
+documentation and for each the docs provide an API reference and example
+for each of these clients: curl, iOS, Android, JavaScript, Ruby and
+Node.js.</p>
+<div class="section" id="working-with-collections">
+<h2>Working with Collections<a class="headerlink" href="#working-with-collections" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="creating-collections">
+<h3>1. Creating collections<a class="headerlink" href="#creating-collections" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="retrieving-collections">
+<h3>2. Retrieving collections<a class="headerlink" href="#retrieving-collections" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="updating-collections">
+<h3>3. Updating collections<a class="headerlink" href="#updating-collections" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="deleting-collections">
+<h3>4. Deleting collections<a class="headerlink" href="#deleting-collections" title="Permalink to this headline">¶</a></h3>
+</div>
+</div>
+<div class="section" id="working-with-entities">
+<h2>Working with Entities<a class="headerlink" href="#working-with-entities" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="creating-a-custom-entity">
+<h3>5. Creating a custom entity<a class="headerlink" href="#creating-a-custom-entity" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="creating-multiple-custom-entities">
+<h3>6. Creating multiple custom entities<a class="headerlink" href="#creating-multiple-custom-entities" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="creating-an-entity-with-sub-properties">
+<h3>7. Creating an entity with sub-properties<a class="headerlink" href="#creating-an-entity-with-sub-properties" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="retrieving-an-entity">
+<h3>8. Retrieving an entity<a class="headerlink" href="#retrieving-an-entity" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="retrieving-multiple-entities">
+<h3>9. Retrieving multiple entities<a class="headerlink" href="#retrieving-multiple-entities" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="updating-an-entity">
+<h3>10. Updating an entity<a class="headerlink" href="#updating-an-entity" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="updating-a-sub-property">
+<h3>11. Updating a sub-property<a class="headerlink" href="#updating-a-sub-property" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="deleting-data-entities">
+<h3>12. Deleting data entities<a class="headerlink" href="#deleting-data-entities" title="Permalink to this headline">¶</a></h3>
+</div>
+</div>
+<div class="section" id="data-queries">
+<h2>Data Queries<a class="headerlink" href="#data-queries" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="querying-your-data">
+<h3>13. Querying your data<a class="headerlink" href="#querying-your-data" title="Permalink to this headline">¶</a></h3>
+</div>
+</div>
+<div class="section" id="entity-connections">
+<h2>Entity Connections<a class="headerlink" href="#entity-connections" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="connecting-users-other-data">
+<h3>14. Connecting users other data<a class="headerlink" href="#connecting-users-other-data" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="retrieving-user-connection-data">
+<h3>15. Retrieving user connection data<a class="headerlink" href="#retrieving-user-connection-data" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="disconnecting-entities">
+<h3>16. Disconnecting entities<a class="headerlink" href="#disconnecting-entities" title="Permalink to this headline">¶</a></h3>
+</div>
+</div>
+<div class="section" id="permissions-roles">
+<h2>Permissions & Roles<a class="headerlink" href="#permissions-roles" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="assigning-permissions">
+<h3>17. Assigning permissions<a class="headerlink" href="#assigning-permissions" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="removing-permissions">
+<h3>18. Removing permissions<a class="headerlink" href="#removing-permissions" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="id1">
+<h3>19. Assigning permissions<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="id2">
+<h3>20. Removing permissions<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="creating-roles">
+<h3>21. Creating roles<a class="headerlink" href="#creating-roles" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="assigning-roles">
+<h3>22. Assigning roles<a class="headerlink" href="#assigning-roles" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="removing-roles">
+<h3>23. Removing roles<a class="headerlink" href="#removing-roles" title="Permalink to this headline">¶</a></h3>
+</div>
+</div>
+<div class="section" id="authentication">
+<h2>Authentication<a class="headerlink" href="#authentication" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="application-user-authentication-user-login">
+<h3>24. Application user authentication (user login)<a class="headerlink" href="#application-user-authentication-user-login" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="application-client-authentication">
+<h3>25. Application client authentication<a class="headerlink" href="#application-client-authentication" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="admin-user-authentication">
+<h3>26. Admin user authentication<a class="headerlink" href="#admin-user-authentication" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="organization-client-authentication">
+<h3>27. Organization client authentication<a class="headerlink" href="#organization-client-authentication" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="revoking-tokens-user-logout">
+<h3>28. Revoking tokens (user logout)<a class="headerlink" href="#revoking-tokens-user-logout" title="Permalink to this headline">¶</a></h3>
+</div>
+</div>
+</div>
+<div class="section" id="working-with-users-groups">
+<h1>Working with Users & Groups<a class="headerlink" href="#working-with-users-groups" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="activities-feeds">
+<h2>Activities & Feeds<a class="headerlink" href="#activities-feeds" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="posting-a-user-activity">
+<h3>37. Posting a user activity<a class="headerlink" href="#posting-a-user-activity" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="posting-an-activity-to-a-group">
+<h3>38. Posting an activity to a group<a class="headerlink" href="#posting-an-activity-to-a-group" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="creating-an-activity-for-a-user-s-followers-in-a-group">
+<h3>39. Creating an activity for a user’s followers in a group<a class="headerlink" href="#creating-an-activity-for-a-user-s-followers-in-a-group" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="retrieving-a-user-s-activity-feed">
+<h3>40. Retrieving a user’s activity feed<a class="headerlink" href="#retrieving-a-user-s-activity-feed" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="retrieving-a-group-s-activity-feed">
+<h3>41. Retrieving a group’s activity feed<a class="headerlink" href="#retrieving-a-group-s-activity-feed" title="Permalink to this headline">¶</a></h3>
+</div>
+</div>
+<div class="section" id="events-counters">
+<h2>Events & Counters<a class="headerlink" href="#events-counters" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="creating-incrementing-counters">
+<h3>42. Creating & incrementing counters<a class="headerlink" href="#creating-incrementing-counters" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="retrieving-counters">
+<h3>43. Retrieving counters<a class="headerlink" href="#retrieving-counters" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="retrieving-counters-by-time-interval">
+<h3>44. Retrieving counters by time interval<a class="headerlink" href="#retrieving-counters-by-time-interval" title="Permalink to this headline">¶</a></h3>
+</div>
+</div>
+<div class="section" id="managing-orgs-apps">
+<h2>Managing Orgs & Apps<a class="headerlink" href="#managing-orgs-apps" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="creating-an-organization">
+<h3>46. Creating an organization<a class="headerlink" href="#creating-an-organization" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="getting-an-organization">
+<h3>47. Getting an organization<a class="headerlink" href="#getting-an-organization" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="activating-an-organization">
+<h3>48. Activating an organization<a class="headerlink" href="#activating-an-organization" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="reactivating-an-organization">
+<h3>49. Reactivating an organization<a class="headerlink" href="#reactivating-an-organization" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="generating-organization-client-credentials">
+<h3>50. Generating organization client credentials<a class="headerlink" href="#generating-organization-client-credentials" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="retrieving-organization-client-credentials">
+<h3>51. Retrieving organization client credentials<a class="headerlink" href="#retrieving-organization-client-credentials" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="getting-an-organization-s-activity-feed">
+<h3>52. Getting an organization’s activity feed<a class="headerlink" href="#getting-an-organization-s-activity-feed" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="getting-the-applications-in-an-organization">
+<h3>53. Getting the applications in an organization<a class="headerlink" href="#getting-the-applications-in-an-organization" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="getting-the-admin-users-in-an-organization">
+<h3>54. Getting the admin users in an organization<a class="headerlink" href="#getting-the-admin-users-in-an-organization" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="removing-an-admin-user-from-an-organization">
+<h3>55. Removing an admin user from an organization<a class="headerlink" href="#removing-an-admin-user-from-an-organization" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="creating-an-organization-application">
+<h3>56. Creating an organization application<a class="headerlink" href="#creating-an-organization-application" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="generating-application-credentials">
+<h3>57. Generating application credentials<a class="headerlink" href="#generating-application-credentials" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="getting-application-credentials">
+<h3>58. Getting application credentials<a class="headerlink" href="#getting-application-credentials" title="Permalink to this headline">¶</a></h3>
+</div>
+</div>
+<div class="section" id="managing-admin-users">
+<h2>Managing Admin Users<a class="headerlink" href="#managing-admin-users" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="creating-an-admin-user">
+<h3>59. Creating an admin user<a class="headerlink" href="#creating-an-admin-user" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="updating-an-admin-user">
+<h3>60. Updating an admin user<a class="headerlink" href="#updating-an-admin-user" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="getting-an-admin-user">
+<h3>61. Getting an admin user<a class="headerlink" href="#getting-an-admin-user" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="setting-an-admin-user-s-password">
+<h3>62. Setting an admin user’s password<a class="headerlink" href="#setting-an-admin-user-s-password" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="resetting-an-admin-user-s-password">
+<h3>63. Resetting an admin user’s password<a class="headerlink" href="#resetting-an-admin-user-s-password" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="activating-an-admin-user">
+<h3>64. Activating an admin user<a class="headerlink" href="#activating-an-admin-user" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="reactivating-an-admin-user">
+<h3>65. Reactivating an admin user<a class="headerlink" href="#reactivating-an-admin-user" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="getting-an-admin-user-s-activity-feed">
+<h3>66. Getting an admin user’s activity feed<a class="headerlink" href="#getting-an-admin-user-s-activity-feed" title="Permalink to this headline">¶</a></h3>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ <footer>
+
+
+ <hr/>
+
+ <div role="contentinfo">
+ <p>
+ © Copyright 2013-2015, Apache Usergrid.
+
+ </p>
+ </div>
+ Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+
+
+
+
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT:'../',
+ VERSION:'1.0',
+ COLLAPSE_INDEX:false,
+ FILE_SUFFIX:'.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+
+
+
+
+
+ <script type="text/javascript" src="../_static/js/theme.js"></script>
+
+
+
+
+ <script type="text/javascript">
+ jQuery(function () {
+ SphinxRtdTheme.StickyNav.enable();
+ });
+ </script>
+
+
+</body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/sdks/tbd.html
----------------------------------------------------------------------
diff --git a/content/docs/sdks/tbd.html b/content/docs/sdks/tbd.html
index a266bfa..a537b46 100644
--- a/content/docs/sdks/tbd.html
+++ b/content/docs/sdks/tbd.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -141,9 +155,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -158,11 +172,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul class="current">
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/search.html
----------------------------------------------------------------------
diff --git a/content/docs/search.html b/content/docs/search.html
index bddb739..b046993 100644
--- a/content/docs/search.html
+++ b/content/docs/search.html
@@ -80,14 +80,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -111,10 +112,23 @@
<li class="toctree-l1"><a class="reference internal" href="entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -139,9 +153,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -156,11 +170,13 @@
<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
[24/36] usergrid git commit: Update generated website content.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/assets-and-files/uploading-assets.html
----------------------------------------------------------------------
diff --git a/content/docs/assets-and-files/uploading-assets.html b/content/docs/assets-and-files/uploading-assets.html
new file mode 100644
index 0000000..afdb065
--- /dev/null
+++ b/content/docs/assets-and-files/uploading-assets.html
@@ -0,0 +1,432 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>Uploading assets — Apache Usergrid 1.0 documentation</title>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+
+
+
+
+
+ <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+ <link rel="next" title="Retrieving assets" href="retrieving-assets.html"/>
+ <link rel="prev" title="Geolocating your Entities" href="../geolocation/geolocation.html"/>
+
+
+ <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+ <div class="wy-grid-for-nav">
+
+
+ <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+ <div class="wy-side-nav-search">
+
+
+
+ <a href="../index.html" class="icon icon-home"> Apache Usergrid
+
+
+
+ </a>
+
+
+
+
+ <div class="version">
+ 1.0
+ </div>
+
+
+
+
+<div role="search">
+ <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+ <input type="text" name="q" placeholder="Search docs" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+
+
+ </div>
+
+ <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+
+
+
+ <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters & clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators & data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security & Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management & Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management & social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets & Files</span></p>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">Uploading assets</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#id1">Uploading assets</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#request-syntax">Request syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-request">Example request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-response">Example response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#updating-assets">Updating assets</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters & Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters & events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating & incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations & Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations & Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code & Docs</a></li>
+</ul>
+
+
+
+ </div>
+
+ </nav>
+
+ <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+ <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+ <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+ <a href="../index.html">Apache Usergrid</a>
+ </nav>
+
+
+
+ <div class="wy-nav-content">
+ <div class="rst-content">
+ <div role="navigation" aria-label="breadcrumbs navigation">
+ <ul class="wy-breadcrumbs">
+ <li><a href="../index.html">Docs</a> »</li>
+
+ <li>Uploading assets</li>
+ <li class="wy-breadcrumbs-aside">
+
+
+ <a href="../_sources/assets-and-files/uploading-assets.txt" rel="nofollow"> View page source</a>
+
+
+ </li>
+ </ul>
+ <hr/>
+</div>
+ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+ <div itemprop="articleBody">
+
+ <div class="section" id="uploading-assets">
+<h1>Uploading assets<a class="headerlink" href="#uploading-assets" title="Permalink to this headline">¶</a></h1>
+<p>With Usergrid, you can store and retrieve files and assets that hold
+data objects such as images, video, and audio content.</p>
+<p>Usergrid manages these objects as Asset entities. Optionally, you can
+use Folder entities to organize related assets.</p>
+<div class="section" id="id1">
+<h2>Uploading assets<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h2>
+<p>Assets can be any file type and can be attached to any entity. When an
+asset is uploaded, Usergrid will automatically detect the file metadata
+for the asset and save it in the associated entity as a
+<code class="docutils literal"><span class="pre">file-metadata</span></code> property. Only 1 asset can be attached to an entity.</p>
+<p>To attach an asset to an entity, do the following:</p>
+<div class="section" id="request-syntax">
+<h3>Request syntax<a class="headerlink" href="#request-syntax" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST -F name='<filename>' -F file=@<file_location> 'https://api.usergrid.com/<org>/<app>/<collection>/<entity>
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="20%" />
+<col width="80%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>filename</td>
+<td>A filename to associate with the asset.</td>
+</tr>
+<tr class="row-odd"><td>file_location</td>
+<td>The location of the asset to be uploaded.</td>
+</tr>
+<tr class="row-even"><td>org Organization</td>
+<td>UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app Application</td>
+<td>UUID or application name</td>
+</tr>
+<tr class="row-even"><td>collection</td>
+<td>Name or UUID of the collection of the entity you want to attach the asset to.</td>
+</tr>
+<tr class="row-odd"><td>entity</td>
+<td>Name or UUID of an existing entity you want to attach the asset to.</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="example-request">
+<h3>Example request<a class="headerlink" href="#example-request" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST -i -F name='clouds' -F file=@happy_clouds.jpg 'https://api.usergrid.com/your-org/your-app/pictures/'
+</pre></div>
+</div>
+</div>
+<div class="section" id="example-response">
+<h3>Example response<a class="headerlink" href="#example-response" title="Permalink to this headline">¶</a></h3>
+<p>Notice the <code class="docutils literal"><span class="pre">file-metadata</span></code> property in the response.</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+ <span class="s">"action"</span> <span class="p">:</span> <span class="s">"post"</span><span class="p">,</span>
+ <span class="s">"application"</span> <span class="p">:</span> <span class="s">"f34f4222-a166-11e2-a7f7-02e81adcf3d0"</span><span class="p">,</span>
+ <span class="s">"params"</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/users"</span><span class="p">,</span>
+ <span class="s">"uri"</span> <span class="p">:</span> <span class="s">"https://api.usergrid.com/amuramoto/sandbox/pictures"</span><span class="p">,</span>
+ <span class="s">"entities"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+ <span class="s">"uuid"</span> <span class="p">:</span> <span class="s">"410b213a-b379-11e3-a0e5-9953085ea376"</span><span class="p">,</span>
+ <span class="s">"type"</span> <span class="p">:</span> <span class="s">"user"</span><span class="p">,</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"test"</span><span class="p">,</span>
+ <span class="s">"created"</span> <span class="p">:</span> <span class="mi">1395681911491</span><span class="p">,</span>
+ <span class="s">"modified"</span> <span class="p">:</span> <span class="mi">1399069838919</span><span class="p">,</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"clouds"</span><span class="p">,</span>
+ <span class="s">"file"</span> <span class="p">:</span> <span class="s">"fobnszewobnioerabnoiawegbrn</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span>
+ <span class="s">"file-metadata"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"content-type"</span> <span class="p">:</span> <span class="s">"image/jpeg"</span><span class="p">,</span>
+ <span class="s">"etag"</span> <span class="p">:</span> <span class="s">"</span><span class="se">\"</span><span class="s">2e1db7299b0a667ed80e674a0ef9d653</span><span class="se">\"</span><span class="s">"</span><span class="p">,</span>
+ <span class="s">"last-modified"</span> <span class="p">:</span> <span class="mi">1399070010115</span><span class="p">,</span>
+ <span class="s">"content-length"</span> <span class="p">:</span> <span class="mi">28</span><span class="p">,</span>
+ <span class="s">"checksum"</span> <span class="p">:</span> <span class="s">"2e1db7299b0a667ed80e674a0ef9d653"</span>
+ <span class="p">},</span>
+ <span class="s">"metadata"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"connecting"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"likes"</span> <span class="p">:</span> <span class="s">"/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/likes"</span>
+ <span class="p">},</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/users/410b213a-b379-11e3-a0e5-9953085ea376"</span><span class="p">,</span>
+ <span class="s">"sets"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"rolenames"</span> <span class="p">:</span> <span class="s">"/users/410b213a-b379-11e3-a0e5-9953085ea376/roles"</span><span class="p">,</span>
+ <span class="s">"permissions"</span> <span class="p">:</span> <span class="s">"/users/410b213a-b379-11e3-a0e5-9953085ea376/permissions"</span>
+ <span class="p">},</span>
+ <span class="s">"connections"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"follows"</span> <span class="p">:</span> <span class="s">"/users/410b213a-b379-11e3-a0e5-9953085ea376/follows"</span>
+ <span class="p">},</span>
+ <span class="s">"collections"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"activities"</span> <span class="p">:</span> <span class="s">"/users/410b213a-b379-11e3-a0e5-9953085ea376/activities"</span><span class="p">,</span>
+ <span class="s">"devices"</span> <span class="p">:</span> <span class="s">"/users/410b213a-b379-11e3-a0e5-9953085ea376/devices"</span><span class="p">,</span>
+ <span class="s">"feed"</span> <span class="p">:</span> <span class="s">"/users/410b213a-b379-11e3-a0e5-9953085ea376/feed"</span><span class="p">,</span>
+ <span class="s">"groups"</span> <span class="p">:</span> <span class="s">"/users/410b213a-b379-11e3-a0e5-9953085ea376/groups"</span><span class="p">,</span>
+ <span class="s">"roles"</span> <span class="p">:</span> <span class="s">"/users/410b213a-b379-11e3-a0e5-9953085ea376/roles"</span><span class="p">,</span>
+ <span class="s">"following"</span> <span class="p">:</span> <span class="s">"/users/410b213a-b379-11e3-a0e5-9953085ea376/following"</span><span class="p">,</span>
+ <span class="s">"followers"</span> <span class="p">:</span> <span class="s">"/users/410b213a-b379-11e3-a0e5-9953085ea376/followers"</span>
+ <span class="p">}</span>
+ <span class="p">}</span>
+ <span class="p">}</span> <span class="p">],</span>
+ <span class="s">"timestamp"</span> <span class="p">:</span> <span class="mi">1399070009986</span><span class="p">,</span>
+ <span class="s">"duration"</span> <span class="p">:</span> <span class="mi">441</span><span class="p">,</span>
+ <span class="s">"organization"</span> <span class="p">:</span> <span class="s">"your-org"</span><span class="p">,</span>
+ <span class="s">"applicationName"</span> <span class="p">:</span> <span class="s">"your-app"</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="updating-assets">
+<h2>Updating assets<a class="headerlink" href="#updating-assets" title="Permalink to this headline">¶</a></h2>
+<p>To update the data for an asset, perform the same request outlined above
+in ‘Uploading assets’ as a <code class="docutils literal"><span class="pre">PUT</span></code> request rather than a <code class="docutils literal"><span class="pre">POST</span></code>.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ <footer>
+
+ <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+
+ <a href="retrieving-assets.html" class="btn btn-neutral float-right" title="Retrieving assets" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+
+
+ <a href="../geolocation/geolocation.html" class="btn btn-neutral" title="Geolocating your Entities" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+
+ </div>
+
+
+ <hr/>
+
+ <div role="contentinfo">
+ <p>
+ © Copyright 2013-2015, Apache Usergrid.
+
+ </p>
+ </div>
+ Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+
+
+
+
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT:'../',
+ VERSION:'1.0',
+ COLLAPSE_INDEX:false,
+ FILE_SUFFIX:'.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+
+
+
+
+
+ <script type="text/javascript" src="../_static/js/theme.js"></script>
+
+
+
+
+ <script type="text/javascript">
+ jQuery(function () {
+ SphinxRtdTheme.StickyNav.enable();
+ });
+ </script>
+
+
+</body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/counters-and-events/creating-and-incrementing-counters.html
----------------------------------------------------------------------
diff --git a/content/docs/counters-and-events/creating-and-incrementing-counters.html b/content/docs/counters-and-events/creating-and-incrementing-counters.html
index 511a0e3..c40f42a 100644
--- a/content/docs/counters-and-events/creating-and-incrementing-counters.html
+++ b/content/docs/counters-and-events/creating-and-incrementing-counters.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -141,9 +155,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul class="current">
@@ -163,11 +177,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/counters-and-events/events-and-counters.html
----------------------------------------------------------------------
diff --git a/content/docs/counters-and-events/events-and-counters.html b/content/docs/counters-and-events/events-and-counters.html
index d759fc5..46ced7a 100644
--- a/content/docs/counters-and-events/events-and-counters.html
+++ b/content/docs/counters-and-events/events-and-counters.html
@@ -32,7 +32,7 @@
<link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
<link rel="next" title="Creating & incrementing counters" href="creating-and-incrementing-counters.html"/>
- <link rel="prev" title="Folders" href="../asset-and-files/folders.html"/>
+ <link rel="prev" title="Folders" href="../assets-and-files/folders.html"/>
<script src="../_static/js/modernizr.min.js"></script>
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -141,9 +155,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul class="current">
@@ -158,11 +172,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -242,7 +258,7 @@ you might track with a user-defined counter are:</p>
<a href="creating-and-incrementing-counters.html" class="btn btn-neutral float-right" title="Creating & incrementing counters" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
- <a href="../asset-and-files/folders.html" class="btn btn-neutral" title="Folders" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+ <a href="../assets-and-files/folders.html" class="btn btn-neutral" title="Folders" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
</div>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/counters-and-events/retrieving-counters.html
----------------------------------------------------------------------
diff --git a/content/docs/counters-and-events/retrieving-counters.html b/content/docs/counters-and-events/retrieving-counters.html
index 9eff15a..6cdf0ca 100644
--- a/content/docs/counters-and-events/retrieving-counters.html
+++ b/content/docs/counters-and-events/retrieving-counters.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -141,9 +155,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul class="current">
@@ -167,11 +181,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/data-queries/advanced-query-usage.html
----------------------------------------------------------------------
diff --git a/content/docs/data-queries/advanced-query-usage.html b/content/docs/data-queries/advanced-query-usage.html
index 7c1bfc1..3b79b51 100644
--- a/content/docs/data-queries/advanced-query-usage.html
+++ b/content/docs/data-queries/advanced-query-usage.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -116,10 +117,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -144,9 +158,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -161,11 +175,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/data-queries/operators-and-types.html
----------------------------------------------------------------------
diff --git a/content/docs/data-queries/operators-and-types.html b/content/docs/data-queries/operators-and-types.html
index f021697..1a16fd6 100644
--- a/content/docs/data-queries/operators-and-types.html
+++ b/content/docs/data-queries/operators-and-types.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -117,10 +118,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -145,9 +159,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -162,11 +176,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -318,8 +334,8 @@ type-aware to ensure that query results are as you expect them to be.</p>
<p>For example, if you create an entity with a price property with a value
of 100.00, querying for 100 will return no results, since the API
expected a decimal-delimited float value in your query.</p>
-<p>For a list of property data types for each default entities, see Default
-Data Entity Types.</p>
+<p>For a list of property data types for each default entities, see
+<a class="reference external" href="../rest-endpoints/api-doc.html#models">Default Data Entities</a>s.</p>
<table class="usergrid-table">
<tr>
<td><p>string</p>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/data-queries/query-parameters.html
----------------------------------------------------------------------
diff --git a/content/docs/data-queries/query-parameters.html b/content/docs/data-queries/query-parameters.html
index bb5c638..7c354cc 100644
--- a/content/docs/data-queries/query-parameters.html
+++ b/content/docs/data-queries/query-parameters.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -120,10 +121,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -148,9 +162,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -165,11 +179,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -297,7 +313,8 @@ only.</p>
<h2>Location<a class="headerlink" href="#location" title="Permalink to this headline">¶</a></h2>
<p>If you’ve stored location data with your entities, you can query for the
proximity of the geographical locations those entities represent. For
-more information on geolocation, see Geolocation.</p>
+more information on geolocation, see
+<a class="reference external" href="../geolocation/geolocation.html">Geolocation</a>.</p>
<table class="usergrid-table">
<tr>
<td><p>Goal</p>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/data-queries/querying-your-data.html
----------------------------------------------------------------------
diff --git a/content/docs/data-queries/querying-your-data.html b/content/docs/data-queries/querying-your-data.html
index 6a618a1..923c61a 100644
--- a/content/docs/data-queries/querying-your-data.html
+++ b/content/docs/data-queries/querying-your-data.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -121,10 +122,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -149,9 +163,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -166,11 +180,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -295,8 +311,8 @@ entities array. The array will include one JSON-object for each entity
returned for the query. Each returned entity will include a number of
default properties, including the UUID of the entity, the entity type,
and values for properties such as name, username, email, and so on. For
-a complete list of default properties by entity type, see Default Data
-Entity Types.</p>
+a complete list of default properties by entity type, see <a class="reference external" href="../rest-endpoints/api-doc.html#models">Default Data
+Entities</a>.</p>
<p>For example, the following query for all entities of type user where the
name property equals ‘Gladys Kravitz’:</p>
<div class="highlight-python"><div class="highlight"><pre>/users?ql=select * where name = ‘Gladys Kravitz’
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/data-storage/collections.html
----------------------------------------------------------------------
diff --git a/content/docs/data-storage/collections.html b/content/docs/data-storage/collections.html
index ef51089..2f197aa 100644
--- a/content/docs/data-storage/collections.html
+++ b/content/docs/data-storage/collections.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -139,10 +140,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -167,9 +181,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -184,11 +198,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -253,8 +269,10 @@ empty collections if you wish, but creating an entity of a new type will
automatically create a corresponding collection for you. For example,
creating a new custom “item” entity, creates an “items” collection.</p>
<p><strong>Note</strong>: Although not shown in the API examples below, you need to
-provide a valid access token with each API call. See Authenticating
-users and application clients for details.</p>
+provide a valid access token with each API call. See <a class="reference external" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating
+users and application
+clients</a>
+for details.</p>
<div class="section" id="creating-a-collection">
<h3>Creating a collection<a class="headerlink" href="#creating-a-collection" title="Permalink to this headline">¶</a></h3>
<p>The following example shows how to create an empty collection.
@@ -330,8 +348,10 @@ also use the LIMIT parameter in a query string to increase the number of
results returned. For more information on using cursors, see <a class="reference external" href="../data-queries/query-parameters.html">Query
Parameters</a>.</p>
</p></div><p><strong>Note</strong>: Although not shown in the API examples below, you need to
-provide a valid access token with each API call. See Authenticating
-users and application clients for details.</p>
+provide a valid access token with each API call. See <a class="reference external" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating
+users and application
+clients</a>
+for details.</p>
<div class="section" id="retrieving-sets-of-entities-from-a-collection">
<h3>Retrieving sets of entities from a collection<a class="headerlink" href="#retrieving-sets-of-entities-from-a-collection" title="Permalink to this headline">¶</a></h3>
</div>
@@ -418,8 +438,10 @@ request, which can either specify all entities in the collection or a
subset of entities for the update to be performed on. For more
information on queries, see Querying your data.</p>
<p><strong>Note</strong>: Although not shown in the API examples below, you need to
-provide a valid access token with each API call. See Authenticating
-users and application clients for details.</p>
+provide a valid access token with each API call. See <a class="reference external" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating
+users and application
+clients</a>
+for details.</p>
<div class="section" id="batch-updating-entities-in-a-collection">
<h3>Batch updating entities in a collection<a class="headerlink" href="#batch-updating-entities-in-a-collection" title="Permalink to this headline">¶</a></h3>
</div>
@@ -511,8 +533,10 @@ queries, see Querying your data.</p>
<p>Currently, collections cannot be deleted; however, you can delete all of
the entities from a collection.</p>
<p><strong>Note</strong>: Although not shown in the API examples below, you need to
-provide a valid access token with each API call. See Authenticating
-users and application clients for details.</p>
+provide a valid access token with each API call. See <a class="reference external" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating
+users and application
+clients</a>
+for details.</p>
<div class="section" id="batch-deleting-entities-in-a-collection">
<h3>Batch deleting entities in a collection<a class="headerlink" href="#batch-deleting-entities-in-a-collection" title="Permalink to this headline">¶</a></h3>
</div>
[35/36] usergrid git commit: add aggregation service
Posted by sf...@apache.org.
add aggregation service
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/198f4891
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/198f4891
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/198f4891
Branch: refs/heads/entity-size
Commit: 198f489155b3f9d4346d62c0fe7ba859be917b70
Parents: c47b02d
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Aug 26 09:36:32 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Aug 26 09:36:32 2015 -0600
----------------------------------------------------------------------
.../usergrid/persistence/index/EntityIndex.java | 61 ++++++---
.../index/impl/EsEntityIndexImpl.java | 51 +++++++-
.../persistence/index/impl/EntityIndexTest.java | 129 ++++++++++++++++---
3 files changed, 193 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/198f4891/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
index 7fa2f07..6d563ff 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
@@ -39,34 +39,47 @@ public interface EntityIndex extends CPManager {
/**
* Create an index and add to alias, will create alias and remove any old index from write alias if alias already exists
- * @param indexSuffix index name
+ *
+ * @param indexSuffix index name
* @param shards
* @param replicas
* @param writeConsistency
*/
- void addIndex(
- final String indexSuffix,
- final int shards,
- final int replicas,
- final String writeConsistency
- );
+ void addIndex(
+ final String indexSuffix,
+ final int shards,
+ final int replicas,
+ final String writeConsistency
+ );
/**
* Refresh the index.
*/
- Observable<IndexRefreshCommand.IndexRefreshCommandInfo> refreshAsync();
+ Observable<IndexRefreshCommand.IndexRefreshCommandInfo> refreshAsync();
/**
* Check health of cluster.
*/
- Health getClusterHealth();
+ Health getClusterHealth();
/**
* Check health of this specific index.
*/
- Health getIndexHealth();
+ Health getIndexHealth();
+ /**
+ * get total entity size
+ * @return
+ */
+ long getEntitySize();
+
+ /**
+ * get total entity size by an edge -> "term":{"edgeName":"zzzcollzzz|roles"}
+ * @param edge
+ * @return
+ */
+ long getEntitySize(final String edge);
/**
* Initialize the index if necessary. This is an idempotent operation and should not create an index
@@ -82,48 +95,54 @@ public interface EntityIndex extends CPManager {
/**
* Search on every document in the specified search edge. Also search by the types if specified
- * @param searchEdge The edge to search on
+ *
+ * @param searchEdge The edge to search on
* @param searchTypes The search types to search
- * @param query The query to execute
- * @param limit The limit of values to return
- * @param offset The offset to query on
+ * @param query The query to execute
+ * @param limit The limit of values to return
+ * @param offset The offset to query on
* @return
*/
- CandidateResults search( final SearchEdge searchEdge, final SearchTypes searchTypes, final String query,
- final int limit, final int offset );
+ CandidateResults search(final SearchEdge searchEdge, final SearchTypes searchTypes, final String query,
+ final int limit, final int offset);
/**
* Same as search, just iterates all documents that match the index edge exactly.
- * @param edge The edge to search on
+ *
+ * @param edge The edge to search on
* @param entityId The entity that the searchEdge is connected to.
* @return
*/
- CandidateResults getAllEdgeDocuments( final IndexEdge edge, final Id entityId );
+ CandidateResults getAllEdgeDocuments(final IndexEdge edge, final Id entityId);
/**
* Returns all entity documents that match the entityId and come before the marked version
- * @param entityId The entityId to match when searching
+ *
+ * @param entityId The entityId to match when searching
* @param markedVersion The version that has been marked for deletion. All version before this one must be deleted.
* @return
*/
- CandidateResults getAllEntityVersionsBeforeMarkedVersion( final Id entityId, final UUID markedVersion );
+ CandidateResults getAllEntityVersionsBeforeMarkedVersion(final Id entityId, final UUID markedVersion);
/**
* delete all application records
+ *
* @return
*/
Observable deleteApplication();
/**
* Get the indexes for an alias
+ *
* @param aliasType name of alias
* @return list of index names
*/
- String[] getIndexes( final AliasType aliasType );
+ String[] getIndexes(final AliasType aliasType);
/**
* get all unique indexes
+ *
* @return
*/
String[] getIndexes();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/198f4891/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
index 87e2dbd..800dac3 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
@@ -62,6 +62,10 @@ import org.elasticsearch.index.query.*;
import org.elasticsearch.indices.IndexAlreadyExistsException;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.SearchHits;
+import org.elasticsearch.search.aggregations.Aggregation;
+import org.elasticsearch.search.aggregations.AggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.Sum;
+import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -424,7 +428,7 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
and query Es directly for matches
*/
- IndexValidationUtils.validateSearchEdge( edge );
+ IndexValidationUtils.validateSearchEdge(edge);
Preconditions.checkNotNull( entityId, "entityId cannot be null" );
SearchResponse searchResponse;
@@ -505,12 +509,12 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
final SearchRequestBuilder srb = searchRequestBuilderStrategyV2.getBuilder();
- FilterBuilder entityIdFilter = FilterBuilders.termFilter( IndexingUtils.ENTITY_ID_FIELDNAME,
- IndexingUtils.entityId( entityId ) );
+ FilterBuilder entityIdFilter = FilterBuilders.termFilter(IndexingUtils.ENTITY_ID_FIELDNAME,
+ IndexingUtils.entityId(entityId));
- FilterBuilder entityVersionFilter = FilterBuilders.rangeFilter( IndexingUtils.ENTITY_VERSION_FIELDNAME ).lte( markedVersion );
+ FilterBuilder entityVersionFilter = FilterBuilders.rangeFilter( IndexingUtils.ENTITY_VERSION_FIELDNAME ).lte(markedVersion);
- FilterBuilder andFilter = FilterBuilders.andFilter(entityIdFilter,entityVersionFilter );
+ FilterBuilder andFilter = FilterBuilders.andFilter(entityIdFilter, entityVersionFilter);
srb.setPostFilter(andFilter);
@@ -570,7 +574,7 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
* Completely delete an index.
*/
public Observable deleteApplication() {
- String idString = applicationId( applicationScope.getApplication() );
+ String idString = applicationId(applicationScope.getApplication());
final TermQueryBuilder tqb = QueryBuilders.termQuery(APPLICATION_ID_FIELDNAME, idString);
final String[] indexes = getIndexes();
//Added For Graphite Metrics
@@ -734,6 +738,41 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
}
@Override
+ public long getEntitySize(){
+
+
+ SearchRequestBuilder builder = searchRequestBuilderStrategyV2.getBuilder();
+ return getEntitySizeAggregation(builder);
+ }
+
+
+ @Override
+ public long getEntitySize(final String edge){
+ //"term":{"edgeName":"zzzcollzzz|roles"}
+ SearchRequestBuilder builder = searchRequestBuilderStrategyV2.getBuilder();
+ builder.setQuery(new TermQueryBuilder("edgeName",edge));
+ return getEntitySizeAggregation(builder);
+ }
+
+ private long getEntitySizeAggregation( SearchRequestBuilder builder) {
+ final String key = "entitySize";
+ SumBuilder sumBuilder = new SumBuilder(key);
+ sumBuilder.field("entitySize");
+ builder.addAggregation(sumBuilder);
+ Observable<Number> o = Observable.from(builder.execute())
+ .map(response -> {
+ Sum aggregation = (Sum) response.getAggregations().get(key);
+ if(aggregation == null){
+ return -1;
+ }else{
+ return aggregation.getValue();
+ }
+ });
+ Number val = o.toBlocking().first();
+ return val.longValue();
+ }
+
+ @Override
public int getImplementationVersion() {
return IndexDataVersions.SINGLE_INDEX.getVersion();
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/198f4891/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
index 9154382..564e5e7 100644
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
@@ -270,7 +270,7 @@ public class EntityIndexTest extends BaseIT {
insertJsonBlob( entityType, searchEdge, "/sample-large.json", 1, 0 );
- entityIndex.addIndex(UUID.randomUUID()+ "v2", 1, 0, "one" );
+ entityIndex.addIndex(UUID.randomUUID() + "v2", 1, 0, "one");
entityIndex.refreshAsync().toBlocking().first();
insertJsonBlob( entityType, searchEdge, "/sample-large.json", 1, 1 );
@@ -278,12 +278,12 @@ public class EntityIndexTest extends BaseIT {
CandidateResults crs = testQuery( searchEdge, searchTypes, "name = 'Bowers Oneil'", 1 );
EntityIndexBatch entityIndexBatch = entityIndex.createBatch();
- entityIndexBatch.deindex( searchEdge, crs.get( 0 ) );
+ entityIndexBatch.deindex(searchEdge, crs.get(0));
entityIndexBatch.execute().toBlocking().last();
entityIndex.refreshAsync().toBlocking().first();
//Hilda Youn
- testQuery( searchEdge, searchTypes, "name = 'Bowers Oneil'", 0 );
+ testQuery(searchEdge, searchTypes, "name = 'Bowers Oneil'", 0);
}
@@ -291,13 +291,14 @@ public class EntityIndexTest extends BaseIT {
String filePath, final int max, final int startIndex ) throws IOException {
InputStream is = this.getClass().getResourceAsStream( filePath );
ObjectMapper mapper = new ObjectMapper();
- List<Object> sampleJson = mapper.readValue( is, new TypeReference<List<Object>>() {} );
+ List<Object> sampleJson = mapper.readValue(is, new TypeReference<List<Object>>() {
+ });
EntityIndexBatch batch = entityIndex.createBatch();
- insertJsonBlob( sampleJson, batch, entityType, indexEdge, max, startIndex );
+ insertJsonBlob(sampleJson, batch, entityType, indexEdge, max, startIndex);
batch.execute().toBlocking().last();
IndexRefreshCommandImpl.IndexRefreshCommandInfo info = entityIndex.refreshAsync().toBlocking().first();
long time = info.getExecutionTime();
- log.info( "refresh took ms:" + time );
+ log.info("refresh took ms:" + time);
}
@@ -366,7 +367,7 @@ public class EntityIndexTest extends BaseIT {
candidateResults = entityIndex
.search(searchEdge, SearchTypes.fromTypes( entity.getId().getType() ), "name contains 'Ferrari*'", 10, 0 );
- assertEquals( 0, candidateResults.size() );
+ assertEquals(0, candidateResults.size());
}
@@ -420,8 +421,8 @@ public class EntityIndexTest extends BaseIT {
timer.stop();
- assertEquals( num, candidateResults.size() );
- log.debug( "Query time {}ms", timer.getTime() );
+ assertEquals(num, candidateResults.size());
+ log.debug("Query time {}ms", timer.getTime());
return candidateResults;
}
@@ -609,13 +610,13 @@ public class EntityIndexTest extends BaseIT {
assertEquals( bill.getId(), r.get( 0 ).getId() );
r = entityIndex.search( indexScope, searchTypes, "where username = 'fred'", 10, 0);
- assertEquals( fred.getId(), r.get( 0 ).getId() );
+ assertEquals(fred.getId(), r.get(0).getId());
r = entityIndex.search( indexScope, searchTypes, "where age = 41", 10, 0);
- assertEquals( fred.getId(), r.get( 0 ).getId() );
+ assertEquals(fred.getId(), r.get(0).getId());
r = entityIndex.search( indexScope, searchTypes, "where age = 'thirtysomething'", 10, 0);
- assertEquals( bill.getId(), r.get( 0 ).getId() );
+ assertEquals(bill.getId(), r.get(0).getId());
}
@@ -749,8 +750,8 @@ public class EntityIndexTest extends BaseIT {
final String query = "where searchUUID = " + searchUUID;
final CandidateResults r =
- entityIndex.search( indexSCope, SearchTypes.fromTypes( entityId.getType() ), query, 10, 0);
- assertEquals( user.getId(), r.get( 0 ).getId() );
+ entityIndex.search( indexSCope, SearchTypes.fromTypes(entityId.getType()), query, 10, 0);
+ assertEquals(user.getId(), r.get(0).getId());
}
@@ -781,7 +782,7 @@ public class EntityIndexTest extends BaseIT {
EntityIndexBatch batch = entityIndex.createBatch();
- batch.index( indexSCope, user );
+ batch.index(indexSCope, user);
batch.execute().toBlocking().last();
entityIndex.refreshAsync().toBlocking().first();
@@ -790,7 +791,7 @@ public class EntityIndexTest extends BaseIT {
final CandidateResults r =
entityIndex.search( indexSCope, SearchTypes.fromTypes( entityId.getType() ), query, 10, 0);
- assertEquals(user.getId(), r.get(0).getId() );
+ assertEquals(user.getId(), r.get(0).getId());
//shouldn't match
final String queryNoWildCard = "where string = 'I am'";
@@ -830,7 +831,7 @@ public class EntityIndexTest extends BaseIT {
final Entity second = new Entity( "search" );
- second.setField( new StringField( "string", "bravo long string" ) );
+ second.setField(new StringField("string", "bravo long string"));
EntityUtils.setVersion( second, UUIDGenerator.newTimeUUID() );
@@ -897,11 +898,11 @@ public class EntityIndexTest extends BaseIT {
//get ordering, so 2 is before 1 when both match
IndexEdge indexScope1 = new IndexEdgeImpl( ownerId, "searches", SearchEdge.NodeType.SOURCE, 10 );
- batch.index( indexScope1, first );
+ batch.index(indexScope1, first);
IndexEdge indexScope2 = new IndexEdgeImpl( ownerId, "searches", SearchEdge.NodeType.SOURCE, 11 );
- batch.index( indexScope2, second);
+ batch.index(indexScope2, second);
batch.execute().toBlocking().last();
@@ -914,8 +915,8 @@ public class EntityIndexTest extends BaseIT {
entityIndex.search(indexScope1, SearchTypes.fromTypes( first.getId().getType() ), singleMatchQuery, 10, 0 );
- assertEquals( 1, singleResults.size() );
- assertEquals( first.getId(), singleResults.get( 0 ).getId() );
+ assertEquals(1, singleResults.size());
+ assertEquals(first.getId(), singleResults.get(0).getId());
//search in reversed
@@ -1213,6 +1214,92 @@ public class EntityIndexTest extends BaseIT {
assertEquals( 0, noMatchesContainsOrResults.size() );
}
+ @Test
+ public void testSize(){
+ final String type = UUID.randomUUID().toString();
+
+ Id ownerId = new SimpleId( type );
+
+
+ final Entity first = new Entity( "search" );
+
+ first.setField( new StringField( "string", "I ate a sammich" ) );
+ first.setSize(100);
+
+ EntityUtils.setVersion( first, UUIDGenerator.newTimeUUID() );
+
+
+ final Entity second = new Entity( "search" );
+ second.setSize(100);
+
+ second.setField( new StringField( "string", "I drank a beer" ) );
+
+
+ EntityUtils.setVersion( second, UUIDGenerator.newTimeUUID() );
+
+
+ EntityIndexBatch batch = entityIndex.createBatch();
+
+
+ //get ordering, so 2 is before 1 when both match
+ IndexEdge indexScope1 = new IndexEdgeImpl( ownerId, "searches", SearchEdge.NodeType.SOURCE, 10 );
+ batch.index( indexScope1, first );
+
+
+ IndexEdge indexScope2 = new IndexEdgeImpl( ownerId, "searches", SearchEdge.NodeType.SOURCE, 11 );
+ batch.index( indexScope2, second);
+
+
+ batch.execute().toBlocking().last();
+ entityIndex.refreshAsync().toBlocking().first();
+ long size = entityIndex.getEntitySize();
+ assertTrue( size >= 200 );
+
+ }
+
+ @Test
+ public void testSizeByEdge(){
+ final String type = UUID.randomUUID().toString();
+
+ Id ownerId = new SimpleId( "owner" );
+
+
+ final Entity first = new Entity( type );
+
+ first.setField( new StringField( "string", "I ate a sammich" ) );
+ first.setSize(100);
+
+ EntityUtils.setVersion( first, UUIDGenerator.newTimeUUID() );
+
+
+ final Entity second = new Entity( type );
+ second.setSize(100);
+
+ second.setField( new StringField( "string", "I drank a beer" ) );
+
+
+ EntityUtils.setVersion( second, UUIDGenerator.newTimeUUID() );
+
+
+ EntityIndexBatch batch = entityIndex.createBatch();
+
+
+ //get ordering, so 2 is before 1 when both match
+ IndexEdge indexScope1 = new IndexEdgeImpl( ownerId,type , SearchEdge.NodeType.SOURCE, 10 );
+ batch.index( indexScope1, first );
+
+
+ IndexEdge indexScope2 = new IndexEdgeImpl( ownerId, type+"er", SearchEdge.NodeType.SOURCE, 11 );
+ batch.index( indexScope2, second);
+
+
+ batch.execute().toBlocking().last();
+ entityIndex.refreshAsync().toBlocking().first();
+ long size = entityIndex.getEntitySize(type);
+ assertTrue( size == 100 );
+
+ }
+
}
[30/36] usergrid git commit: Cherry pick: Remove operation cross
references from Markdown representation as Sphinx will not allow me to set
anchors.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/2303eeac/docs/rest-endpoints/api-docs.md
----------------------------------------------------------------------
diff --git a/docs/rest-endpoints/api-docs.md b/docs/rest-endpoints/api-docs.md
index 3a1b748..39c1ed9 100644
--- a/docs/rest-endpoints/api-docs.md
+++ b/docs/rest-endpoints/api-docs.md
@@ -4,16 +4,16 @@ Methods are organized by tag. Follow the methods are the [Model Definitions](#mo
<h2>Table of Contents</h2>
-* [Access-Tokens](#Access-Tokens)
-* [Activities](#Activities)
-* [Admin-Users](#Admin-Users)
-* [App-Users](#App-Users)
-* [Entities-Collections](#Entities-Collections)
-* [Events](#Events)
-* [Groups](#Groups)
-* [Notifications](#Notifications)
-* [Organizations-Applications](#Organizations-Applications)
-* [Permissions-Roles](#Permissions-Roles)
+* [Access-Tokens](#access-tokens)
+* [Activities](#activities)
+* [Admin-Users](#admin-users)
+* [App-Users](#app-users)
+* [Entities-Collections](#entities-collections)
+* [Events](#events)
+* [Groups](#groups)
+* [Notifications](#notifications)
+* [Organizations-Applications](#organizations-applications)
+* [Permissions-Roles](#permissions-roles)
<br>
<br>
@@ -27,6 +27,8 @@ Methods are organized by tag. Follow the methods are the [Model Definitions](#mo
<h2 class="usergrid-POST-heading">POST /management/token</h2>
+<a name="op-g6kolrjbqc"></a>
+
Login with Admin-User or Organization credentials.
<h3>Parameters</h3>
@@ -39,16 +41,18 @@ Login credentials either username/password or id/secret. (Specified in body).
__200__
* Description: Object containing access_token.
-* Schema: [AccessTokenResponse](#AccessTokenResponse)
+* Schema: [AccessTokenResponse](#accesstokenresponse)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/token</h2>
+<a name="op-1epwdjbmq5"></a>
+
Login with App-User or Application credentials.
<h3>Parameters</h3>
@@ -61,12 +65,12 @@ Login credentials either username/password or id/secret. (Specified in body).
__200__
* Description: Object containing access_token.
-* Schema: [AccessTokenResponse](#AccessTokenResponse)
+* Schema: [AccessTokenResponse](#accesstokenresponse)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
### Activities
@@ -74,6 +78,8 @@ __default__
<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/groups/{groupId}/feed</h2>
+<a name="op-ogkiyu6hiw"></a>
+
Get a group's feed through providing all the identifications.
<h3>Parameters</h3>
@@ -90,16 +96,18 @@ One of the group's identification which includes name or uuid. (Specified in
__200__
* Description: An array of group's activity.
-* Schema: [ActivityFeed](#ActivityFeed)
+* Schema: [ActivityFeed](#activityfeed)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/users/{userId}/activities</h2>
+<a name="op-vxk180byil"></a>
+
Create an activity in the activities collection.
<h3>Parameters</h3>
@@ -118,16 +126,18 @@ One or more sets of activity properties. (Specified in body).
__200__
* Description: An array of user's activity.
-* Schema: [ActivityFeed](#ActivityFeed)
+* Schema: [ActivityFeed](#activityfeed)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users/{userId}/feed</h2>
+<a name="op-3e8mjg3ild"></a>
+
Retrieve a user's feed through providing all the identifications.
<h3>Parameters</h3>
@@ -144,12 +154,12 @@ One of the user's identification which includes username or UUID. (Specified
__200__
* Description: An array of user's activity feed.
-* Schema: [ActivityFeed](#ActivityFeed)
+* Schema: [ActivityFeed](#activityfeed)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
### Admin-Users
@@ -157,6 +167,8 @@ __default__
<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/users</h2>
+<a name="op-0h23bhc1fo"></a>
+
Retrieve details about the admin users in an organization.
<h3>Parameters</h3>
@@ -169,16 +181,18 @@ One of the organization's identification which includes name or uuid. (Speci
__200__
* Description: An array of retrieved Admin user's info.
-* Schema: [User](#User)
+* Schema: [User](#user)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-DELETE-heading">DELETE /management/orgs/{orgId}/users/{userId}</h2>
+<a name="op-tslbueyidt"></a>
+
Remove an admin user from an organization through providing both Id of application and organization.
<h3>Parameters</h3>
@@ -193,16 +207,18 @@ One of the user's identification which includes username, email address or U
__200__
* Description: An array of deleted Admin user's info.
-* Schema: [User](#User)
+* Schema: [User](#user)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-POST-heading">POST /management/users</h2>
+<a name="op-qq0xsfwrk9"></a>
+
Create a whole new admin user.
<h3>Parameters</h3>
@@ -215,16 +231,18 @@ User entity with fields required for User creation. (Specified in body).
__200__
* Description: An API Response with a entities array containing the newly created Admin User.
-* Schema: [User](#User)
+* Schema: [User](#user)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /management/users/resetpw</h2>
+<a name="op-d5w5sa7r6g"></a>
+
Initiate the reset of an admin user's password.
<h3>Parameters</h3>
@@ -235,16 +253,18 @@ Initiate the reset of an admin user's password.
__200__
* Description: An array of complete messages.
-* Schema: [Action](#Action)
+* Schema: [Action](#action)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-POST-heading">POST /management/users/resetpw</h2>
+<a name="op-mtjnervjog"></a>
+
Complete the password reset through getting the newpassword and the old one for identification.
<h3>Parameters</h3>
@@ -262,11 +282,13 @@ __200__
__default__
* Description:
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /management/users/{userId}</h2>
+<a name="op-pqthpqruuu"></a>
+
Retrieve details about an admin user.
<h3>Parameters</h3>
@@ -279,16 +301,18 @@ One of the user's identification which includes username, real name, email a
__200__
* Description: An API Response with a entities array containing the Admin User.
-* Schema: [User](#User)
+* Schema: [User](#user)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-PUT-heading">PUT /management/users/{userId}</h2>
+<a name="op-mydfdnvoxu"></a>
+
Update the info of an admin user.
<h3>Parameters</h3>
@@ -301,16 +325,18 @@ One of the user's identification which includes username, real name, email a
__200__
* Description: An API Response with a entities array containing the updated Admin User
-* Schema: [User](#User)
+* Schema: [User](#user)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /management/users/{userId}/activate</h2>
+<a name="op-ydubzwoyll"></a>
+
Activate an admin user from a link provIded in an email notification.
<h3>Parameters</h3>
@@ -327,16 +353,18 @@ Query statement of whether send confimation email or not. (Specified in query).
__200__
* Description: An array of complete messages.
-* Schema: [Action](#Action)
+* Schema: [Action](#action)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-PUT-heading">PUT /management/users/{userId}/password</h2>
+<a name="op-tojtjxiv8m"></a>
+
Update an admin user's password through getting the newpassword and the old one for identification.
<h3>Parameters</h3>
@@ -351,16 +379,18 @@ The user's old and new password. (Specified in body).
__200__
* Description: An array of complete messages.
-* Schema: [Action](#Action)
+* Schema: [Action](#action)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /management/users/{userId}/reactivate</h2>
+<a name="op-fcsvsgqdmf"></a>
+
Reactivate an expired admin user.
<h3>Parameters</h3>
@@ -373,12 +403,12 @@ One of the user's identification which includes username, real name, email a
__200__
* Description: An array of complete messages.
-* Schema: [Action](#Action)
+* Schema: [Action](#action)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
### App-Users
@@ -386,6 +416,8 @@ __default__
<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users</h2>
+<a name="op-apfodlbfvw"></a>
+
Retrieve users though query statement.
<h3>Parameters</h3>
@@ -402,16 +434,18 @@ The query statement of the User. (Specified in query).
__200__
* Description: An array of retrieved user's info.
-* Schema: [User](#User)
+* Schema: [User](#user)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/users</h2>
+<a name="op-vcebxhfnai"></a>
+
Create a user in the users collection through providing all the identifications.
<h3>Parameters</h3>
@@ -428,16 +462,18 @@ The properties of the user. (Specified in body).
__200__
* Description: An array of created user's info.
-* Schema: [User](#User)
+* Schema: [User](#user)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users/{userId}</h2>
+<a name="op-rxzqi79iqh"></a>
+
Retrieve a user through providing all the identifications.
<h3>Parameters</h3>
@@ -454,16 +490,18 @@ One of the user's identification which includes username, email address or U
__200__
* Description: An array of retrieved user's info.
-* Schema: [User](#User)
+* Schema: [User](#user)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-PUT-heading">PUT /{orgId}/{appId}/users/{userId}</h2>
+<a name="op-eqfv3kglfr"></a>
+
Update a user through providing all the identifications.
<h3>Parameters</h3>
@@ -480,16 +518,18 @@ One of the user's identification which includes username or UUID. (Specified
__200__
* Description: An array of updated user's info.
-* Schema: [User](#User)
+* Schema: [User](#user)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/users/{userId}</h2>
+<a name="op-q0sbwpkbrn"></a>
+
Remove a user through providing all the identifications.
<h3>Parameters</h3>
@@ -506,16 +546,18 @@ One of the user's identification which includes username or UUID. (Specified
__200__
* Description: An array of deleted user's info.
-* Schema: [User](#User)
+* Schema: [User](#user)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/users/{user}/password</h2>
+<a name="op-tz8aby9w7l"></a>
+
Set a user's password or reset the user's existing password.
<h3>Parameters</h3>
@@ -534,12 +576,12 @@ The user's old and new password. (Specified in body).
__200__
* Description: An array of complete messages.
-* Schema: [Action](#Action)
+* Schema: [Action](#action)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
### Entities-Collections
@@ -547,6 +589,8 @@ __default__
<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users/{userId}/{relation}</h2>
+<a name="op-p3wfwppylf"></a>
+
Retrieve a user's collections or connections through query statement.
<h3>Parameters</h3>
@@ -567,16 +611,18 @@ The query statement of the user. (Specified in query).
__200__
* Description: An array of user's collections info.
-* Schema: [Entity](#Entity)
+* Schema: [Entity](#entity)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/{collectionId}</h2>
+<a name="op-071uvg9uhh"></a>
+
Retrieve collection through query statement.
<h3>Parameters</h3>
@@ -595,16 +641,18 @@ Any values specified in the query statement should be enclosed in single-quotes.
__200__
* Description: An array of retrieved collection's info.
-* Schema: [Entity](#Entity)
+* Schema: [Entity](#entity)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-PUT-heading">PUT /{orgId}/{appId}/{collectionId}</h2>
+<a name="op-vlva22mrqv"></a>
+
Update collection through query statement.
<h3>Parameters</h3>
@@ -623,16 +671,18 @@ Any values specified in the query statement should be enclosed in single-quotes.
__200__
* Description: An array of updated collection's info.
-* Schema: [Entity](#Entity)
+* Schema: [Entity](#entity)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2}</h2>
+<a name="op-yhl3yuzrpo"></a>
+
Add an entity to a collection through providing all the identifications.
<h3>Parameters</h3>
@@ -655,16 +705,18 @@ The Id of the 2nd entity. (Specified in path).
__200__
* Description: An array of added entity's info.
-* Schema: [Entity](#Entity)
+* Schema: [Entity](#entity)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2}</h2>
+<a name="op-9gfzhzym3s"></a>
+
Remove an entity from a collection through providing all the identifications.
<h3>Parameters</h3>
@@ -687,16 +739,18 @@ The Id of the 2nd entity. (Specified in path).
__200__
* Description: An array of deleted entity's info.
-* Schema: [Entity](#Entity)
+* Schema: [Entity](#entity)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/{collectionId}/{entityId}</h2>
+<a name="op-usi7vrth9c"></a>
+
Retrieve an entity through providing Id of application, organization, collection and entity.
<h3>Parameters</h3>
@@ -715,16 +769,18 @@ One of the entity's identification which includes name or uuid. (Specified i
__200__
* Description: An array of retrieved entity's info.
-* Schema: [Entity](#Entity)
+* Schema: [Entity](#entity)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-PUT-heading">PUT /{orgId}/{appId}/{collectionId}/{entityId}</h2>
+<a name="op-grwgmcmeiv"></a>
+
One or more properties can be updated with a single request.
<h3>Parameters</h3>
@@ -745,16 +801,18 @@ The properties of the entity. (Specified in body).
__200__
* Description: An array of updated entity's info.
-* Schema: [Entity](#Entity)
+* Schema: [Entity](#entity)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId}</h2>
+<a name="op-3pvhj9pwas"></a>
+
Delete an entity from the collection.
<h3>Parameters</h3>
@@ -773,16 +831,18 @@ One of the entity's identification which includes name or uuid. (Specified i
__200__
* Description: An array of deleted entity's info.
-* Schema: [Entity](#Entity)
+* Schema: [Entity](#entity)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/{entitytype}</h2>
+<a name="op-yaupy7fiha"></a>
+
When a new entity is created, Usergrid will automatically create a corresponding collection if one does not already exist. The collection will automatically be named with the plural form of the entity type.
<h3>Parameters</h3>
@@ -801,12 +861,12 @@ The properties of the entity. (Specified in body).
__200__
* Description: An array of created custom entity's info.
-* Schema: [Entity](#Entity)
+* Schema: [Entity](#entity)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
### Events
@@ -814,6 +874,8 @@ __default__
<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/events</h2>
+<a name="op-sahbmftblc"></a>
+
Create an event through providing both Id of organization and application.
<h3>Parameters</h3>
@@ -830,12 +892,12 @@ The required property of the event. (Specified in body).
__200__
* Description: An array of created event's info.
-* Schema: [Event](#Event)
+* Schema: [Event](#event)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
### Groups
@@ -843,6 +905,8 @@ __default__
<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/groups</h2>
+<a name="op-lqawyn1jf7"></a>
+
Create a new group through providing both Id of organization and application.
<h3>Parameters</h3>
@@ -859,16 +923,18 @@ The property of the created group. (Specified in body).
__200__
* Description: An array of created group's info.
-* Schema: [Group](#Group)
+* Schema: [Group](#group)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/groups/{groupId}/activities</h2>
+<a name="op-kah8tippl1"></a>
+
Create an activity to a specific group. In this case the activity is created in the activities collection and is accessible at the /activities endpoint to users who have the permission to read that endpoint. In addition, a relationship is established between the activity and the group, and because of that, the activity will appear in the group’s feed. The group 'owns' the activity. Also, the activity will be published in the feed of all users that are members of the group.
<h3>Parameters</h3>
@@ -887,16 +953,18 @@ One or more sets of activity properties. (Specified in body).
__200__
* Description:
-* Schema: [ActivityFeed](#ActivityFeed)
+* Schema: [ActivityFeed](#activityfeed)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/groups/{groupId}/users/{userId}</h2>
+<a name="op-lwbnuuzwdp"></a>
+
Add a user to a group through providing all the identifications.
<h3>Parameters</h3>
@@ -915,16 +983,18 @@ One of the user's identification which includes username or UUID. (Specified
__200__
* Description: An array of added user's info.
-* Schema: [User](#User)
+* Schema: [User](#user)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/groups/{groupId}/users/{userId}</h2>
+<a name="op-yrptebgezb"></a>
+
Delete user from a group through providing all the identifications.
<h3>Parameters</h3>
@@ -943,16 +1013,18 @@ One of the user's identification which includes username or UUID. (Specified
__200__
* Description: An array of deleted user's info.
-* Schema: [User](#User)
+* Schema: [User](#user)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /{org_Id}/{app_Id}/groups/{groupId}</h2>
+<a name="op-2yavprepml"></a>
+
Get a group through through providing all the identifications.
<h3>Parameters</h3>
@@ -969,16 +1041,18 @@ One of the group's identification which includes name or uuid. (Specified in
__200__
* Description: An array of retrieved group's info.
-* Schema: [Group](#Group)
+* Schema: [Group](#group)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-PUT-heading">PUT /{org_Id}/{app_Id}/groups/{groupId}</h2>
+<a name="op-1ogt6s1meu"></a>
+
Update a group through providing all the identifications.
<h3>Parameters</h3>
@@ -995,12 +1069,12 @@ One of the group's identification which includes name or uuid. (Specified in
__200__
* Description: An array of updated group's info.
-* Schema: [Group](#Group)
+* Schema: [Group](#group)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
### Notifications
@@ -1008,6 +1082,8 @@ __default__
<h2 class="usergrid-POST-heading">POST /{orgId}/{applicationId}/devices</h2>
+<a name="op-gtyulxpfuh"></a>
+
Create notifications for user through targeting by location and providing all the identifications.
<h3>Parameters</h3>
@@ -1026,16 +1102,18 @@ The query statement of the location of the user. (Specified in query).
__200__
* Description: An array of created notification's info.
-* Schema: [Notification](#Notification)
+* Schema: [Notification](#notification)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-POST-heading">POST /{orgId}/{applicationId}/devices/*/notifications</h2>
+<a name="op-fmxyekvv79"></a>
+
Create notifications for all devices. This request will target all device entities.
<h3>Parameters</h3>
@@ -1052,16 +1130,18 @@ These parameters are used when forming the notification portion of the request.
__200__
* Description: An array of created notification's info.
-* Schema: [Notification](#Notification)
+* Schema: [Notification](#notification)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-POST-heading">POST /{orgId}/{applicationId}/devices/{deviceId}/notifications</h2>
+<a name="op-iycz2tnhqk"></a>
+
Create notifications for a single device. This request will target a specific device entity.
<h3>Parameters</h3>
@@ -1080,16 +1160,18 @@ These parameters are used when forming the notification portion of the request.
__200__
* Description: An array of created notification's info.
-* Schema: [Notification](#Notification)
+* Schema: [Notification](#notification)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-POST-heading">POST /{orgId}/{applicationId}/groups/{path}/notifications</h2>
+<a name="op-cz55hca573"></a>
+
Create notifications for a group. This request will target all users associated with a specific group entity.
<h3>Parameters</h3>
@@ -1108,16 +1190,18 @@ These parameters are used when forming the notification portion of the request.
__200__
* Description: An array of created notification's info.
-* Schema: [Notification](#Notification)
+* Schema: [Notification](#notification)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /{orgId}/{applicationId}/notifications</h2>
+<a name="op-dt0m447vtt"></a>
+
Retrieve one or more notifications through providing all the identifications.
<h3>Parameters</h3>
@@ -1132,16 +1216,18 @@ One of the application's identification which includes name or uuid (same as
__200__
* Description: An array of retrieved notification's info.
-* Schema: [Notification](#Notification)
+* Schema: [Notification](#notification)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-PUT-heading">PUT /{orgId}/{applicationId}/notifications/{notificationId}</h2>
+<a name="op-x3htrvnimm"></a>
+
Update a Notification in order to cancel the notifcation or set a new expiration time.
<h3>Parameters</h3>
@@ -1160,16 +1246,18 @@ Object with Notification fields to be updated. (Specified in body).
__200__
* Description: An API Response object containing an entity of type Notification.
-* Schema: [Notification](#Notification)
+* Schema: [Notification](#notification)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{applicationId}/notifications/{notificationId}</h2>
+<a name="op-v8fksfkydk"></a>
+
Delete an unsent Notification from the system.
<h3>Parameters</h3>
@@ -1186,16 +1274,18 @@ One of the notification's identification which includes name or uuid. (Speci
__200__
* Description: API Response containing Notification entity that was deleted.
-* Schema: [Notification](#Notification)
+* Schema: [Notification](#notification)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /{orgId}/{applicationId}/receipts</h2>
+<a name="op-bierhevrl4"></a>
+
Retrieve one or more receipts through providing all the identifications.
<h3>Parameters</h3>
@@ -1210,16 +1300,18 @@ One of the application's identification which includes name or uuid (same as
__200__
* Description: An array of retrieved receipt's info.
-* Schema: [Receipt](#Receipt)
+* Schema: [Receipt](#receipt)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-POST-heading">POST /{orgId}/{applicationId}/users/{userId}/notifications</h2>
+<a name="op-0e0sm3lp5t"></a>
+
Create notifications for a user. This request will target a specific user entity.
<h3>Parameters</h3>
@@ -1238,16 +1330,18 @@ These parameters are used when forming the notification portion of the request.
__200__
* Description: An array of created notification's info.
-* Schema: [Notification](#Notification)
+* Schema: [Notification](#notification)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /{orgId}/{applicationId}/{deviceId}/*/receipts</h2>
+<a name="op-dkszriccku"></a>
+
Retrieve receipts associated with one or more devices through providing all the identifications.
<h3>Parameters</h3>
@@ -1264,16 +1358,18 @@ One of the device's identification which includes name or uuid. (Specified i
__200__
* Description: An array of retrieved receipt's info.
-* Schema: [Receipt](#Receipt)
+* Schema: [Receipt](#receipt)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /{orgId}/{applicationId}/{notificationId}/*/queue</h2>
+<a name="op-t8pxsqwc6d"></a>
+
Retrieve the list of devices associated with one or more notifications before the notifications are sent through providing all the identifications.
<h3>Parameters</h3>
@@ -1290,16 +1386,18 @@ One of the notification's identification which includes name or uuid. (Speci
__200__
* Description: An array of retrieved device's info.
-* Schema: [Device](#Device)
+* Schema: [Device](#device)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /{orgId}/{applicationId}/{notificationId}/*/receipts</h2>
+<a name="op-xcy3ifmfkc"></a>
+
Retrieve receipts for one or more notifications through providing all the identifications.
<h3>Parameters</h3>
@@ -1316,16 +1414,18 @@ One of the notification's identification which includes name or uuid. (Speci
__200__
* Description: An array of retrieved receipt's info.
-* Schema: [Receipt](#Receipt)
+* Schema: [Receipt](#receipt)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /{orgId}/{applicationId}/{receiptId}/*/notifications</h2>
+<a name="op-xoeujjr9zv"></a>
+
Retrieve notifications associated with one or more receipts through providing all the identifications.
<h3>Parameters</h3>
@@ -1342,12 +1442,12 @@ One of the receipt's identification which includes name or uuid. (Specified
__200__
* Description: An array of retrieved notification's info.
-* Schema: [Notification](#Notification)
+* Schema: [Notification](#notification)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
### Organizations-Applications
@@ -1355,6 +1455,8 @@ __default__
<h2 class="usergrid-POST-heading">POST /management/orgs</h2>
+<a name="op-vcwlytogis"></a>
+
Create an organization through a form post.
<h3>Parameters</h3>
@@ -1367,16 +1469,18 @@ A set of organization properties supplied through a form. (Specified in body).
__200__
* Description: An array of created Organization.
-* Schema: [Organization](#Organization)
+* Schema: [Organization](#organization)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}</h2>
+<a name="op-fuenkzdzx7"></a>
+
Retrieve an organization given a specified UUID or username.
<h3>Parameters</h3>
@@ -1389,16 +1493,18 @@ One of the organization's identification which includes name or uuid. (Speci
__200__
* Description: An array of created Organization.
-* Schema: [Organization](#Organization)
+* Schema: [Organization](#organization)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/activate</h2>
+<a name="op-rlwkfscz2c"></a>
+
Activate an organization from a link provIded in an email notification.
<h3>Parameters</h3>
@@ -1415,16 +1521,18 @@ Send confirmation email or not. (Specified in query).
__200__
* Description: An array of complete messages.
-* Schema: [Action](#Action)
+* Schema: [Action](#action)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/apps</h2>
+<a name="op-7rcjv4cu57"></a>
+
Retrieve the applications in an organization through providing both Id of application and organization.
<h3>Parameters</h3>
@@ -1437,16 +1545,18 @@ One of the organization's identification which includes name or uuid. (Speci
__200__
* Description: An array of retrieved application data.
-* Schema: [AppData](#AppData)
+* Schema: [AppData](#appdata)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-DELETE-heading">DELETE /management/orgs/{orgId}/apps/{appId}</h2>
+<a name="op-ytwesqwdgc"></a>
+
Remove an application from an organization through providing both Id of application and organization.
<h3>Parameters</h3>
@@ -1461,16 +1571,18 @@ One of the application's identification which includes name or uuid. (Specif
__200__
* Description: An array of deleted application info.
-* Schema: [AppData](#AppData)
+* Schema: [AppData](#appdata)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/apps/{appId}/credentials</h2>
+<a name="op-9xfw58hzbu"></a>
+
Retrieve the client Id and client secret credentials for an application in an organization.
<h3>Parameters</h3>
@@ -1485,16 +1597,18 @@ One of the application's identification which includes name or uuid. (Specif
__200__
* Description: An array of retrieved credentials info.
-* Schema: [Credential](#Credential)
+* Schema: [Credential](#credential)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-POST-heading">POST /management/orgs/{orgId}/apps/{appId}/credentials</h2>
+<a name="op-lcqnmroopm"></a>
+
Generate the client Id and client secret credentials for an application in an organization.
<h3>Parameters</h3>
@@ -1509,16 +1623,18 @@ One of the application's identification which includes name or uuid. (Specif
__200__
* Description: An array of generated credentials info.
-* Schema: [Credential](#Credential)
+* Schema: [Credential](#credential)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/credentials</h2>
+<a name="op-srhannjni2"></a>
+
Retrieve the credentials for an organization client.
<h3>Parameters</h3>
@@ -1531,16 +1647,18 @@ One of the organization's identification which includes name or uuid. (Speci
__200__
* Description: An array of Credential
-* Schema: [Credential](#Credential)
+* Schema: [Credential](#credential)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-POST-heading">POST /management/orgs/{orgId}/credentials</h2>
+<a name="op-konb0d3faz"></a>
+
Generate whole new credentials for an organization client.
<h3>Parameters</h3>
@@ -1553,16 +1671,18 @@ One of the organization's identification which includes name or uuid. (Speci
__200__
* Description: An array of Credential
-* Schema: [Credential](#Credential)
+* Schema: [Credential](#credential)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/feed</h2>
+<a name="op-jmorkmmhu8"></a>
+
Retrieve an organization's activity feed.
<h3>Parameters</h3>
@@ -1575,16 +1695,18 @@ One of the organization's identification which includes name or uuid. (Speci
__200__
* Description: An array of the organization's ActivityFeed.
-* Schema: [ActivityFeed](#ActivityFeed)
+* Schema: [ActivityFeed](#activityfeed)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/reactivate</h2>
+<a name="op-2eplhfrllc"></a>
+
Reactivate an expired organization.
<h3>Parameters</h3>
@@ -1597,16 +1719,18 @@ One of the organization's identification which includes name or uuid. (Speci
__200__
* Description: An array of complete messages.
-* Schema: [Action](#Action)
+* Schema: [Action](#action)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /management/users/{userId}/feed</h2>
+<a name="op-yitoouap1l"></a>
+
Retrieve an admin user's activity feed.
<h3>Parameters</h3>
@@ -1619,12 +1743,12 @@ One of the user's identification which includes username, real name, email a
__200__
* Description: An array of user's activity
-* Schema: [ActivityFeed](#ActivityFeed)
+* Schema: [ActivityFeed](#activityfeed)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
### Permissions-Roles
@@ -1632,6 +1756,8 @@ __default__
<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/roles</h2>
+<a name="op-gzvozr9tpx"></a>
+
Retrieve the roles in an application through providing all the identifications.
<h3>Parameters</h3>
@@ -1646,16 +1772,18 @@ One of the application's identification which includes name or uuid. (Specif
__200__
* Description: An array of retrieved role's info.
-* Schema: [Role](#Role)
+* Schema: [Role](#role)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/roles</h2>
+<a name="op-6cxfmtg8qw"></a>
+
Create a new role through providing all the identifications.
<h3>Parameters</h3>
@@ -1672,16 +1800,18 @@ The required properties of the role. (Specified in body).
__200__
* Description: An array of created role's info.
-* Schema: [Role](#Role)
+* Schema: [Role](#role)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/roles/{roleId}/permissions</h2>
+<a name="op-xhckyqr6ab"></a>
+
Remove permissions from a role.
<h3>Parameters</h3>
@@ -1700,16 +1830,18 @@ The query statement of the url pattern. (Specified in body).
__200__
* Description: Permissions object with array of the deleated Usergrid Permission strings.
-* Schema: [Permissions](#Permissions)
+* Schema: [Permissions](#permissions)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/roles/{roleId}/users</h2>
+<a name="op-xvyk7zreff"></a>
+
Retrieve the users in a role through providing all the identifications.
<h3>Parameters</h3>
@@ -1726,16 +1858,18 @@ One of the role's identification which includes name or uuid. (Specified in
__200__
* Description: An API Response with a entities array of Users.
-* Schema: [User](#User)
+* Schema: [User](#user)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/roles/{roleId}/users/{userId}</h2>
+<a name="op-muyc43xgrf"></a>
+
Add a user to a role through providing all the identifications.
<h3>Parameters</h3>
@@ -1754,16 +1888,18 @@ One of the user's identification which includes username or UUID. (Specified
__200__
* Description: An array of added user's info.
-* Schema: [User](#User)
+* Schema: [User](#user)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/roles/{roleId}/users/{userId}</h2>
+<a name="op-ozbsrlozwi"></a>
+
Remove a user from a role through providing all the identifications.
<h3>Parameters</h3>
@@ -1782,16 +1918,18 @@ One of the user's identification which includes username or UUID. (Specified
__200__
* Description: An array of deleted user's info.
-* Schema: [User](#User)
+* Schema: [User](#user)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/roles/{rolename}</h2>
+<a name="op-1obkbxb1zd"></a>
+
Remove a role through providing all the identifications.
<h3>Parameters</h3>
@@ -1808,16 +1946,18 @@ The name of the role. (Specified in path).
__200__
* Description: An array of deleted role's info.
-* Schema: [Role](#Role)
+* Schema: [Role](#role)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-GET-heading">GET /{orgId}/{applicationId}/roles/{roleId}/permissions</h2>
+<a name="op-bb3svhbvfj"></a>
+
Retrieve permissions for a Role.
<h3>Parameters</h3>
@@ -1834,16 +1974,18 @@ One of the role's identification which includes name or uuid. (Specified in
__200__
* Description: Permissions object with array of Usergrid Permission strings.
-* Schema: [Permissions](#Permissions)
+* Schema: [Permissions](#permissions)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
<h2 class="usergrid-POST-heading">POST /{orgId}/{applicationId}/roles/{roleId}/permissions</h2>
+<a name="op-mu9s1qxs5u"></a>
+
Add permissions to a role through providing all the identifications.
<h3>Parameters</h3>
@@ -1862,12 +2004,12 @@ Permissions object with array of Usergrid Permission strings to be added. (Speci
__200__
* Description: Permissions object with array of Usergrid Permission strings.
-* Schema: [Permission](#Permission)
+* Schema: [Permission](#permission)
__default__
* Description: Unexpected error.
-* Schema: [Error](#Error)
+* Schema: [Error](#error)
## Models
@@ -1912,12 +2054,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/management/token](#op-MhD5hWgRwK)
-* [/{orgId}/{appId}/token](#op-9TDlDc0BL3)
-
-
### Action
@@ -1974,17 +2110,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/management/users/resetpw](#op-AiNhPeeyiq)
-* [/{orgId}/{appId}/users/{user}/password](#op-d0NWF6YZuK)
-* [/management/orgs/{orgId}/activate](#op-5138i0P1q8)
-* [/management/users/{userId}/activate](#op-c9LsV7Ulbr)
-* [/management/orgs/{orgId}/reactivate](#op-RIuF55JkgX)
-* [/management/users/{userId}/reactivate](#op-jk8tbzHamj)
-* [/management/users/{userId}/password](#op-yjg1hntm4R)
-
-
__Referring Definitions__
* [Receipt](#receipt)
@@ -2079,16 +2204,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/{orgId}/{appId}/users/{userId}/activities](#op-SgbcdXdHSq)
-* [/{orgId}/{appId}/users/{userId}/feed](#op-JOpALhJR9x)
-* [/management/orgs/{orgId}/feed](#op-FsWAA6TQ6j)
-* [/{orgId}/{appId}/groups/{groupId}/feed](#op-vjWBovszxD)
-* [/management/users/{userId}/feed](#op-oyQqxIeMTj)
-* [/{orgId}/{appId}/groups/{groupId}/activities](#op-Y8sHuGSnUK)
-
-
### AddRole
@@ -2121,11 +2236,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/{orgId}/{appId}/roles](#op-77UvdX1AKS)
-
-
### AppData
@@ -2174,12 +2284,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/management/orgs/{orgId}/apps](#op-FxESea37Iw)
-* [/management/orgs/{orgId}/apps/{appId}](#op-dfDXMn6FHh)
-
-
__Referring Definitions__
* [Organization](#organization)
@@ -2248,12 +2352,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/{orgId}/{appId}/users/{userId}/activities](#op-SgbcdXdHSq)
-* [/{orgId}/{appId}/groups/{groupId}/activities](#op-Y8sHuGSnUK)
-
-
### CreateAdminUser
@@ -2302,11 +2400,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/management/users](#op-OrsKI3OblZ)
-
-
### CreateEntities
@@ -2323,12 +2416,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/{orgId}/{appId}/{entitytype}](#op-vhYugcLtOU)
-* [/{orgId}/{appId}/{collectionId}/{entityId}](#op-rIFHtzBMnq)
-
-
### CreateEvent
@@ -2353,11 +2440,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/{orgId}/{appId}/events](#op-tbL4sW2gO4)
-
-
### CreateGroup
@@ -2390,11 +2472,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/{orgId}/{appId}/groups](#op-cSFYOwc349)
-
-
### CreateNotifications
@@ -2411,15 +2488,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/{orgId}/{applicationId}/groups/{path}/notifications](#op-HcxsWWHJuW)
-* [/{orgId}/{applicationId}/devices](#op-tHQHlcVc6O)
-* [/{orgId}/{applicationId}/devices/{deviceId}/notifications](#op-DhaimEfP36)
-* [/{orgId}/{applicationId}/users/{userId}/notifications](#op-GqqUlXEpw0)
-* [/{orgId}/{applicationId}/devices/*/notifications](#op-9Av28Sb6xD)
-
-
### CreateOrg
@@ -2476,11 +2544,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/management/orgs](#op-10Xly2uR81)
-
-
### CreateUser
@@ -2505,11 +2568,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/{orgId}/{appId}/users](#op-B3JxnPdQnX)
-
-
### Credential
@@ -2550,14 +2608,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/management/orgs/{orgId}/credentials](#op-yvf6XFwT9U)
-* [/management/orgs/{orgId}/apps/{appId}/credentials](#op-BQVtNYKbr6)
-* [/management/orgs/{orgId}/credentials](#op-x2rOvoWwdu)
-* [/management/orgs/{orgId}/apps/{appId}/credentials](#op-l2sf6CY3kb)
-
-
### Device
@@ -2630,11 +2680,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/{orgId}/{applicationId}/{notificationId}/*/queue](#op-813WAQfcPn)
-
-
### Entity
@@ -2707,19 +2752,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/{orgId}/{appId}/{collectionId}/{entityId}](#op-6bY9NIsNDh)
-* [/{orgId}/{appId}/{collectionId}](#op-uUIPNDp91Q)
-* [/{orgId}/{appId}/users/{userId}/{relation}](#op-p76OEoqzeq)
-* [/{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2}](#op-fqEhlK2uYz)
-* [/{orgId}/{appId}/{collectionId}/{entityId}](#op-gMtdxV5Km7)
-* [/{orgId}/{appId}/{collectionId}](#op-JNUUZzf2XB)
-* [/{orgId}/{appId}/{entitytype}](#op-vhYugcLtOU)
-* [/{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2}](#op-HEKlO2fyjg)
-* [/{orgId}/{appId}/{collectionId}/{entityId}](#op-rIFHtzBMnq)
-
-
__Referring Definitions__
* [Role](#role)
@@ -2767,7 +2799,6 @@ __Properties__
</table>
-
### Event
@@ -2839,11 +2870,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/{orgId}/{appId}/events](#op-tbL4sW2gO4)
-
-
### Group
@@ -2924,13 +2950,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/{orgId}/{appId}/groups](#op-cSFYOwc349)
-* [/{org_Id}/{app_Id}/groups/{groupId}](#op-DN1sgDsfHL)
-* [/{org_Id}/{app_Id}/groups/{groupId}](#op-WJCUsLbpoy)
-
-
### LoginCredentials
@@ -2987,12 +3006,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/management/token](#op-MhD5hWgRwK)
-* [/{orgId}/{appId}/token](#op-9TDlDc0BL3)
-
-
### Notification
@@ -3089,19 +3102,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/{orgId}/{applicationId}/notifications/{notificationId}](#op-xHUyW9SEKp)
-* [/{orgId}/{applicationId}/notifications/{notificationId}](#op-p1JCjxXaT6)
-* [/{orgId}/{applicationId}/{receiptId}/*/notifications](#op-tMb27wddix)
-* [/{orgId}/{applicationId}/groups/{path}/notifications](#op-HcxsWWHJuW)
-* [/{orgId}/{applicationId}/devices](#op-tHQHlcVc6O)
-* [/{orgId}/{applicationId}/notifications](#op-EVJZ1t5REk)
-* [/{orgId}/{applicationId}/devices/{deviceId}/notifications](#op-DhaimEfP36)
-* [/{orgId}/{applicationId}/users/{userId}/notifications](#op-GqqUlXEpw0)
-* [/{orgId}/{applicationId}/devices/*/notifications](#op-9Av28Sb6xD)
-
-
### NotificationUpdate
@@ -3142,11 +3142,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/{orgId}/{applicationId}/notifications/{notificationId}](#op-xHUyW9SEKp)
-
-
### Organization
@@ -3275,12 +3270,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/management/orgs](#op-10Xly2uR81)
-* [/management/orgs/{orgId}](#op-fMZQcXXAv8)
-
-
### Permissions
@@ -3329,13 +3318,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/{orgId}/{applicationId}/roles/{roleId}/permissions](#op-fB9nGqslMj)
-* [/{orgId}/{appId}/roles/{roleId}/permissions](#op-kaaoh5SC55)
-* [/{orgId}/{applicationId}/roles/{roleId}/permissions](#op-9VeULLNiHw)
-
-
### Receipt
@@ -3432,13 +3414,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/{orgId}/{applicationId}/{notificationId}/*/receipts](#op-4ltskxwFlh)
-* [/{orgId}/{applicationId}/receipts](#op-Jrx6MJpfDT)
-* [/{orgId}/{applicationId}/{deviceId}/*/receipts](#op-dcBSAaCDdl)
-
-
### ResetPW
@@ -3471,12 +3446,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/{orgId}/{appId}/users/{user}/password](#op-d0NWF6YZuK)
-* [/management/users/{userId}/password](#op-yjg1hntm4R)
-
-
### ResetPWMsg
@@ -3517,11 +3486,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/management/users/resetpw](#op-XfnvemSsD8)
-
-
### Role
@@ -3610,13 +3574,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/{orgId}/{appId}/roles](#op-Xs9X9TSi8B)
-* [/{orgId}/{appId}/roles](#op-77UvdX1AKS)
-* [/{orgId}/{appId}/roles/{rolename}](#op-OVMDaZHUiZ)
-
-
### User
@@ -3753,25 +3710,6 @@ __Properties__
</tr>
</table>
-__Referring API Paths__
-
-* [/management/orgs/{orgId}/users](#op-z7AQVyIzPn)
-* [/{orgId}/{appId}/users](#op-Rq1TkYSvPN)
-* [/management/users/{userId}](#op-Vh6g9ZgYMh)
-* [/{orgId}/{appId}/groups/{groupId}/users/{userId}](#op-tTRCEhAz0z)
-* [/{orgId}/{appId}/roles/{roleId}/users/{userId}](#op-Hscxz1kxfu)
-* [/{orgId}/{appId}/groups/{groupId}/users/{userId}](#op-EeS4c1jZT1)
-* [/management/users/{userId}](#op-SrpcXlZC86)
-* [/{orgId}/{appId}/users/{userId}](#op-0bju5bw1ZH)
-* [/{orgId}/{appId}/users/{userId}](#op-tRnoDrscSy)
-* [/{orgId}/{appId}/roles/{roleId}/users/{userId}](#op-D4YceDJCBp)
-* [/{orgId}/{appId}/users](#op-B3JxnPdQnX)
-* [/management/orgs/{orgId}/users/{userId}](#op-XQZui6aKiZ)
-* [/{orgId}/{appId}/roles/{roleId}/users](#op-UG5vx2zh0S)
-* [/{orgId}/{appId}/users/{userId}](#op-RDt20tQoio)
-* [/management/users](#op-OrsKI3OblZ)
-
-
__Referring Definitions__
* [AccessTokenResponse](#accesstokenresponse)
@@ -3827,7 +3765,6 @@ __Properties__
</tr>
</table>
-
__Referring Definitions__
* [Metadata](#metadata)
@@ -3888,7 +3825,6 @@ __Properties__
</tr>
</table>
-
__Referring Definitions__
* [CreateActivity](#createactivity)
@@ -3941,7 +3877,6 @@ __Properties__
</tr>
</table>
-
__Referring Definitions__
* [Receipt](#receipt)
@@ -4000,7 +3935,6 @@ __Properties__
</tr>
</table>
-
__Referring Definitions__
* [ActivityFeed](#activityfeed)
@@ -4037,7 +3971,6 @@ __Properties__
</tr>
</table>
-
__Referring Definitions__
* [Metadata](#metadata)
http://git-wip-us.apache.org/repos/asf/usergrid/blob/2303eeac/docs/src/main/groovy/usergrid/ApiDocGenerator.groovy
----------------------------------------------------------------------
diff --git a/docs/src/main/groovy/usergrid/ApiDocGenerator.groovy b/docs/src/main/groovy/usergrid/ApiDocGenerator.groovy
index 523cdd4..895918e 100644
--- a/docs/src/main/groovy/usergrid/ApiDocGenerator.groovy
+++ b/docs/src/main/groovy/usergrid/ApiDocGenerator.groovy
@@ -150,7 +150,7 @@ public class ApiDocGenerator {
urlOp.url = url;
urlOp.method = method;
urlOp.operation = operation;
- urlOp.opId = RandomStringUtils.randomAlphanumeric(10);
+ urlOp.opId = RandomStringUtils.randomAlphanumeric(10).toLowerCase();
urlOps.add(urlOp);
operation.getResponses().each { responseEntry ->
@@ -227,7 +227,7 @@ public class ApiDocGenerator {
// if parameter has a schema, assume that it is a reference
if ( responseEntry.value.schema != null) {
response.schema = responseEntry.value.schema.ref;
- response.schemaAnchor = responseEntry.value.schema.ref;
+ response.schemaAnchor = responseEntry.value.schema.ref.toLowerCase();
// keep track of paths that use each schema definition
if ( response.status.equals("200") ) {
@@ -327,7 +327,7 @@ public class ApiDocGenerator {
allTags.each{ tag ->
def atag = [:];
atag.name = tag;
- atag.link = tag;
+ atag.link = tag.toLowerCase();
tags.add(atag);
};
scope.tags = tags;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/2303eeac/docs/src/main/resources/markdown/model.mustache
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/markdown/model.mustache b/docs/src/main/resources/markdown/model.mustache
index 2a41a00..395648f 100644
--- a/docs/src/main/resources/markdown/model.mustache
+++ b/docs/src/main/resources/markdown/model.mustache
@@ -24,15 +24,6 @@ __Properties__
{{/properties}}
</table>
-{{#hasReferrers}}
-__Referring API Paths__
-
-{{#referrers}}
-* [{{url}}](#op-{{opId}})
-{{/referrers}}
-
-{{/hasReferrers}}
-
{{#hasModelRefs}}
__Referring Definitions__
http://git-wip-us.apache.org/repos/asf/usergrid/blob/2303eeac/docs/src/main/resources/markdown/operation.mustache
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/markdown/operation.mustache b/docs/src/main/resources/markdown/operation.mustache
index cce0524..eb6a50f 100644
--- a/docs/src/main/resources/markdown/operation.mustache
+++ b/docs/src/main/resources/markdown/operation.mustache
@@ -1,6 +1,8 @@
<h2 class="usergrid-{{method}}-heading">{{method}} {{url}}</h2>
+<a name="op-{{opId}}"></a>
+
{{description}}
<h3>Parameters</h3>
[36/36] usergrid git commit: Merge branch 'two-dot-o-dev' of
https://git-wip-us.apache.org/repos/asf/usergrid into entity-size
Posted by sf...@apache.org.
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/usergrid into entity-size
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/c08ad512
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/c08ad512
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/c08ad512
Branch: refs/heads/entity-size
Commit: c08ad512568f68d32b37bfd110729318db8778e6
Parents: 198f489 ac9da14
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Aug 26 09:39:55 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Aug 26 09:39:55 2015 -0600
----------------------------------------------------------------------
DISCLAIMER | 9 -
NOTICE | 2 +-
README.md | 9 +-
content/community/index.html | 48 +-
content/docs/README.html | 35 +-
content/docs/_images/asapp.png | Bin 0 -> 73593 bytes
content/docs/_images/asemu.png | Bin 0 -> 34744 bytes
content/docs/_images/assettings.png | Bin 0 -> 120338 bytes
content/docs/_images/gcmsetting.png | Bin 0 -> 101084 bytes
content/docs/_images/googleproj0.png | Bin 0 -> 62311 bytes
content/docs/_images/ios-cert.png | Bin 0 -> 41925 bytes
content/docs/_images/iospgapp.png | Bin 0 -> 29796 bytes
content/docs/_images/iospgcert.png | Bin 0 -> 41925 bytes
content/docs/_images/iospgsettings.png | Bin 0 -> 384425 bytes
content/docs/_images/iospushauth.png | Bin 0 -> 42175 bytes
content/docs/_images/iospushfinal.png | Bin 0 -> 29573 bytes
content/docs/_images/iospushsettings.png | Bin 0 -> 137812 bytes
content/docs/_images/iphonemessage.png | Bin 0 -> 80970 bytes
content/docs/_images/pgaapp.png | Bin 0 -> 74807 bytes
content/docs/_images/pgasettings.png | Bin 0 -> 95052 bytes
content/docs/_images/pgaspath.png | Bin 0 -> 34744 bytes
content/docs/_images/pushmiddleandroid0.png | Bin 0 -> 106080 bytes
content/docs/_images/pushmiddleios0.png | Bin 0 -> 105175 bytes
content/docs/_images/pushsslcertificate.png | Bin 0 -> 53445 bytes
content/docs/_images/sendnotification.png | Bin 0 -> 47353 bytes
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 | 30 +-
.../installation/ug1-deploy-to-tomcat.txt | 6 +-
.../installation/ug1-launcher-quick-start.txt | 2 +-
.../installation/ug2-deploy-to-tomcat.txt | 4 +-
.../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 +-
.../push-notifications/adding-push-support.txt | 158 +
.../creating-and-managing-notifications.txt | 269 ++
.../push-notifications/creating-notifiers.txt | 69 +
.../push-notifications/getting-started.txt | 102 +
.../managing-users-and-devices.txt | 313 ++
.../_sources/push-notifications/overview.txt | 58 +
.../_sources/push-notifications/registering.txt | 102 +
.../push-notifications/troubleshooting.txt | 93 +
.../_sources/push-notifications/tutorial.txt | 251 +
.../docs/_sources/reference/contribute-code.txt | 2 +-
.../docs/_sources/rest-endpoints/api-docs.txt | 4385 +++++++++--------
content/docs/_sources/sdks/ios-new.txt | 982 ++++
content/docs/_sources/sdks/sdk-outline.txt | 111 +
content/docs/_sources/sdks/usage.txt | 16 -
.../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 | 8 +-
.../user-management/working-user-data.txt | 12 +-
content/docs/_static/css/theme.css | 168 +-
.../file-storage-configuration.html | 335 ++
content/docs/assets-and-files/folders.html | 404 ++
.../assets-and-files/legacy-asset-support.html | 293 ++
.../assets-and-files/retrieving-assets.html | 372 ++
.../docs/assets-and-files/uploading-assets.html | 432 ++
.../creating-and-incrementing-counters.html | 24 +-
.../events-and-counters.html | 28 +-
.../retrieving-counters.html | 24 +-
.../docs/data-queries/advanced-query-usage.html | 24 +-
.../docs/data-queries/operators-and-types.html | 28 +-
content/docs/data-queries/query-parameters.html | 27 +-
.../docs/data-queries/querying-your-data.html | 28 +-
content/docs/data-storage/collections.html | 48 +-
content/docs/data-storage/data-store-dbms.html | 44 +-
content/docs/data-storage/entities.html | 51 +-
.../docs/data-storage/optimizing-access.html | 24 +-
.../entity-connections/connecting-entities.html | 24 +-
.../disconnecting-entities.html | 28 +-
.../entity-connections/retrieving-entities.html | 38 +-
content/docs/genindex.html | 24 +-
content/docs/geolocation/geolocation.html | 30 +-
.../creating-a-new-application.html | 42 +-
.../docs/getting-started/creating-account.html | 41 +-
.../getting-started/using-a-sandbox-app.html | 39 +-
content/docs/getting-started/using-the-api.html | 27 +-
content/docs/index.html | 202 +-
.../docs/installation/ug1-deploy-to-tomcat.html | 35 +-
.../installation/ug1-launcher-quick-start.html | 30 +-
.../docs/installation/ug2-deploy-to-tomcat.html | 29 +-
content/docs/introduction/async-vs-sync.html | 28 +-
content/docs/introduction/data-model.html | 54 +-
content/docs/introduction/overview.html | 333 ++
.../docs/introduction/usergrid-features.html | 91 +-
content/docs/objects.inv | Bin 663 -> 692 bytes
content/docs/orgs-and-apps/admin-user.html | 104 +-
content/docs/orgs-and-apps/application.html | 39 +-
content/docs/orgs-and-apps/managing.html | 24 +-
content/docs/orgs-and-apps/organization.html | 24 +-
.../push-notifications/adding-push-support.html | 581 +++
.../creating-and-managing-notifications.html | 742 +++
.../push-notifications/creating-notifiers.html | 425 ++
.../push-notifications/getting-started.html | 497 ++
.../managing-users-and-devices.html | 688 +++
content/docs/push-notifications/overview.html | 393 ++
.../docs/push-notifications/registering.html | 484 ++
content/docs/push-notifications/tbd.html | 24 +-
.../push-notifications/troubleshooting.html | 466 ++
content/docs/push-notifications/tutorial.html | 666 +++
.../docs/push-notifications/users-devices.html | 24 +-
content/docs/reference/contribute-code.html | 28 +-
content/docs/reference/presos-and-videos.html | 24 +-
content/docs/rest-endpoints/api-docs.html | 4417 +++++++++---------
content/docs/sdks/ios-new.html | 1323 ++++++
content/docs/sdks/sdk-outline.html | 516 ++
content/docs/sdks/tbd.html | 24 +-
content/docs/sdks/usage.html | 308 --
content/docs/search.html | 24 +-
content/docs/searchindex.js | 2 +-
.../docs/security-and-auth/app-security.html | 28 +-
.../authenticating-api-requests.html | 36 +-
...nticating-users-and-application-clients.html | 46 +-
.../changing-token-time-live-ttl.html | 24 +-
.../docs/security-and-auth/facebook-sign.html | 26 +-
.../revoking-tokens-logout.html | 24 +-
.../security-and-auth/securing-your-app.html | 24 +-
.../user-authentication-types.html | 45 +-
.../security-and-auth/using-permissions.html | 36 +-
content/docs/security-and-auth/using-roles.html | 753 +++
content/docs/user-management/activity.html | 63 +-
content/docs/user-management/group.html | 51 +-
content/docs/user-management/groups.html | 24 +-
.../docs/user-management/messagee-example.html | 34 +-
.../docs/user-management/user-connections.html | 24 +-
.../docs/user-management/user-management.html | 24 +-
.../docs/user-management/working-user-data.html | 59 +-
content/index.html | 48 +-
content/releases/index.html | 44 +-
docs/installation/ug1-deploy-to-tomcat.md | 6 +-
docs/installation/ug1-launcher-quick-start.md | 2 +-
docs/installation/ug2-deploy-to-tomcat.md | 4 +-
docs/reference/contribute-code.md | 2 +-
docs/rest-endpoints/api-docs.html | 1254 ++---
docs/rest-endpoints/api-docs.md | 3434 ++++++++------
.../main/groovy/usergrid/ApiDocGenerator.groovy | 23 +-
docs/src/main/resources/html/model.mustache | 6 +-
docs/src/main/resources/markdown/model.mustache | 41 +-
.../main/resources/markdown/operation.mustache | 2 +
docs/user-management/messagee-example.md | 6 +-
portal/README.md | 4 +-
portal/index-template.html | 14 +-
release/release-candidate.sh | 12 +-
release/release.sh | 16 +-
sdks/android/NOTICE | 2 +-
sdks/android/pom.xml | 2 +-
sdks/dotnet/NOTICE | 2 +-
sdks/dotnet/README.md | 4 +-
sdks/html5-javascript/README.md | 10 +-
sdks/html5-javascript/index.html | 2 +-
sdks/java/pom.xml | 6 +-
sdks/perl/README.md | 2 +-
sdks/perl/lib/Usergrid/Client.pm | 2 +-
sdks/php/README.md | 6 +-
sdks/ruby-on-rails/README.md | 2 +-
stack/README.md | 4 +-
.../corepersistence/CpEntityMapUtilsTest.java | 79 +
.../model/entity/MapToEntityConverter.java | 10 +-
.../java/org/apache/usergrid/launcher/App.java | 2 +-
website/README.md | 2 +-
website/content/community/index.html | 12 +-
website/content/index.html | 97 +
website/content/releases/index.html | 65 +
website/layouts/footer.html | 32 +-
website/layouts/header.html | 4 +-
website/tmp/checksums | 4 +-
website/tmp/compiled_content | 204 +-
192 files changed, 22559 insertions(+), 7354 deletions(-)
----------------------------------------------------------------------
[29/36] usergrid git commit: Update generated website content.
Posted by sf...@apache.org.
Update generated website content.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/73186077
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/73186077
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/73186077
Branch: refs/heads/entity-size
Commit: 73186077040be5df4a3a3084062d817253f4f7e7
Parents: d0f10bc
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Aug 25 10:25:25 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Aug 25 10:25:25 2015 -0400
----------------------------------------------------------------------
content/docs/README.html | 35 +-
content/docs/_images/asapp.png | Bin 0 -> 73593 bytes
content/docs/_images/asemu.png | Bin 0 -> 34744 bytes
content/docs/_images/assettings.png | Bin 0 -> 120338 bytes
content/docs/_images/gcmsetting.png | Bin 0 -> 101084 bytes
content/docs/_images/googleproj0.png | Bin 0 -> 62311 bytes
content/docs/_images/ios-cert.png | Bin 0 -> 41925 bytes
content/docs/_images/iospgapp.png | Bin 0 -> 29796 bytes
content/docs/_images/iospgcert.png | Bin 0 -> 41925 bytes
content/docs/_images/iospgsettings.png | Bin 0 -> 384425 bytes
content/docs/_images/iospushauth.png | Bin 0 -> 42175 bytes
content/docs/_images/iospushfinal.png | Bin 0 -> 29573 bytes
content/docs/_images/iospushsettings.png | Bin 0 -> 137812 bytes
content/docs/_images/iphonemessage.png | Bin 0 -> 80970 bytes
content/docs/_images/pgaapp.png | Bin 0 -> 74807 bytes
content/docs/_images/pgasettings.png | Bin 0 -> 95052 bytes
content/docs/_images/pgaspath.png | Bin 0 -> 34744 bytes
content/docs/_images/pushmiddleandroid0.png | Bin 0 -> 106080 bytes
content/docs/_images/pushmiddleios0.png | Bin 0 -> 105175 bytes
content/docs/_images/pushsslcertificate.png | Bin 0 -> 53445 bytes
content/docs/_images/sendnotification.png | Bin 0 -> 47353 bytes
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 | 30 +-
.../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 +-
.../push-notifications/adding-push-support.txt | 158 +
.../creating-and-managing-notifications.txt | 269 ++
.../push-notifications/creating-notifiers.txt | 69 +
.../push-notifications/getting-started.txt | 102 +
.../managing-users-and-devices.txt | 313 ++
.../_sources/push-notifications/overview.txt | 58 +
.../_sources/push-notifications/registering.txt | 102 +
.../push-notifications/troubleshooting.txt | 93 +
.../_sources/push-notifications/tutorial.txt | 251 +
.../docs/_sources/rest-endpoints/api-docs.txt | 4385 +++++++++--------
content/docs/_sources/sdks/ios-new.txt | 982 ++++
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 | 335 ++
content/docs/assets-and-files/folders.html | 404 ++
.../assets-and-files/legacy-asset-support.html | 293 ++
.../assets-and-files/retrieving-assets.html | 372 ++
.../docs/assets-and-files/uploading-assets.html | 432 ++
.../creating-and-incrementing-counters.html | 24 +-
.../events-and-counters.html | 28 +-
.../retrieving-counters.html | 24 +-
.../docs/data-queries/advanced-query-usage.html | 24 +-
.../docs/data-queries/operators-and-types.html | 28 +-
content/docs/data-queries/query-parameters.html | 27 +-
.../docs/data-queries/querying-your-data.html | 28 +-
content/docs/data-storage/collections.html | 48 +-
content/docs/data-storage/data-store-dbms.html | 44 +-
content/docs/data-storage/entities.html | 51 +-
.../docs/data-storage/optimizing-access.html | 24 +-
.../entity-connections/connecting-entities.html | 24 +-
.../disconnecting-entities.html | 28 +-
.../entity-connections/retrieving-entities.html | 38 +-
content/docs/genindex.html | 24 +-
content/docs/geolocation/geolocation.html | 30 +-
.../creating-a-new-application.html | 42 +-
.../docs/getting-started/creating-account.html | 41 +-
.../getting-started/using-a-sandbox-app.html | 39 +-
content/docs/getting-started/using-the-api.html | 27 +-
content/docs/index.html | 202 +-
.../docs/installation/ug1-deploy-to-tomcat.html | 24 +-
.../installation/ug1-launcher-quick-start.html | 24 +-
.../docs/installation/ug2-deploy-to-tomcat.html | 24 +-
content/docs/introduction/async-vs-sync.html | 28 +-
content/docs/introduction/data-model.html | 54 +-
content/docs/introduction/overview.html | 333 ++
.../docs/introduction/usergrid-features.html | 91 +-
content/docs/objects.inv | Bin 663 -> 692 bytes
content/docs/orgs-and-apps/admin-user.html | 104 +-
content/docs/orgs-and-apps/application.html | 39 +-
content/docs/orgs-and-apps/managing.html | 24 +-
content/docs/orgs-and-apps/organization.html | 24 +-
.../push-notifications/adding-push-support.html | 581 +++
.../creating-and-managing-notifications.html | 742 +++
.../push-notifications/creating-notifiers.html | 425 ++
.../push-notifications/getting-started.html | 497 ++
.../managing-users-and-devices.html | 688 +++
content/docs/push-notifications/overview.html | 393 ++
.../docs/push-notifications/registering.html | 484 ++
content/docs/push-notifications/tbd.html | 24 +-
.../push-notifications/troubleshooting.html | 466 ++
content/docs/push-notifications/tutorial.html | 666 +++
.../docs/push-notifications/users-devices.html | 24 +-
content/docs/reference/contribute-code.html | 24 +-
content/docs/reference/presos-and-videos.html | 24 +-
content/docs/rest-endpoints/api-docs.html | 4417 +++++++++---------
content/docs/sdks/ios-new.html | 1323 ++++++
content/docs/sdks/sdk-outline.html | 516 ++
content/docs/sdks/tbd.html | 24 +-
content/docs/search.html | 24 +-
content/docs/searchindex.js | 2 +-
.../docs/security-and-auth/app-security.html | 28 +-
.../authenticating-api-requests.html | 36 +-
...nticating-users-and-application-clients.html | 46 +-
.../changing-token-time-live-ttl.html | 24 +-
.../docs/security-and-auth/facebook-sign.html | 26 +-
.../revoking-tokens-logout.html | 24 +-
.../security-and-auth/securing-your-app.html | 24 +-
.../user-authentication-types.html | 45 +-
.../security-and-auth/using-permissions.html | 36 +-
content/docs/security-and-auth/using-roles.html | 753 +++
content/docs/user-management/activity.html | 63 +-
content/docs/user-management/group.html | 51 +-
content/docs/user-management/groups.html | 24 +-
.../docs/user-management/messagee-example.html | 28 +-
.../docs/user-management/user-connections.html | 24 +-
.../docs/user-management/user-management.html | 24 +-
.../docs/user-management/working-user-data.html | 59 +-
142 files changed, 19325 insertions(+), 4671 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/README.html
----------------------------------------------------------------------
diff --git a/content/docs/README.html b/content/docs/README.html
index 7abe7ff..561166c 100644
--- a/content/docs/README.html
+++ b/content/docs/README.html
@@ -80,14 +80,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -111,10 +112,23 @@
<li class="toctree-l1"><a class="reference internal" href="entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -139,9 +153,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -156,11 +170,13 @@
<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -230,9 +246,6 @@ $ sudo easy_install pip
</pre></div>
</div>
</div>
-<div class="section" id="how-to-change-update-the-usergrid-documentation">
-<h2>How to change/update the Usergrid documentation<a class="headerlink" href="#how-to-change-update-the-usergrid-documentation" title="Permalink to this headline">¶</a></h2>
-</div>
<div class="section" id="how-to-build-the-usergrid-documentation-using-sphinx">
<h2>How to build the Usergrid documentation using Sphinx<a class="headerlink" href="#how-to-build-the-usergrid-documentation-using-sphinx" title="Permalink to this headline">¶</a></h2>
<p>Sphinx runs via a Makefile in this, the docs directory. So, cd to this
@@ -275,6 +288,12 @@ examples of that around too.</p>
</div>
<div class="section" id="how-to-publish-the-usergrid-docs-to-usergrid-website">
<h2>How to publish the Usergrid docs to Usergrid website<a class="headerlink" href="#how-to-publish-the-usergrid-docs-to-usergrid-website" title="Permalink to this headline">¶</a></h2>
+<p>First you generate the HTML for the docs from the Markdown and reST
+sources like so:</p>
+<div class="highlight-python"><div class="highlight"><pre>cd $usergrid/docs
+make clean html
+</pre></div>
+</div>
<p>To update the Usergrid website you must copy the udpated docs files from
<code class="docutils literal"><span class="pre">target/html</span></code> directory to the website directory at the root of the
Usergrid project, i.e. <code class="docutils literal"><span class="pre">${usergrid-project-dir}/website/docs</span></code>.</p>
@@ -299,7 +318,7 @@ need to edit the Groovy script that does the generation:
will have to Git Clone Mustache.java before you can run the generation
script.</p>
<p>This is the command to run the generation:</p>
-<div class="highlight-python"><div class="highlight"><pre>groovy src/main/groovy/usergrid.ApiDocGenerator.groovy
+<div class="highlight-python"><div class="highlight"><pre>groovy src/main/groovy/usergrid/ApiDocGenerator.groovy
</pre></div>
</div>
<p>The script will update the file <code class="docutils literal"><span class="pre">rest-endpoints/api-docs.md</span></code> and when
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_images/asapp.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/asapp.png b/content/docs/_images/asapp.png
new file mode 100644
index 0000000..6a65f69
Binary files /dev/null and b/content/docs/_images/asapp.png differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_images/asemu.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/asemu.png b/content/docs/_images/asemu.png
new file mode 100644
index 0000000..09626df
Binary files /dev/null and b/content/docs/_images/asemu.png differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_images/assettings.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/assettings.png b/content/docs/_images/assettings.png
new file mode 100644
index 0000000..7812a2e
Binary files /dev/null and b/content/docs/_images/assettings.png differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_images/gcmsetting.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/gcmsetting.png b/content/docs/_images/gcmsetting.png
new file mode 100644
index 0000000..f238504
Binary files /dev/null and b/content/docs/_images/gcmsetting.png differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_images/googleproj0.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/googleproj0.png b/content/docs/_images/googleproj0.png
new file mode 100644
index 0000000..86378b8
Binary files /dev/null and b/content/docs/_images/googleproj0.png differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_images/ios-cert.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/ios-cert.png b/content/docs/_images/ios-cert.png
new file mode 100644
index 0000000..9582ea7
Binary files /dev/null and b/content/docs/_images/ios-cert.png differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_images/iospgapp.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/iospgapp.png b/content/docs/_images/iospgapp.png
new file mode 100644
index 0000000..a393910
Binary files /dev/null and b/content/docs/_images/iospgapp.png differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_images/iospgcert.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/iospgcert.png b/content/docs/_images/iospgcert.png
new file mode 100644
index 0000000..9582ea7
Binary files /dev/null and b/content/docs/_images/iospgcert.png differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_images/iospgsettings.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/iospgsettings.png b/content/docs/_images/iospgsettings.png
new file mode 100644
index 0000000..9389bf1
Binary files /dev/null and b/content/docs/_images/iospgsettings.png differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_images/iospushauth.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/iospushauth.png b/content/docs/_images/iospushauth.png
new file mode 100644
index 0000000..42ab822
Binary files /dev/null and b/content/docs/_images/iospushauth.png differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_images/iospushfinal.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/iospushfinal.png b/content/docs/_images/iospushfinal.png
new file mode 100644
index 0000000..440461c
Binary files /dev/null and b/content/docs/_images/iospushfinal.png differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_images/iospushsettings.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/iospushsettings.png b/content/docs/_images/iospushsettings.png
new file mode 100644
index 0000000..44cd418
Binary files /dev/null and b/content/docs/_images/iospushsettings.png differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_images/iphonemessage.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/iphonemessage.png b/content/docs/_images/iphonemessage.png
new file mode 100644
index 0000000..43f7ff9
Binary files /dev/null and b/content/docs/_images/iphonemessage.png differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_images/pgaapp.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/pgaapp.png b/content/docs/_images/pgaapp.png
new file mode 100644
index 0000000..09e1cad
Binary files /dev/null and b/content/docs/_images/pgaapp.png differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_images/pgasettings.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/pgasettings.png b/content/docs/_images/pgasettings.png
new file mode 100644
index 0000000..aa6f2df
Binary files /dev/null and b/content/docs/_images/pgasettings.png differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_images/pgaspath.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/pgaspath.png b/content/docs/_images/pgaspath.png
new file mode 100644
index 0000000..09626df
Binary files /dev/null and b/content/docs/_images/pgaspath.png differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_images/pushmiddleandroid0.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/pushmiddleandroid0.png b/content/docs/_images/pushmiddleandroid0.png
new file mode 100644
index 0000000..1afd954
Binary files /dev/null and b/content/docs/_images/pushmiddleandroid0.png differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_images/pushmiddleios0.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/pushmiddleios0.png b/content/docs/_images/pushmiddleios0.png
new file mode 100644
index 0000000..1ba14f1
Binary files /dev/null and b/content/docs/_images/pushmiddleios0.png differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_images/pushsslcertificate.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/pushsslcertificate.png b/content/docs/_images/pushsslcertificate.png
new file mode 100644
index 0000000..bab137d
Binary files /dev/null and b/content/docs/_images/pushsslcertificate.png differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_images/sendnotification.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/sendnotification.png b/content/docs/_images/sendnotification.png
new file mode 100644
index 0000000..fb7d813
Binary files /dev/null and b/content/docs/_images/sendnotification.png differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/README.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/README.txt b/content/docs/_sources/README.txt
index 58ccf3b..2f7888c 100644
--- a/content/docs/_sources/README.txt
+++ b/content/docs/_sources/README.txt
@@ -9,10 +9,6 @@ Sphinx requires Python and pip. Once you have Python, you can install sphinx and
$ sudo easy_install sphinx
$ sudo easy_install pip
-## How to change/update the Usergrid documentation
-
-
-
## How to build the Usergrid documentation using Sphinx
Sphinx runs via a Makefile in this, the docs directory. So, cd to this directory and make html:
@@ -40,6 +36,11 @@ A note about tables. Markdown and reST do not have very good table support. Simp
## How to publish the Usergrid docs to Usergrid website
+First you generate the HTML for the docs from the Markdown and reST sources like so:
+
+ cd $usergrid/docs
+ make clean html
+
To update the Usergrid website you must copy the udpated docs files from ``target/html`` directory to the website directory at the root of the Usergrid project, i.e. ``${usergrid-project-dir}/website/docs``.
You can do this by running the script ``update-website.sh``.
@@ -64,6 +65,6 @@ __NOTE__: Mustache.hava is not in Maven Central so unfortunately, you will have
This is the command to run the generation:
- groovy src/main/groovy/usergrid.ApiDocGenerator.groovy
+ groovy src/main/groovy/usergrid/ApiDocGenerator.groovy
The script will update the file ``rest-endpoints/api-docs.md`` and when you are happy with your update you should commit and push that file with Git.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/assets-and-files/file-storage-configuration.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/assets-and-files/file-storage-configuration.txt b/content/docs/_sources/assets-and-files/file-storage-configuration.txt
new file mode 100644
index 0000000..c56265a
--- /dev/null
+++ b/content/docs/_sources/assets-and-files/file-storage-configuration.txt
@@ -0,0 +1,39 @@
+# File storage configuration
+
+Usergrid can store your assets either on your hard drive or in the Amazon S3 cloud.
+
+Local storage configuration
+---
+
+By default assets are stored in the temporary folder /tmp/usergrid
+This can be changed by editing this file /stack/rest/src/main/resources/usergrid-rest-context.xml and replacing {usergrid.temp.files} by the wanted destination
+```xml
+<bean id="binaryStore" class="org.apache.usergrid.services.assets.data.LocalFileBinaryStore">
+ <property name="reposLocation" value="${usergrid.temp.files}"/>
+</bean>
+```
+
+AwS S3 configuration
+---
+
+To use your AWS S3 storage you need to change the binaryStore classpath and add several constructor arguments in /stack/rest/src/main/resources/usergrid-rest-context.xml
+
+Some examples :
+```xml
+<bean id="binaryStore" class="org.apache.usergrid.services.assets.data.AwsSdkS3BinaryStore">
+ <constructor-arg name="accessId" value="x" />
+ <constructor-arg name="secretKey" value="xx" />
+ <constructor-arg name="bucketName" value="x" />
+ <constructor-arg name="regionName" value="eu-central-1" />
+</bean>
+```
+the regionName field is not mandatory, this code is also valid
+```xml
+<bean id="binaryStore" class="org.apache.usergrid.services.assets.data.AwsSdkS3BinaryStore">
+ <constructor-arg name="accessId" value="x" />
+ <constructor-arg name="secretKey" value="xx" />
+ <constructor-arg name="bucketName" value="x" />
+</bean>
+```
+
+The filesize is limited to 50GB but you need to keep in mind that the file has to be stored on the hard drive before being sended to Amazon.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/assets-and-files/folders.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/assets-and-files/folders.txt b/content/docs/_sources/assets-and-files/folders.txt
new file mode 100644
index 0000000..7c425be
--- /dev/null
+++ b/content/docs/_sources/assets-and-files/folders.txt
@@ -0,0 +1,85 @@
+# Folders
+
+## Linking a folder to an asset
+In order to access the asset for the image in the folder, you need to link the folder to the asset. You can do that by issuing a POST request in the following format:
+
+ POST /{org-uuid}/{app-uuid}/folders/{folder-uuid}/assets/{assets_id}
+
+where ``{folder-uuid}`` is the UUID of the folder, and ``{assets-uuid}`` is the UUID of the assets entity.
+
+Here’s how you could link the folder and the asset you created for the my-image.jpg image:
+
+ POST https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/9501cda1-2d21-11e2-b4c6-02e81ac5a17b
+
+In the response, you should see the assets entity for the image added to the folder:
+
+ {
+ "action": "post",
+ "application": "3400ba10-cd0c-11e1-bcf7-12313d1c4491",
+ "params": {},
+ "path": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets",
+ "uri": "https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets",
+ "entities": [
+ {
+ "uuid": "9501cda1-2d21-11e2-b4c6-02e81ac5a17b",
+ "type": "asset",
+ "name": "my-image.jpg",
+ "created": 1352763303163,
+ "modified": 1352763303163,
+ "metadata": {
+ "path": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/9501cda1-2d21-11e2-b4c6-02e81ac5a17b"
+ },
+ "owner": "5c0c1789-d503-11e1-b36a-12313b01d5c1",
+ "path": "/myassets/asset1"
+ }
+ ],
+ "timestamp": 1352830448045,
+ "duration": 54,
+ "organization": "my-org”,
+ "applicationName": "my-app"
+ }
+
+## Retrieve list of folder assets
+You can also request a list of the linked contents of the folder like this:
+
+ GET https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets
+
+The response should look something like this:
+
+ {
+ "action": "get",
+ "application": "3400ba10-cd0c-11e1-bcf7-12313d1c4491",
+ "params": {
+ "_": [
+ "1352830364891"
+ ]
+ },
+ "path": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets",
+ "uri": "https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets",
+ "entities": [
+ {
+ "uuid": "7bf47435-2ac8-11e2-b4c6-02e81ac5a17b",
+ "type": "asset",
+ "name": "my-image.jpg",
+ "created": 1352505133598,
+ "modified": 1352507245108,
+ "checksum": "8e0cd3866ee20746c99e9a9825f38ad8",
+ "content-length": 11853,
+ "content-type": "image/jpeg",
+ "etag": "\"8e0cd3866ee20746c99e9a9825f38ad8\"",
+ "metadata": {
+ "connecting": {
+ "assets": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/7bf47435-2ac8-11e2-b4c6-02e81ac5a17b/connecting/assets"
+ },
+ "connection": "assets",
+ "path": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/7bf47435-2ac8-11e2-b4c6-02e81ac5a17b"
+ },
+ "owner": "5c0c1789-d503-11e1-b36a-12313b01d5c1",
+ "path": "my-image"
+ }
+ ],
+ "timestamp": 1352830363797,
+ "duration": 57,
+ "organization": "my-org",
+ "applicationName": "my-app"
+ }
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/assets-and-files/legacy-asset-support.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/assets-and-files/legacy-asset-support.txt b/content/docs/_sources/assets-and-files/legacy-asset-support.txt
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/assets-and-files/retrieving-assets.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/assets-and-files/retrieving-assets.txt b/content/docs/_sources/assets-and-files/retrieving-assets.txt
new file mode 100644
index 0000000..9313ae8
--- /dev/null
+++ b/content/docs/_sources/assets-and-files/retrieving-assets.txt
@@ -0,0 +1,27 @@
+# Retrieving assets
+
+## Retrieving asset data
+
+To retrieve the asset from an entity, send a ``GET`` request with the ``Accept`` header set to the content type of the asset. The content type can be retrieved from the ``file-metadata.content-type`` property of the entity the asset is attached to.
+
+### Request syntax
+
+ curl -X GET -H 'Accept: <content_type>' 'https://api.usergrid.com/<org>/<app>/<collection>/<entity>
+
+Parameters
+
+Parameter Description
+--------- -----------
+content_type The content type of the attached asset. For example, text/plain, image/jpeg.
+org Organization UUID or organization name
+app Application UUID or application name
+collection Name or UUID of the collection of the entity the asset is attached to.
+entity Name or UUID of the entity the asset is attached to.
+
+### Example request
+The following request will retrieve the data for a jpeg file attached to an entity named 'cloud' in the 'pictures' collection:
+
+ curl -X GET -H 'Accept: image/jpeg' 'https://api.usergrid.com/your-org/your-app/pictures/cloud
+
+## Retrieving an asset entity
+To retrieve the entity that an asset is attached to, perform a ``GET`` request as you normally would to retrieve an entity. For more information, see [Retrieving Data Entities](../data-storage/entities.html#retrieving-data-entities).
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/assets-and-files/uploading-assets.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/assets-and-files/uploading-assets.txt b/content/docs/_sources/assets-and-files/uploading-assets.txt
new file mode 100644
index 0000000..c5b836f
--- /dev/null
+++ b/content/docs/_sources/assets-and-files/uploading-assets.txt
@@ -0,0 +1,86 @@
+# Uploading assets
+
+With Usergrid, you can store and retrieve files and assets that hold data objects such as images, video, and audio content.
+
+Usergrid manages these objects as Asset entities. Optionally, you can use Folder entities to organize related assets.
+
+## Uploading assets
+Assets can be any file type and can be attached to any entity. When an asset is uploaded, Usergrid will automatically detect the file metadata for the asset and save it in the associated entity as a ``file-metadata`` property. Only 1 asset can be attached to an entity.
+
+To attach an asset to an entity, do the following:
+
+### Request syntax
+
+ curl -X POST -F name='<filename>' -F file=@<file_location> 'https://api.usergrid.com/<org>/<app>/<collection>/<entity>
+
+Parameters
+
+Parameter Description
+--------- -----------
+filename A filename to associate with the asset.
+file_location The location of the asset to be uploaded.
+org Organization UUID or organization name
+app Application UUID or application name
+collection Name or UUID of the collection of the entity you want to attach the asset to.
+entity Name or UUID of an existing entity you want to attach the asset to.
+
+### Example request
+
+ curl -X POST -i -F name='clouds' -F file=@happy_clouds.jpg 'https://api.usergrid.com/your-org/your-app/pictures/'
+
+### Example response
+
+Notice the ``file-metadata`` property in the response.
+
+ {
+ "action" : "post",
+ "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+ "params" : { },
+ "path" : "/users",
+ "uri" : "https://api.usergrid.com/amuramoto/sandbox/pictures",
+ "entities" : [ {
+ "uuid" : "410b213a-b379-11e3-a0e5-9953085ea376",
+ "type" : "user",
+ "name" : "test",
+ "created" : 1395681911491,
+ "modified" : 1399069838919,
+ "name" : "clouds",
+ "file" : "fobnszewobnioerabnoiawegbrn\n",
+ "file-metadata" : {
+ "content-type" : "image/jpeg",
+ "etag" : "\"2e1db7299b0a667ed80e674a0ef9d653\"",
+ "last-modified" : 1399070010115,
+ "content-length" : 28,
+ "checksum" : "2e1db7299b0a667ed80e674a0ef9d653"
+ },
+ "metadata" : {
+ "connecting" : {
+ "likes" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/likes"
+ },
+ "path" : "/users/410b213a-b379-11e3-a0e5-9953085ea376",
+ "sets" : {
+ "rolenames" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/roles",
+ "permissions" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/permissions"
+ },
+ "connections" : {
+ "follows" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/follows"
+ },
+ "collections" : {
+ "activities" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/activities",
+ "devices" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/devices",
+ "feed" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/feed",
+ "groups" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/groups",
+ "roles" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/roles",
+ "following" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/following",
+ "followers" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/followers"
+ }
+ }
+ } ],
+ "timestamp" : 1399070009986,
+ "duration" : 441,
+ "organization" : "your-org",
+ "applicationName" : "your-app"
+ }
+
+## Updating assets
+To update the data for an asset, perform the same request outlined above in 'Uploading assets' as a ``PUT`` request rather than a ``POST``.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/data-queries/operators-and-types.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/data-queries/operators-and-types.txt b/content/docs/_sources/data-queries/operators-and-types.txt
index c67ccd1..bb42107 100644
--- a/content/docs/_sources/data-queries/operators-and-types.txt
+++ b/content/docs/_sources/data-queries/operators-and-types.txt
@@ -64,7 +64,7 @@ As you develop queries, remember that entity properties each conform to a partic
For example, if you create an entity with a price property with a value of 100.00, querying for 100 will return no results, since the API expected a decimal-delimited float value in your query.
-For a list of property data types for each default entities, see Default Data Entity Types.
+For a list of property data types for each default entities, see [Default Data Entities](../rest-endpoints/api-doc.html#models)s.
<table class="usergrid-table">
<tr>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/data-queries/query-parameters.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/data-queries/query-parameters.txt b/content/docs/_sources/data-queries/query-parameters.txt
index 9f9fc68..944c27b 100644
--- a/content/docs/_sources/data-queries/query-parameters.txt
+++ b/content/docs/_sources/data-queries/query-parameters.txt
@@ -48,7 +48,7 @@ The following table lists a few examples of the kind of searches you can do in q
### Location
-If you've stored location data with your entities, you can query for the proximity of the geographical locations those entities represent. For more information on geolocation, see Geolocation.
+If you've stored location data with your entities, you can query for the proximity of the geographical locations those entities represent. For more information on geolocation, see [Geolocation](../geolocation/geolocation.html).
<table class="usergrid-table">
<tr>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/data-queries/querying-your-data.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/data-queries/querying-your-data.txt b/content/docs/_sources/data-queries/querying-your-data.txt
index fa10169..2da961d 100644
--- a/content/docs/_sources/data-queries/querying-your-data.txt
+++ b/content/docs/_sources/data-queries/querying-your-data.txt
@@ -42,7 +42,7 @@ For example, the following request returns the address and phone number of users
When you query your data, the API response is formatted in JavaScript Object Notation (JSON). This is a common format used for parameter and return values in REST web services.
-Data corresponding to the response is captured in the response’s entities array. The array will include one JSON-object for each entity returned for the query. Each returned entity will include a number of default properties, including the UUID of the entity, the entity type, and values for properties such as name, username, email, and so on. For a complete list of default properties by entity type, see Default Data Entity Types.
+Data corresponding to the response is captured in the response’s entities array. The array will include one JSON-object for each entity returned for the query. Each returned entity will include a number of default properties, including the UUID of the entity, the entity type, and values for properties such as name, username, email, and so on. For a complete list of default properties by entity type, see [Default Data Entities](../rest-endpoints/api-doc.html#models).
For example, the following query for all entities of type user where the name property equals 'Gladys Kravitz':
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/data-storage/collections.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/data-storage/collections.txt b/content/docs/_sources/data-storage/collections.txt
index c072104..fa8652e 100644
--- a/content/docs/_sources/data-storage/collections.txt
+++ b/content/docs/_sources/data-storage/collections.txt
@@ -4,7 +4,7 @@
This article describes how to create collections in Advanced Usergrid. All entities are automatically associated with a corresponding collection based on the type property of the entity. You may create empty collections if you wish, but creating an entity of a new type will automatically create a corresponding collection for you. For example, creating a new custom "item" entity, creates an "items" collection.
-__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
### Creating a collection
@@ -51,7 +51,7 @@ This article describes how to retrieve all of the entities in a collection.
<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">
By default, the Usergrid API returns 10 entities per request. For collections with more than 10 entities, use the returned 'cursor' property to retrieve the next 10 entities in the result set. You may also use the LIMIT parameter in a query string to increase the number of results returned. For more information on using cursors, see [Query Parameters](../data-queries/query-parameters.html).</p></div>
-__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
### Retrieving sets of entities from a collection
@@ -115,7 +115,7 @@ Response:
This article describes how to perform batch updates on all entities in a collection. Batch updates require the use of a query string in the request, which can either specify all entities in the collection or a subset of entities for the update to be performed on. For more information on queries, see Querying your data.
-__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
### Batch updating entities in a collection
@@ -185,7 +185,7 @@ This article describes how to batch delete entities in a collection. Batch delet
Currently, collections cannot be deleted; however, you can delete all of the entities from a collection.
-__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
### Batch deleting entities in a collection
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/data-storage/data-store-dbms.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/data-storage/data-store-dbms.txt b/content/docs/_sources/data-storage/data-store-dbms.txt
index 539cca6..56fbbdb 100644
--- a/content/docs/_sources/data-storage/data-store-dbms.txt
+++ b/content/docs/_sources/data-storage/data-store-dbms.txt
@@ -4,10 +4,10 @@ The Usergrid data store is backed by Cassandra, an open source distributed DBMS.
<!-- workaround a Sphinx bug -->
<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">
-Usergrid is not a relational database. Optimizing for performance on a non-relational database like Cassandra differs a bit from relational databases. For more information, see Optimizing access to your Usergrid data store.</p> </div>
+Usergrid is not a relational database. Optimizing for performance on a non-relational database like Cassandra differs a bit from relational databases. For more information, see [Optimizing access to your Usergrid data store](../data-storage/optimizing-access.html).</p> </div>
-Cassandra is specifically designed to support applications that need flexibility and high scalability, particularly web and mobile applications. Usergrid client applications write and read data formatted as JavaScript Object Notation (JSON). (Usergrid provides SDKs through which client apps can do much of this work in their native language. For more information, see Usergrid SDKs.)
+Cassandra is specifically designed to support applications that need flexibility and high scalability, particularly web and mobile applications. Usergrid client applications write and read data formatted as JavaScript Object Notation (JSON). (Usergrid provides SDKs through which client apps can do much of this work in their native language. For more information, see [Usergrid SDKs](../sdks/tbd.html).)
With Cassandra as the underlying DBMS, apps benefit from:
@@ -20,10 +20,10 @@ If you have experience with relational databases and are unfamiliar with "NoSQL"
<table class="usergrid-table">
<tr>
- <td></td>
- <td>RDBMS</td>
- <td>Cassandra</td>
- <td>Usergrid</td>
+ <th></th>
+ <th>RDBMS</th>
+ <th>Cassandra</th>
+ <th>Usergrid</th>
</tr>
<tr>
<td>Each tuple is modeled as</td>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/data-storage/entities.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/data-storage/entities.txt b/content/docs/_sources/data-storage/entities.txt
index 5a70b18..be77ebd 100644
--- a/content/docs/_sources/data-storage/entities.txt
+++ b/content/docs/_sources/data-storage/entities.txt
@@ -5,7 +5,7 @@ This article describes how to create custom data entities and entity properties.
The methods cited in this article should be used to create custom data entities. If you are using one of the Usergrid SDKs, use one of the entity type-specific SDK methods to create default data entities.
-__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
### Creating a custom entity
When a new entity is created, Usergrid will automatically create a corresponding collection if one does not already exist. The collection will automatically be named with the plural form of the entity type. For example, creating a custom entity of type 'item' will automatically create a collection named 'items' in which all future 'item' entities will be saved.
@@ -144,7 +144,7 @@ Any valid JSON object can be stored in an entity, regardless of the level of com
### Updating sub-properties
An array of sub-properties is treated as a single object. This means that sub-properties cannot be updated atomically. All sub-properties of a given property must be updated as a set.
-For more on updating an existing sub-property, see Updating Data Entities.
+For more on updating an existing sub-property, see [Updating Data Entities](../data-storage/entities.html#updating-data-entities).
Example Request/Response
@@ -193,7 +193,7 @@ Example Request/Response
## Retrieving Data Entities
This article describes how to retrieve entities from your account.
-__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
With the exception of the user entity, all data entities can be retrieved by using their UUID or a 'name' property. The user entity can be retrieved by UUID or the 'username' property. The value for the 'name' or 'username' property must be unique.
@@ -333,7 +333,7 @@ Response:
This article describes how to update entities in your account.
-__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
### Updating an entity
One or more properties can be updated with a single PUT request. For information on updating sub-properties, see Updating sub-properties below.
@@ -454,7 +454,7 @@ Response:
This article describes how to delete data entities.
-__Note__:Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+__Note__:Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
### Deleting an entity
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/entity-connections/retrieving-entities.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/entity-connections/retrieving-entities.txt b/content/docs/_sources/entity-connections/retrieving-entities.txt
index 31eaf9c..6da8577 100644
--- a/content/docs/_sources/entity-connections/retrieving-entities.txt
+++ b/content/docs/_sources/entity-connections/retrieving-entities.txt
@@ -1,13 +1,12 @@
# Retrieving connections
-Viewing all of an entities connections
To see all of the connection types associated with an entity, simply retrieve the entity.
-All of the connection types the entity has made to other entities will appear in the metadata.connections property.
+All of the connection types the entity has made to other entities will appear in the ``metadata.connections`` property.
-All of the connection types that other entities have made to the entity will appear in the metadata.connecting property.
+All of the connection types that other entities have made to the entity will appear in the ``metadata.connecting`` property.
-For user entities, following/followers connections can be accessed by sending a GET request to the URL in the collections.following and collections.followers properties.
+For user entities, following/followers connections can be accessed by sending a ``GET`` request to the URL in the ``collections.following`` and ``collections.follower``s properties.
Retrieve connected entities by connection type
To get a list of entities a specified entity has connected to with a specific connection type, do the following:
@@ -83,7 +82,7 @@ All of the entities that have made a connection of that type to the specified en
## Retrieve all connecting entities by type
-To get a list of all the entities that have created a connection of a specific type to a specified entity, use the same method as shown above in Retrieve connected entities by connection type, and set the relationship to connecting/<relationship>.
+To get a list of all the entities that have created a connection of a specific type to a specified entity, use the same method as shown above in Retrieve connected entities by connection type, and set the relationship to ``connecting/<relationship>``.
All of the entities that have made a connection to the specified entity will be returned in the entities property of the response.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/geolocation/geolocation.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/geolocation/geolocation.txt b/content/docs/_sources/geolocation/geolocation.txt
index ede4e3c..3da555c 100644
--- a/content/docs/_sources/geolocation/geolocation.txt
+++ b/content/docs/_sources/geolocation/geolocation.txt
@@ -36,7 +36,7 @@ Location-aware apps require the ability to return content and results based on t
The returned results are sorted from nearest to furthest. Entities with the same location are returned in the order they were created.
-The location parameter can be appended to any standard API Services query. For more information on how to query your API Services data, see Querying your data.
+The location parameter can be appended to any standard API Services query. For more information on how to query your API Services data, see [Querying your Data](../data-queries/querying-your-data.html).
For example, here is how you would find all the devices within 8,046 meters (~10 miles) of the center of San Francisco:
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/getting-started/creating-a-new-application.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/getting-started/creating-a-new-application.txt b/content/docs/_sources/getting-started/creating-a-new-application.txt
index cc5f577..ce5fb7a 100644
--- a/content/docs/_sources/getting-started/creating-a-new-application.txt
+++ b/content/docs/_sources/getting-started/creating-a-new-application.txt
@@ -8,7 +8,9 @@ To create a new application with the admin portal:
1. In the admin portal, from the dropdown menu at the far top left, select the organization to which you will add the new application.
1. Click the ADD NEW APP button, located at the top of the screen, next to the application drop-down.
1. In the dialog box, enter a new application name, then click the Create button. Your new application will automatically be selected in the applications drop-down menu.
-Applications can also be created programmatically with a POST request to the API. For more, see Application.
+
+Applications can also be created programatically with a ``POST`` request to the API. For more, see [Application](../orgs-and-apps/application.html).
## Securing an application
-If this is going to be a production application, be sure to configure security roles that provide only the level of access your users will need. For more on security, see Security best practices.
\ No newline at end of file
+If this is going to be a production application, be sure to configure security roles that provide only the level of access your users will need. For more on security, see [Security Best Practices](../security-and-auth/securing-your-app.html)
+.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/getting-started/creating-account.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/getting-started/creating-account.txt b/content/docs/_sources/getting-started/creating-account.txt
index 1440926..f4f542a 100644
--- a/content/docs/_sources/getting-started/creating-account.txt
+++ b/content/docs/_sources/getting-started/creating-account.txt
@@ -3,7 +3,7 @@ To get started using the Usergrid, you'll need an Usergrid account. (Before read
With an account, you get the following useful things:
-* A sandbox application you can try things with (we automatically create one for you with your new account). The sandbox is a partitioned area of the data store where you can add example data and try out API calls. The sandbox isn't secure, but it's handy to play in. For more about the sandbox, see "Using Your Application Sandbox".
+* A sandbox application you can try things with (we automatically create one for you with your new account). The sandbox is a partitioned area of the data store where you can add example data and try out API calls. The sandbox isn't secure, but it's handy to play in. For more about the sandbox, see [Using Your Application Sandbox](../getting-started/using-a-sandbox-app.html).
* The ability to create more applications (in addition to the sandbox). You can (and should!) make these as secure as you need to. These are the applications that you'll have behind the apps you make available to your users.
* Access to the Admin Portal. In the portal, you can do the following:
** Create and manage applications.
@@ -11,11 +11,11 @@ With an account, you get the following useful things:
** Manage the data in your app.
** Manage app features, including push notifications, activities, analytics, and so on.
** Try out API calls with a shell command window.
-** To create an Usergrid account and see a very short tutorial to get started with, go to the get started page.
+** To create an Usergrid account and see a very short tutorial to get started with, go to the get started page of the Portal.
## Next steps
Ready to learn and do more?
-* Install an SDK that will be most useful for your application environment. For more about Usergrid's SDKs, see SDKs.
+* Install an SDK that will be most useful for your application environment. For more about Usergrid's SDKs, see [SDKs](../sdks/tbd.html).
* Review Usergrid features for information on concepts and features.
* Consult the API Reference for usage details.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/getting-started/using-a-sandbox-app.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/getting-started/using-a-sandbox-app.txt b/content/docs/_sources/getting-started/using-a-sandbox-app.txt
index 7fb9cd1..75c296f 100644
--- a/content/docs/_sources/getting-started/using-a-sandbox-app.txt
+++ b/content/docs/_sources/getting-started/using-a-sandbox-app.txt
@@ -2,7 +2,7 @@
## What is the sandbox application?
-When you create a new Usergrid account (see Creating an Usergrid Account) to use services for developers, Usergrid creates a new application for you on its servers. With the new application, called "sandbox," you can add your own example data and try out API calls that do things with the data. Be sure to see Using the API for suggestions.
+When you create a new Usergrid account (see [Creating an Usergrid Account](creating-account.html)) to use services for developers, Usergrid creates a new application for you on its servers. With the new application, called "sandbox," you can add your own example data and try out API calls that do things with the data. Be sure to see Using the API for suggestions.
## Is the sandbox secure?
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/getting-started/using-the-api.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/getting-started/using-the-api.txt b/content/docs/_sources/getting-started/using-the-api.txt
index 9a7ba2d..d85f86a 100644
--- a/content/docs/_sources/getting-started/using-the-api.txt
+++ b/content/docs/_sources/getting-started/using-the-api.txt
@@ -59,7 +59,7 @@ For example, this request retrieves users whose Facebook first name is john:
/users?ql=select * where facebook.first_name ='john'
-For further information about queries, see Queries and parameters.
+For further information about queries, see [Querying your Data](../data-queries/querying-your-data.html)
## Authentication (OAuth)
Usergrid implements the OAuth 2.0 standard for authenticating users, clients and API requests.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/index.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/index.txt b/content/docs/_sources/index.txt
index e25eebc..0003f26 100644
--- a/content/docs/_sources/index.txt
+++ b/content/docs/_sources/index.txt
@@ -8,6 +8,7 @@ Apache Usergrid Documentation
:maxdepth: 2
:caption: Introduction
+ introduction/overview.md
introduction/usergrid-features
introduction/data-model
introduction/async-vs-sync
@@ -18,8 +19,8 @@ Apache Usergrid Documentation
:maxdepth: 2
:caption: Getting Started
- getting-started/creating-a-new-application
getting-started/creating-account
+ getting-started/creating-a-new-application
getting-started/using-a-sandbox-app
getting-started/using-the-api.md
@@ -55,6 +56,22 @@ Apache Usergrid Documentation
entity-connections/retrieving-entities
entity-connections/disconnecting-entities
+.. _push-notifications:
+
+.. toctree::
+ :maxdepth: 2
+ :caption: Push Notifications
+
+ push-notifications/overview
+ push-notifications/adding-push-support
+ push-notifications/getting-started
+ push-notifications/tutorial
+ push-notifications/registering
+ push-notifications/creating-notifiers
+ push-notifications/managing-users-and-devices
+ push-notifications/creating-and-managing-notifications
+ push-notifications/troubleshooting
+
.. _security-and-authentication:
.. toctree::
@@ -63,6 +80,7 @@ Apache Usergrid Documentation
security-and-auth/app-security
security-and-auth/using-permissions
+ security-and-auth/using-roles
security-and-auth/authenticating-users-and-application-clients
security-and-auth/user-authentication-types
security-and-auth/changing-token-time-live-ttl
@@ -98,9 +116,9 @@ Apache Usergrid Documentation
:maxdepth: 2
:caption: Assets & Files
- asset-and-files/uploading-assets.md
- asset-and-files/retrieving-assets.md
- asset-and-files/folders.md
+ assets-and-files/uploading-assets.md
+ assets-and-files/retrieving-assets.md
+ assets-and-files/folders.md
.. _counters-and-events:
@@ -121,7 +139,7 @@ Apache Usergrid Documentation
orgs-and-apps/managing
orgs-and-apps/organization
orgs-and-apps/application
- orgs-and-apps/adminuser
+ orgs-and-apps/admin-user
.. _rest-endpoints:
@@ -138,7 +156,7 @@ Apache Usergrid Documentation
:caption: Client SDKs
sdks/tbd
-
+
.. _installation:
.. toctree::
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/introduction/data-model.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/introduction/data-model.txt b/content/docs/_sources/introduction/data-model.txt
index 0278b97..41421bd 100644
--- a/content/docs/_sources/introduction/data-model.txt
+++ b/content/docs/_sources/introduction/data-model.txt
@@ -8,7 +8,7 @@ An organization contains one or more applications, and represents administrator-
An organization with the same name as your username is automatically created for you when you sign up. By default, you are assigned as the administrator of this organization.
## Applications
-In Usergrid, you can create one or more applications within an organization. Applications represent an instance of application data associated with an app, and you may create as many applications as you wish. This allows you to utilize the backend in a way that corresponds to your development process. For example, you might create separate applications for development and production instances of your app. By default, all organization have a sandbox application (see Using a Sandbox Application for important information regarding the default sandbox application).
+In Usergrid, you can create one or more applications within an organization. Applications represent an instance of application data associated with an app, and you may create as many applications as you wish. This allows you to utilize the backend in a way that corresponds to your development process. For example, you might create separate applications for development and production instances of your app. By default, all organization have a sandbox application (see Using a [Sandbox Application](../getting-started/using-a-sandbox-app.html) for important information regarding the default sandbox application).
Each application provides the infrastructure for storing, retrieving, updating and deleting the entities and collections associated with a specific app instance.
@@ -33,20 +33,20 @@ Here is a simple example of an entity:
}
## Default entities
-The following entity types are predefined in Usergrid. For more details, see Default Data Entity Types.
-
-* user
-* group
-* role
-* application
-* activity
-* device
-* asset
-* folder
-* event
-* notifier
-* notification
-* receipt
+The following entity types are predefined in Usergrid. For more details, see the [API Reference](../rest-endpoints/api-docs.html)
+
+* [user](../rest-endpoints/api-docs.html#user)
+* [group](../rest-endpoints/api-docs.html#group)
+* [role](../rest-endpoints/api-docs.html#role)
+* [application](../rest-endpoints/api-docs.html#application)
+* [activity](../rest-endpoints/api-docs.html#activity)
+* [device](../rest-endpoints/api-docs.html#device)
+* [asset](../rest-endpoints/api-docs.html#asset)
+* [folder](../rest-endpoints/api-docs.html#folder)
+* [event](../rest-endpoints/api-docs.html#event)
+* [notifier](../rest-endpoints/api-docs.html#notifier)
+* [notification](../rest-endpoints/api-docs.html#notification)
+* [receipt](../rest-endpoints/api-docs.html#recept)
## Properties
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/introduction/overview.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/introduction/overview.txt b/content/docs/_sources/introduction/overview.txt
new file mode 100644
index 0000000..e9c6968
--- /dev/null
+++ b/content/docs/_sources/introduction/overview.txt
@@ -0,0 +1,17 @@
+# Documentation Overview
+
+The Usergrid documentation is written for a couple of distinctly different audiences:
+
+* __Application Developer__: this is you if you are a Javascript, iOS, Android, Java or other developer who wants to build an app that uses the Usergrid APIs for data storage, user management, authentication, etc. __Most of our docs are written for application developers__ so browse the left side-bar and work your way down the topics list.
+
+
+* __Deployment/Operations Engineer__: this is for you if you are the person who will be installing Usergrid, setting up the required Cassandra database and other things that Usergrid needs. Currently, we have limited docs for installation, deployment and maintenance of Usergrid:
+ * [Deploying to Tomcat](../ug1-deploy-to-tomacat): How to build and deploy Usergrid to Tomcat and Cassandra.
+ * [Launcher Quick Start](../ug1-launcher-quick-start): How to build and run Usergrid via the Usergrid Launcher.
+
+
+* __Open Source Contributor__: How to "give back" and contribute to Usergrid. Usergrid welcomes code and documentation contributions, GitHub pull-requests, bug reports and suggestions for improvement.
+ * [How to Contribute Code & Docs](../reference/contribute-code):
+
+
+
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/introduction/usergrid-features.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/introduction/usergrid-features.txt b/content/docs/_sources/introduction/usergrid-features.txt
index 5e57071..1a2f0d6 100644
--- a/content/docs/_sources/introduction/usergrid-features.txt
+++ b/content/docs/_sources/introduction/usergrid-features.txt
@@ -10,21 +10,21 @@ With Usergrid, developers can set up their own cloud-based data platform in minu
At the core of Usergrid is a flexible platform that can store any type of application data, from simple records like a catalog of books to complex associations like user relationships. No matter what type of data drives your app, you can store it as collections of data entities and immediately perform complex queries or full-text searches on any field. You can also create custom entities with custom properties, giving you the ability to store data and context in a way that makes sense for your app.
-To learn more about entities and collections, see Usergrid Data model.
+To learn more about entities and collections, see [Usergrid Data model](data-model.html).
-For a complete list of the default data entities available, see Default Data Entity Types.
+For a complete list of the default data entities available, see [Models](../rest-endpoint/api-docs.html#models).
### Files & assets
Images, video, and audio are key components of a great app experience. With Usergrid, you can upload and retrieve binary objects from the same data store as the rest of your application data, eliminating the need to set up content delivery networks (CDNs) and easing implementation. We handle all the back-end details that keep your content quickly accessible.
-To learn more about files and asset storage, see Uploading files and assets .
+To learn more about files and asset storage, see [Uploading files and assets](../assets-and-files/uploading-assets.html).
## Flexible data querying
One of Usergrid' most powerful features is the ability to perform SQL-style queries and full-text searches on data entities, as well as their properties. This lets you quickly retrieve specific data entities based on multiple criteria, then utilize that data to power social features, target push notifications, perform user analysis, and more.
-Learn more about querying app data, see Data query overview.
+Learn more about querying app data, see [Data query overview](../data-queries/querying-your-data.html).
## Social
@@ -32,13 +32,13 @@ Learn more about querying app data, see Data query overview.
You can create relationships between data entities to help build features, improve user experience, and contextualize data. For example, you might associate a user with their devices to capture valuable geolocation data, create relationships between users to build social graphs, or implement popular features such as activity streams.
-To learn more about entity relationships, see Entity connections.
+To learn more about entity relationships, see [Entity connections](../entity-connections/connecting-entities.html).
### Activity streams
A key aspect of social networking apps is the ability to provide and publish data streams of user actions, such as ongoing lists of comments, activities, and tweets. Usergrid simplifies management and routing of these data streams by providing an activity entity that is specifically designed to automatically create a relationship between activities and the user who created them.
-To learn more about activities and activity feeds, see Activity feeds.
+To learn more about activities and activity feeds, see [Activity feeds](../user-management/activity.html).
## User management
@@ -46,7 +46,7 @@ To learn more about activities and activity feeds, see Activity feeds.
You can easily add and manage users by providing the core services necessary to handle secure registration and log in, including OAuth 2.0-compliant client authentication. In addition, any number of default or custom data entities and properties can be associated with a user entity to create complete user profiles.
-To learn more about user management, see User.
+To learn more about user management, see [User Management](../user-management/user-management.html).
To learn more about authentication, see Authenticating users and application clients.
@@ -54,28 +54,28 @@ To learn more about authentication, see Authenticating users and application cli
Applications often require the ability to configure fine-grain control of user access to data, features and functionality. Usergrid solves the implementation details of user access with roles and permissions. Simply create roles that represent user types or access levels, such as Administrator, then assign the necessary permissions to that role. With a single API call, you can then associate your roles with any user or group of users.
-To learn more about user roles and permissions, see Managing access by defining permission rules.
+To learn more about user roles and permissions, see [Using Permissions](../security-and-auth/securing-your-app.html).
### Groups
Groups are a flexible way to organize your users based on any number of criteria. For example, you might group users based on interests or location to more effectively deliver relevant content, target offers, or customize campaigns. You can also take advantage of the groups entity to enable group-based social networking activities, such as allowing your users to create private information feeds or circles of friends.
-To learn more about groups, see Working with group data.
+To learn more about groups, see [Working with group data](../user-management/groups.html).
### Third-party authentication
In addition to supporting user management and OAuth-based login for your app, Usergrid also makes it easy to integrate third-party authentication through such popular services as Facebook, Twitter and other OAuth-enabled accounts. Providing third-party sign-in can improve user experience, while increasing adoption, giving you access to valuable information from social networks and services.
-To learn more about using third-party sign-in, see Facebook sign in.
+To learn more about using third-party sign-in, see [Facebook sign in](../security-and-auth/facebook-sign.html).
## Geolocation
The device entity allows you to capture geolocation data from your users' GPS-enabled devices to more effectively target campaigns, push notifications, offers and more. Geolocation also gives you an important data point for contextualizing and analyzing trends and user behavior.
-To learn more about geolocation, see Geolocation.
+To learn more about geolocation, see [Geolocation](../geolocation/geolocation.html).
-## Push notifications
+## Push notifications (Coming soon...)
-Push notifications are the most effective way to engage your users with relevant content, and thanks to Usergrid, implementing them can be done in minutes. Simply register your app and your user's devices with a notification provider, such as Apple Push Notification Service or Google Cloud Messaging, then use the Usergrid notification entity to send millions of push notifications a month at no cost. When used in conjunction with queries of user and application data, push notifications become a powerful tool for leveraging user data, ensuring relevancy and driving engagement.
+__(Coming Usergrid 2.0)__ Push notifications are the most effective way to engage your users with relevant content, and thanks to Usergrid, implementing them can be done in minutes. Simply register your app and your user's devices with a notification provider, such as Apple Push Notification Service or Google Cloud Messaging, then use the Usergrid notification entity to send millions of push notifications a month at no cost. When used in conjunction with queries of user and application data, push notifications become a powerful tool for leveraging user data, ensuring relevancy and driving engagement.
-To learn more about push notifications, see Push notifications overview.
+To learn more about push notifications, see [Push notifications overview](../push-notifications/tbd.html).
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/orgs-and-apps/admin-user.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/orgs-and-apps/admin-user.txt b/content/docs/_sources/orgs-and-apps/admin-user.txt
index 87b96f9..6b1b7d3 100644
--- a/content/docs/_sources/orgs-and-apps/admin-user.txt
+++ b/content/docs/_sources/orgs-and-apps/admin-user.txt
@@ -1,4 +1,4 @@
-# Admin user$
+# Admin user
An admin user has full access to perform any operation on all organization accounts of which the admin user is a member. Using the API Services BaaS API, you can create, update, or retrieve an admin user. You can also set or reset an admin user's password, activite or reactivate an admin user, and get an admin user's activity feed.
In addition, you can add, retrieve, or remove an admin user from an organization. For information on these organization-related operations, see [Organization](organization.html).
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/orgs-and-apps/application.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/orgs-and-apps/application.txt b/content/docs/_sources/orgs-and-apps/application.txt
index 7495aee..801b9ef 100644
--- a/content/docs/_sources/orgs-and-apps/application.txt
+++ b/content/docs/_sources/orgs-and-apps/application.txt
@@ -1,5 +1,5 @@
# Application
-You can create a new application in an organization through the Admin portal. The Admin portal creates the new application by issuing a post against the management endpoint (see the "Creating an organization application" section in Organization for details). If you need to create an application programmatically in your app, you can also use the API to do this. You can access application entities using your app name or UUID, prefixed with the organization name or UUID:
+You can create a new application in an organization through the Admin portal. The Admin portal creates the new application by issuing a post against the management endpoint (see the [Creating an Application](../orgs-and-apps/application.html#creating-an-application) section in Organization for details). If you need to create an application programmatically in your app, you can also use the API to do this. You can access application entities using your app name or UUID, prefixed with the organization name or UUID:
https://api.usergrid.com/{org_name|uuid}/{app_name|uuid}
[16/36] usergrid git commit: Update generated website content.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/rest-endpoints/api-docs.html
----------------------------------------------------------------------
diff --git a/content/docs/rest-endpoints/api-docs.html b/content/docs/rest-endpoints/api-docs.html
index 7368826..a3523fe 100644
--- a/content/docs/rest-endpoints/api-docs.html
+++ b/content/docs/rest-endpoints/api-docs.html
@@ -32,7 +32,7 @@
<link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
<link rel="next" title="COMING SOON..." href="../sdks/tbd.html"/>
- <link rel="prev" title="Application" href="../orgs-and-apps/application.html"/>
+ <link rel="prev" title="Admin user" href="../orgs-and-apps/admin-user.html"/>
<script src="../_static/js/modernizr.min.js"></script>
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -141,9 +155,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -158,44 +172,34 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul class="current">
<li class="toctree-l1 current"><a class="current reference internal" href="">Methods</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="#action-methods">Action Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#activityfeed-methods">ActivityFeed Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#appdata-methods">AppData Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#credential-methods">Credential Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#devices-methods">Devices Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#entity-methods">Entity Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#event-methods">Event Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#group-methods">Group Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#notification-methods">Notification Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#organization-methods">Organization Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#permission-methods">Permission Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#receipt-methods">Receipt Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#role-methods">Role Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#user-methods">User Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#access-tokens">Access-Tokens</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#activities">Activities</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#admin-users">Admin-Users</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#app-users">App-Users</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#entities-collections">Entities-Collections</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#events">Events</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#groups">Groups</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#notifications">Notifications</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#organizations-applications">Organizations-Applications</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#permissions-roles">Permissions-Roles</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="#models">Models</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#accesstokenresponse">AccessTokenResponse</a></li>
<li class="toctree-l2"><a class="reference internal" href="#action">Action</a></li>
<li class="toctree-l2"><a class="reference internal" href="#activityfeed">ActivityFeed</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#actor">Actor</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#addpermission">AddPermission</a></li>
<li class="toctree-l2"><a class="reference internal" href="#addrole">AddRole</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#adminuserupdate">AdminUserUpdate</a></li>
<li class="toctree-l2"><a class="reference internal" href="#appdata">AppData</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#cancelmsg">CancelMSG</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#collections">Collections</a></li>
<li class="toctree-l2"><a class="reference internal" href="#createactivity">CreateActivity</a></li>
<li class="toctree-l2"><a class="reference internal" href="#createadminuser">CreateAdminUser</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#createapp">CreateApp</a></li>
<li class="toctree-l2"><a class="reference internal" href="#createentities">CreateEntities</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#createentity">CreateEntity</a></li>
<li class="toctree-l2"><a class="reference internal" href="#createevent">CreateEvent</a></li>
<li class="toctree-l2"><a class="reference internal" href="#creategroup">CreateGroup</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#createnotification">CreateNotification</a></li>
<li class="toctree-l2"><a class="reference internal" href="#createnotifications">CreateNotifications</a></li>
<li class="toctree-l2"><a class="reference internal" href="#createorg">CreateOrg</a></li>
<li class="toctree-l2"><a class="reference internal" href="#createuser">CreateUser</a></li>
@@ -205,23 +209,26 @@
<li class="toctree-l2"><a class="reference internal" href="#error">Error</a></li>
<li class="toctree-l2"><a class="reference internal" href="#event">Event</a></li>
<li class="toctree-l2"><a class="reference internal" href="#group">Group</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#imagemodel">ImageModel</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#metadata">Metadata</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#logincredentials">LoginCredentials</a></li>
<li class="toctree-l2"><a class="reference internal" href="#notification">Notification</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#notifier">Notifier</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#object">Object</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#notificationupdate">NotificationUpdate</a></li>
<li class="toctree-l2"><a class="reference internal" href="#organization">Organization</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#permission">Permission</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#permissions">Permissions</a></li>
<li class="toctree-l2"><a class="reference internal" href="#receipt">Receipt</a></li>
<li class="toctree-l2"><a class="reference internal" href="#resetpw">ResetPW</a></li>
<li class="toctree-l2"><a class="reference internal" href="#resetpwmsg">ResetPWMsg</a></li>
<li class="toctree-l2"><a class="reference internal" href="#role">Role</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#schedulenotification">ScheduleNotification</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#setexpiration">SetExpiration</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#sets">Sets</a></li>
<li class="toctree-l2"><a class="reference internal" href="#user">User</a></li>
</ul>
</li>
+<li class="toctree-l1"><a class="reference internal" href="#sub-types">Sub-Types</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#collections">Collections</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#imagemodel">ImageModel</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#metadata">Metadata</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#object">Object</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#sets">Sets</a></li>
+</ul>
+</li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -275,461 +282,472 @@
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
<div itemprop="articleBody">
- <div class="section" id="methods">
+ <h1><p>Usergrid API Reference</p>
+</h1><p>Methods are organized by tag. Follow the methods are the <a class="reference external" href="#models">Model
+Definitions</a>.</p>
+<h2><p>Table of Contents</p>
+</h2><ul class="simple">
+<li><a class="reference external" href="#Access-Tokens">Access-Tokens</a></li>
+<li><a class="reference external" href="#Activities">Activities</a></li>
+<li><a class="reference external" href="#Admin-Users">Admin-Users</a></li>
+<li><a class="reference external" href="#App-Users">App-Users</a></li>
+<li><a class="reference external" href="#Entities-Collections">Entities-Collections</a></li>
+<li><a class="reference external" href="#Events">Events</a></li>
+<li><a class="reference external" href="#Groups">Groups</a></li>
+<li><a class="reference external" href="#Notifications">Notifications</a></li>
+<li><a class="reference external" href="#Organizations-Applications">Organizations-Applications</a></li>
+<li><a class="reference external" href="#Permissions-Roles">Permissions-Roles</a></li>
+</ul>
+<div class="section" id="methods">
<h1>Methods<a class="headerlink" href="#methods" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="action-methods">
-<h2>Action Methods<a class="headerlink" href="#action-methods" title="Permalink to this headline">¶</a></h2>
-<h2 class="usergrid-GET-heading"><p>GET /management/orgs/{orgId}/activate</p>
-</h2><p>Activate an organization from a link provIded in an email notification.</p>
+<div class="section" id="access-tokens">
+<h2>Access-Tokens<a class="headerlink" href="#access-tokens" title="Permalink to this headline">¶</a></h2>
+<h2 class="usergrid-POST-heading"><p>POST /management/token</p>
+</h2><p>Login with Admin-User or Organization credentials.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
-<li><strong>orgId</strong> (string) One of the organization’s identification which
-includes name or uuid. (Specified in path).</li>
-<li><strong>token</strong> () Activation token. (Specified in query).</li>
-<li><strong>confirm_email</strong> () Send confirmation email or not. (Specified in
-query).</li>
+<li><strong>login-credentials</strong> (<a class="reference external" href="#logincredentials">LoginCredentials</a>)
+Login credentials either username/password or id/secret. (Specified
+in body).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of complete messages.</li>
-<li>Schema: <a class="reference external" href="#action">Action</a></li>
+<li>Description: Object containing access_token.</li>
+<li>Schema: <a class="reference external" href="#AccessTokenResponse">AccessTokenResponse</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-GET-heading"><p>GET /management/orgs/{orgId}/reactivate</p>
-</h2><p>Reactivate an expired organization.</p>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/token</p>
+</h2><p>Login with App-User or Application credentials.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
-<li><strong>orgId</strong> (string) One of the organization’s identification which
-includes name or uuid. (Specified in path).</li>
+<li><strong>login-credentials</strong> (<a class="reference external" href="#logincredentials">LoginCredentials</a>)
+Login credentials either username/password or id/secret. (Specified
+in body).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of complete messages.</li>
-<li>Schema: <a class="reference external" href="#action">Action</a></li>
+<li>Description: Object containing access_token.</li>
+<li>Schema: <a class="reference external" href="#AccessTokenResponse">AccessTokenResponse</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-GET-heading"><p>GET /management/users/resetpw</p>
-</h2><p>Initiate the reset of an admin user’s password.</p>
+</div>
+<div class="section" id="activities">
+<h2>Activities<a class="headerlink" href="#activities" title="Permalink to this headline">¶</a></h2>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/groups/{groupId}/feed</p>
+</h2><p>Get a group’s feed through providing all the identifications.</p>
<h3><p>Parameters</p>
-</h3>
-
-
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization’s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application’s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>groupId</strong> (string) One of the group’s identification which includes
+name or uuid. (Specified in path).</li>
+</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of complete messages.</li>
-<li>Schema: <a class="reference external" href="#action">Action</a></li>
+<li>Description: An array of group’s activity.</li>
+<li>Schema: <a class="reference external" href="#ActivityFeed">ActivityFeed</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-POST-heading"><p>POST /management/users/resetpw</p>
-</h2><p>Complete the password reset through getting the newpassword and the old
-one for identification.</p>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/users/{userId}/activities</p>
+</h2><p>Create an activity in the activities collection.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
-<li><strong>ResetPWMsg</strong> (<a class="reference external" href="#resetpwmsg">ResetPWMsg</a>) Parameters and value
-for the Captcha challenge, the admin user’s response to the Captcha
-challenge, and the admin user’s email address. (Specified in body).</li>
+<li><strong>orgId</strong> (string) One of the organization’s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application’s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>userId-3</strong> (string) One of the user’s identification which includes
+username or UUID. (Specified in path).</li>
+<li><strong>CreateActivity</strong> (<a class="reference external" href="#createactivity">CreateActivity</a>) One or more
+sets of activity properties. (Specified in body).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of complete messages.</li>
-<li>Schema: <a class="reference external" href="#action">Action</a></li>
+<li>Description: An array of user’s activity.</li>
+<li>Schema: <a class="reference external" href="#ActivityFeed">ActivityFeed</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-GET-heading"><p>GET /management/users/{userId}/activate</p>
-</h2><p>Activate an admin user from a link provIded in an email notification.</p>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/users/{userId}/feed</p>
+</h2><p>Retrieve a user’s feed through providing all the identifications.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
-<li><strong>userId</strong> (string) One of the user’s identification which includes
-username, real name, email address or UUID. (Specified in path).</li>
-<li><strong>token</strong> () Activation token’s query statement. (Specified in
-query).</li>
-<li><strong>confirm_email</strong> () Query statement of whether send confimation
-email or not. (Specified in query).</li>
+<li><strong>orgId</strong> (string) One of the organization’s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application’s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>userId-3</strong> (string) One of the user’s identification which includes
+username or UUID. (Specified in path).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of complete messages.</li>
-<li>Schema: <a class="reference external" href="#action">Action</a></li>
+<li>Description: An array of user’s activity feed.</li>
+<li>Schema: <a class="reference external" href="#ActivityFeed">ActivityFeed</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-PUT-heading"><p>PUT /management/users/{userId}/password</p>
-</h2><p>Update an admin user’s password through getting the newpassword and the
-old one for identification.</p>
+</div>
+<div class="section" id="admin-users">
+<h2>Admin-Users<a class="headerlink" href="#admin-users" title="Permalink to this headline">¶</a></h2>
+<h2 class="usergrid-GET-heading"><p>GET /management/orgs/{orgId}/users</p>
+</h2><p>Retrieve details about the admin users in an organization.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
-<li><strong>userId</strong> (string) One of the user’s identification which includes
-username, real name, email address or UUID. (Specified in path).</li>
-<li><strong>ResetPW</strong> (<a class="reference external" href="#resetpw">ResetPW</a>) The user’s old and new password.
-(Specified in body).</li>
+<li><strong>orgId</strong> (string) One of the organization’s identification which
+includes name or uuid. (Specified in path).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of complete messages.</li>
-<li>Schema: <a class="reference external" href="#action">Action</a></li>
+<li>Description: An array of retrieved Admin user’s info.</li>
+<li>Schema: <a class="reference external" href="#User">User</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-GET-heading"><p>GET /management/users/{userId}/reactivate</p>
-</h2><p>Reactivate an expired admin user.</p>
+<h2 class="usergrid-DELETE-heading"><p>DELETE /management/orgs/{orgId}/users/{userId}</p>
+</h2><p>Remove an admin user from an organization through providing both Id of
+application and organization.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
-<li><strong>userId</strong> (string) One of the user’s identification which includes
-username, real name, email address or UUID. (Specified in path).</li>
+<li><strong>orgId</strong> (string) One of the organization’s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>userId-2</strong> (string) One of the user’s identification which includes
+username, email address or UUID. (Specified in path).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of complete messages.</li>
-<li>Schema: <a class="reference external" href="#action">Action</a></li>
+<li>Description: An array of deleted Admin user’s info.</li>
+<li>Schema: <a class="reference external" href="#User">User</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/users/{user}/password</p>
-</h2><p>Set a user’s password or reset the user’s existing password.</p>
+<h2 class="usergrid-POST-heading"><p>POST /management/users</p>
+</h2><p>Create a whole new admin user.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
-<li><strong>orgId</strong> (string) One of the organization’s identification which
-includes name or uuid. (Specified in path).</li>
-<li><strong>appId</strong> (string) One of the application’s identification which
-includes name or uuid. (Specified in path).</li>
-<li><strong>username</strong> (string) The username of the user. (Specified in path).</li>
-<li><strong>ResetPW</strong> (<a class="reference external" href="#resetpw">ResetPW</a>) The user’s old and new password.
-(Specified in body).</li>
+<li><strong>CreateAdminUser</strong> (<a class="reference external" href="#createadminuser">CreateAdminUser</a>) User
+entity with fields required for User creation. (Specified in body).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of complete messages.</li>
-<li>Schema: <a class="reference external" href="#action">Action</a></li>
+<li>Description: An API Response with a entities array containing the
+newly created Admin User.</li>
+<li>Schema: <a class="reference external" href="#User">User</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-</div>
-<div class="section" id="activityfeed-methods">
-<h2>ActivityFeed Methods<a class="headerlink" href="#activityfeed-methods" title="Permalink to this headline">¶</a></h2>
-<h2 class="usergrid-GET-heading"><p>GET /management/orgs/{orgId}/feed</p>
-</h2><p>Retrieve an organization’s activity feed.</p>
+<h2 class="usergrid-GET-heading"><p>GET /management/users/resetpw</p>
+</h2><p>Initiate the reset of an admin user’s password.</p>
<h3><p>Parameters</p>
-</h3><ul class="simple">
-<li><strong>orgId</strong> (string) One of the organization’s identification which
-includes name or uuid. (Specified in path).</li>
-</ul>
+</h3>
+
+
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of the organization’s ActivityFeed.</li>
-<li>Schema: <a class="reference external" href="#activityfeed">ActivityFeed</a></li>
+<li>Description: An array of complete messages.</li>
+<li>Schema: <a class="reference external" href="#Action">Action</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-GET-heading"><p>GET /management/users/{userId}/feed</p>
-</h2><p>Retrieve an admin user’s activity feed.</p>
+<h2 class="usergrid-POST-heading"><p>POST /management/users/resetpw</p>
+</h2><p>Complete the password reset through getting the newpassword and the old
+one for identification.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
-<li><strong>userId</strong> (string) One of the user’s identification which includes
-username, real name, email address or UUID. (Specified in path).</li>
+<li><strong>ResetPWMsg</strong> (<a class="reference external" href="#resetpwmsg">ResetPWMsg</a>) Parameters and value
+for the Captcha challenge, the admin user’s response to the Captcha
+challenge, and the admin user’s email address. (Specified in body).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of user’s activity</li>
-<li>Schema: <a class="reference external" href="#activityfeed">ActivityFeed</a></li>
+<li>Description: An array of complete messages.</li>
+<li>Schema: ` <#>`__</li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
-<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Description:</li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/groups/{groupId}/activities</p>
-</h2><p>Create an activity to a specific group. In this case the activity is
-created in the activities collection and is accessible at the
-/activities endpoint to users who have the permission to read that
-endpoint. In addition, a relationship is established between the
-activity and the group, and because of that, the activity will appear in
-the group’s feed. The group ‘owns’ the activity. Also, the activity will
-be published in the feed of all users that are members of the group.</p>
+<h2 class="usergrid-GET-heading"><p>GET /management/users/{userId}</p>
+</h2><p>Retrieve details about an admin user.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
-<li><strong>orgId</strong> (string) One of the organization’s identification which
-includes name or uuid. (Specified in path).</li>
-<li><strong>appId</strong> (string) One of the application’s identification which
-includes name or uuid. (Specified in path).</li>
-<li><strong>groupId</strong> (string) One of the group’s identification which includes
-name or uuid. (Specified in path).</li>
-<li><strong>CreateActivity</strong> (<a class="reference external" href="#createactivity">CreateActivity</a>) One or more
-sets of activity properties. (Specified in body).</li>
+<li><strong>userId</strong> (string) One of the user’s identification which includes
+username, real name, email address or UUID. (Specified in path).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of user’s activity.</li>
-<li>Schema: <a class="reference external" href="#activityfeed">ActivityFeed</a></li>
+<li>Description: An API Response with a entities array containing the
+Admin User.</li>
+<li>Schema: <a class="reference external" href="#User">User</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/groups/{groupId}/feed</p>
-</h2><p>Get a group’s feed through providing all the identifications.</p>
+<h2 class="usergrid-PUT-heading"><p>PUT /management/users/{userId}</p>
+</h2><p>Update the info of an admin user.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
-<li><strong>orgId</strong> (string) One of the organization’s identification which
-includes name or uuid. (Specified in path).</li>
-<li><strong>appId</strong> (string) One of the application’s identification which
-includes name or uuid. (Specified in path).</li>
-<li><strong>groupId</strong> (string) One of the group’s identification which includes
-name or uuid. (Specified in path).</li>
+<li><strong>userId</strong> (string) One of the user’s identification which includes
+username, real name, email address or UUID. (Specified in path).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of group’s activity.</li>
-<li>Schema: <a class="reference external" href="#activityfeed">ActivityFeed</a></li>
+<li>Description: An API Response with a entities array containing the
+updated Admin User</li>
+<li>Schema: <a class="reference external" href="#User">User</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/users/{userId}/activities</p>
-</h2><p>Create an activity in the activities collection.</p>
+<h2 class="usergrid-GET-heading"><p>GET /management/users/{userId}/activate</p>
+</h2><p>Activate an admin user from a link provIded in an email notification.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
-<li><strong>orgId</strong> (string) One of the organization’s identification which
-includes name or uuid. (Specified in path).</li>
-<li><strong>appId</strong> (string) One of the application’s identification which
-includes name or uuid. (Specified in path).</li>
-<li><strong>userId-3</strong> (string) One of the user’s identification which includes
-username or UUID. (Specified in path).</li>
-<li><strong>CreateActivity</strong> (<a class="reference external" href="#createactivity">CreateActivity</a>) One or more
-sets of activity properties. (Specified in body).</li>
+<li><strong>userId</strong> (string) One of the user’s identification which includes
+username, real name, email address or UUID. (Specified in path).</li>
+<li><strong>token</strong> (string) Activation token’s query statement. (Specified in
+query).</li>
+<li><strong>confirm_email</strong> (boolean) Query statement of whether send
+confimation email or not. (Specified in query).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of user’s activity.</li>
-<li>Schema: <a class="reference external" href="#activityfeed">ActivityFeed</a></li>
+<li>Description: An array of complete messages.</li>
+<li>Schema: <a class="reference external" href="#Action">Action</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/users/{userId}/feed</p>
-</h2><p>Retrieve a user’s feed through providing all the identifications.</p>
+<h2 class="usergrid-PUT-heading"><p>PUT /management/users/{userId}/password</p>
+</h2><p>Update an admin user’s password through getting the newpassword and the
+old one for identification.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
-<li><strong>orgId</strong> (string) One of the organization’s identification which
-includes name or uuid. (Specified in path).</li>
-<li><strong>appId</strong> (string) One of the application’s identification which
-includes name or uuid. (Specified in path).</li>
-<li><strong>userId-3</strong> (string) One of the user’s identification which includes
-username or UUID. (Specified in path).</li>
+<li><strong>userId</strong> (string) One of the user’s identification which includes
+username, real name, email address or UUID. (Specified in path).</li>
+<li><strong>ResetPW</strong> (<a class="reference external" href="#resetpw">ResetPW</a>) The user’s old and new password.
+(Specified in body).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of user’s activity feed.</li>
-<li>Schema: <a class="reference external" href="#activityfeed">ActivityFeed</a></li>
+<li>Description: An array of complete messages.</li>
+<li>Schema: <a class="reference external" href="#Action">Action</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-</div>
-<div class="section" id="appdata-methods">
-<h2>AppData Methods<a class="headerlink" href="#appdata-methods" title="Permalink to this headline">¶</a></h2>
-<h2 class="usergrid-GET-heading"><p>GET /management/orgs/{orgId}/apps</p>
-</h2><p>Retrieve the applications in an organization through providing both Id
-of application and organization.</p>
+<h2 class="usergrid-GET-heading"><p>GET /management/users/{userId}/reactivate</p>
+</h2><p>Reactivate an expired admin user.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
-<li><strong>orgId</strong> (string) One of the organization’s identification which
-includes name or uuid. (Specified in path).</li>
+<li><strong>userId</strong> (string) One of the user’s identification which includes
+username, real name, email address or UUID. (Specified in path).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of retrieved application data.</li>
-<li>Schema: <a class="reference external" href="#appdata">AppData</a></li>
+<li>Description: An array of complete messages.</li>
+<li>Schema: <a class="reference external" href="#Action">Action</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-DELETE-heading"><p>DELETE /management/orgs/{orgId}/apps/{appId}</p>
-</h2><p>Remove an application from an organization through providing both Id of
-application and organization.</p>
+</div>
+<div class="section" id="app-users">
+<h2>App-Users<a class="headerlink" href="#app-users" title="Permalink to this headline">¶</a></h2>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/users</p>
+</h2><p>Retrieve users though query statement.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
<li><strong>orgId</strong> (string) One of the organization’s identification which
includes name or uuid. (Specified in path).</li>
<li><strong>appId</strong> (string) One of the application’s identification which
includes name or uuid. (Specified in path).</li>
+<li><strong>queryStatement</strong> (string) The query statement of the User.
+(Specified in query).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of deleted application info.</li>
-<li>Schema: <a class="reference external" href="#appdata">AppData</a></li>
+<li>Description: An array of retrieved user’s info.</li>
+<li>Schema: <a class="reference external" href="#User">User</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-</div>
-<div class="section" id="credential-methods">
-<h2>Credential Methods<a class="headerlink" href="#credential-methods" title="Permalink to this headline">¶</a></h2>
-<h2 class="usergrid-GET-heading"><p>GET /management/orgs/{orgId}/apps/{appId}/credentials</p>
-</h2><p>Retrieve the client Id and client secret credentials for an application
-in an organization.</p>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/users</p>
+</h2><p>Create a user in the users collection through providing all the
+identifications.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
<li><strong>orgId</strong> (string) One of the organization’s identification which
includes name or uuid. (Specified in path).</li>
<li><strong>appId</strong> (string) One of the application’s identification which
includes name or uuid. (Specified in path).</li>
+<li><strong>CreateUser</strong> (<a class="reference external" href="#createuser">CreateUser</a>) The properties of the
+user. (Specified in body).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of retrieved credentials info.</li>
-<li>Schema: <a class="reference external" href="#credential">Credential</a></li>
+<li>Description: An array of created user’s info.</li>
+<li>Schema: <a class="reference external" href="#User">User</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-POST-heading"><p>POST /management/orgs/{orgId}/apps/{appId}/credentials</p>
-</h2><p>Generate the client Id and client secret credentials for an application
-in an organization.</p>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/users/{userId}</p>
+</h2><p>Retrieve a user through providing all the identifications.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
<li><strong>orgId</strong> (string) One of the organization’s identification which
includes name or uuid. (Specified in path).</li>
<li><strong>appId</strong> (string) One of the application’s identification which
includes name or uuid. (Specified in path).</li>
+<li><strong>userId-2</strong> (string) One of the user’s identification which includes
+username, email address or UUID. (Specified in path).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of generated credentials info.</li>
-<li>Schema: <a class="reference external" href="#credential">Credential</a></li>
+<li>Description: An array of retrieved user’s info.</li>
+<li>Schema: <a class="reference external" href="#User">User</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-GET-heading"><p>GET /management/orgs/{orgId}/credentials</p>
-</h2><p>Retrieve the credentials for an organization client.</p>
+<h2 class="usergrid-PUT-heading"><p>PUT /{orgId}/{appId}/users/{userId}</p>
+</h2><p>Update a user through providing all the identifications.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
<li><strong>orgId</strong> (string) One of the organization’s identification which
includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application’s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>userId-3</strong> (string) One of the user’s identification which includes
+username or UUID. (Specified in path).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of Credential</li>
-<li>Schema: <a class="reference external" href="#credential">Credential</a></li>
+<li>Description: An array of updated user’s info.</li>
+<li>Schema: <a class="reference external" href="#User">User</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-POST-heading"><p>POST /management/orgs/{orgId}/credentials</p>
-</h2><p>Generate whole new credentials for an organization client.</p>
+<h2 class="usergrid-DELETE-heading"><p>DELETE /{orgId}/{appId}/users/{userId}</p>
+</h2><p>Remove a user through providing all the identifications.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
<li><strong>orgId</strong> (string) One of the organization’s identification which
includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application’s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>userId-3</strong> (string) One of the user’s identification which includes
+username or UUID. (Specified in path).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of Credential</li>
-<li>Schema: <a class="reference external" href="#credential">Credential</a></li>
+<li>Description: An array of deleted user’s info.</li>
+<li>Schema: <a class="reference external" href="#User">User</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-</div>
-<div class="section" id="devices-methods">
-<h2>Devices Methods<a class="headerlink" href="#devices-methods" title="Permalink to this headline">¶</a></h2>
-<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/{notificationId}/*/queue</p>
-</h2><p>Retrieve the list of devices associated with one or more notifications
-before the notifications are sent through providing all the
-identifications.</p>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/users/{user}/password</p>
+</h2><p>Set a user’s password or reset the user’s existing password.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
<li><strong>orgId</strong> (string) One of the organization’s identification which
includes name or uuid. (Specified in path).</li>
<li><strong>appId</strong> (string) One of the application’s identification which
includes name or uuid. (Specified in path).</li>
-<li><strong>notificationId</strong> (string) One of the notification’s identification
-which includes name or uuid. (Specified in path).</li>
+<li><strong>username</strong> (string) The username of the user. (Specified in path).</li>
+<li><strong>ResetPW</strong> (<a class="reference external" href="#resetpw">ResetPW</a>) The user’s old and new password.
+(Specified in body).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of retrieved device’s info.</li>
-<li>Schema: <a class="reference external" href="#device">Device</a></li>
+<li>Description: An array of complete messages.</li>
+<li>Schema: <a class="reference external" href="#Action">Action</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
</div>
-<div class="section" id="entity-methods">
-<h2>Entity Methods<a class="headerlink" href="#entity-methods" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="entities-collections">
+<h2>Entities-Collections<a class="headerlink" href="#entities-collections" title="Permalink to this headline">¶</a></h2>
<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/users/{userId}/{relation}</p>
</h2><p>Retrieve a user’s collections or connections through query statement.</p>
<h3><p>Parameters</p>
@@ -742,19 +760,19 @@ includes name or uuid. (Specified in path).</li>
username or UUID. (Specified in path).</li>
<li><strong>relation</strong> (string) The relation between user and collections.
(Specified in path).</li>
-<li><strong>queryStatement</strong> () The query statement of the user. (Specified in
-query).</li>
+<li><strong>queryStatement</strong> (string) The query statement of the user.
+(Specified in query).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
<li>Description: An array of user’s collections info.</li>
-<li>Schema: <a class="reference external" href="#entity">Entity</a></li>
+<li>Schema: <a class="reference external" href="#Entity">Entity</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/{collectionId}</p>
</h2><p>Retrieve collection through query statement.</p>
@@ -766,19 +784,19 @@ includes name or uuid. (Specified in path).</li>
includes name or uuid. (Specified in path).</li>
<li><strong>collectionId</strong> (string) One of the collection’s identification
which includes name or uuid. (Specified in path).</li>
-<li><strong>queryStatement</strong> () Any values specified in the query statement
-should be enclosed in single-quotes. (Specified in query).</li>
+<li><strong>queryStatement</strong> (string) Any values specified in the query
+statement should be enclosed in single-quotes. (Specified in query).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
<li>Description: An array of retrieved collection’s info.</li>
-<li>Schema: <a class="reference external" href="#entity">Entity</a></li>
+<li>Schema: <a class="reference external" href="#Entity">Entity</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
<h2 class="usergrid-PUT-heading"><p>PUT /{orgId}/{appId}/{collectionId}</p>
</h2><p>Update collection through query statement.</p>
@@ -790,19 +808,19 @@ includes name or uuid. (Specified in path).</li>
includes name or uuid. (Specified in path).</li>
<li><strong>collectionId</strong> (string) One of the collection’s identification
which includes name or uuid. (Specified in path).</li>
-<li><strong>queryStatement</strong> () Any values specified in the query statement
-should be enclosed in single-quotes. (Specified in query).</li>
+<li><strong>queryStatement</strong> (string) Any values specified in the query
+statement should be enclosed in single-quotes. (Specified in query).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
<li>Description: An array of updated collection’s info.</li>
-<li>Schema: <a class="reference external" href="#entity">Entity</a></li>
+<li>Schema: <a class="reference external" href="#Entity">Entity</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2}</p>
</h2><p>Add an entity to a collection through providing all the identifications.</p>
@@ -823,12 +841,12 @@ which includes name or uuid. (Specified in path).</li>
</h3><p><strong>200</strong></p>
<ul class="simple">
<li>Description: An array of added entity’s info.</li>
-<li>Schema: <a class="reference external" href="#entity">Entity</a></li>
+<li>Schema: <a class="reference external" href="#Entity">Entity</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
<h2 class="usergrid-DELETE-heading"><p>DELETE
/{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2}</p>
@@ -851,12 +869,12 @@ which includes name or uuid. (Specified in path).</li>
</h3><p><strong>200</strong></p>
<ul class="simple">
<li>Description: An array of deleted entity’s info.</li>
-<li>Schema: <a class="reference external" href="#entity">Entity</a></li>
+<li>Schema: <a class="reference external" href="#Entity">Entity</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/{collectionId}/{entityId}</p>
</h2><p>Retrieve an entity through providing Id of application, organization,
@@ -876,12 +894,12 @@ includes name or uuid. (Specified in path).</li>
</h3><p><strong>200</strong></p>
<ul class="simple">
<li>Description: An array of retrieved entity’s info.</li>
-<li>Schema: <a class="reference external" href="#entity">Entity</a></li>
+<li>Schema: <a class="reference external" href="#Entity">Entity</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
<h2 class="usergrid-PUT-heading"><p>PUT /{orgId}/{appId}/{collectionId}/{entityId}</p>
</h2><p>One or more properties can be updated with a single request.</p>
@@ -902,12 +920,12 @@ properties of the entity. (Specified in body).</li>
</h3><p><strong>200</strong></p>
<ul class="simple">
<li>Description: An array of updated entity’s info.</li>
-<li>Schema: <a class="reference external" href="#entity">Entity</a></li>
+<li>Schema: <a class="reference external" href="#Entity">Entity</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
<h2 class="usergrid-DELETE-heading"><p>DELETE /{orgId}/{appId}/{collectionId}/{entityId}</p>
</h2><p>Delete an entity from the collection.</p>
@@ -926,12 +944,12 @@ includes name or uuid. (Specified in path).</li>
</h3><p><strong>200</strong></p>
<ul class="simple">
<li>Description: An array of deleted entity’s info.</li>
-<li>Schema: <a class="reference external" href="#entity">Entity</a></li>
+<li>Schema: <a class="reference external" href="#Entity">Entity</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/{entitytype}</p>
</h2><p>When a new entity is created, Usergrid will automatically create a
@@ -951,65 +969,143 @@ properties of the entity. (Specified in body).</li>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of created custom entity’s info.</li>
-<li>Schema: <a class="reference external" href="#entity">Entity</a></li>
+<li>Description: An array of created custom entity’s info.</li>
+<li>Schema: <a class="reference external" href="#Entity">Entity</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
+</ul>
+</div>
+<div class="section" id="events">
+<h2>Events<a class="headerlink" href="#events" title="Permalink to this headline">¶</a></h2>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/events</p>
+</h2><p>Create an event through providing both Id of organization and
+application.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization’s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application’s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>CreateEvent</strong> (<a class="reference external" href="#createevent">CreateEvent</a>) The required
+property of the event. (Specified in body).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of created event’s info.</li>
+<li>Schema: <a class="reference external" href="#Event">Event</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
+</ul>
+</div>
+<div class="section" id="groups">
+<h2>Groups<a class="headerlink" href="#groups" title="Permalink to this headline">¶</a></h2>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/groups</p>
+</h2><p>Create a new group through providing both Id of organization and
+application.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization’s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application’s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>groupproperty</strong> (<a class="reference external" href="#creategroup">CreateGroup</a>) The property of
+the created group. (Specified in body).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of created group’s info.</li>
+<li>Schema: <a class="reference external" href="#Group">Group</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
+</ul>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/groups/{groupId}/activities</p>
+</h2><p>Create an activity to a specific group. In this case the activity is
+created in the activities collection and is accessible at the
+/activities endpoint to users who have the permission to read that
+endpoint. In addition, a relationship is established between the
+activity and the group, and because of that, the activity will appear in
+the group’s feed. The group ‘owns’ the activity. Also, the activity will
+be published in the feed of all users that are members of the group.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization’s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application’s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>groupId</strong> (string) One of the group’s identification which includes
+name or uuid. (Specified in path).</li>
+<li><strong>CreateActivity</strong> (<a class="reference external" href="#createactivity">CreateActivity</a>) One or more
+sets of activity properties. (Specified in body).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description:</li>
+<li>Schema: <a class="reference external" href="#ActivityFeed">ActivityFeed</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-</div>
-<div class="section" id="event-methods">
-<h2>Event Methods<a class="headerlink" href="#event-methods" title="Permalink to this headline">¶</a></h2>
-<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/events</p>
-</h2><p>Create an event through providing both Id of organization and
-application.</p>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/groups/{groupId}/users/{userId}</p>
+</h2><p>Add a user to a group through providing all the identifications.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
<li><strong>orgId</strong> (string) One of the organization’s identification which
includes name or uuid. (Specified in path).</li>
<li><strong>appId</strong> (string) One of the application’s identification which
includes name or uuid. (Specified in path).</li>
-<li><strong>CreateEvent</strong> (<a class="reference external" href="#createevent">CreateEvent</a>) The required
-property of the event. (Specified in body).</li>
+<li><strong>groupId</strong> (string) One of the group’s identification which includes
+name or uuid. (Specified in path).</li>
+<li><strong>userId-3</strong> (string) One of the user’s identification which includes
+username or UUID. (Specified in path).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of created event’s info.</li>
-<li>Schema: <a class="reference external" href="#event">Event</a></li>
+<li>Description: An array of added user’s info.</li>
+<li>Schema: <a class="reference external" href="#User">User</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-</div>
-<div class="section" id="group-methods">
-<h2>Group Methods<a class="headerlink" href="#group-methods" title="Permalink to this headline">¶</a></h2>
-<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/groups</p>
-</h2><p>Create a new group through providing both Id of organization and
-application.</p>
+<h2 class="usergrid-DELETE-heading"><p>DELETE /{orgId}/{appId}/groups/{groupId}/users/{userId}</p>
+</h2><p>Delete user from a group through providing all the identifications.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
<li><strong>orgId</strong> (string) One of the organization’s identification which
includes name or uuid. (Specified in path).</li>
<li><strong>appId</strong> (string) One of the application’s identification which
includes name or uuid. (Specified in path).</li>
-<li><strong>groupproperty</strong> (<a class="reference external" href="#creategroup">CreateGroup</a>) The property of
-the created group. (Specified in body).</li>
+<li><strong>groupId</strong> (string) One of the group’s identification which includes
+name or uuid. (Specified in path).</li>
+<li><strong>userId-3</strong> (string) One of the user’s identification which includes
+username or UUID. (Specified in path).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of created group’s info.</li>
-<li>Schema: <a class="reference external" href="#group">Group</a></li>
+<li>Description: An array of deleted user’s info.</li>
+<li>Schema: <a class="reference external" href="#User">User</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
<h2 class="usergrid-GET-heading"><p>GET /{org_Id}/{app_Id}/groups/{groupId}</p>
</h2><p>Get a group through through providing all the identifications.</p>
@@ -1026,12 +1122,12 @@ name or uuid. (Specified in path).</li>
</h3><p><strong>200</strong></p>
<ul class="simple">
<li>Description: An array of retrieved group’s info.</li>
-<li>Schema: <a class="reference external" href="#group">Group</a></li>
+<li>Schema: <a class="reference external" href="#Group">Group</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
<h2 class="usergrid-PUT-heading"><p>PUT /{org_Id}/{app_Id}/groups/{groupId}</p>
</h2><p>Update a group through providing all the identifications.</p>
@@ -1048,137 +1144,93 @@ name or uuid. (Specified in path).</li>
</h3><p><strong>200</strong></p>
<ul class="simple">
<li>Description: An array of updated group’s info.</li>
-<li>Schema: <a class="reference external" href="#group">Group</a></li>
+<li>Schema: <a class="reference external" href="#Group">Group</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
</div>
-<div class="section" id="notification-methods">
-<h2>Notification Methods<a class="headerlink" href="#notification-methods" title="Permalink to this headline">¶</a></h2>
-<h2 class="usergrid-PUT-heading"><p>PUT /my-org/sandbox/notifications/{notificationId}</p>
-</h2><p>Cancel sent notifications through providing the Id of the notification.</p>
-<h3><p>Parameters</p>
-</h3><ul class="simple">
-<li><strong>notificationId</strong> (string) One of the notification’s identification
-which includes name or uuid. (Specified in path).</li>
-<li><strong>cancelMsg</strong> (<a class="reference external" href="#cancelmsg">CancelMSG</a>) Indicete whether is
-canceled or not. (Specified in body).</li>
-</ul>
-<h3><p>Responses</p>
-</h3><p><strong>200</strong></p>
-<ul class="simple">
-<li>Description: An array of canceled notification’s info.</li>
-<li>Schema: <a class="reference external" href="#notification">Notification</a></li>
-</ul>
-<p><strong>default</strong></p>
-<ul class="simple">
-<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
-</ul>
-<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/devices</p>
+<div class="section" id="notifications">
+<h2>Notifications<a class="headerlink" href="#notifications" title="Permalink to this headline">¶</a></h2>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{applicationId}/devices</p>
</h2><p>Create notifications for user through targeting by location and
providing all the identifications.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
<li><strong>orgId</strong> (string) One of the organization’s identification which
includes name or uuid. (Specified in path).</li>
-<li><strong>appId</strong> (string) One of the application’s identification which
-includes name or uuid. (Specified in path).</li>
+<li><strong>applicationId</strong> (string) One of the application’s identification
+which includes name or uuid (same as appId). (Specified in path).</li>
<li><strong>notification</strong> (<a class="reference external" href="#createnotifications">CreateNotifications</a>)
These parameters are used when forming the notification portion of
the request. (Specified in body).</li>
-<li><strong>scheduleNotification</strong>
-(<a class="reference external" href="#schedulenotification">ScheduleNotification</a>) To schedule a
-notification for a later time add the deliver parameter with a UNIX
-timestamp to the body of your request. (Specified in body).</li>
-<li><strong>setExpiration</strong> (<a class="reference external" href="#setexpiration">SetExpiration</a>) If a push
-service can’t deliver a message to a device and needs to resend it
-you can set a notification to expire after a certain date/time.
-(Specified in body).</li>
-<li><strong>queryStatement</strong> () The query statement of the location of the
-user. (Specified in query).</li>
+<li><strong>queryStatement</strong> (string) The query statement of the location of
+the user. (Specified in query).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
<li>Description: An array of created notification’s info.</li>
-<li>Schema: <a class="reference external" href="#notification">Notification</a></li>
+<li>Schema: <a class="reference external" href="#Notification">Notification</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/devices/*/notifications</p>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{applicationId}/devices/*/notifications</p>
</h2><p>Create notifications for all devices. This request will target all
device entities.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
<li><strong>orgId</strong> (string) One of the organization’s identification which
includes name or uuid. (Specified in path).</li>
-<li><strong>appId</strong> (string) One of the application’s identification which
-includes name or uuid. (Specified in path).</li>
+<li><strong>applicationId</strong> (string) One of the application’s identification
+which includes name or uuid (same as appId). (Specified in path).</li>
<li><strong>notification</strong> (<a class="reference external" href="#createnotifications">CreateNotifications</a>)
These parameters are used when forming the notification portion of
the request. (Specified in body).</li>
-<li><strong>scheduleNotification</strong>
-(<a class="reference external" href="#schedulenotification">ScheduleNotification</a>) To schedule a
-notification for a later time add the deliver parameter with a UNIX
-timestamp to the body of your request. (Specified in body).</li>
-<li><strong>setExpiration</strong> (<a class="reference external" href="#setexpiration">SetExpiration</a>) If a push
-service can’t deliver a message to a device and needs to resend it
-you can set a notification to expire after a certain date/time.
-(Specified in body).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
<li>Description: An array of created notification’s info.</li>
-<li>Schema: <a class="reference external" href="#notification">Notification</a></li>
+<li>Schema: <a class="reference external" href="#Notification">Notification</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/devices/{deviceId}/notifications</p>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{applicationId}/devices/{deviceId}/notifications</p>
</h2><p>Create notifications for a single device. This request will target a
specific device entity.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
<li><strong>orgId</strong> (string) One of the organization’s identification which
includes name or uuid. (Specified in path).</li>
-<li><strong>appId</strong> (string) One of the application’s identification which
-includes name or uuid. (Specified in path).</li>
+<li><strong>applicationId</strong> (string) One of the application’s identification
+which includes name or uuid (same as appId). (Specified in path).</li>
<li><strong>deviceId</strong> (string) One of the device’s identification which
includes name or uuid. (Specified in path).</li>
<li><strong>notification</strong> (<a class="reference external" href="#createnotifications">CreateNotifications</a>)
These parameters are used when forming the notification portion of
the request. (Specified in body).</li>
-<li><strong>scheduleNotification</strong>
-(<a class="reference external" href="#schedulenotification">ScheduleNotification</a>) To schedule a
-notification for a later time add the deliver parameter with a UNIX
-timestamp to the body of your request. (Specified in body).</li>
-<li><strong>setExpiration</strong> (<a class="reference external" href="#setexpiration">SetExpiration</a>) If a push
-service can’t deliver a message to a device and needs to resend it
-you can set a notification to expire after a certain date/time.
-(Specified in body).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
<li>Description: An array of created notification’s info.</li>
-<li>Schema: <a class="reference external" href="#notification">Notification</a></li>
+<li>Schema: <a class="reference external" href="#Notification">Notification</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/groups/{path}/notifications</p>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{applicationId}/groups/{path}/notifications</p>
</h2><p>Create notifications for a group. This request will target all users
associated with a specific group entity.</p>
<h3><p>Parameters</p>
@@ -1191,497 +1243,507 @@ includes name or uuid. (Specified in path).</li>
<li><strong>notification</strong> (<a class="reference external" href="#createnotifications">CreateNotifications</a>)
These parameters are used when forming the notification portion of
the request. (Specified in body).</li>
-<li><strong>scheduleNotification</strong>
-(<a class="reference external" href="#schedulenotification">ScheduleNotification</a>) To schedule a
-notification for a later time add the deliver parameter with a UNIX
-timestamp to the body of your request. (Specified in body).</li>
-<li><strong>setExpiration</strong> (<a class="reference external" href="#setexpiration">SetExpiration</a>) If a push
-service can’t deliver a message to a device and needs to resend it
-you can set a notification to expire after a certain date/time.
-(Specified in body).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
<li>Description: An array of created notification’s info.</li>
-<li>Schema: <a class="reference external" href="#notification">Notification</a></li>
+<li>Schema: <a class="reference external" href="#Notification">Notification</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/notifications</p>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{applicationId}/notifications</p>
</h2><p>Retrieve one or more notifications through providing all the
identifications.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
<li><strong>orgId</strong> (string) One of the organization’s identification which
includes name or uuid. (Specified in path).</li>
-<li><strong>appId</strong> (string) One of the application’s identification which
-includes name or uuid. (Specified in path).</li>
+<li><strong>applicationId</strong> (string) One of the application’s identification
+which includes name or uuid (same as appId). (Specified in path).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
<li>Description: An array of retrieved notification’s info.</li>
-<li>Schema: <a class="reference external" href="#notification">Notification</a></li>
+<li>Schema: <a class="reference external" href="#Notification">Notification</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-DELETE-heading"><p>DELETE /{orgId}/{appId}/notifications/{notificationId}</p>
-</h2><p>Remove unsent notifications through providing all the identifications.</p>
+<h2 class="usergrid-PUT-heading"><p>PUT /{orgId}/{applicationId}/notifications/{notificationId}</p>
+</h2><p>Update a Notification in order to cancel the notifcation or set a new
+expiration time.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
<li><strong>orgId</strong> (string) One of the organization’s identification which
includes name or uuid. (Specified in path).</li>
-<li><strong>appId</strong> (string) One of the application’s identification which
+<li><strong>applicationId</strong> (string) One of the application’s identification
+which includes name or uuid (same as appId). (Specified in path).</li>
+<li><strong>notificationId</strong> (string) One of the notification’s identification
+which includes name or uuid. (Specified in path).</li>
+<li><strong>notificationUpdate</strong> (<a class="reference external" href="#notificationupdate">NotificationUpdate</a>)
+Object with Notification fields to be updated. (Specified in body).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An API Response object containing an entity of type
+Notification.</li>
+<li>Schema: <a class="reference external" href="#Notification">Notification</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
+</ul>
+<h2 class="usergrid-DELETE-heading"><p>DELETE /{orgId}/{applicationId}/notifications/{notificationId}</p>
+</h2><p>Delete an unsent Notification from the system.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization’s identification which
includes name or uuid. (Specified in path).</li>
+<li><strong>applicationId</strong> (string) One of the application’s identification
+which includes name or uuid (same as appId). (Specified in path).</li>
<li><strong>notificationId</strong> (string) One of the notification’s identification
which includes name or uuid. (Specified in path).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of deleted notification’s info.</li>
-<li>Schema: <a class="reference external" href="#notification">Notification</a></li>
+<li>Description: API Response containing Notification entity that was
+deleted.</li>
+<li>Schema: <a class="reference external" href="#Notification">Notification</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
+</ul>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{applicationId}/receipts</p>
+</h2><p>Retrieve one or more receipts through providing all the identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization’s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>applicationId</strong> (string) One of the application’s identification
+which includes name or uuid (same as appId). (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of retrieved receipt’s info.</li>
+<li>Schema: <a class="reference external" href="#Receipt">Receipt</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/users/{userId}/notifications</p>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{applicationId}/users/{userId}/notifications</p>
</h2><p>Create notifications for a user. This request will target a specific
user entity.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
<li><strong>orgId</strong> (string) One of the organization’s identification which
includes name or uuid. (Specified in path).</li>
-<li><strong>appId</strong> (string) One of the application’s identification which
-includes name or uuid. (Specified in path).</li>
+<li><strong>applicationId</strong> (string) One of the application’s identification
+which includes name or uuid (same as appId). (Specified in path).</li>
<li><strong>userId-3</strong> (string) One of the user’s identification which includes
username or UUID. (Specified in path).</li>
<li><strong>notification</strong> (<a class="reference external" href="#createnotifications">CreateNotifications</a>)
These parameters are used when forming the notification portion of
the request. (Specified in body).</li>
-<li><strong>scheduleNotification</strong>
-(<a class="reference external" href="#schedulenotification">ScheduleNotification</a>) To schedule a
-notification for a later time add the deliver parameter with a UNIX
-timestamp to the body of your request. (Specified in body).</li>
-<li><strong>setExpiration</strong> (<a class="reference external" href="#setexpiration">SetExpiration</a>) If a push
-service can’t deliver a message to a device and needs to resend it
-you can set a notification to expire after a certain date/time.
-(Specified in body).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
<li>Description: An array of created notification’s info.</li>
-<li>Schema: <a class="reference external" href="#notification">Notification</a></li>
+<li>Schema: <a class="reference external" href="#Notification">Notification</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/{receiptId}/*/notifications</p>
-</h2><p>Retrieve notifications associated with one or more receipts through
-providing all the identifications.</p>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{applicationId}/{deviceId}/*/receipts</p>
+</h2><p>Retrieve receipts associated with one or more devices through providing
+all the identifications.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
<li><strong>orgId</strong> (string) One of the organization’s identification which
includes name or uuid. (Specified in path).</li>
-<li><strong>appId</strong> (string) One of the application’s identification which
-includes name or uuid. (Specified in path).</li>
-<li><strong>receiptId</strong> (string) One of the receipt’s identification which
+<li><strong>applicationId</strong> (string) One of the application’s identification
+which includes name or uuid (same as appId). (Specified in path).</li>
+<li><strong>deviceId</strong> (string) One of the device’s identification which
includes name or uuid. (Specified in path).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of retrieved notification’s info.</li>
-<li>Schema: <a class="reference external" href="#notification">Notification</a></li>
+<li>Description: An array of retrieved receipt’s info.</li>
+<li>Schema: <a class="reference external" href="#Receipt">Receipt</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-</div>
-<div class="section" id="organization-methods">
-<h2>Organization Methods<a class="headerlink" href="#organization-methods" title="Permalink to this headline">¶</a></h2>
-<h2 class="usergrid-POST-heading"><p>POST /management/orgs</p>
-</h2><p>Create an organization through a form post.</p>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{applicationId}/{notificationId}/*/queue</p>
+</h2><p>Retrieve the list of devices associated with one or more notifications
+before the notifications are sent through providing all the
+identifications.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
-<li><strong>CreateOrg</strong> (<a class="reference external" href="#createorg">CreateOrg</a>) A set of organization
-properties supplied through a form. (Specified in body).</li>
+<li><strong>orgId</strong> (string) One of the organization’s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>applicationId</strong> (string) One of the application’s identification
+which includes name or uuid (same as appId). (Specified in path).</li>
+<li><strong>notificationId</strong> (string) One of the notification’s identification
+which includes name or uuid. (Specified in path).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of created Organization.</li>
-<li>Schema: <a class="reference external" href="#organization">Organization</a></li>
+<li>Description: An array of retrieved device’s info.</li>
+<li>Schema: <a class="reference external" href="#Device">Device</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-<h2 class="usergrid-GET-heading"><p>GET /management/orgs/{orgId}</p>
-</h2><p>Retrieve an organization given a specified UUID or username.</p>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{applicationId}/{notificationId}/*/receipts</p>
+</h2><p>Retrieve receipts for one or more notifications through providing all
+the identifications.</p>
<h3><p>Parameters</p>
</h3><ul class="simple">
<li><strong>orgId</strong> (string) One of the organization’s identification which
includes name or uuid. (Specified in path).</li>
+<li><strong>applicationId</strong> (string) One of the application’s identification
+which includes name or uuid (same as appId). (Specified in path).</li>
+<li><strong>notificationId</strong> (string) One of the notification’s identification
+which includes name or uuid. (Specified in path).</li>
</ul>
<h3><p>Responses</p>
</h3><p><strong>200</strong></p>
<ul class="simple">
-<li>Description: An array of created Organization.</li>
-<li>Schema: <a class="reference external" href="#organization">Organization</a></li>
+<li>Description: An array of retrieved receipt’s info.</li>
+<li>Schema: <a class="reference external" href="#Receipt">Receipt</a></li>
</ul>
<p><strong>default</strong></p>
<ul class="simple">
<li>Description: Unexpected error.</li>
-<li>Schema: <a class="reference external" href="#error">Error</a></li>
+<li>Schema: <a class="reference external" href="#Error">Error</a></li>
</ul>
-</div>
-<div class="section" id="permission-methods">
-<h2>Permission Methods<a class="headerlink" href="#permission-methods" title="Permalink to this headline">¶</a></h2>
-<h2 class="userg
<TRUNCATED>
[22/36] usergrid git commit: Update generated website content.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/getting-started/using-a-sandbox-app.html
----------------------------------------------------------------------
diff --git a/content/docs/getting-started/using-a-sandbox-app.html b/content/docs/getting-started/using-a-sandbox-app.html
index a2494dc..21c1d8d 100644
--- a/content/docs/getting-started/using-a-sandbox-app.html
+++ b/content/docs/getting-started/using-a-sandbox-app.html
@@ -32,7 +32,7 @@
<link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
<link rel="next" title="Using the API" href="using-the-api.html"/>
- <link rel="prev" title="Creating an Usergrid Account" href="creating-account.html"/>
+ <link rel="prev" title="Creating a new application" href="creating-a-new-application.html"/>
<script src="../_static/js/modernizr.min.js"></script>
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1 current"><a class="current reference internal" href="">Using a Sandbox Application</a><ul>
<li class="toctree-l2"><a class="reference internal" href="#what-is-the-sandbox-application">What is the sandbox application?</a></li>
<li class="toctree-l2"><a class="reference internal" href="#is-the-sandbox-secure">Is the sandbox secure?</a></li>
@@ -118,10 +119,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -146,9 +160,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -163,11 +177,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -225,11 +241,12 @@
<h1>Using a Sandbox Application<a class="headerlink" href="#using-a-sandbox-application" title="Permalink to this headline">¶</a></h1>
<div class="section" id="what-is-the-sandbox-application">
<h2>What is the sandbox application?<a class="headerlink" href="#what-is-the-sandbox-application" title="Permalink to this headline">¶</a></h2>
-<p>When you create a new Usergrid account (see Creating an Usergrid
-Account) to use services for developers, Usergrid creates a new
-application for you on its servers. With the new application, called
-“sandbox,” you can add your own example data and try out API calls that
-do things with the data. Be sure to see Using the API for suggestions.</p>
+<p>When you create a new Usergrid account (see <a class="reference external" href="creating-account.html">Creating an Usergrid
+Account</a>) to use services for developers,
+Usergrid creates a new application for you on its servers. With the new
+application, called “sandbox,” you can add your own example data and try
+out API calls that do things with the data. Be sure to see Using the API
+for suggestions.</p>
</div>
<div class="section" id="is-the-sandbox-secure">
<h2>Is the sandbox secure?<a class="headerlink" href="#is-the-sandbox-secure" title="Permalink to this headline">¶</a></h2>
@@ -296,7 +313,7 @@ application whatever you like (including “sandbox”).</li>
<a href="using-the-api.html" class="btn btn-neutral float-right" title="Using the API" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
- <a href="creating-account.html" class="btn btn-neutral" title="Creating an Usergrid Account" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+ <a href="creating-a-new-application.html" class="btn btn-neutral" title="Creating a new application" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
</div>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/getting-started/using-the-api.html
----------------------------------------------------------------------
diff --git a/content/docs/getting-started/using-the-api.html b/content/docs/getting-started/using-the-api.html
index d80add6..333b4cb 100644
--- a/content/docs/getting-started/using-the-api.html
+++ b/content/docs/getting-started/using-the-api.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1 current"><a class="current reference internal" href="">Using the API</a><ul>
<li class="toctree-l2"><a class="reference internal" href="#supported-http-methods">Supported HTTP methods</a></li>
@@ -124,10 +125,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -152,9 +166,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -169,11 +183,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -312,7 +328,8 @@ john:</p>
<div class="highlight-python"><div class="highlight"><pre>/users?ql=select * where facebook.first_name ='john'
</pre></div>
</div>
-<p>For further information about queries, see Queries and parameters.</p>
+<p>For further information about queries, see <a class="reference external" href="../data-queries/querying-your-data.html">Querying your
+Data</a></p>
</div>
<div class="section" id="authentication-oauth">
<h2>Authentication (OAuth)<a class="headerlink" href="#authentication-oauth" title="Permalink to this headline">¶</a></h2>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/index.html
----------------------------------------------------------------------
diff --git a/content/docs/index.html b/content/docs/index.html
index 81812d4..caa61a4 100644
--- a/content/docs/index.html
+++ b/content/docs/index.html
@@ -31,7 +31,7 @@
<link rel="top" title="Apache Usergrid 1.0 documentation" href="#"/>
- <link rel="next" title="Usergrid Features" href="introduction/usergrid-features.html"/>
+ <link rel="next" title="Documentation Overview" href="introduction/overview.html"/>
<script src="_static/js/modernizr.min.js"></script>
@@ -81,14 +81,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -112,10 +113,23 @@
<li class="toctree-l1"><a class="reference internal" href="entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -140,9 +154,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -157,11 +171,13 @@
<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -220,13 +236,14 @@
<div class="toctree-wrapper compound" id="introduction">
<p class="caption"><span class="caption-text">Introduction</span><a class="headerlink" href="#introduction" title="Permalink to this toctree">¶</a></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="introduction/usergrid-features.html">Usergrid Features</a><ul>
<li class="toctree-l2"><a class="reference internal" href="introduction/usergrid-features.html#data-storage-management">Data storage & management</a></li>
<li class="toctree-l2"><a class="reference internal" href="introduction/usergrid-features.html#flexible-data-querying">Flexible data querying</a></li>
<li class="toctree-l2"><a class="reference internal" href="introduction/usergrid-features.html#social">Social</a></li>
<li class="toctree-l2"><a class="reference internal" href="introduction/usergrid-features.html#user-management">User management</a></li>
<li class="toctree-l2"><a class="reference internal" href="introduction/usergrid-features.html#geolocation">Geolocation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="introduction/usergrid-features.html#push-notifications">Push notifications</a></li>
+<li class="toctree-l2"><a class="reference internal" href="introduction/usergrid-features.html#push-notifications-coming-soon">Push notifications (Coming soon...)</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="introduction/data-model.html">Usergrid Data model</a><ul>
@@ -249,15 +266,15 @@
<div class="toctree-wrapper compound" id="id1">
<span id="getting-started"></span><p class="caption"><span class="caption-text">Getting Started</span><a class="headerlink" href="#id1" title="Permalink to this toctree">¶</a></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-account.html">Creating an Usergrid Account</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="getting-started/creating-account.html#next-steps">Next steps</a></li>
+</ul>
+</li>
<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-a-new-application.html">Creating a new application</a><ul>
<li class="toctree-l2"><a class="reference internal" href="getting-started/creating-a-new-application.html#creating-an-application">Creating an application</a></li>
<li class="toctree-l2"><a class="reference internal" href="getting-started/creating-a-new-application.html#securing-an-application">Securing an application</a></li>
</ul>
</li>
-<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-account.html">Creating an Usergrid Account</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="getting-started/creating-account.html#next-steps">Next steps</a></li>
-</ul>
-</li>
<li class="toctree-l1"><a class="reference internal" href="getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a><ul>
<li class="toctree-l2"><a class="reference internal" href="getting-started/using-a-sandbox-app.html#what-is-the-sandbox-application">What is the sandbox application?</a></li>
<li class="toctree-l2"><a class="reference internal" href="getting-started/using-a-sandbox-app.html#is-the-sandbox-secure">Is the sandbox secure?</a></li>
@@ -350,6 +367,77 @@
</li>
</ul>
</div>
+<div class="toctree-wrapper compound" id="id5">
+<span id="push-notifications"></span><p class="caption"><span class="caption-text">Push Notifications</span><a class="headerlink" href="#id5" title="Permalink to this toctree">¶</a></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/overview.html">Push notifications overview</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/overview.html#reach-your-users-with-push">Reach your users with push</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/overview.html#get-started">Get started</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/overview.html#build-push-support">Build push support</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/overview.html#learn-more">Learn more</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/adding-push-support.html">Adding push notifications support</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/adding-push-support.html#setting-up-push-notification-support">Setting up push notification support</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/adding-push-support.html#requirements">Requirements</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/adding-push-support.html#tutorials">Tutorials</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/adding-push-support.html#sample-apps">Sample Apps</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/adding-push-support.html#troubleshooting">Troubleshooting</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/getting-started.html">Getting started with push notifications</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/getting-started.html#what-are-push-notifications">What are push notifications?</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/getting-started.html#prerequisites">Prerequisites</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/getting-started.html#setup-overview">Setup overview</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/getting-started.html#how-it-works">How it works</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/tutorial.html">Tutorial: Push notifications sample app</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/tutorial.html#before-you-begin">Before you begin</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/tutorial.html#step-1-download-a-sample-app">Step 1: Download a sample app</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/tutorial.html#step-2-register-with-a-notification-service-and-generate-a-certificate-key">Step 2: Register with a notification service and generate a certificate/key</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/tutorial.html#step-3-create-a-notifier">Step 3: Create a notifier</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/tutorial.html#step-4-configure-and-run-the-sample-app">Step 4: Configure and run the sample app</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/tutorial.html#step-5-review-the-data-entities-created-by-the-sample-app">Step 5: Review the data entities created by the sample app</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/tutorial.html#step-6-send-additional-push-notifications-using-other-usergrid-tools">Step 6: Send additional push notifications using other Usergrid tools</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/registering.html">Registering with a notification service</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/registering.html#registering-with-apple-apns">Registering with Apple APNs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/registering.html#registering-with-google-gcm">Registering with Google GCM</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/creating-notifiers.html">Creating notifiers</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/creating-notifiers.html#requirements">Requirements</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/creating-notifiers.html#creating-notifiers-with-the-admin-portal">Creating notifiers with the admin portal</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/creating-notifiers.html#creating-notifiers-programmatically">Creating notifiers programmatically</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/creating-notifiers.html#notifier-endpoints">Notifier endpoints</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/managing-users-and-devices.html">Managing users and devices</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/managing-users-and-devices.html#registering-devices">Registering devices</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/managing-users-and-devices.html#connecting-devices-to-users">Connecting devices to users</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/creating-and-managing-notifications.html#creating-notifications">Creating notifications</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/creating-and-managing-notifications.html#scheduling-notifications">Scheduling notifications</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/creating-and-managing-notifications.html#targeting-multiple-notifiers-or-messages">Targeting multiple notifiers or messages</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/creating-and-managing-notifications.html#setting-a-notification-expiration">Setting a notification expiration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/creating-and-managing-notifications.html#getting-notifications">Getting notifications</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/creating-and-managing-notifications.html#canceling-sent-notifications">Canceling sent notifications</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/creating-and-managing-notifications.html#deleting-unsent-notifications">Deleting unsent notifications</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/creating-and-managing-notifications.html#getting-receipts">Getting receipts</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/creating-and-managing-notifications.html#notification-endpoints">Notification endpoints</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/troubleshooting.html">Troubleshooting</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/troubleshooting.html#working-with-android">Working with Android</a></li>
+<li class="toctree-l2"><a class="reference internal" href="push-notifications/troubleshooting.html#working-with-phonegap-android">Working with PhoneGap Android</a></li>
+</ul>
+</li>
+</ul>
+</div>
<div class="toctree-wrapper compound" id="security-authentication">
<span id="security-and-authentication"></span><p class="caption"><span class="caption-text">Security & Authentication</span><a class="headerlink" href="#security-authentication" title="Permalink to this toctree">¶</a></p>
<ul>
@@ -361,6 +449,13 @@
<li class="toctree-l2"><a class="reference internal" href="security-and-auth/using-permissions.html#removing-permissions">Removing permissions</a></li>
</ul>
</li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/using-roles.html">Using roles</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/using-roles.html#default-roles">Default roles</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/using-roles.html#creating-roles">Creating roles</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/using-roles.html#assigning-roles">Assigning roles</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/using-roles.html#removing-roles">Removing roles</a></li>
+</ul>
+</li>
<li class="toctree-l1"><a class="reference internal" href="security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a><ul>
<li class="toctree-l2"><a class="reference internal" href="security-and-auth/authenticating-users-and-application-clients.html#authentication-levels">Authentication levels</a></li>
<li class="toctree-l2"><a class="reference internal" href="security-and-auth/authenticating-users-and-application-clients.html#application-user-authentication-user-login">Application user authentication (user login)</a></li>
@@ -472,19 +567,19 @@
<div class="toctree-wrapper compound" id="assets-files">
<span id="asset-and-file-management"></span><p class="caption"><span class="caption-text">Assets & Files</span><a class="headerlink" href="#assets-files" title="Permalink to this toctree">¶</a></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="asset-and-files/uploading-assets.html">Uploading assets</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="asset-and-files/uploading-assets.html#id1">Uploading assets</a></li>
-<li class="toctree-l2"><a class="reference internal" href="asset-and-files/uploading-assets.html#updating-assets">Updating assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="assets-and-files/uploading-assets.html">Uploading assets</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="assets-and-files/uploading-assets.html#id1">Uploading assets</a></li>
+<li class="toctree-l2"><a class="reference internal" href="assets-and-files/uploading-assets.html#updating-assets">Updating assets</a></li>
</ul>
</li>
-<li class="toctree-l1"><a class="reference internal" href="asset-and-files/retrieving-assets.html">Retrieving assets</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="asset-and-files/retrieving-assets.html#retrieving-asset-data">Retrieving asset data</a></li>
-<li class="toctree-l2"><a class="reference internal" href="asset-and-files/retrieving-assets.html#retrieving-an-asset-entity">Retrieving an asset entity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="assets-and-files/retrieving-assets.html">Retrieving assets</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="assets-and-files/retrieving-assets.html#retrieving-asset-data">Retrieving asset data</a></li>
+<li class="toctree-l2"><a class="reference internal" href="assets-and-files/retrieving-assets.html#retrieving-an-asset-entity">Retrieving an asset entity</a></li>
</ul>
</li>
-<li class="toctree-l1"><a class="reference internal" href="asset-and-files/folders.html">Folders</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="asset-and-files/folders.html#linking-a-folder-to-an-asset">Linking a folder to an asset</a></li>
-<li class="toctree-l2"><a class="reference internal" href="asset-and-files/folders.html#retrieve-list-of-folder-assets">Retrieve list of folder assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="assets-and-files/folders.html">Folders</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="assets-and-files/folders.html#linking-a-folder-to-an-asset">Linking a folder to an asset</a></li>
+<li class="toctree-l2"><a class="reference internal" href="assets-and-files/folders.html#retrieve-list-of-folder-assets">Retrieve list of folder assets</a></li>
</ul>
</li>
</ul>
@@ -514,7 +609,7 @@
</ul>
</div>
<div class="toctree-wrapper compound" id="organizations-applications">
-<p class="caption"><span class="caption-text">Organizations & Applications</span><a class="headerlink" href="#organizations-applications" title="Permalink to this toctree">¶</a></p>
+<span id="organization-and-application-management"></span><p class="caption"><span class="caption-text">Organizations & Applications</span><a class="headerlink" href="#organizations-applications" title="Permalink to this toctree">¶</a></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/organization.html">Organization</a><ul>
@@ -537,46 +632,48 @@
<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/application.html#getting-application-credentials">Getting application credentials</a></li>
</ul>
</li>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/admin-user.html">Admin user</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/admin-user.html#creating-an-admin-user">Creating an admin user</a></li>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/admin-user.html#updating-an-admin-user">Updating an admin user</a></li>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/admin-user.html#getting-an-admin-user">Getting an admin user</a></li>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/admin-user.html#setting-an-admin-user-s-password">Setting an admin user’s password</a></li>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/admin-user.html#resetting-an-admin-user-s-password">Resetting an admin user’s password</a></li>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/admin-user.html#completing-a-password-reset">Completing a password reset</a></li>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/admin-user.html#activating-an-admin-user">Activating an admin user</a></li>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/admin-user.html#reactivating-an-admin-user">Reactivating an admin user</a></li>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/admin-user.html#id20">Example - Request</a></li>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/admin-user.html#getting-an-admin-user-s-activity-feed">Getting an admin user’s activity feed</a></li>
+</ul>
+</li>
</ul>
</div>
<div class="toctree-wrapper compound" id="api-reference">
<span id="rest-endpoints"></span><p class="caption"><span class="caption-text">API Reference</span><a class="headerlink" href="#api-reference" title="Permalink to this toctree">¶</a></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html">Methods</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#action-methods">Action Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#activityfeed-methods">ActivityFeed Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#appdata-methods">AppData Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#credential-methods">Credential Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#devices-methods">Devices Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#entity-methods">Entity Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#event-methods">Event Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#group-methods">Group Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#notification-methods">Notification Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#organization-methods">Organization Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#permission-methods">Permission Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#receipt-methods">Receipt Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#role-methods">Role Methods</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#user-methods">User Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#access-tokens">Access-Tokens</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#activities">Activities</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#admin-users">Admin-Users</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#app-users">App-Users</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#entities-collections">Entities-Collections</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#events">Events</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#groups">Groups</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#notifications">Notifications</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#organizations-applications">Organizations-Applications</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#permissions-roles">Permissions-Roles</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html#models">Models</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#accesstokenresponse">AccessTokenResponse</a></li>
<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#action">Action</a></li>
<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#activityfeed">ActivityFeed</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#actor">Actor</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#addpermission">AddPermission</a></li>
<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#addrole">AddRole</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#adminuserupdate">AdminUserUpdate</a></li>
<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#appdata">AppData</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#cancelmsg">CancelMSG</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#collections">Collections</a></li>
<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#createactivity">CreateActivity</a></li>
<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#createadminuser">CreateAdminUser</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#createapp">CreateApp</a></li>
<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#createentities">CreateEntities</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#createentity">CreateEntity</a></li>
<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#createevent">CreateEvent</a></li>
<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#creategroup">CreateGroup</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#createnotification">CreateNotification</a></li>
<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#createnotifications">CreateNotifications</a></li>
<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#createorg">CreateOrg</a></li>
<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#createuser">CreateUser</a></li>
@@ -586,23 +683,26 @@
<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#error">Error</a></li>
<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#event">Event</a></li>
<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#group">Group</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#imagemodel">ImageModel</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#metadata">Metadata</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#logincredentials">LoginCredentials</a></li>
<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#notification">Notification</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#notifier">Notifier</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#object">Object</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#notificationupdate">NotificationUpdate</a></li>
<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#organization">Organization</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#permission">Permission</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#permissions">Permissions</a></li>
<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#receipt">Receipt</a></li>
<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#resetpw">ResetPW</a></li>
<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#resetpwmsg">ResetPWMsg</a></li>
<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#role">Role</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#schedulenotification">ScheduleNotification</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#setexpiration">SetExpiration</a></li>
-<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#sets">Sets</a></li>
<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#user">User</a></li>
</ul>
</li>
+<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html#sub-types">Sub-Types</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#collections">Collections</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#imagemodel">ImageModel</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#metadata">Metadata</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#object">Object</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#sets">Sets</a></li>
+</ul>
+</li>
</ul>
</div>
<div class="toctree-wrapper compound" id="client-sdks">
@@ -670,7 +770,7 @@
<div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
- <a href="introduction/usergrid-features.html" class="btn btn-neutral float-right" title="Usergrid Features" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+ <a href="introduction/overview.html" class="btn btn-neutral float-right" title="Documentation Overview" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
</div>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/installation/ug1-deploy-to-tomcat.html
----------------------------------------------------------------------
diff --git a/content/docs/installation/ug1-deploy-to-tomcat.html b/content/docs/installation/ug1-deploy-to-tomcat.html
index e7db71c..e9d3a55 100644
--- a/content/docs/installation/ug1-deploy-to-tomcat.html
+++ b/content/docs/installation/ug1-deploy-to-tomcat.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -141,9 +155,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -158,11 +172,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/installation/ug1-launcher-quick-start.html
----------------------------------------------------------------------
diff --git a/content/docs/installation/ug1-launcher-quick-start.html b/content/docs/installation/ug1-launcher-quick-start.html
index 9a54005..6efe471 100644
--- a/content/docs/installation/ug1-launcher-quick-start.html
+++ b/content/docs/installation/ug1-launcher-quick-start.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -141,9 +155,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -158,11 +172,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/installation/ug2-deploy-to-tomcat.html
----------------------------------------------------------------------
diff --git a/content/docs/installation/ug2-deploy-to-tomcat.html b/content/docs/installation/ug2-deploy-to-tomcat.html
index 96d5523..915c2a7 100644
--- a/content/docs/installation/ug2-deploy-to-tomcat.html
+++ b/content/docs/installation/ug2-deploy-to-tomcat.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -141,9 +155,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -158,11 +172,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/introduction/async-vs-sync.html
----------------------------------------------------------------------
diff --git a/content/docs/introduction/async-vs-sync.html b/content/docs/introduction/async-vs-sync.html
index caf0163..159ebb8 100644
--- a/content/docs/introduction/async-vs-sync.html
+++ b/content/docs/introduction/async-vs-sync.html
@@ -31,7 +31,7 @@
<link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
- <link rel="next" title="Creating a new application" href="../getting-started/creating-a-new-application.html"/>
+ <link rel="next" title="Creating an Usergrid Account" href="../getting-started/creating-account.html"/>
<link rel="prev" title="Usergrid Data model" href="data-model.html"/>
@@ -82,6 +82,7 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1 current"><a class="current reference internal" href="">Async vs. sync calls</a><ul>
@@ -92,8 +93,8 @@
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -117,10 +118,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -145,9 +159,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -162,11 +176,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -277,7 +293,7 @@ execution completes.</p>
<div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
- <a href="../getting-started/creating-a-new-application.html" class="btn btn-neutral float-right" title="Creating a new application" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+ <a href="../getting-started/creating-account.html" class="btn btn-neutral float-right" title="Creating an Usergrid Account" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
<a href="data-model.html" class="btn btn-neutral" title="Usergrid Data model" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/introduction/data-model.html
----------------------------------------------------------------------
diff --git a/content/docs/introduction/data-model.html b/content/docs/introduction/data-model.html
index e8aba1e..5dc9bb1 100644
--- a/content/docs/introduction/data-model.html
+++ b/content/docs/introduction/data-model.html
@@ -82,6 +82,7 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1 current"><a class="current reference internal" href="">Usergrid Data model</a><ul>
<li class="toctree-l2"><a class="reference internal" href="#organizations">Organizations</a></li>
@@ -97,8 +98,8 @@
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -122,10 +123,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -150,9 +164,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -167,11 +181,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -251,8 +267,8 @@ wish. This allows you to utilize the backend in a way that corresponds
to your development process. For example, you might create separate
applications for development and production instances of your app. By
default, all organization have a sandbox application (see Using a
-Sandbox Application for important information regarding the default
-sandbox application).</p>
+<a class="reference external" href="../getting-started/using-a-sandbox-app.html">Sandbox Application</a>
+for important information regarding the default sandbox application).</p>
<p>Each application provides the infrastructure for storing, retrieving,
updating and deleting the entities and collections associated with a
specific app instance.</p>
@@ -294,20 +310,20 @@ user perspective.</p>
<div class="section" id="default-entities">
<h2>Default entities<a class="headerlink" href="#default-entities" title="Permalink to this headline">¶</a></h2>
<p>The following entity types are predefined in Usergrid. For more details,
-see Default Data Entity Types.</p>
+see the <a class="reference external" href="../rest-endpoints/api-docs.html">API Reference</a></p>
<ul class="simple">
-<li>user</li>
-<li>group</li>
-<li>role</li>
-<li>application</li>
-<li>activity</li>
-<li>device</li>
-<li>asset</li>
-<li>folder</li>
-<li>event</li>
-<li>notifier</li>
-<li>notification</li>
-<li>receipt</li>
+<li><a class="reference external" href="../rest-endpoints/api-docs.html#user">user</a></li>
+<li><a class="reference external" href="../rest-endpoints/api-docs.html#group">group</a></li>
+<li><a class="reference external" href="../rest-endpoints/api-docs.html#role">role</a></li>
+<li><a class="reference external" href="../rest-endpoints/api-docs.html#application">application</a></li>
+<li><a class="reference external" href="../rest-endpoints/api-docs.html#activity">activity</a></li>
+<li><a class="reference external" href="../rest-endpoints/api-docs.html#device">device</a></li>
+<li><a class="reference external" href="../rest-endpoints/api-docs.html#asset">asset</a></li>
+<li><a class="reference external" href="../rest-endpoints/api-docs.html#folder">folder</a></li>
+<li><a class="reference external" href="../rest-endpoints/api-docs.html#event">event</a></li>
+<li><a class="reference external" href="../rest-endpoints/api-docs.html#notifier">notifier</a></li>
+<li><a class="reference external" href="../rest-endpoints/api-docs.html#notification">notification</a></li>
+<li><a class="reference external" href="../rest-endpoints/api-docs.html#recept">receipt</a></li>
</ul>
</div>
<div class="section" id="properties">
[11/36] usergrid git commit: Update generated website content.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/security-and-auth/using-roles.html
----------------------------------------------------------------------
diff --git a/content/docs/security-and-auth/using-roles.html b/content/docs/security-and-auth/using-roles.html
new file mode 100644
index 0000000..3375c48
--- /dev/null
+++ b/content/docs/security-and-auth/using-roles.html
@@ -0,0 +1,753 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>Using roles — Apache Usergrid 1.0 documentation</title>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+
+
+
+
+
+ <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+ <link rel="next" title="Authenticating users & app clients" href="authenticating-users-and-application-clients.html"/>
+ <link rel="prev" title="Using permissions" href="using-permissions.html"/>
+
+
+ <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+ <div class="wy-grid-for-nav">
+
+
+ <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+ <div class="wy-side-nav-search">
+
+
+
+ <a href="../index.html" class="icon icon-home"> Apache Usergrid
+
+
+
+ </a>
+
+
+
+
+ <div class="version">
+ 1.0
+ </div>
+
+
+
+
+<div role="search">
+ <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+ <input type="text" name="q" placeholder="Search docs" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+
+
+ </div>
+
+ <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+
+
+
+ <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters & clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators & data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security & Authentication</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="app-security.html">Security & token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Using roles</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#default-roles">Default roles</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#creating-roles">Creating roles</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#request-syntax">Request syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-request">Example request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-response">Example response</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#creating-roles-in-the-admin-portal">Creating Roles in the Admin Portal</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#assigning-roles">Assigning roles</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id1">Request syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id2">Example request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id3">Example response</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#assigning-roles-in-the-admin-portal">Assigning Roles in the Admin Portal</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#removing-roles">Removing roles</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id4">Request syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id5">Example request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id6">Example response</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#removing-roles-in-the-admin-portal">Removing Roles in the Admin Portal</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management & Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management & social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets & Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters & Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters & events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating & incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations & Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations & Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code & Docs</a></li>
+</ul>
+
+
+
+ </div>
+
+ </nav>
+
+ <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+ <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+ <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+ <a href="../index.html">Apache Usergrid</a>
+ </nav>
+
+
+
+ <div class="wy-nav-content">
+ <div class="rst-content">
+ <div role="navigation" aria-label="breadcrumbs navigation">
+ <ul class="wy-breadcrumbs">
+ <li><a href="../index.html">Docs</a> »</li>
+
+ <li>Using roles</li>
+ <li class="wy-breadcrumbs-aside">
+
+
+ <a href="../_sources/security-and-auth/using-roles.txt" rel="nofollow"> View page source</a>
+
+
+ </li>
+ </ul>
+ <hr/>
+</div>
+ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+ <div itemprop="articleBody">
+
+ <div class="section" id="using-roles">
+<h1>Using roles<a class="headerlink" href="#using-roles" title="Permalink to this headline">¶</a></h1>
+<p>Roles are named sets of one or more permissions, and are useful for
+defining specific access levels to resources in your Usergrid data
+store. Multiple roles can be assigned to a user or group, giving you a
+great deal of flexibility in how access to resources are defined.</p>
+<p>For example, in a blogging app you might create a ‘reviewer’ role that
+allows GET and PUT access to an articles collection to allow the user to
+retrieve and update articles, but not allow them to create new articles.</p>
+<div class="section" id="default-roles">
+<h2>Default roles<a class="headerlink" href="#default-roles" title="Permalink to this headline">¶</a></h2>
+<p>While you can create as many custom roles as you want per application,
+all Usegrid applications include three default roles. These roles each
+serve a special purpose and should not be deleted; however, you can and
+should adjust the permissions assigned to these roles to suit the needs
+of you app.</p>
+<p>The following table describes each pre-defined role, and the permissions
+that are assigned to them by default.</p>
+<table class="usergrid-table">
+<tr>
+ <th><p>Role</p>
+</th>
+ <th class="usergrid-30"><p>Permissions</p>
+</th>
+ <th><p>Description</p>
+</th>
+</tr>
+<tr>
+ <td><p>Guest</p>
+</td>
+ <td><ul class="simple">
+<li>post: /devices</li>
+<li>post: /users</li>
+<li>put: /devices/*</li>
+</ul>
+</td>
+ <td><p>Assigned to all unauthenticated requests. Includes a basic set of
+permissions that are commonly needed by unregistered or unauthenticated
+users.</p>
+<p><p>Grants permission for a user to create a user account and for their
+device to be registered.</p>
+</td>
+</tr>
+<tr>
+ <td><p>Default</p>
+</td>
+ <td><ul class="simple">
+<li>get, post, put, delete: /**</li>
+</ul>
+</td>
+ <td><p>Default for authenticated users. Assigns the associated permissions to
+all users whose requests are authenticated with a valid access token.</p>
+<div class="admonition warning"> <p class="first admonition-title"><p>WARNING</p>
+ </p> <p class="last">
+
+
+By default, **grants full access for all resources in your<p>application**. A first task in securing your application should be to
+restrict access by redefining this role to narrow the access it
+provides. Remove the default full permission rule and add restrictive
+permission rules for a production deployment.</p>
+</p></div></td>
+</tr>
+<tr>
+ <td><p>Administrator</p>
+</td>
+ <td><p>None</p>
+</td>
+ <td><p>Unused until you associate it with users or groups. By default, includes
+no permissions that provide access. Grants no access. Consider this a
+blank slate. Add permission rules and associate this role with users and
+groups as needed.</p>
+<div class="admonition note"> <p class="first admonition-title"><p>NOTE</p>
+ </p> <p class="last">
+
+
+The Administrator role is not the same as an organization<p>administrator, that is, someone who authenticates as an Admin User. The
+Admin User is an implicit user created when you create an organization.
+After authenticating, the Admin User has full access to all of the
+administration features of the Usergrid API. By comparison, the
+Administrator role is simply a role (initially without permissions) that
+can be assigned to any user.</p>
+</p></div></td>
+</tr>
+</table></div>
+<div class="section" id="creating-roles">
+<h2>Creating roles<a class="headerlink" href="#creating-roles" title="Permalink to this headline">¶</a></h2>
+<p>Generally, it is easiest to a create a role for each access type you
+want to enable in your app. You may, however, assign multiple roles to
+any user or group entity, so you have the flexibility to define any
+schema for applying roles that you like.</p>
+<p>The following shows how to create a new role and assign permissions to
+it.</p>
+<div class="section" id="request-syntax">
+<h3>Request syntax<a class="headerlink" href="#request-syntax" title="Permalink to this headline">¶</a></h3>
+<p>With cURL requests a role entity is created with a POST request, then
+permissions must be assigned to it with a separate request. For more on
+assigning permissions with cURL, see <a class="reference external" href="security-and-auth/using-permissions.html">Using
+Permissions</a>.</p>
+<p>The following details how to create a new role entity.</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST https://api.usergrid.com/<org>/<app>/roles -d '{"name":<roleName>}'
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="24%" />
+<col width="76%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>roleName</td>
+<td>The name of the role to be created</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="example-request">
+<h3>Example request<a class="headerlink" href="#example-request" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST "https://api.usergrid.com/my-org/my-app/roles/ -d '{"name":"manager"}'
+</pre></div>
+</div>
+</div>
+<div class="section" id="example-response">
+<h3>Example response<a class="headerlink" href="#example-response" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+ <span class="s">"action"</span> <span class="p">:</span> <span class="s">"post"</span><span class="p">,</span>
+ <span class="s">"application"</span> <span class="p">:</span> <span class="s">"f34f4222-a166-11e2-a7f7-02e81adcf3d0"</span><span class="p">,</span>
+ <span class="s">"params"</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/roles"</span><span class="p">,</span>
+ <span class="s">"uri"</span> <span class="p">:</span> <span class="s">"https://api.usergrid.com/your-org/your-app/roles"</span><span class="p">,</span>
+ <span class="s">"entities"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+ <span class="s">"uuid"</span> <span class="p">:</span> <span class="s">"382d0991-74bb-3548-8166-6b07e44495ef"</span><span class="p">,</span>
+ <span class="s">"type"</span> <span class="p">:</span> <span class="s">"role"</span><span class="p">,</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"manager"</span><span class="p">,</span>
+ <span class="s">"created"</span> <span class="p">:</span> <span class="mi">1402612783104</span><span class="p">,</span>
+ <span class="s">"modified"</span> <span class="p">:</span> <span class="mi">1402612783104</span><span class="p">,</span>
+ <span class="s">"roleName"</span> <span class="p">:</span> <span class="s">"manager"</span><span class="p">,</span>
+ <span class="s">"title"</span> <span class="p">:</span> <span class="s">"manager"</span><span class="p">,</span>
+ <span class="s">"inactivity"</span> <span class="p">:</span> <span class="mi">0</span><span class="p">,</span>
+ <span class="s">"metadata"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/roles/382d0991-74bb-3548-8166-6b07e44495ef"</span><span class="p">,</span>
+ <span class="s">"sets"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"permissions"</span> <span class="p">:</span> <span class="s">"/roles/382d0991-74bb-3548-8166-6b07e44495ef/permissions"</span>
+ <span class="p">},</span>
+ <span class="s">"collections"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"groups"</span> <span class="p">:</span> <span class="s">"/roles/382d0991-74bb-3548-8166-6b07e44495ef/groups"</span><span class="p">,</span>
+ <span class="s">"users"</span> <span class="p">:</span> <span class="s">"/roles/382d0991-74bb-3548-8166-6b07e44495ef/users"</span>
+ <span class="p">}</span>
+ <span class="p">}</span>
+ <span class="p">}</span> <span class="p">],</span>
+ <span class="s">"timestamp"</span> <span class="p">:</span> <span class="mi">1402612783102</span><span class="p">,</span>
+ <span class="s">"duration"</span> <span class="p">:</span> <span class="mi">30</span><span class="p">,</span>
+ <span class="s">"organization"</span> <span class="p">:</span> <span class="s">"your-org"</span><span class="p">,</span>
+ <span class="s">"applicationName"</span> <span class="p">:</span> <span class="s">"your-app"</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="creating-roles-in-the-admin-portal">
+<h3>Creating Roles in the Admin Portal<a class="headerlink" href="#creating-roles-in-the-admin-portal" title="Permalink to this headline">¶</a></h3>
+<ol class="arabic simple">
+<li>In the left sidebar of the Usergrid portal, click Users > Roles. This
+displays the roles defined for the application. Click the ‘+’ button.</li>
+<li>In the dialog box, provide a ‘title’ and ‘role name.’ A title is an
+alias for the role name.</li>
+<li>Click ‘Create’. The role will be created, but will not have any
+permissions assigned to it.</li>
+<li>Click the role you created in the list.</li>
+<li>Click the ‘Add permissions’ button.</li>
+<li>In the dialog box, click the check boxes for the HTTP methods you
+want to grant permissions for, and enter the resource path in the
+‘Path’ field.</li>
+<li>The ‘Inactivity’ field lets you control automatic user logout during
+periods of inactivity. Set a number of seconds of inactivity before
+users assigned to this role are automatically logged out.</li>
+</ol>
+</div>
+</div>
+<div class="section" id="assigning-roles">
+<h2>Assigning roles<a class="headerlink" href="#assigning-roles" title="Permalink to this headline">¶</a></h2>
+<p>Once you have created some roles, you will need to explicitly assign
+them to a user or group entity. The permissions associated with that
+role will be granted to the entity immediately for any requests they
+send that are authenticated by a valid access token. Please note that
+assigning a role to a group will grant the associated permissions to
+every user in that group.</p>
+<p>The following shows how to assign a role to an entity.</p>
+<div class="section" id="id1">
+<h3>Request syntax<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST https://api.usergrid.com/<org>/<app>/roles/<roleName>/<entityType>/<entityID>
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="13%" />
+<col width="87%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>roleName</td>
+<td>The name of the role to be created</td>
+</tr>
+<tr class="row-odd"><td>entityType</td>
+<td>The type of the entity the role is being assigned to. ‘Group’ and ‘user’ are valid values.</td>
+</tr>
+<tr class="row-even"><td>entityID</td>
+<td>The UUID of the entity the role is being assigned to.</td>
+</tr>
+</tbody>
+</table>
+<p>For groups, the ‘name’ property can be used. For users, the ‘username’
+property can be used.</p>
+</div>
+<div class="section" id="id2">
+<h3>Example request<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST "https://api.usergrid.com/my-org/my-app/roles/manager/users/someUser
+</pre></div>
+</div>
+</div>
+<div class="section" id="id3">
+<h3>Example response<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+ <span class="s">"action"</span> <span class="p">:</span> <span class="s">"post"</span><span class="p">,</span>
+ <span class="s">"application"</span> <span class="p">:</span> <span class="s">"f34f4222-a166-11e2-a7f7-02e81adcf3d0"</span><span class="p">,</span>
+ <span class="s">"params"</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users"</span><span class="p">,</span>
+ <span class="s">"uri"</span> <span class="p">:</span> <span class="s">"https://api.usergrid.com/your-org/your-app/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users"</span><span class="p">,</span>
+ <span class="s">"entities"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+ <span class="s">"uuid"</span> <span class="p">:</span> <span class="s">"410b213a-b379-11e3-a0e5-9953085ea376"</span><span class="p">,</span>
+ <span class="s">"type"</span> <span class="p">:</span> <span class="s">"user"</span><span class="p">,</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"someUser"</span><span class="p">,</span>
+ <span class="s">"created"</span> <span class="p">:</span> <span class="mi">1395681911491</span><span class="p">,</span>
+ <span class="s">"modified"</span> <span class="p">:</span> <span class="mi">1399070010291</span><span class="p">,</span>
+ <span class="s">"username"</span> <span class="p">:</span> <span class="s">"someUser"</span><span class="p">,</span>
+ <span class="s">"activated"</span> <span class="p">:</span> <span class="n">true</span><span class="p">,</span>
+ <span class="s">"file"</span> <span class="p">:</span> <span class="s">"fobnszewobnioerabnoiawegbrn</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span>
+ <span class="s">"metadata"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"connecting"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"friends"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/friends"</span><span class="p">,</span>
+ <span class="s">"likes"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/likes"</span>
+ <span class="p">},</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376"</span><span class="p">,</span>
+ <span class="s">"sets"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"rolenames"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/roles"</span><span class="p">,</span>
+ <span class="s">"permissions"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/permissions"</span>
+ <span class="p">},</span>
+ <span class="s">"connections"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"completed"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/completed"</span><span class="p">,</span>
+ <span class="s">"follows"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/follows"</span>
+ <span class="p">},</span>
+ <span class="s">"collections"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"activities"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/activities"</span><span class="p">,</span>
+ <span class="s">"devices"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/devices"</span><span class="p">,</span>
+ <span class="s">"feed"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/feed"</span><span class="p">,</span>
+ <span class="s">"groups"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/groups"</span><span class="p">,</span>
+ <span class="s">"roles"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/roles"</span><span class="p">,</span>
+ <span class="s">"following"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/following"</span><span class="p">,</span>
+ <span class="s">"followers"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/followers"</span>
+ <span class="p">}</span>
+ <span class="p">}</span>
+ <span class="p">}</span> <span class="p">],</span>
+ <span class="s">"timestamp"</span> <span class="p">:</span> <span class="mi">1402965083889</span><span class="p">,</span>
+ <span class="s">"duration"</span> <span class="p">:</span> <span class="mi">41</span><span class="p">,</span>
+ <span class="s">"organization"</span> <span class="p">:</span> <span class="s">"your-org"</span><span class="p">,</span>
+ <span class="s">"applicationName"</span> <span class="p">:</span> <span class="s">"your-app"</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="assigning-roles-in-the-admin-portal">
+<h3>Assigning Roles in the Admin Portal<a class="headerlink" href="#assigning-roles-in-the-admin-portal" title="Permalink to this headline">¶</a></h3>
+<p>The easiest way to assign roles to user or group entities is to use the
+‘Users’ tab of the Usergrid admin portal, by doing the following:</p>
+<ol class="arabic simple">
+<li>In the left sidebar of the admin portal, click Users > Users or Users
+> Groups to display either the list of users or groups in your
+application.</li>
+<li>In the list, click the name of the user or group entity you want to
+assign roles to to display its details in the right pane.</li>
+<li>Click the ‘Roles & Permissions’ tab above the right pane.</li>
+<li>Click the ‘Add Role’ button.</li>
+<li>In the popup, select a role from the drop down menu.</li>
+<li>Click the ‘Add’ button.</li>
+</ol>
+</div>
+</div>
+<div class="section" id="removing-roles">
+<h2>Removing roles<a class="headerlink" href="#removing-roles" title="Permalink to this headline">¶</a></h2>
+<p>At times it may be necessary to remove a role from a user or group
+entity, for example if a user changes jobs, or the duties of a group are
+altered. Please note that removing a role from a group will remove the
+associated permissions from every user in that group.</p>
+<p>The following shows how to remove a role from an entity.</p>
+<div class="section" id="id4">
+<h3>Request syntax<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X DELETE https://api.usergrid.com/<org>/<app>/roles/<roleName>/<entityType>/<entityID>
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="13%" />
+<col width="87%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>roleName</td>
+<td>The name of the role to be created</td>
+</tr>
+<tr class="row-odd"><td>entityType</td>
+<td>The type of the entity the role is being removed from. ‘Group’ and ‘user’ are valid values.</td>
+</tr>
+<tr class="row-even"><td>entityID</td>
+<td>The UUID of the entity the role is being removed from.</td>
+</tr>
+</tbody>
+</table>
+<p>For groups, the ‘name’ property can be used. For users, the ‘username’
+property can be used.</p>
+</div>
+<div class="section" id="id5">
+<h3>Example request<a class="headerlink" href="#id5" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X DELETE https://api.usergrid.com/my-org/my-app/roles/manager/users/someUser
+</pre></div>
+</div>
+</div>
+<div class="section" id="id6">
+<h3>Example response<a class="headerlink" href="#id6" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+ <span class="s">"action"</span> <span class="p">:</span> <span class="s">"delete"</span><span class="p">,</span>
+ <span class="s">"application"</span> <span class="p">:</span> <span class="s">"f34f4222-a166-11e2-a7f7-02e81adcf3d0"</span><span class="p">,</span>
+ <span class="s">"params"</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users"</span><span class="p">,</span>
+ <span class="s">"uri"</span> <span class="p">:</span> <span class="s">"https://api.usergrid.com/your-org/your-app/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users"</span><span class="p">,</span>
+ <span class="s">"entities"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+ <span class="s">"uuid"</span> <span class="p">:</span> <span class="s">"410b213a-b379-11e3-a0e5-9953085ea376"</span><span class="p">,</span>
+ <span class="s">"type"</span> <span class="p">:</span> <span class="s">"user"</span><span class="p">,</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"someUser"</span><span class="p">,</span>
+ <span class="s">"created"</span> <span class="p">:</span> <span class="mi">1395681911491</span><span class="p">,</span>
+ <span class="s">"modified"</span> <span class="p">:</span> <span class="mi">1399070010291</span><span class="p">,</span>
+ <span class="s">"username"</span> <span class="p">:</span> <span class="s">"someUser"</span><span class="p">,</span>
+ <span class="s">"activated"</span> <span class="p">:</span> <span class="n">true</span><span class="p">,</span>
+ <span class="s">"metadata"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"connecting"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"friends"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/friends"</span><span class="p">,</span>
+ <span class="s">"likes"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/likes"</span>
+ <span class="p">},</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376"</span><span class="p">,</span>
+ <span class="s">"sets"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"rolenames"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/roles"</span><span class="p">,</span>
+ <span class="s">"permissions"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/permissions"</span>
+ <span class="p">},</span>
+ <span class="s">"connections"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"completed"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/completed"</span><span class="p">,</span>
+ <span class="s">"follows"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/follows"</span>
+ <span class="p">},</span>
+ <span class="s">"collections"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"activities"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/activities"</span><span class="p">,</span>
+ <span class="s">"devices"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/devices"</span><span class="p">,</span>
+ <span class="s">"feed"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/feed"</span><span class="p">,</span>
+ <span class="s">"groups"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/groups"</span><span class="p">,</span>
+ <span class="s">"roles"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/roles"</span><span class="p">,</span>
+ <span class="s">"following"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/following"</span><span class="p">,</span>
+ <span class="s">"followers"</span> <span class="p">:</span> <span class="s">"/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/followers"</span>
+ <span class="p">}</span>
+ <span class="p">}</span>
+ <span class="p">}</span> <span class="p">],</span>
+ <span class="s">"timestamp"</span> <span class="p">:</span> <span class="mi">1403214283808</span><span class="p">,</span>
+ <span class="s">"duration"</span> <span class="p">:</span> <span class="mi">358</span><span class="p">,</span>
+ <span class="s">"organization"</span> <span class="p">:</span> <span class="s">"your-org"</span><span class="p">,</span>
+ <span class="s">"applicationName"</span> <span class="p">:</span> <span class="s">"your-app"</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="removing-roles-in-the-admin-portal">
+<h3>Removing Roles in the Admin Portal<a class="headerlink" href="#removing-roles-in-the-admin-portal" title="Permalink to this headline">¶</a></h3>
+<p>The easiest way to remove roles from user or group entities is to use
+the ‘Users’ tab of the Usergrid admin portal, by doing the following:</p>
+<ol class="arabic simple">
+<li>In the left sidebar of the Usergrid admin portal, click Users > Users
+or Users > Groups to display either the list of users or groups in
+your application.</li>
+<li>In the list, click the name of the user or group entity you want to
+remove roles from to display its details in the right pane.</li>
+<li>Click the ‘Roles & Permissions’ tab above the right pane.</li>
+<li>Click the role you created in the list.</li>
+<li>Under ‘Roles’, click the checkbox beside the role you want to remove
+from the entity.</li>
+<li>Click the ‘Leave roles’ button.</li>
+</ol>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ <footer>
+
+ <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+
+ <a href="authenticating-users-and-application-clients.html" class="btn btn-neutral float-right" title="Authenticating users & app clients" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+
+
+ <a href="using-permissions.html" class="btn btn-neutral" title="Using permissions" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+
+ </div>
+
+
+ <hr/>
+
+ <div role="contentinfo">
+ <p>
+ © Copyright 2013-2015, Apache Usergrid.
+
+ </p>
+ </div>
+ Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+
+
+
+
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT:'../',
+ VERSION:'1.0',
+ COLLAPSE_INDEX:false,
+ FILE_SUFFIX:'.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+
+
+
+
+
+ <script type="text/javascript" src="../_static/js/theme.js"></script>
+
+
+
+
+ <script type="text/javascript">
+ jQuery(function () {
+ SphinxRtdTheme.StickyNav.enable();
+ });
+ </script>
+
+
+</body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/user-management/activity.html
----------------------------------------------------------------------
diff --git a/content/docs/user-management/activity.html b/content/docs/user-management/activity.html
index 12e632b..ec0a88d 100644
--- a/content/docs/user-management/activity.html
+++ b/content/docs/user-management/activity.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -173,9 +187,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -190,11 +204,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -264,12 +280,12 @@ information about these actions).</p>
<p>When a user creates an activity, it creates a relationship between the
activity and the user who created it. Because this relationship exists,
the activity will appear in the feed of any of the user’s followers.
-Think of the Activities endpoint (/users/{uuid|username}/activities) as
-an “outbox” of news items created by the user. Think of the Feed
-endpoint (/users/{uuid|username}/feed) as an “inbox” of news items
+Think of the Activities endpoint (<code class="docutils literal"><span class="pre">/users/{uuid|username}/activities</span></code>)
+as an “outbox” of news items created by the user. Think of the Feed
+endpoint (<code class="docutils literal"><span class="pre">/users/{uuid|username}/feed</span></code>) as an “inbox” of news items
meant to be seen or consumed by the user.</p>
<p>A user can also post an activity to a group (located at
-/groups/{uuid|groupname}/activities). This allows you to emulate
+<code class="docutils literal"><span class="pre">/groups/{uuid|groupname}/activities</span></code>). This allows you to emulate
Facebook-style group functionality, where a limited number of users can
share content on a common “wall”. In any of these cases, there is no
need to construct publish/subscribe relationships manually.</p>
@@ -281,8 +297,7 @@ posts a short, 140-character or less, “tweet”, that activity gets ad
to the user’s activity stream for display as well as to the activity
streams of any of the user’s followers.</p>
<p>Using Usergrid APIs you can create, retrieve, update, and delete
-activity entities. See You do not have access to view this node for
-descriptions of these APIs.</p>
+activity entities.</p>
<p><strong>Note:</strong> Although not shown in the API examples below, you need to
provide a valid access token with each API call. See <a class="reference external" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating
users and application
@@ -406,11 +421,12 @@ the <code class="docutils literal"><span class="pre">/activities</span></code> e
that endpoint.</p>
<p>Notice the properties specified in the request body in the previous
example are actor, verb, and content. The actor, verb, and content
-properties are built into the Activity entity (see Default Data Entity
-Types). The actor property specifies properties of the entity that
-performs the action (here, user john.doe). The gravatar URL is used to
-create an icon for the activity. And because an Activity is simply an
-API Services data entity, you can also create custom properties.</p>
+properties are built into the Activity entity (see <a class="reference external" href="../rest-endpoints/api-doc.html#activity">Activity entity
+properties</a> ). The actor
+property specifies properties of the entity that performs the action
+(here, user john.doe). The gravatar URL is used to create an icon for
+the activity. And because an Activity is simply an API Services data
+entity, you can also create custom properties.</p>
<p>The verb parameter is descriptive. You can use it to indicate what type
of activity is posted, for example, an image versus text. The value post
is defined in the JSON Activity Streams specification as “the act of
@@ -421,12 +437,12 @@ authoring an object and then publishing it online.“</p>
<h2>Posting an activity to a group<a class="headerlink" href="#posting-an-activity-to-a-group" title="Permalink to this headline">¶</a></h2>
<p>Use the POST method to post an activity to a specific group. In this
case the activity is created in the activities collection and is
-accessible at the /activities endpoint to users who have the permission
-to read that endpoint. In addition, a relationship is established
-between the activity and the group, and because of that, the activity
-will appear in the group’s feed. The group “owns” the activity. Also,
-the activity will be published in the feed of all users that are members
-of the group.</p>
+accessible at the <code class="docutils literal"><span class="pre">/activities</span></code> endpoint to users who have the
+permission to read that endpoint. In addition, a relationship is
+established between the activity and the group, and because of that, the
+activity will appear in the group’s feed. The group “owns” the activity.
+Also, the activity will be published in the feed of all users that are
+members of the group.</p>
<div class="section" id="id1">
<h3>Request URI<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
<div class="highlight-python"><div class="highlight"><pre>POST /{org_id}/{app_id}/groups/{uuid|groupname}/activities {request body}
@@ -545,9 +561,8 @@ cross-posted to the group’s activity endpoint
automatically created between the activity entity that was just created
and the user within that group
(<code class="docutils literal"><span class="pre">/groups/{uuid|groupname}/users/{uuid|username}</span></code>) The user within the
-group (``/groups/{uuid|groupname}/users/{uuid|username}```)
-becomes the owner of the activity (through the owner property in the
-activity).</p>
+group (<code class="docutils literal"><span class="pre">/groups/{uuid|groupname}/users/{uuid|username}</span></code>) becomes the
+owner of the activity (through the owner property in the activity).</p>
<div class="section" id="id4">
<h3>Request URI<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h3>
<div class="highlight-python"><div class="highlight"><pre>POST /{org_id}/{app_id}/groups/{uuid|groupname}/users/{uuid|username}/activities {request body}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/user-management/group.html
----------------------------------------------------------------------
diff --git a/content/docs/user-management/group.html b/content/docs/user-management/group.html
index 0f2a33d..1614f36 100644
--- a/content/docs/user-management/group.html
+++ b/content/docs/user-management/group.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -183,9 +197,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -200,11 +214,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -279,10 +295,10 @@ create group properties specific to your application.</p>
<div class="section" id="creating-groups">
<h2>Creating groups<a class="headerlink" href="#creating-groups" title="Permalink to this headline">¶</a></h2>
<p>A group entity represents an application group of users. You can create,
-retrieve, update, delete, and query group entities. See User entity
-properties for a list of the system-defined properties for group
-entities. In addition, you can create group properties specific to your
-application.</p>
+retrieve, update, delete, and query group entities. See <a class="reference external" href="../rest-endpoints/api-doc.html#user">User entity
+properties</a> for a list of the
+system-defined properties for group entities. In addition, you can
+create group properties specific to your application.</p>
<div class="section" id="request-syntax">
<h3>Request Syntax<a class="headerlink" href="#request-syntax" title="Permalink to this headline">¶</a></h3>
<div class="highlight-python"><div class="highlight"><pre>curl -X POST "https://api.usergrid.com/your-org/your-app/groups" '{ request body }'
@@ -333,8 +349,10 @@ forward slashes to denote hierarchical relationships.</p>
<div class="section" id="example">
<h3>Example<a class="headerlink" href="#example" title="Permalink to this headline">¶</a></h3>
<p><strong>Note</strong>: Although not shown in the API examples below, you need to
-provide a valid access token with each API call. See Authenticating
-users and application clients for details.</p>
+provide a valid access token with each API call. See <a class="reference external" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating
+users and application
+clients</a>
+for details.</p>
</div>
<div class="section" id="request">
<h3>Request<a class="headerlink" href="#request" title="Permalink to this headline">¶</a></h3>
@@ -409,7 +427,8 @@ create group properties specific to your application.</p>
<p>org_id | uuid Organization UUID or organization name app_id | uuid
Application UUID or application name groupPath | uuid Group UUID or
group path, which must be unique. query_string A data store query. For
-more on queries, see Data queries.</p>
+more on queries, see <a class="reference external" href="../data-queries/querying-your-data.html">Data
+queries</a>.</p>
<div class="section" id="id3">
<h3>Request<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
<div class="highlight-python"><div class="highlight"><pre># Get a group by the group path, "employees/managers".
@@ -559,14 +578,14 @@ Entities</a>.</p>
</div>
<div class="section" id="adding-a-user-to-a-group">
<h2>Adding a user to a group<a class="headerlink" href="#adding-a-user-to-a-group" title="Permalink to this headline">¶</a></h2>
-<p>See all application entities</p>
<p>You can add users to groups from client code using cURL commands or one
of the SDKs, as described here.</p>
<p>When setting up your application on the server, you might find it easier
and more convenient to create and populate groups with the admin portal.
There, you can create groups, create roles, and define permission rules
that govern user access to data and services in your application. For
-more information, see Security & token authentication.</p>
+more information, see <a class="reference external" href="../security-and-auth/app-security.html">Security & Token
+Authentication</a>.</p>
<p>Use the POST method to add a user to a group. If the named group does
not yet exist, an error message is returned.</p>
<div class="section" id="id6">
@@ -610,8 +629,10 @@ not yet exist, an error message is returned.</p>
<div class="section" id="id8">
<h3>Example<a class="headerlink" href="#id8" title="Permalink to this headline">¶</a></h3>
<p><strong>Note</strong>: Although not shown in the API examples below, you need to
-provide a valid access token with each API call. See Authenticating
-users and application clients for details.</p>
+provide a valid access token with each API call. See <a class="reference external" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating
+users and application
+clients</a>
+for details.</p>
</div>
<div class="section" id="id9">
<h3>Request<a class="headerlink" href="#id9" title="Permalink to this headline">¶</a></h3>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/user-management/groups.html
----------------------------------------------------------------------
diff --git a/content/docs/user-management/groups.html b/content/docs/user-management/groups.html
index 6fd0a61..fe0437b 100644
--- a/content/docs/user-management/groups.html
+++ b/content/docs/user-management/groups.html
@@ -80,14 +80,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -111,10 +112,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -139,9 +153,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -156,11 +170,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/user-management/messagee-example.html
----------------------------------------------------------------------
diff --git a/content/docs/user-management/messagee-example.html b/content/docs/user-management/messagee-example.html
index 68da004..0eb9a37 100644
--- a/content/docs/user-management/messagee-example.html
+++ b/content/docs/user-management/messagee-example.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -166,9 +180,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -183,11 +197,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -259,9 +275,7 @@ client</a></li>
users, and run the app. You also learn how to use the Usergrid admin
portal, a user interface that streamlines data and application
management in the Usergrid system. The portal is also a reference
-application that shows how to incorporate Usergrid APIs with JavaScript.
-For a more detailed discussion of the portal’s functionality, see Admin
-portal.</p>
+application that shows how to incorporate Usergrid APIs with JavaScript.</p>
<div class="section" id="creating-a-user-account-in-usergrid">
<h2>Creating a user account in Usergrid<a class="headerlink" href="#creating-a-user-account-in-usergrid" title="Permalink to this headline">¶</a></h2>
<p>Go to the Usergrid portal and login. If you are new to Usergrid, sign up
[13/36] usergrid git commit: Update generated website content.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/searchindex.js
----------------------------------------------------------------------
diff --git a/content/docs/searchindex.js b/content/docs/searchindex.js
index 2541ca4..5461ddb 100644
--- a/content/docs/searchindex.js
+++ b/content/docs/searchindex.js
@@ -1 +1 @@
-Search.setIndex({envversion:46,filenames:["README","assets-and-files/file-storage-configuration","assets-and-files/folders","assets-and-files/legacy-asset-support","assets-and-files/retrieving-assets","assets-and-files/uploading-assets","counters-and-events/creating-and-incrementing-counters","counters-and-events/events-and-counters","counters-and-events/retrieving-counters","data-queries/advanced-query-usage","data-queries/operators-and-types","data-queries/query-parameters","data-queries/querying-your-data","data-storage/collections","data-storage/data-store-dbms","data-storage/entities","data-storage/optimizing-access","entity-connections/connecting-entities","entity-connections/disconnecting-entities","entity-connections/retrieving-entities","geolocation/geolocation","getting-started/creating-a-new-application","getting-started/creating-account","getting-started/using-a-sandbox-app","getting-started/using-the-api","index","installation/ug1-deploy-to-tomcat","installation/ug1-lau
ncher-quick-start","installation/ug2-deploy-to-tomcat","introduction/async-vs-sync","introduction/data-model","introduction/overview","introduction/usergrid-features","orgs-and-apps/admin-user","orgs-and-apps/application","orgs-and-apps/managing","orgs-and-apps/organization","push-notifications/tbd","push-notifications/users-devices","reference/contribute-code","reference/presos-and-videos","rest-endpoints/api-docs","sdks/ios-new","sdks/sdk-outline","sdks/tbd","security-and-auth/app-security","security-and-auth/authenticating-api-requests","security-and-auth/authenticating-users-and-application-clients","security-and-auth/changing-token-time-live-ttl","security-and-auth/facebook-sign","security-and-auth/revoking-tokens-logout","security-and-auth/securing-your-app","security-and-auth/user-authentication-types","security-and-auth/using-permissions","security-and-auth/using-roles","user-management/activity","user-management/group","user-management/groups","user-management/messagee-exam
ple","user-management/user-connections","user-management/user-management","user-management/working-user-data"],objects:{},objnames:{},objtypes:{},terms:{"005056c00008":61,"00767101f6b4f2cf5d02ed510dbcf0b4":56,"02e81ac5a17b":[2,10],"02e81adcf3d0":[5,6,8,13,15,18,19,24,42,53,54,55,56],"02e81ae236e9":56,"02e81ae61238":56,"02e81ae640dc":[2,55],"02e81ae66238":56,"02e81aeb2129":56,"02e81aeb26e9":56,"02e9sjwsf3d0":[15,42],"03ae956a":20,"0455fc92de2636fc7a176cc5d298bb78":56,"08fe":42,"0abe":[13,42],"0d7cf92a":[15,42],"0d7e":36,"0d7f":36,"0f1ff3650d20":[17,56,61],"10e":10,"10e10":10,"11e0":[8,61],"11e1":[2,24,30,33,36,55,56,61],"11e2":[2,5,6,8,10,12,13,15,18,19,24,36,42,53,54,55,56],"11e3":[5,13,15,17,18,19,20,24,42,48,54,56,61],"1231380a0284":55,"12313b01d5c1":[2,24,30,55],"12313b06ae01":55,"12313b06d112":55,"12313b111c56":36,"12313b122c56":[33,36],"12313d027361":36,"12313d027471":36,"12313d14bde7":56,"12313d1520f1":55,"12313d1c4491":[2,33,36,55],"12313d1c44914":55,"12313d1c5591":36,"12313d
288ee0":36,"12313d288ff0":36,"12313d331ae8":55,"12313f0204b":61,"12313f0204bb":[8,61],"12313f0204bb8":61,"12331b144c65":33,"12331d1c5591":[33,36],"12424d1c4491":33,"174785aa":17,"19a0":[15,42],"1a62":[13,42],"1a9356ba":[13,15,42],"1bd100b8059e":[13,42],"1c8f60e4":61,"1f3567aa":55,"1px":40,"1st":41,"20adr":61,"20c57d4f41cf51f2db44165eb058b3b2":12,"20employe":56,"20or":15,"20titl":56,"20uuid":15,"20where":[56,61],"22000a1c4e22":56,"22000a1c5a67":[56,61],"2440ca58":55,"2482a1c5":55,"249f":20,"2ac6":2,"2ac8":2,"2d00":55,"2d21":2,"2e1db7299b0a667ed80e674a0ef9d653":5,"2nd":41,"31847b9a":[13,42],"3192ac6a":[13,42],"327b527f":[33,36],"328b526e":33,"328fe64a":[15,42],"335b527f":[33,36],"33dd0563":[33,36],"3400ba10":[2,36,55],"348388de":54,"34e26bc9":55,"3500ba10":36,"37f3":55,"382d0991":54,"38dc":15,"3c1e":54,"3d1a9356ba":15,"410b213a":[5,54],"411c466c4f2c":12,"417f":[17,56,61],"4353136f":61,"438a1ca1":8,"477d":56,"48c92c73":36,"496ca1d42ce7":[13,42],"49ff":55,"4a1edb70":[15,42],"4d2664c8e0c
3":56,"5005a0fa":56,"503f17da":24,"50gb":1,"5111c463":55,"5373d7165c2d":48,"53fe3700":[13,42],"563f5d96":55,"58606d0a":[18,19],"58e8":[56,61],"5ae1fa7a":[13,42],"5bb76bca":[13,15,42],"5bcc47ca":[18,19],"5bd5fa5f701f":42,"5c0c1789":[2,30],"5de0bb69":36,"5f4a65c16193":[15,42],"5wugd":47,"61c9":55,"62de5d97":24,"62fd53c78ce7":53,"65c8":36,"6640a601":2,"6715d5ef47a6":[15,42],"67cb":56,"698b":56,"699740088e05":6,"6a42":55,"6b07e44495ef":54,"6be0003c809b":[13,42],"6c56ffda":17,"6fbc8157":56,"6ldstnesaaaaakhdvglhmmu86_eoyxsjjqqd1ipz":[33,61],"74bb":54,"74d2d7da":56,"78c54a82":61,"7bf47435":2,"7fb8d891":56,"802f":56,"81581bbaf055":[13,15,42],"8272c9b0":12,"83ceb9965c26":56,"83de":56,"83e9b7ea":[15,42],"84a5":61,"84c0":55,"84df":[15,42],"87b9":36,"884d":61,"89ab":[13,42],"8a2a":[15,42],"8a4c":53,"8ae8a6ea":61,"8bde":[18,19],"8cef":12,"8d05e96f700d":[13,42],"8d5c":24,"8dd1801e534c":17,"8e0cd3866ee20746c99e9a9825f38ad8":2,"8ea8":17,"903f":[13,15,42],"90f823ba15655b8cc8e3b4d63377576f":56,"917d"
:[15,42],"924d":10,"92c3":2,"92e2":12,"9501cda1":2,"95c8":[33,36],"96f6":55,"98b9":36,"9953085ea376":[5,54],"999e12039f87":42,"99a7":48,"99fd":17,"9c1b":56,"9ce3":[15,42],"9d3a":6,"9de5":54,"9e75":17,"9e92":[15,42],"9efc8ad529d8":54,"9f80":20,"9ff6c621a7a4":[13,15,42],"9ffc":55,"____usergrid":26,"boolean":[10,36,38,41],"case":[9,16,26,29,38,41,42,55,57,59],"catch":42,"class":[1,28,33,47,50,61],"default":[1,10,11,12,13,14,15,20,24,25,26,28],"export":42,"float":10,"function":[6,29,32,49,52,55,56,57,58,60],"import":[23,24,29,30,32,45],"long":[10,30,38,57],"new":[6,9,13,15,16],"null":[6,49],"public":[33,61],"return":[10,11,12,13,16,19,20,24,27,29,33,36,38,41,47,48,49,50,53,55,56],"short":[22,55],"static":26,"super":25,"transient":28,"true":[10,12,18,19,24,26,27,28,33,36,41,49,54,56,61],"try":[22,23,27,33,42,45,49,53],"typeof":49,"var":[9,33,49],"while":[23,26,29,30,32,38,53,54],a065:55,a0dd:24,a0e5:[5,54],a0f7:55,a166:[5,6,8,13,15,18,19,24,42,53,54,56],a24f:[13,42],a407b1e7:[56,61],a51b
:[15,42],a554b7fbd57a:24,a5c5:54,a668717b:56,a694:[18,19],a6e3:56,a71c:53,a72a:[13,15,42],a7e008061e10:[18,19],a7f7:[5,6,8,13,15,18,19,24,42,53,54,56],a9c1:42,abbrevi:[12,16,24],abil:[20,22,32,59,60],abl:[16,24,26,51,52,55,60,61],about:[0,10,16,22,23,24,25,26,32,33,35,36,41,47,51,52,55,56,57,60,61],abov:[5,6,19,26,27,28,54,55],ac46:[56,61],accept:[4,47,53],access:[2,13,14,15,16,19,21,22,23],access_token:[27,41,46,47,48,49],accessid:1,accesstokenrepons:41,accesstokenrespons:25,accesstokenttl:48,accomplish:50,accord:47,account:[12,15,16],achiev:59,acquaint:55,acquir:25,across:[8,16],act:[12,55,58],action:[2,5,6,7,8,12,13,14,15,16,17,18,19,24,25,26,32,33,34,36],activ:[5,10,12,18,19,20,22,24,25,26,28,30],activit:33,activityfe:25,actor:[25,33,36],actorproperti:41,actual:16,add:[1,9,14,15,16,21,22,23,25],addit:[8,16,22,32,33,41,46,47,52,55,56,59,61],addobject:42,addpermiss:25,address:[12,24,26,33,36,38,41,47,61],addrol:25,adjust:[11,54],admin:[21,22,23,25,26,27,28],admin_password:47,admin
_usernam:47,admin_users_require_activ:[26,28],admin_users_require_confirm:[26,28],admingmail:33,administr:[26,27,30,32,34,36,38,47,51,52,54],adminus:[33,36,41],adminuserproperti:41,adminuserupd:25,adomain:61,adopt:[32,39],advantag:32,advertis:20,advis:51,ae1f:17,aec3:55,afad:55,affect:48,after:[6,10,24,27,29,47,49,51,54,58],again:[26,33],against:[18,28,34,46,47,51,53],aggreg:8,air:14,alert:[20,29,56,57],alia:[54,61],all:[0,6,8],alloc:42,allow:[7,12,20,24,26,28,30,32,36,38,41,49,52,53,54,55,56,57,59,60,61],almost:60,along:[11,16],alreadi:[15,16,22,26,38,41,42,49,51,58],also:[1,2,6,7,8,11,13,15,16,21,27,28,30,32,33,34,36,38,41,47,49,50,51,53,55,56,57,58,59,61],alter:54,altern:[12,13,56,57],although:[13,15,33,55,56,61],alwai:30,amazon:1,amazonaw:26,amount:[11,52,55],amuramoto:[5,15,42,48],analysi:32,analyt:22,analyz:[32,46,47,51,52],android:[24,25,29,31,42,43,47,49,50],ani:[5,6,8,10,12,14,15,16,20,28,29,30,32,33,35,41,45,46,47,48,51,52,53,54,55,56,58,59,60,61],anonym:[38,55,61],anoth:[
12,16,23,46,55,58,59,61],answer:61,ant:53,anuff:40,anyon:[52,55],anyth:26,anytim:55,anywher:11,apachecon:40,apidocgener:0,apige:[24,40,42,56],apigeecli:42,apigeeclientrespons:42,apigeecollect:42,apigeemobileconfig:48,apikei:49,apirequest:42,apn:41,app1:41,app2:41,app:[2,4,5,6,7,8,12,13,14,15,16,17,18,19],app_id:[15,41,55,56,61],app_nam:[34,48,50],app_uuid:[14,16],appdata:25,appdeleg:42,appear:[19,41,55,58,59],append:[8,9,13,16,20,46,49],appid:[41,49],appl:[32,41],appli:[24,28,48,51,53,54,59,60,61],applic:[2,4,5,6,7,8,12,13,14,15,16,17,18,19,20],application_client_secret:47,application_clientid:47,application_info:36,applicationdata:41,applicationid:[33,36,41],applicationnam:[2,5,6,8,12,13,14,15,16,17,18,19,24,41,42,48,53,54,55,56,61],appnam:[9,47,49],appropri:[30,38,49],approv:[26,28],arbitrari:[24,59],architectur:[14,26],area:[22,23,33,45,61],aren:[14,16],arg:[1,34,36,55,56],argument:1,arm:51,around:[0,16],arrai:[10,12,14,15,16,19,24,41,42],arthur:[17,18,19,59,60],articl:[12,13,15,
46,54],asc:11,ascend:11,ask:[12,28],aspect:[7,32],asset1:2,asset:1,assets_id:2,assign:[6,25,30,32,38],associ:[5,10,13,19,20,21,24,30,32,36,38,42,45,47,48,50,52,54,56,58,60,61],assum:[16,46],async:25,asynchron:25,atistophan:33,atom:15,attach:[4,5],attack:[45,51],attempt:[36,41,46],attribut:14,audienc:31,audio:[5,32],auth:[26,28,38,49],authent:[13,15,23],author:[27,35,46,48,49,55,60],author_uuid:16,authorid:[14,16],authorimag:16,authornam:16,authoruuid:16,authrespons:49,auto:[26,28],automat:[5,6,13,15,21,22,28,30,32,41,47,49,50,53,54,55,59],avail:[13,15,20,22,24,27,32,42,47,58,60],avatar:[12,24,55,56,61],avoid:[16,58],awai:16,awar:[10,20],awssdks3binarystor:1,b0c6:56,b11217fc:6,b1f7:[13,42],b24e:6,b2bd:56,b2e4:15,b31d:48,b36a:[2,30],b379:[5,54],b3aad0a4:42,b3u68vghi6fmeekn9wlogtzz0a:34,b3u6aaabmqz:47,b3u6zuz5_u8i:34,b4c6:2,b690:56,b6dd:55,b77ec8addc0d:56,b90c:56,b93d:61,baa:[33,36,45],back:[14,16,27,31,32,39,58],backend:[12,25,30],bad:[36,47,52],banner:7,bar1234b:61,bar:[24,31],barnei
:[56,59],base:[0,13,20],batch:11,baz:24,bcc1:8,bcf7:[2,33,36,55],bcf8:[33,36],bd397ea1:53,be04:[13,42],be08a5f9:36,be09a5f9:36,bean:1,bearer:[27,46],beca:36,becaus:[14,20,23,26,41,47,51,52,55,58],becom:[11,12,20,26,32,55,56,57],been:[6,16,46,49,50,51,55],bef8:[33,36],befor:[0,1,22,23,28,29,49,51,54,61],begin:[8,11,35],behalf:47,behav:58,behavior:32,behind:[22,38,49],belong:[27,30,38,55,57],below:[13,14,15,16,26,28,33,42,43,49,55,56,58,61],beneath:58,benefici:29,benefit:[14,26],besid:54,best:[11,12],better:[16,47,52],bewar:28,beyond:55,bike:10,bin:28,binari:[32,46,47,51,52],binarystor:1,bit:14,blank:54,block:29,blog:54,board:58,boat:10,boavijt0oyrkjf:34,bodi:[6,16,33,34,36,41,48,55,56,61],book:[11,32,42],border:40,both:[6,14,17,28,29,30,39,41,52,60],bounc:16,bouncer:16,bounci:[14,16],box:[21,23,54,58,60],bracket:15,bread:[13,15,42],brief:[29,49],broad:[46,47,52],brows:31,browser:[26,28,33,49],bucketnam:1,bug:31,buildcurl:49,built:[16,24,26,55],busi:20,button:[7,21,23,33,54,58,61],but
ton_click:[6,8],c2v7n61dy90mcdg78xixprxfdq:36,c2v7wedxiutzwekwdyslct_lydfvmmn:36,c5e707256e71:[15,42],california:[33,56,57],call:8,callback:[29,49],campaign:32,can:[0,1,2,4,5,6,7,8,10,11,12,13,14,15,16,17,19,20,21,22,23,24,26,27,28,29,30,32,33,34,35,36,38,39,41,45,46,47,48,49,51,52,53,54,55,56,57,58,59,60,61],cancel:[41,49],cancelmsg:25,cannot:[13,15,24,29,30,52],capabl:51,captcha:[33,41,61],captur:[12,16,20,32],car:10,carefulli:52,carri:35,cassandra:[14,16,25],cast:40,castl:[14,16],cat:27,catalina:28,catalog:32,categori:[14,33,36,41],caus:[0,15],caution:48,cautiou:[46,47,52],ccc:40,cd0c:[2,33,36,55],cd0d:[33,36],cd789b00:56,cd796d0a:56,cdf1ce04c1c0:12,cdn:32,cede5b7:36,cede5b8:36,cell:0,center:20,central:[0,1],certain:[15,16,30,50,60],cf3e981c:33,cf4d981c:[33,36],cf9b:8,cfed:[18,19],chain:6,challeng:[24,33,41,61],chang:[0,1,25,26,28,30,46],channel:49,channelurl:49,charact:[11,55,61],charset:[33,61],check:[23,26,27,49,52,53,54,55],checkbox:54,checksum:[2,5],chicago:61,choos:16,circl
:[32,55],circumst:50,cite:15,citi:[11,33,41,61],clara:40,classpath:1,clean:[0,26,27,28,33],cli:26,click:[7,16,21,23,35,54,58],client:[9,11,13,14,15,16,24,25,26,29,32,33,34,35],client_credenti:[34,41,47],client_id:[34,36,41,46,47,49],client_secret:[34,36,41,46,47],climb:16,clone:[0,26,28],closer:16,cloud:[1,4,5,32],clue:26,cluster:26,cluster_nam:28,cn0wtdxxkxmqlgzvtmubcp20fulczq:47,code:[1,11,16,24,25,26,27,29,31,32],coffe:14,colleagu:55,colleciton:42,collect:[4,5,12],collection_nam:13,collectionid:41,column:[14,16],com:[2,4,5,6,8,12,13,14,15,16,17,18,19,20,24,26,27,28,30,33,34,36,38,42,47,48,49,50,53,54,55,56,58,59,60,61],combin:[16,51,61],come:[23,25,26,28],comma:[12,41,42,49,53],comma_separated_list_of_permission_nam:49,command:[0,22,26,27,28,49,56],comment:[32,55],commit:0,committ:39,common:[12,51,55,61],commonli:54,commun:58,compani:[35,36,58],compar:12,comparison:54,compil:[46,47,51,52],complet:[12,25,26,29,30,32],completemsg:41,complex:[15,16,25,32],compliant:32,complic:26,com
pon:[30,32],compromis:46,concept:[14,22],config:28,confim:41,confirm:[26,28,33,36,41,58],confirm_email:[33,36,41],conflict:58,conform:10,conjunct:[32,60],connect:[0,2,5,12,16],connected_collect:[17,18],connected_ent:[17,18],connecting_collect:[17,18],connecting_ent:[17,18],consid:[47,51,54],consider:[46,47,52],consol:25,constrain:14,constructor:1,consult:22,consum:[32,55],contain:10,containslook:11,containswil:11,content_typ:4,context:[1,32],contextu:32,continu:[11,29,58],contrast:[16,59],contribut:[25,31],contributor:[31,39],control:[32,48,51,54,61],conveni:[9,46,56,58],convent:30,cooki:49,copi:[0,16,26,58],core:[27,28,32],cores:28,correct:[38,49,58],correspond:[12,13,15,24,30,41,42],cost:32,costli:16,could:[2,11,16,29,46,47,51,52,56,57,59,60],count:[7,8,12,13,14,15,42,55],counter_nam:[6,8],coupl:31,creat:[2,5],createact:25,createadminus:25,createapp:25,createcollect:42,createent:[25,29],createev:25,creategroup:25,createnotif:25,createorg:25,createus:25,creation:[38,48,57],credenti
:[25,26,28],credential:28,criteria:32,cross:55,css:[33,61],cumul:6,curiou:22,curl:[4,5,6,8,9,11,12,13,15,17,18,19,20,27,28,33,34,36,42,43,47,48,49,50,53,54,55,56,61],current:[6,13,20,30,31,41,53,55,61],custom:[9,13],custom_id:9,d0d7d0ba:12,d16344f5a0e1:20,d20976ff:56,d28c:24,d503:[2,30],d7a8:[15,42],d86a:12,d878de4r:48,d87edec7:55,d9693ec3:55,da448955:55,da4a50dc:15,da67:61,da71:61,da83:55,dai:[7,8,48],daili:8,dashboard:49,data:1,databas:[11,14,16,20,25],datacli:[9,42,47,50],date:10,dave:40,david:40,db1e60a0:[17,56,61],dbf5228024a7:[18,19],dbm:[11,12,14,16],dc5d478e9c029853fbd025bed0dc51f8:24,decim:10,decompil:51,dedic:6,defin:[7,14,15,23,28,30,42,45,47,48,53,54,55,56,60,61],definit:[41,53],degre:48,deleg:42,delet:[11,12],deletecollect:42,deleteent:42,delimit:[10,41,53,57],deliv:[32,41],deliveri:[32,41],denot:[56,59],depend:[24,56,57],deploi:25,deploy:25,desc:11,descend:11,describ:[11,12,13,15,16,20,24,35,38,45,46,47,49,54,56,58],descript:[4,5,6,8,11,13,14,15,17,18,19,25,30,33,34,35
,36,38,41,42,47,52,53,54,55],design:[14,16,20,26,32,55,56,57,58,60],destin:1,destroi:50,detail:[13,15,22,30,32,33,34,35,36,41,47,49,54,55,56,59,61],detect:[5,20],determin:[20,55,61],dev:[28,49],develop:[10,20,23,30,31,32,41,51,58,60],devic:[5,18,19,20,21,24,25,30,32],dfr4d5m1mjmoeeogvpncm:48,dialog:[21,23,33],did:15,differenti:32,dimens:60,diner:11,dino:[24,59],dir:0,direct:[0,16],directli:[0,34,52],directori:[0,26,27,28,39,49,58],disabl:[23,26,33,36,38,41],displai:[8,11,20,38,41,49,54,55,57,58],displayemail:41,displayemailaddress:[33,36],displaynam:[33,36,41,55],distanc:20,distance_in_met:20,distinctli:31,distribut:[14,16,51],div:[33,61],dk88fh4r:19,doctyp:[33,61],doe:[0,15,24,30,38,41,42,46,47,48,49,55,56,61],doesn:[14,16,23],dog:[15,24,29,56,57,59],dogcreatecallback:29,doge:[56,57],domain:49,don:[26,51,55,61],done:[0,26,32,41,49,51,52,61],dot:[6,10],down:[10,21,31,54],download:25,drive:[1,32],drop:[21,54],dropdown:21,dskiptest:[26,27,28],dtd:[33,61],due:[11,12,16,47],duplic:16,du
rat:[2,5,6,8,12,13,14,15,16,17,18,19,24,26,33,34,36,42,48,50,53,54,55,56,61],dure:[51,54],duti:54,e13743a7f1db7f4246badd6fd6ff54ff:61,e694:56,e7127751:56,e7d0:55,e8f5:[15,42],e94123890c7a:[15,42],e978:61,e97b:12,each:[0,6,7,8,10,12,13,14,15,16,20,23,24,30,33,38,42,43,49,52,54,55,56,61],eas:32,easi:[0,32,60],easier:[9,11,12,16,23,24,51,56,59],easiest:54,easili:[6,20,30,32,51,60],east:26,easy_instal:0,eb20e5bce407:17,ebc6f49d1fc4:[15,42],ec39:24,edit:[0,1,25,26],edort1:33,ee912c4b:10,ef0b:[15,42],effb:[15,42],effect:32,effici:[12,16],either:[1,13,17,41,46,49,54],elasticsearch:28,elev:51,elimin:[32,46,51],els:[29,49],email:[12,24,26,27,28,30,33,36,38,41,47,55,56,58,61],email_address:[24,61],embed:28,embed_cod:40,employe:56,empti:[13,42,58],emul:[55,56,57],enabl:[20,26,32,38,49,51,54,55],enclos:[12,41],encod:[9,11,12,15],end:[8,32,42],end_tim:8,endpoint:[0,6,18,34,38,41,42,46,47,49,50,55,61],engag:[20,32],engin:31,enhanc:20,enough:23,ensur:[10,16,24,32,45,47,51],enter:[21,23,33,49,54,58
,61],entir:[11,41],entit:16,entiti:[0,2],entity_nam:15,entity_typ:[15,42],entity_uuid:15,entityid1:41,entityid2:41,entityid:[41,42,54],entityproperti:41,entitytyp:[33,36,41,54],entri:[11,49],environ:[22,41,51],equal:[10,12,48],equiv:[33,61],err:[29,49],error:[6,25,29,36,38],errorcod:41,errormessag:41,escap:42,essenti:60,establish:[41,55,60],etag:[2,5],etc:[31,38],evalu:26,even:[8,11,16,26,30,46,47,51,52,59],event:6,everi:[8,9,24,30,46,51,52,54,56,57],everyth:[0,24],exact:[20,60],exactli:11,examin:[8,51],exampl:[0,1],except:[15,46,51],execut:[9,11,12,29],exhaust:51,exist:[5,6,15,16,20,26,36,38,41,42,48,49,55,56],expect:[10,20,33,36,42,60],experi:[14,20,32,60],experiment:[23,45],expir:[25,41],expires_in:[41,47],explain:[0,26],explan:29,explicitli:[46,50,54],expos:27,express:11,extend:59,extens:58,extern:39,extract:[26,27,28,46,47,49,52],f18e8f6fb3bc:61,f315e5aa568a:[15,42],f322:42,f34f4222:[5,6,8,13,15,24,42,53,54,56],f399:55,f3a8061a:[15,42],f3aa:55,f3be262a:[15,42],f3teeg:34,f42752a
a:42,f8zemolceecubwbqvsaaca:47,f_gubelxeecfrgbqvsaaca:47,facebook:[24,25,32],facebookaccesstoken:49,facebooktoken:49,factor:26,fail:[41,42],failur:14,fals:[10,26,28,33,36,41],famili:[14,20],familiar:[16,22],faq:26,far:21,fast:14,favorit:61,fb_access_token:[38,49],fbasynchinit:49,fbasyncinit:49,fc4d:55,fdd3:36,fe80:33,fe90:[33,36],featur:[16,20,22,24,25],feed:[5,12,18,19,24,25,32],feel:28,few:[11,20,58,60],ffd79647:55,field:[1,11,15,32,33,41,54],fieldset:[33,61],file_loc:5,filenam:5,files:1,filter:[12,55,56,61],find:[0,11,20,26,51,56],fine:[28,32],finish:[41,58],first:[0,11,12,13,16,22,24,28,29,33,38,42,51,54],first_nam:24,firstnam:[11,12,38],fish:27,fit:52,five_minut:8,flexibl:[14,16,25,30],flow:[49,61],fluffi:27,fobnszewobnioerabnoiawegbrn:[5,54],focu:[24,32],folder:1,follow:[0,2,4,5,6,8,9,10,11,12,13,14,15,16,18,19,20,22,23,24,25,26,27,28,29,30,35,38,41],foo9876a:61,foo:24,force_refresh:28,ford:[18,19,59,60],forgot:61,fork:39,forkei:42,form:[15,30,33,36,41,42],format:[0,2,12,13,14
,15,20],fortun:8,forward:[49,56],found:[34,46,47],four:[47,52],foursquar:55,fragment:49,framebord:40,framework:58,francisco:[20,33,56,57],fred:[11,56,59],free:[28,30],friend:[18,20,32,54,55],from:[0,4,9,11,12],full:[11,15,23,32,33,35,46,47,51,52,54,59],fulli:[24,28,42],further:[24,29,35,38,46,49,51],furthest:[11,20],futur:[15,51],g9qgaaaurv_lfq7uu6ayhjjjn7qcrgovnvu:48,gain:[46,51],game:7,gaufeolxeecfrgbqvsaaca:47,gcm:41,gener:[0,6,7,24,25,27,28,30],geo:25,geocoordin:20,geograph:11,geoloc:11,get:[2,4,8,11,12,13,14,15],getcollect:42,getent:42,ggkaaqmaggkabge5ffm1aqcadqaq_9ewr_ozeeguwxixowauaqcadqaqablaovoaeeguwxixowauaqa:55,ggkaaqmaggkabge5mlfh7gcadqaqjikhxefqeegw9hixowbregcadqaqjnep6ufqeegw9hixowbrega:55,ggkaaqmaggkabge5xc3r1gcadqaqz02yhp6qeegvybixoxisvgcadqaqz3soh_6qeegvybixoxisvga:36,ggkaaqmaggkabge5xc3r1gcadqaqz02yhp6qeegvybixoxisvgcadqaqz4zbyf6qeegvybixoxisvga:33,ggkaaqmaggkabge7pehcgwcadqaqvj9dljfzeekg9wloguza3acadqaqvkvrctfzeekg9wloguza3aa:55,git:[0,39],github:[26,31,39],give:[
6,16,23,24,31,32,48,53,54,60],given:[15,16,23,30,36,40,41,46,51],gladi:12,gmail:[28,33,55,61],goal:11,goe:26,gold:27,good:[0,23,51],googl:[32,33,41,55,61],govern:[45,47,52,56],grain:32,grant:[24,41,46,47,49,51,52,54],grant_typ:[27,34,41,47,48],grant_url_pattern:41,granular:[6,8],graph:[25,32],graph_async:28,graph_us:28,gravatar:[12,24,55,56,61],great:[32,38,54,56,57],greater:[10,11,48],greatest:52,groovi:0,group:[5,12,14,15,18,19,24,25,30],groupid:41,groupnam:[55,56],grouppath:56,groupproperti:41,gte:10,guarante:29,guest:[23,46,51,54,55,61],guid:[9,26,39,42,49],hacker:[46,47,51,52],half_hour:8,hand:16,handi:22,handl:[21,32,33,60],happen:20,happi:[0,55],happy_cloud:5,hard:[1,52],hava:0,have:[0,12,14,15,16,19,22,24,30,31,34,36,38,41,47,48,49,51,52,54,55,56,57,58,60,61],head:[33,61],header:[4,46],height:[40,55],hello:55,help:[7,11,14,30,32,45,47],her:[16,33],here:[2,12,16,20,24,26,27,30,39,49,55,56,58,61],hierarchi:[6,30,35,36,53,56],high:[14,16,45,48],higher:[27,52],highest:[35,36],hi
ghlight:16,hike:52,him:27,hold:[5,42],home:20,homepag:6,host:[26,28,46,49],hotmail:36,hour:8,hous:16,howev:[8,11,12,13,15,28,29,30,38,49,51,54,55,58],href:[33,36,61],html4:[33,61],html5:[24,25],html:[0,33,41,49,58,61],htmldisplayemail:41,htmldisplayemailaddress:[33,36],http:[2,4,5,6,8,12,13,14,15,16,17,18,19,20],human:[33,61],hundr:11,hurrai:49,hystrix:28,icon:[55,58],idea:51,ident:16,identif:41,identifi:[9,16,30,33,38,42,61],ifram:40,illustr:[14,45],imag:[2,4,5,14,32,41,55],imagemodel:25,imagin:[12,16,52],immedi:[32,54,61],immut:30,implement:[24,32,45,46,47,49,52,61],implicit:54,improv:[20,31,32],inact:54,inbox:[38,55,57],includ:[6,11,12,14,15,16,21,22,23,24,30,32,33,41,42,46,47,48,49,51,54,56,61],incorpor:58,incorrect:[24,33],increas:[13,20,32],increment_valu:6,index:[0,10,11,15,28,30,58],index_prefix:28,indic:[41,48,55,56],individu:[15,30,48,52],ineffici:[11,12,16],inflat:16,info:[33,41],inform:[4,8,11,12,13,14,15,16,20,22,24,26,30,32,33,35,38,39,42,45,46,49,51,55,56,58,59,61],in
frastructur:[30,32],ing:55,inher:51,init:[42,49],initi:9,initil:28,initwithobject:42,inner:16,input:[28,33,61],insecur:51,insert:49,insid:24,instal:[0,9,22,24,25],instanc:[26,27,30,42,47,50,58],instead:[16,24,28,32,47,51,52],instruct:[0,26,49,58,61],integ:[11,41],integr:[20,24,32,49],intend:30,intention:16,interest:[8,32],interfac:[26,58],intern:25,interpret:[24,53],intersect:10,intrins:24,introduct:25,invalid:[38,49],iphon:58,isn:[14,22,24,45],iso:[33,61],issu:[0,2],item:[10,12,13,15,24,42,55],items:13,itself:16,jane:61,jar:27,java:[0,26,27],javascript:[6,9,12,14,24,25,26,29,31,33,42,43,47],javscript:29,jdk:[26,27,28],jdoe57:30,jenni:16,jim:33,jin:40,jinm:33,job:54,john:[24,30,47,55,56,61],johnson:40,join:16,jpeg:[2,4,5],jpg:[2,5,14,16],json:[10,12,14,15,16,19,24,27,30,33,34,42,49,55,56,60],json_arrai:15,json_object:15,just:[14,16,17,20,23,24,26,55,60],k88dh4f:18,keep:[1,7,9,11,12,23,32,46,47,51,52],kei:[13,15,16,24,32,42,49],keyspac:[26,28],keyword:15,kid:16,kind:[11,12,16],know:8
,kravitz:12,label:33,lack:23,lag:29,languag:[10,14,15,24],larg:[0,11,55],last:[5,11,30,36,38],lastnam:[11,12,38],latenc:29,later:[16,20],latest:[26,27],latitud:[11,20],latitude_coordin:20,launch:[8,51],launcher:25,layer:27,lceecubwbqvsaaca:47,learn:[22,23,32,51,58,60],least:26,leav:[26,54],left:[21,31,54,55,58],length:[2,5],less:[10,14,48,55],let:[8,27,32,54],letter:61,level:[6,8,14,15,21,22,23,25,27,30,32,34,35,36,45,46],leverag:[32,58],lib:[26,28],lightweight:60,like:[0,2,5,8,10,14,16,17,18,19,23,26,28,29,32,33,38,49,51,53,54,55,57,58,59,60,61],liked_bi:59,limit:1,line:[0,16,26,27],linear:[14,26],live:[23,25,46],load:[27,49],localfilebinarystor:1,localhost:[26,27,28],locat:5,log:[6,26,32,38,47,49,50,54,55,58,61],login:25,logincredenti:25,loginfacebook:49,logout:25,longer:[11,51],longitud:[11,20],longitude_coordin:20,look:[2,8,10,11,16,49,52,55,61],loos:[33,61],love:16,lower:6,lte:10,ltixndg0nduxndpvdjb0jwrevls1vcd0xvr3nwt0jrqq:11,made:[19,24,53,59],magic:16,mai:[0,6,9,13,15,23,30,
41,50,51,54,56],mail:[26,28,30,56],mailer:[26,28],mailto:[33,36],main:[0,1,49],maintain:[16,49],mainten:31,make:[0,9,11,12,14,16,22,23,24,28,29,30,32,35,38,46,47,49,50,51,55,58,59,60,61],makefil:0,maker:14,malici:[45,46,47,52],manag:[5,11,12,22,23,25,26,27,28,30,31],mandatori:[1,38,41,56,57,61],mani:[7,11,12,14,16,20,23,30,54,60],manual:[55,59],map:14,marginheight:40,marginwidth:40,massoddb:55,match:[11,15,42,53,61],matter:32,mattress:14,maven:[0,26,27,28],max:28,maximum:[11,48],mayb:16,mean:[10,14,15,16,23,29,30,45,46,51,59,60],meant:55,meanwhil:29,measur:45,mechan:58,meet:26,member:[30,33,35,41,52,55,56,57],meme:[56,57],memori:20,menu:[21,34,54,58],messag:[6,26,28,32,33,41,48,56,58,60],message:25,meta:[33,61],metadata:[2,4,5,6,10,12,13,14,15,16,17,18,19,20,24,25,33,36],metadataproperti:41,meter:[11,20],method:[6,8,11,15,19],mfdsadfdsaoabl:55,middl:38,middlenam:38,might:[7,8,9,11,12,14,15,16,22,26,30,32,34,51,54,56],mile:20,milk:[13,15,42],million:32,millisecond:[30,41,48],mind:[1,
9,11,12,16,20,23],minim:[16,26,28],minimum:[30,34,36],minu:16,minut:[8,32],mix:24,moab:55,mobil:[14,16,20,23,25,34],model:14,modern:[30,55],modif:[38,57],modifi:[2,5,6,12,13,14,15,16,17,18,19,20,24,30,33,36,38,41,42,48,54,55,56,57,61],modul:6,monitor:32,month:[8,32],more:[4,6,8,9,11,12,13,14,15,16,20,21,22,23,24,25,26,30,32,36,39,41,42,45,47,48,50,51,52,53,54,55,56,58,59,60,61],morn:8,most:[8,11,16,22,28,29,30,31,32,34,51,55,59,60,61],mountain:52,much:[10,14,16,51,58],multi:[15,42],multipl:[0,11],must:[0,10,15,16,27,28,30,36,41,42,46,48,54,55,56,58,59,61],mustach:0,mvn:[26,27,28],my_app:[14,16,38,49],my_org:[14,16,38,49],myadmin:27,myapp:[12,27],myasset:2,mycollect:10,myfirstorg:27,mygroup:[55,56],mynewapp:[56,61],mynewgroup:56,mynewpassword:33,myorg:[12,56],mypassword:27,myself:[16,26,28],myuser:27,name:[1,2,4,5,6,8,10,11,12,13,14,15,16,17,18,19,20,21,23,24,26,27,28,30,33,34,36,38,41,42,46,48,49,51,53,54,55,56,57,58,61],narrow:[10,54],nativ:[0,14],natur:[11,12],navig:[26,27,28],nea
rbi:20,nearest:[11,20],nearli:16,necessari:[16,32,54],need:[0,1,2,8,9,11,12,13,14,15,16,21,22,24,26,28,30,31,32,33,34,35,36,38,46,47,49,50,51,52,54,55,56,58,59,60,61],neg:6,nest:[15,30,42],net:[24,40],network:32,never:[23,25,34,46,47,48],new_password:[33,61],new_review_uuid:16,newent:42,newli:[53,55],newpassword:[33,41,61],next:[11,13,21],nil:42,node:[24,26,28,42,43,47,50],nodej:28,non:[14,16],none:54,normal:[4,15,16],nosql:[11,12,14],notat:[10,12,14],note__:61,notic:[5,16,19,49,55],notif:[20,22,25,26,28,30],notifi:[25,30],notify_sysadmin_of_new_admin_us:[26,28],notify_sysadmin_of_new_organ:[26,28],notitf:41,now:[26,27,28,49,58],nsarrai:42,nsdictionari:42,nsexcept:42,nsmutablearrai:42,nsmutabledictionari:42,nsstring:42,number:[6,7,11,12,13,14,30,32,41,51,54,55,61],oauth2:41,ob5ko:48,object:[5,9,10,12,14,15,24,25,30,32,33,34,36],objectproperti:41,objecttyp:[33,36,41],objectuuid:41,obtain:[38,46,48,49,51],occur:[7,20],occurr:11,octal:10,off:[26,49],offer:[20,23,24,32,51,59,60],offici:
58,often:[8,10,16,30,32,55],old:[33,41,61],old_password:[33,61],oldpassword:[33,61],omit:12,onc:[0,11,16,26,29,49,51,54,61],ongo:[32,55],onli:[5,9,11,12,16,21,23,24,26,29,30,34,41,45,46,47,48,51,52,53,55,56,59,61],onlin:55,oop:49,opdata:42,open:[14,16,23,25,28,31],optim:[11,12,14,16],option:[5,9,26,28,30,42,46,49],order:2,orderl:11,org:[1,2,4,5,6,8,12,13,15,17,18,19,20,24,26,27,28,33,34,36,41],org_client_secret:47,org_clientid:47,org_id:[15,41,55,56,61],org_nam:[34,36,48,50],org_uuid:[34,36],organ:[0,2,4,5,6,8,12,13,14,15,16,17,18,19,21,23,24,25,26,27,28],organizationnam:48,organizations_require_activ:[26,28],orgid:41,orgnam:[9,41,47,49],orguuid:41,origin:56,originali:57,oscar:27,our:[0,9,11,12,26,27,28,31,39,42,60],out:11,outbox:55,outgo:28,outlin:5,output:49,over:[8,48],overrid:[28,48],overview:[11,12,25,30],overwritten:15,own:[7,23,32,41,49,53,55,56,57,61],owner:[2,36,41,55,56],packag:[26,49,58],page:[22,23,27,33,47,49],pair:[13,15,42],pane:54,param:[2,5,6,8,12,13,14,15,16,17,18,
19,24,42,48,53,54,55,56,61],paramet:[4,5,6,8,9],pars:49,part:[9,11,12,16,20,24],partial:[11,30],particular:[10,16,55],particularli:[14,16,53,55,59],partit:22,pass:[11,34],passiv:60,password:[24,25,26,27,28],path:[2,5,6,12,13,14,15,16,17,18,19,20,23,24,25,26,28,33,36,41,42,49],path_to_imag:16,pathnam:49,pattern:[41,53],payload:41,peak:8,peopl:[7,30,55,56,57,58],per:[13,14,49,54],perceiv:29,perform:[4,5,13,14,16,18,29,32,33,35,38,46,47,52,53,55,57,61],period:[7,8,20,54],permiss:[5,12,18,19,23,24,25],permissiondata:41,persist:[24,27,28],person:[16,20,31,33,36,58],perspect:30,pertin:35,pet:27,phone:12,phone_numb:12,photo:[20,60],physic:20,pictur:[4,5,12,20,24,38,41,56,61],pinterest:55,pip:0,place:[14,15,16,26,30,42,47,61],plai:[7,22],plain:4,plan:16,platform:32,pleas:[10,33,46,48,54,59],plenti:0,plural:[13,15,30,41],png:16,point:[10,11,14,20,28,29,32,49,58],polici:[39,51],pop:58,popul:[56,58,60],popular:[32,58],popup:54,port:[26,27,28],portal:[21,22,23,26],portion:41,pose:48,posit:[11,2
0],possibl:[16,51,59],post:[2,5,6,7,13,15,16,17,18,21,23,24,25,27,33,34,35,36,41],postal:11,potenti:11,power:[20,27,30,32,40,47,52,59],practic:[11,12],preced:[12,16],precis:55,predefin:30,prefer:[11,24,26],prefix:34,prepar:51,present:[16,25],preserv:56,prevent:[11,12],preview:0,previou:[55,58],previous:58,price:[10,13,15,42],primari:[16,38],prior:51,privaci:55,privat:32,privileg:36,probabl:[0,16,26,29],process:[27,30,33,60],product:[14,16,21,23,25,26,30,41,45],product_uuid:[14,16],productid:16,productimag:16,productnam:16,productuuid:16,profil:[20,32,38,49,60],program:29,programat:21,programmat:[34,52],project:[0,27,35,36,39,58],prompt:[26,49],prone:55,proof:[33,61],prop:42,properit:20,properli:[27,29],properti:[1,4,5,6,9,10,11],properties____:26,property_1:[13,15],property_2:[13,15],property_nam:11,props1:42,props2:42,propti:33,protect:[45,47],protocol:[26,28,49,51],prototyp:49,provid:[6,8,11,13,14,15,20,21,24,28,30,32,33,34,36,38,41,42,43,46,47,49,51,52,54,55,56,58,61],provis:[38,
49],proxim:[11,20],pull:31,pure:24,purpos:[10,23,26,30,34,54,60],push:[0,20,22,25],put:[5,12,13,15],pw123:26,pwhere:28,python:0,qualifi:24,quantiti:10,query_stat:12,query_str:[56,61],querystat:41,querystr:42,quick:25,quicker:24,quickli:[11,12,16,30,32,60],quitwait:[26,28],quot:[12,41,42],raleigh:40,rang:8,rate:16,rather:[5,16,17,18,32],raw:0,rdbm:[14,16],reach:10,reactiv:25,read:[9,11,12,14,16,22,39,41,55],readabl:16,readi:[11,22,28,58],readm:[0,39],real:41,reason:56,recaptcha:[33,61],recaptcha_challeng:41,recaptcha_challenge_field:33,recaptcha_respons:41,recaptcha_response_field:33,recaptchaopt:33,receipt:[25,30],receiv:[11,29,38,57,58,61],reciproc:59,recommend:[26,42,51],record:[30,32],recurs:53,redefin:54,redirect:[26,28,49],redirect_root:[26,28],redirect_uri:49,reduc:[12,16],redund:16,ref:41,regard:[6,30],regardless:15,regionnam:1,regist:[32,45,52,54,58,60,61],rel:[33,61],relat:[5,14],relationship:[16,17,18,19],relev:[20,32,41,49,51,60],reli:16,rememb:[10,49,58],remind:16,remot:
20,remov:[23,25,26,33],removeent:42,renam:30,repeat:58,replac:[1,16,49,58],replic:26,replication_factor:[26,28],repo:[26,28,39],report:[7,31],reposloc:1,repres:[11,14,21,24,30,32,33,36,52,53,55,56,61],represent:[11,15,24,30],request:2,requir:[0,6,13,17,18,20,23,25],reserv:30,resetpw:[25,26,28,33],resetpwmsg:25,resolut:8,resourc:[0,1,24,35,38,41,46,49,52,53,54],resource_path:[41,53],respect:46,respons:2,response_typ:49,restaur:[11,20],restkit:58,restrict:[51,54],restructuredtext:0,result:[10,11,13],review_entity_json:16,review_uuid:16,reviewed_product_uuid:16,reviewedbi:16,reviewedin:16,revok:25,revoketoken:50,rich:[32,60],right:[16,24,29,54,55,58,60],rigid:30,risk:48,rock:10,rockadero:20,rocki:52,role:[5,10,12,18,19,21,23,24,25,30],roleid:41,rolenam:[5,12,18,19,24,38,41,54,56,57,61],roleproperti:41,root:[0,26,27,28,51],rout:[32,55],row:14,rubi:[24,42,43],rule:[23,45,47,51,52,53,54,56,61],run:[0,7,25],safe:52,sai:[8,46,47,55],sake:28,same:[5,6,11,16,18,19,20,28,30,32,52,54,55,56,57,5
8],sampl:[55,56,58,61],san:[20,33,56,57],sandbox:[5,15,22],santa:40,save:[5,15],scalabl:[14,16,26],scale:16,scatter:16,scene:[38,49],schedul:41,schedulenotif:25,schema:[14,30,41,54],scope:[16,27,47,49,52],screen:[21,40],script:[0,33,52,61],scroll:40,sdk:[6,9,14,15,22],search:[8,11,32],second:[6,29,33,48,54,58],secondari:16,secret:[25,34,41],secretkei:1,section:[24,34,46,47,56,58,61],see:[2,4,8,9,10,11,12,13,14,15,19,20,21,22,23,24,26,27,30,32,33,34,35,36,39,42,45,46,47,48,49,51,52,53,54,55,56,58,59,61],seen:55,segment:53,select:[10,11,12,16,21,23,24,54,56,58,61],self:49,send:[1,4,9,11,12,19,20,27,32,33,36,38,41,49,54,58,60],sens:[16,32],sensit:[23,45],sent:[9,12,24,33,34,36,41,42,46,47,53,58,61],separ:[6,12,16,30,42,49,54],seri:0,serv:[51,52,54],server:[11,23,26,29,32,34,46,47,49,50,51,52,56,58],servic:[1,12,20,23,24,27,32,33,35,36,38,41,42,45,47,49,55,56,58,61],session:[49,51],set:[0,4,5,6,8,11,12],setexpir:25,setobject:42,settoken:49,setup:25,sever:[1,24],share:[27,36,55,60],share
dappl:42,shell:22,shorthand:11,should:[0,2,11,12,15,16,17,18,22,23,26,28,39,41,42,45,46,47,48,51,52,54,58],show:[12,13,16,42,54,58],shown:[9,11,12,13,15,19,33,46,49,55,56,61],side:[31,32,34,46,47,49,51,52,58],sidebar:54,sign:[25,26,28,30,32],similar:[16,55,58],simpl:[0,14,16,23,26,30,32,58,60],simplestrategi:[26,28],simpli:[13,19,24,32,54,55,58],simplifi:[16,32],sinc:[10,11,29,46,52],singl:[8,12,14,15,16,26,30,32,41,56],singular:30,six_dai:8,skim:[15,42],sku:[14,15,42],slash:[56,57],slate:54,slideshar:40,slideshow:40,slightli:14,slower:10,small:26,smith:11,smtp:[26,28],snippet:49,social:[20,25],softwar:28,sojre5ywlkq7jrdcka:47,solid:40,solut:30,solv:32,some:[0,1,7,9,11,16,24,27,29,30,51,54,55,56,58],somegroup:56,someon:[8,54],somepassword:[26,48],somesubgroup:56,someth:[2,16,26],sometim:[0,14],someus:[24,26,48,50,54,56,61],soon:25,sort:[11,20,24],sourc:[0,14,16,25,31],space:16,span:[8,16],sparingli:52,special:[0,20,53,54,59],specif:[7,10,11,14,15,16,19,24,30,32,41,42,46,50,52,53,54,
55,56,61],specifi:[6,11,12,13,15,17,18,19,20,24,26,35,36,41,42,46,47,48,53,55,56,58,61],split:8,sql:[10,16,32],squar:15,src:[0,1,33,40,61],stack:[1,25,26,27],stage:28,standalon:27,standard:[20,24,51,52,61],start:[8,11,12,14,16,22,24,25],start_tim:8,startup:27,state:[24,33,41,49],statement:[12,29,41],statist:7,statu:[12,26,27,28,33,36,41,49,60],steventraut:[56,61],still:[22,51],stock:[13,15,26,42],stop:11,store:[1,5,10,11,12],str:55,strateg:16,strategi:[26,28],stream:20,streamlin:[16,58],string:[9,10,11,12,13,15,16,30,33,34,36,38,41,42,46,49,55,56,57],stringifi:49,strong:33,stronger:20,structur:[16,24,27,35,59],struggl:55,style:[32,33,40,45,55,58,61],stylesheet:[33,61],sub_properti:15,subgroup:56,submit:[11,12,33,39,53,61],subproperti:42,subproperty1:42,subproperty2:42,subscrib:[55,56,57],subscript:[56,57,59],subsequ:[38,41,46,47,49],subset:[13,16],substitut:55,subtract:10,succe:[38,49,53],success:[26,29,42,51],sudo:0,suggest:[20,23,31],suit:[47,52,54],summit:40,sungju:40,superadmin:
26,superus:[26,28],suppli:[33,36,41,47],support:[0,8,10,14,16,20,22],suppos:15,sure:[21,23,28,45,51,58],swagger:0,symbol:61,sync:25,synchron:25,sysadmin:[26,28],system:[0,14,26,28,30,38,39,48,55,56,58,61],tab:54,tag:[41,49],take:[6,11,16,28,29,32,45,47,51],taken:[20,49],tale:[10,11],talk:[40,51,58],tar:49,target:[0,26,27,28,32],task:54,team:[35,36,58],technic:49,techniqu:[11,16],temp:1,templat:0,temporari:1,tempt:16,tend:[56,57],test12345:[33,36],test1234:61,test123:[33,36],test:[5,11,23,26,28,36,51,52,56,58],testadmin:47,testadminpw:47,testapp1:[34,36],testapp2:36,tester123:36,tester:41,testorg:[34,36],testpw:47,text:[4,10,11,32,33,55,58,61],text_field:33,than:[0,5,6,8,10,11,12,13,16,17,18,26,32,48,51],thank:32,thei:[0,11,12,15,16,20,30,36,45,46,47,51,52,54,55,56,57,61],them:[0,6,9,10,11,12,16,23,24,32,47,49,52,54,55],theme:[16,33],themselv:61,thereaft:45,thi:[0,1,2,6,8,9,10,11,12,13,14,15,16,20,21,22,24,26,27,28,29,30,31,32,33,34,38,39,41,42,45,46,47,48,49,50,51,52,54,55,56,57,58,
59,60,61],thing:[7,10,22,23,31,40,45,56,57,61],think:55,those:[11,16,39,45,46,47,51,52,55,61],though:[11,16,41],thousand:14,threadpool:28,three:[6,11,26,52,54,58],through:[14,16,21,32,34,35,36,38,41,45,49,51,52,55,56,61],thumb:23,tier:27,time:[6,7],timeout:28,timestamp:[2,5,6,8,10,12,13,14,15,16,17,18,19,24,26,30,33,34,36,38,41,42,48,50,53,54,55,56,57,61],titl:[10,11,16,33,36,41,54,56,57,61],tld:[26,28],tmp:1,toctre:0,todai:20,togeth:[0,52],token:[9,13,15,23,24,25,27,33,34,35,36,38],token_to_revok:50,tom:53,tomcat:25,too:0,tool:[9,11,12,32,60],top:[21,27,49,58],topic:[11,31,42,43,47,56,57,61],topolog:26,track:[6,7,38],trail:52,transfer:24,transform:0,transit:[33,61],transport:[26,28],treat:[15,25],trend:32,trial:24,truli:32,tsefia:33,ttl:25,ttl_in_millisecond:48,tupl:14,turn:49,tutori:22,tweet:[32,55],twitter:[32,55,58],two:[11,12,27,29,30,33,42,46,58,59,60],type:[2,4,5,6],typic:[10,24,30,61],udpat:0,uffff:10,uiapplic:42,unauthent:54,under:[23,26,47,50,51,54,58],underli:14,understan
d:30,unencod:[9,11,12],unexpect:41,unfamiliar:14,unfortun:0,unicod:10,union:10,uniqu:[15,30,38,41,49,56,57,58,61],univers:30,unix:[6,38,57],unless:[0,38,46,49,52,58],unlik:[14,15,30],unnecesari:51,unregist:54,unreleas:28,unsecur:51,until:[29,41,54],untrust:51,untrustworthi:25,unus:54,upcom:20,updatecollect:42,updatedent:42,updateent:42,upon:24,upward:6,uri:[2,5,6,8,9,12,13,14,15,16,17,18,19,24],url:[9,11,12,13,15,16,19],usag:8,usegrid:[24,25],user:[5,7,10,11,12,13,15,16,17,18,19,20,21,22,23,24,25],user_uuid:16,user_uuid_or_usernam:50,usergrid_appl:28,usergriddatacli:[47,50],usergridsdk:49,userid:41,usernam:[11,12,15,17,18,19,24,26,27,28,30,33,36,38,41,45,47,48,51,52,53,54,55,56,58,59,61],username_or_email:61,usual:26,utc:[30,41],util:[27,30,32],uuid:[2,4,5,6,10,12,13,14,15,16,17,18,19,20,24,30,33,34,36,38,41,42,48,49,53,54,55,56,57,61],uuid_for_selected_review:16,val:49,valid:[1,13,15,30,33,34,36,38,46,48,49,51,53,54,55,56,57,61],valu:[1,6,8,10,11],valuabl:32,value_1:[13,15],value_2
:[13,15],vari:8,variabl:53,varieti:[15,24,35,42,61],variety_1:42,variety_2:42,variety_3:42,variety_list:42,variou:51,verb:[16,33,36,41,55],veri:[0,11,12,22,30,46,55],verifi:45,version:[26,28,58],versu:55,via:[0,26,30,31,33,36,52,53,56,57,60],video:[5,25,32],view:[8,16,26,28,52],visit:26,visitor:52,w3c:[33,61],wai:[6,11,12,14],wait:[11,29],wall:55,want:[0,1,5,6,11],war:25,warn:[23,46,47,52,54],watch:26,web:[12,14,16,26,27,28,34,38,47,49,51,52,60],webapp:[26,27],week:8,welcom:[26,28,31],well:[20,24,26,32,50,51,55,58,59,60,61],went:26,were:[11,12,20,56,57],what:[16,20,22],whatev:23,whatsoev:45,when:[0,5,9,11,12,15,16,17,20,23,24,25,26,28,29,30,32,41,45,46,47],whenev:49,where:[0,2,10,11,12,16,20,22,23,24,28,30,38,49,51,55,61],whether:[38,41,46,60],which:[0,8,11,13,14,15,16,18,21,26,29,30,33,35,38,41,45,46,47,48,49,51,52,53,55,56,57,59,61],who:[16,31,32,39,41,45,47,51,54,55],whole:[15,41,42],whose:[11,12,19,24,54,61],why:26,wide:[52,61],width:[40,41,55],wildcard:[11,53],window:[22,49,58]
,wireless:20,wish:[13,30,61],within:[6,11,15,20,26,30,36,48,52,55,58],without:[11,46,54,61],won:55,word:[11,13,14,15,16,55],work:[0,11,12,14,16,20,23,25,26,28,29,31,32],workflow:39,world:55,would:[4,8,9,11,16,19,20,26,33,46,48,49,51,52,53,55,56,57,59,61],wouldn:16,write:[14,16,45,58],written:[0,14,16,26,31,39],wrong:26,wrote:16,www:[12,24,33,40,49,55,56,61],xfbml:49,xml:1,yaml:0,year:55,yet:[11,56],yhixpqk1cq:34,you:[0,1,2,4,5,6,7,8,9,10,11,12,13,14,15],your:[0,1,4,5,6,7,8,9,10,11],your_app_id:49,your_domain:49,your_redirect_url:49,your_response_typ:49,your_state_valu:49,yourapp:9,yourappnam:49,yourdomain:24,yourorg:9,yourorgnam:49,ywmt4nqe8q9geelyjhixpsio4aaaato5fqfcg0ced2h9nwmdmrorknnreeqydof:33,ywq6aaabmqz_xuyyeerokkjnzn7yqxxlpgml69fvaa:47,yxa65gylqja8ayysay8ox3vg5arzp48:34,yxa6aaabmq0d4mep_ugbza0:47,yxa7ygil:34,yxb7nad7em0meej989xixprxekq:47,yxb7nautv9krhhmr8ycw0qbozh2pxef:47,yxu6aaabmq0hdy4:47,zip:49},titles:["Apache Usergrid Documentation","File storage configuration","Folders
","<no title>","Retrieving assets","Uploading assets","Creating & incrementing counters","Counters & events","Retrieving counters","Advanced query usage","Query operators & data types","Query parameters & clauses","Querying your data","Collections","The Usergrid Data Store","Entities","Data Store Best Practices","Connecting entities","Disconnecting entities","Retrieving connections","Geolocating your Entities","Creating a new application","Creating an Usergrid Account","Using a Sandbox Application","Using the API","Apache Usergrid Documentation","Usegrid 1: Deploying to Tomcat","Usegrid 1: Launcher Quick-start","Usergrid 2: Deploy to Tomcat","Async vs. sync calls","Usergrid Data model","Documentation Overview","Usergrid Features","Admin user","Application","Organization & application management","Organization","COMING IN USERGRID 2","Users & Devices","How to Contribute Code & Docs","Presentations & Videos","Methods","Usergrid iOS SDK","Usergrid
SDK Documentation outline","COMING SOON...","Security & token authentication","Authenticating API requests","Authenticating users & app clients","Changing token expiration (time-to-live)","Facebook sign in","Revoking tokens (logout)","Security best practices","Authentication levels","Using permissions","Using roles","Activity","Working with group data","Groups","App Example - Messagee","Social Graph Connections","User management & social graph","Working with User Data"],titleterms:{"default":[30,48,51,54],"new":[21,23],"return":61,"super":26,access:[24,41,46,51],accesstokenrespons:41,account:[22,58],acquir:51,action:41,activ:[32,33,36,41,42,43,55,60],activityfe:41,actor:41,add:[26,49],addpermiss:41,addrol:41,admin:[33,36,41,42,43,47,50,52,54],adminuserupd:41,advanc:9,all:[9,19],android:58,apach:[0,25,40],api:[0,9,24,27,46],app:[20,40,41,42,43,47,49,51,58],appdata:41,applic:[21,23,30,32,34,35,36,41,42,43,47],asset:[2,4,5,32],assign:[42,43,53,54],async:29,asynchron:29,atta
ch:9,authent:[24,32,42,43,45,46,47,52],backend:40,base:24,basic:12,batch:13,best:[16,51],between:0,build:[0,26,27,28,40,42,43],call:[9,29],cancelmsg:41,cassandra:[26,40],chang:[48,61],claus:11,client:[36,42,43,46,47,51,58],code:39,collect:[13,24,30,41,42,43,57],come:[32,37,44],complet:33,complex:53,comput:16,configur:[1,26,52],connect:[17,19,42,43,59,60],consol:26,construct:24,contain:11,content:0,contribut:[39,40],counter:[6,7,8,42,43],creat:[6,13,15,21,22,23,33,34,36,42,43,48,49,54,55,56,58,59,61],createact:41,createadminus:41,createapp:41,createent:41,createev:41,creategroup:41,createnotif:41,createorg:41,createus:41,credenti:[34,36,41,42,43],cursor:11,custom:[15,26,42,43],data:[4,10,12,14,15,16,20,30,32,42,43,56,61],databas:26,deal:0,decrement:6,delet:[13,15,42,43,56,61],denorm:16,deploi:[26,28],deploy:28,descript:56,devic:[38,41],dialog:49,differ:0,disconnect:[18,42,43],displai:61,doc:[0,39],document:[0,25,31,39,43],download2:27,download:[26,27],edit:51,enrich:20,entiti:[4,13,1
5,17,18,19,20,24,30,32,41,42,43],error:41,event:[7,41,42,43],exampl:[4,5,6,8,13,15,26,28,33,34,36,42,43,47,48,49,50,53,54,55,56,58,61],expir:48,facebook:[38,49],featur:32,feed:[33,36,42,43,55,60],file:[0,1,26,28,32],flexibl:32,folder:2,follow:[42,43,55,59],form:61,format:24,from:[13,36,42,43,56],gener:[34,36,42,43,57],geoloc:[20,32],get:[16,26,27,33,34,36,42,43,61],graph:[59,60],group:[32,41,42,43,55,56,57,60],handl:61,hierarch:6,how:[0,39,40],html5:58,http:[24,27,51],imagemodel:41,increment:[6,42,43],initi:33,instal:[26,42,43],intern:40,interv:[8,42,43],invok:49,issu:24,itself:28,java:28,javascript:[49,58],launcher:27,let:61,level:[47,52],limit:11,link:2,list:2,live:48,local:[1,28],locat:[11,20],login:[26,32,42,43,47,49],logincredenti:41,logout:[42,43,50],manag:[32,35,42,43,60],markdown:0,message:58,metadata:41,method:[24,41],mobil:[40,51],model:[16,30,41],multipl:[12,15,42,43],never:51,next:22,note:0,notif:[32,41],notifi:41,oauth:[24,49],object:41,open:40,oper:10,order:11,org:[42,
43],organ:[30,35,36,41,42,43,47],other:[0,42,43,59],out:16,outlin:43,overview:[31,40],paramet:[11,56],parti:32,password:[33,42,43,61],path:53,permiss:[32,41,42,43,51,53],portal:[28,54],post:[42,43,55],practic:[16,51],pre:16,prerequisit:0,present:40,product:51,properti:[12,15,26,28,30,38,42,43,57],publish:0,push:32,put:16,queri:[9,10,11,12,16,20,24,32,42,43],quick:27,reactiv:[33,36,42,43],receipt:41,refer:[0,42,43],registr:32,relat:16,relationship:[32,38],relationshop:38,remov:[36,42,43,53,54,56],request:[4,5,6,8,12,13,15,17,18,19,24,33,34,36,46,47,48,50,53,54,55,56,61],requir:[26,27,28],reset:[6,33,42,43,61],resetpw:41,resetpwmsg:41,respons:[5,6,8,12,13,15,24,33,34,36,47,48,53,54,55,56,61],rest:[0,61],result:16,retriev:[2,4,8,12,13,15,16,19,36,42,43,55,56,61],review:[16,51],revok:[42,43,50],role:[32,41,42,43,51,54],rst:0,run:[26,27,28],sandbox:[23,51],save:20,schedulenotif:41,sdk:[24,28,42,43,47,49,58],secret:46,secur:[21,23,45,51],set:[13,33,38,41,42,43,57],setexpir:41,setup:[26,49
],sign:[38,49],social:[32,59,60],soon:[32,44],sourc:[40,42,43],sphinx:0,stack:28,start:[26,27,42,43],step:[22,49,58,61],storag:[1,32],store:[14,16],stream:32,sub:[15,42,43],support:24,sync:29,synchron:29,syntax:[4,5,6,8,12,13,15,17,18,19,47,48,50,53,54,56,61],tabl:0,third:32,time:[8,42,43,48],token:[41,42,43,45,46,48,50,51],tomcat:[26,28],treat:51,ttl:48,type:[10,19],untrustworthi:51,updat:[0,5,13,15,33,42,43,61],upload:5,uri:[33,34,36,55,56,61],url:[24,36],usag:[9,12],usegrid:[26,27],user:[26,32,33,36,38,41,42,43,47,50,52,55,56,58,60,61],usergrid:[0,14,22,25,26,28,30,32,37,40,42,43,58,61],valu:12,video:40,wai:[16,51],want:16,war:26,websit:[0,39],what:23,when:48,work:[42,43,56,61],you:16,your:[12,16,20,42,43,51]}})
+Search.setIndex({envversion:46,filenames:["README","assets-and-files/file-storage-configuration","assets-and-files/folders","assets-and-files/legacy-asset-support","assets-and-files/retrieving-assets","assets-and-files/uploading-assets","counters-and-events/creating-and-incrementing-counters","counters-and-events/events-and-counters","counters-and-events/retrieving-counters","data-queries/advanced-query-usage","data-queries/operators-and-types","data-queries/query-parameters","data-queries/querying-your-data","data-storage/collections","data-storage/data-store-dbms","data-storage/entities","data-storage/optimizing-access","entity-connections/connecting-entities","entity-connections/disconnecting-entities","entity-connections/retrieving-entities","geolocation/geolocation","getting-started/creating-a-new-application","getting-started/creating-account","getting-started/using-a-sandbox-app","getting-started/using-the-api","index","installation/ug1-deploy-to-tomcat","installation/ug1-lau
ncher-quick-start","installation/ug2-deploy-to-tomcat","introduction/async-vs-sync","introduction/data-model","introduction/overview","introduction/usergrid-features","orgs-and-apps/admin-user","orgs-and-apps/application","orgs-and-apps/managing","orgs-and-apps/organization","push-notifications/adding-push-support","push-notifications/creating-and-managing-notifications","push-notifications/creating-notifiers","push-notifications/getting-started","push-notifications/managing-users-and-devices","push-notifications/overview","push-notifications/registering","push-notifications/tbd","push-notifications/troubleshooting","push-notifications/tutorial","push-notifications/users-devices","reference/contribute-code","reference/presos-and-videos","rest-endpoints/api-docs","sdks/ios-new","sdks/sdk-outline","sdks/tbd","security-and-auth/app-security","security-and-auth/authenticating-api-requests","security-and-auth/authenticating-users-and-application-clients","security-and-auth/changing-token
-time-live-ttl","security-and-auth/facebook-sign","security-and-auth/revoking-tokens-logout","security-and-auth/securing-your-app","security-and-auth/user-authentication-types","security-and-auth/using-permissions","security-and-auth/using-roles","user-management/activity","user-management/group","user-management/groups","user-management/messagee-example","user-management/user-connections","user-management/user-management","user-management/working-user-data"],objects:{},objnames:{},objtypes:{},terms:{"005056c00008":70,"00767101f6b4f2cf5d02ed510dbcf0b4":65,"02e81ac5a17b":[2,10],"02e81adcf3d0":[5,6,8,13,15,18,19,24,51,62,63,64,65],"02e81ae236e9":65,"02e81ae61238":65,"02e81ae640dc":[2,64],"02e81ae66238":65,"02e81aeb2129":65,"02e81aeb26e9":65,"02e9sjwsf3d0":[15,51],"03ae956a":20,"0455fc92de2636fc7a176cc5d298bb78":65,"08fe":51,"0abe":[13,51],"0d7cf92a":[15,51],"0d7e":36,"0d7f":36,"0f1ff3650d20":[17,65,70],"10e":10,"10e10":10,"11apigeeapsdestination11":38,"11e0":[8,70],"11e1":[2,24,30,33,
36,64,65,70],"11e2":[2,5,6,8,10,12,13,15,18,19,24,36,51,62,63,64,65],"11e3":[5,13,15,17,18,19,20,24,51,57,63,65,70],"1231380a0284":64,"12313b01d5c1":[2,24,30,64],"12313b06ae01":64,"12313b06d112":64,"12313b111c56":36,"12313b122c56":[33,36],"12313d027361":36,"12313d027471":36,"12313d14bde7":65,"12313d1520f1":64,"12313d1c4491":[2,33,36,64],"12313d1c44914":64,"12313d1c5591":36,"12313d288ee0":36,"12313d288ff0":36,"12313d331ae8":64,"12313f0204b":70,"12313f0204bb":[8,70],"12313f0204bb8":70,"12331b144c65":33,"12331d1c5591":[33,36],"12424d1c4491":33,"174785aa":17,"19a0":[15,51],"1a62":[13,51],"1a9356ba":[13,15,51],"1bd100b8059e":[13,51],"1c8f60e4":70,"1f3567aa":64,"1px":49,"1st":50,"20adr":70,"20c57d4f41cf51f2db44165eb058b3b2":12,"20employe":65,"20or":15,"20titl":65,"20uuid":15,"20where":[65,70],"22000a1c4e22":65,"22000a1c5a67":[65,70],"2440ca58":64,"2482a1c5":64,"249f":20,"2ac6":2,"2ac8":2,"2d00":64,"2d21":2,"2e1db7299b0a667ed80e674a0ef9d653":5,"2nd":50,"31847b9a":[13,51],"3192ac6a":[13,51]
,"327b527f":[33,36],"328b526e":33,"328fe64a":[15,51],"335b527f":[33,36],"33dd0563":[33,36],"3400ba10":[2,36,64],"348388de":63,"34e26bc9":64,"3500ba10":36,"37f3":64,"382d0991":63,"38dc":15,"3bee":41,"3c1e":63,"3d1a9356ba":15,"410b213a":[5,63],"411c466c4f2c":12,"417f":[17,65,70],"4353136f":70,"438a1ca1":8,"477d":65,"48c92c73":36,"496ca1d42ce7":[13,51],"49ff":64,"4a1edb70":[15,51],"4d2664c8e0c3":65,"4f511f12a386":41,"5005a0fa":65,"503f17da":24,"50gb":1,"5111c463":64,"5373d7165c2d":57,"53fe3700":[13,51],"563f5d96":64,"58606d0a":[18,19],"58e8":[65,70],"5ae1fa7a":[13,51],"5bb76bca":[13,15,51],"5bcc47ca":[18,19],"5bd5fa5f701f":51,"5c0c1789":[2,30],"5de0bb69":36,"5f4a65c16193":[15,51],"5wugd":56,"61c9":64,"62de5d97":24,"62fd53c78ce7":62,"65c8":36,"6640a601":2,"6715d5ef47a6":[15,51],"67cb":65,"698b":65,"699740088e05":6,"6a42":64,"6b07e44495ef":63,"6be0003c809b":[13,51],"6c56ffda":17,"6fbc8157":65,"6ldstnesaaaaakhdvglhmmu86_eoyxsjjqqd1ipz":[33,70],"74bb":63,"74d2d7da":65,"78c54a82":70,"7a0a1c
ba":41,"7bf47435":2,"7fb8d891":65,"802f":65,"81581bbaf055":[13,15,51],"8272c9b0":12,"83ceb9965c26":65,"83de":65,"83e9b7ea":[15,51],"84a5":70,"84c0":64,"84df":[15,51],"87b9":36,"884d":70,"89ab":[13,51],"8a2a":[15,51],"8a4c":62,"8ae3":41,"8ae8a6ea":70,"8bde":[18,19],"8cef":12,"8d05e96f700d":[13,51],"8d5c":24,"8dd1801e534c":17,"8e0cd3866ee20746c99e9a9825f38ad8":2,"8ea8":17,"903f":[13,15,51],"90f823ba15655b8cc8e3b4d63377576f":65,"917d":[15,51],"924d":10,"92c3":2,"92e2":12,"9501cda1":2,"95c8":[33,36],"96f6":64,"98b9":36,"9953085ea376":[5,63],"999e12039f87":51,"99a7":57,"99fd":17,"9a18":41,"9c1b":65,"9ce3":[15,51],"9d3a":6,"9de5":63,"9e75":17,"9e92":[15,51],"9efc8ad529d8":63,"9f80":20,"9ff6c621a7a4":[13,15,51],"9ffc":64,"____usergrid":26,"__weak":38,"boolean":[10,36,47,50],"byte":38,"case":[9,16,26,29,37,40,45,47,50,51,64,66,68],"catch":51,"class":[1,28,33,38,41,56,59,70],"default":[1,10,11,12,13,14,15,20,24,25,26,28],"export":[43,46,51],"final":[41,43],"float":10,"function":[6,29,32,41,5
8,61,64,65,66,67,69],"import":[23,24,29,30,32,37,40,41,46,54],"long":[10,30,38,47,66],"new":[6,9,13,15,16],"null":[6,41,58],"public":[33,41,43,70],"return":[10,11,12,13,16,19,20,24,27,29,33,36,41,43,47,50,56,57,58,59,62,64,65],"short":[22,64],"static":[26,41],"super":25,"throw":[37,45],"transient":28,"true":[10,12,18,19,24,26,27,28,33,36,38,41,50,58,63,65,70],"try":[22,23,27,33,37,38,45,51,54,58,62],"typeof":58,"var":[9,33,41,58],"void":[38,41],"while":[23,26,29,30,32,37,40,41,42,45,47,62,63],a065:64,a0dd:24,a0e5:[5,63],a0f7:64,a166:[5,6,8,13,15,18,19,24,51,62,63,65],a24f:[13,51],a407b1e7:[65,70],a51b:[15,51],a554b7fbd57a:24,a5c5:63,a668717b:65,a694:[18,19],a6e3:65,a71c:62,a72a:[13,15,51],a7e008061e10:[18,19],a7f7:[5,6,8,13,15,18,19,24,51,62,63,65],a9c1:51,abbrevi:[12,16,24,43],abil:[20,22,32,68,69],abl:[16,24,26,37,38,40,46,60,61,64,69,70],about:[0,10,16,22,23,24,25,26,32,33,35,36,37,38,40,41,42],abov:[5,6,19,26,27,28,37,40,41,46,63,64],ac46:[65,70],accept:[4,39,41,56,62],access:[2
,13,14,15,16,19,21,22,23],access_token:[27,50,55,56,57,58],accessid:1,accesstokenrespons:25,accesstokenttl:57,accomplish:[38,59],accord:56,account:[12,15,16],achiev:68,acquaint:64,acquir:25,across:[8,16,38],act:[12,64,67],action:[2,5,6,7,8,12,13,14,15,16,17,18,19,24,25,26,32,33,34,36,37,38,46],activ:[5,10,12,18,19,20,22,24,25,26,28,30],activit:33,activityfe:25,actor:[33,36,50,64],actual:[16,37,40,46],add:[1,9,14,15,16,21,22,23,25],addit:[8,16,22,25,32,33,43],addobject:51,address:[12,24,26,33,36,37,40,43,47,50,56,70],addrol:25,adjust:[11,63],admin:[21,22,23,25,26,27,28],admin_password:56,admin_usernam:56,admin_users_require_activ:[26,28],admin_users_require_confirm:[26,28],admingmail:33,administr:[26,27,30,32,34,36,47,56,60,61,63],adminus:[33,36,50],adomain:70,adopt:[32,48],advantag:32,advertis:20,advis:60,ae1f:17,aec3:64,afad:64,affect:57,after:[6,10,24,27,29,37,38,40,41,46,56,58,60,63,67],again:[26,33,37,45],against:[18,28,34,55,56,60,62],aggreg:8,air:14,aizasyckxotbq7a9gojsslqzlod
_yjefxxxxxxx:39,alert:[20,29,38,41,65,66],alerttext:38,alia:[63,70],all:[0,6,8],alloc:[38,41,51],allow:[7,12,20,24,26,28,30,32,36,38,41,43,46,47,58,61,62,63,64,65,66,68,69,70],almost:69,alon:[37,40],along:[11,16,37,41,45],alreadi:[15,16,22,26,37,38,39,41,47,50,51,58,60,67],also:[1,2,6,7,8,11,13,15,16,21,27,28,30,32,33,34,36,37,38,39,40,41,46,47,50,56,58,59,60,62,64,65,66,67,68,70],alter:63,altern:[12,13,65,66],although:[13,15,33,38,64,65,70],alwai:[30,38],amazon:1,amazonaw:26,amount:[11,61,64],amuramoto:[5,15,51,57],analysi:32,analyt:22,analyz:[32,55,56,60,61],android:[24,25,29,31],androiddev:39,androidmanifest:46,anew:[37,45],ani:[5,6,8,10,12,14,15,16,20,28,29,30,32,33,35,38,41,46,50,54,55,56,57,60,61,62,63,64,65,67,68,69,70],announc:42,anonym:[47,64,70],anoth:[12,16,23,37,38,40,45,46,55,64,67,68,70],answer:70,ant:62,anuff:49,anyon:[61,64],anyth:26,anytim:64,anywher:11,apachecon:49,apidocgener:0,apige:[24,37,38,41,42,43,46,49,51,65],apigeeapsdestin:38,apigeeapspayload:38,apigeecli:
[41,51],apigeeclientrespons:[38,41,51],apigeecollect:51,apigeedatacli:38,apigeedataclientcompletionhandl:38,apigeemobileconfig:57,apikei:[39,58],apirequest:51,apirespons:41,apiresponsecallback:41,apn:25,app1:50,app2:50,app:[2,4,5,6,7,8,12,13,14,15,16,17,18,19],app_id:[15,50,64,65,70],app_nam:[34,57,59],app_uuid:[14,16],appdata:25,appdeleg:[38,41,46,51],appear:[19,39,43,50,64,67,68],append:[8,9,13,16,20,38,55,58],appid:[50,58],appl:[25,32],appledev:46,applenotifi:39,appleopt:41,appli:[24,28,57,60,62,63,68,69,70],applic:[2,4,5,6,7,8,12,13,14,15,16,17,18,19,20],application_client_secret:56,application_clientid:56,application_info:36,applicationdata:50,applicationdidbecomeact:41,applicationid:[33,36,41,50],applicationnam:[2,5,6,8,12,13,14,15,16,17,18,19,24,50,51,57,62,63,64,65,70],appnam:[9,41,46,56,58],appropri:[30,38,39,41,47,58],approv:[26,28],appservic:41,aps_develop:43,apspayload:38,arbitrari:[24,68],architectur:[14,26],area:[22,23,33,38,43,54,70],aren:[14,16],arg:[1,34,36,64,65],a
rgument:[1,41],arm:60,around:[0,16],arrai:[10,12,14,15,16,19,24,50,51],arthur:[17,18,19,68,69],articl:[12,13,15,55,63],asc:11,ascend:11,ask:[12,28,46],aspect:[7,32],asset1:2,asset:1,assets_id:2,assign:[6,25,30,32,47],assist:43,associ:[5,10,13,19,20,21,24,30,32,36,37,38,39,40,41,43,46,47,50,51,54,56,57,59,61,63,65,67,69,70],assum:[16,41,46,55],async:25,asynchron:25,atistophan:33,atom:15,atop:46,attach:[4,5],attack:[54,60],attempt:[36,50,55],attribut:14,audienc:31,audio:[5,32],auth:[26,28,39,43,47,58],authent:[13,15,23],author:[27,35,39,41,43,55,57,58,64,69],author_uuid:16,authorid:[14,16],authorimag:16,authornam:16,authoruuid:16,authrespons:58,auto:[26,28],automat:[5,6,13,15,21,22,28,30,32,50,56,58,59,62,63,64,68],avail:[13,15,20,22,24,27,32,37,39,41,51,56,67,69],avatar:[12,24,64,65,70],avoid:[16,67],awai:16,awar:[10,20],awssdks3binarystor:1,b0c6:65,b11217fc:6,b1f7:[13,51],b24e:6,b2bd:65,b2e4:15,b31d:57,b36a:[2,30],b379:[5,63],b3aad0a4:51,b3u68vghi6fmeekn9wlogtzz0a:34,b3u6aaabmqz:56,
b3u6zuz5_u8i:34,b4c6:2,b690:65,b6dd:64,b77ec8addc0d:65,b90c:65,b93d:70,baa:[33,36,38,39,43,54],back:[14,16,27,31,32,41,48,67],backend:[12,25,30,38],backslash:38,bad:[36,56,61],badg:[38,41],banner:7,bar1234b:70,bar:[24,31],barnei:[65,68],base:[0,13,20],baseurl:41,batch:11,baz:24,bcc1:8,bcf7:[2,33,36,64],bcf8:[33,36],bd397ea1:62,be04:[13,51],be08a5f9:36,be09a5f9:36,bean:1,bearer:[27,39,55],beca:36,becaus:[14,20,23,26,37,45,50,56,60,61,64,67],becom:[11,12,20,26,32,43,64,65,66],been:[6,16,37,38,41,45,46,50,55,58,59,60,64],bef8:[33,36],befor:[0,1,22,23,25,28,29,37,38,40,41,43,45],begin:[8,11,25,35],behalf:56,behav:67,behavior:32,behind:[22,47,58],belong:[27,30,38,47,64,66],below:[13,14,15,16,26,28,33,37,38,40,46,51,52,58,64,65,67,70],beneath:67,benefici:29,benefit:[14,26],besid:63,best:[11,12],better:[16,56,61],bewar:28,beyond:64,bike:10,bin:28,binari:[32,55,56,60,61],binarystor:1,bit:14,blank:[43,63],block:29,blog:63,blue:41,board:67,boat:10,boavijt0oyrkjf:34,bodi:[6,16,33,34,36,38,50,5
7,64,65,70],book:[11,32,51],bool:41,border:49,both:[6,14,17,28,29,30,38,41,48,50,61,69],bounc:16,bouncer:16,bounci:[14,16],box:[21,23,38,46,63,67,69],bracket:15,bread:[13,15,51],brief:[29,58],broad:[55,56,61],brows:31,browser:[26,28,33,37,40,58],bucketnam:1,bug:31,buildcurl:58,built:[16,24,26,46,64],bundl:[41,46],busi:20,button:[7,21,23,33,37,40,43,45,46,63,67,70],button_click:[6,8],c2v7n61dy90mcdg78xixprxfdq:36,c2v7wedxiutzwekwdyslct_lydfvmmn:36,c5e707256e71:[15,51],california:[33,65,66],call:8,callback:[29,41,58],campaign:32,can:[0,1,2,4,5,6,7,8,10,11,12,13,14,15,16,17,19,20,21,22,23,24,26,27,28,29,30,32,33,34,35,36,37,38,39,40,41],cancel:25,cannot:[13,15,24,29,30,61],capabl:60,captcha:[33,50,70],captur:[12,16,20,32],car:10,care:[40,42,43],carefulli:61,carri:[35,39,46],cassandra:[14,16,25],cast:49,castl:[14,16],cat:27,catalina:28,catalog:32,categori:[14,33,36,50],caus:[0,15,50],caution:57,cautiou:[55,56,61],ccc:49,cd0c:[2,33,36,64],cd0d:[33,36],cd789b00:65,cd796d0a:65,cdf1ce04c1c0
:12,cdn:32,cede5b7:36,cede5b8:36,cell:0,center:[20,37,40,46],central:[0,1],cer:43,certain:[15,16,30,38,59,69],certif:[25,37,39,40],certsigningrequest:43,cf3e981c:33,cf4d981c:[33,36],cf9b:8,cfed:[18,19],chain:6,challeng:[24,33,50,70],chang:[0,1,25,26,28,30,46,50,55],channel:58,channelurl:58,charact:[11,64,70],characterist:[40,41],charset:[33,70],check:[23,26,27,41,46,58,61,62,63,64],checkbox:63,checksum:[2,5],chicago:70,choic:46,choos:[16,38,39,43],chose:46,circl:[32,64],circumst:59,cite:15,citi:[11,33,70],clara:49,classpath:1,clean:[0,26,27,28,33],cli:26,click:[7,16,21,23,35,37,38,39,40,43,45,46,63,67],client:[9,11,13,14,15,16,24,25,26,29,32,33,34,35],client_credenti:[34,50,56],client_id:[34,36,50,55,56,58],client_secret:[34,36,50,55,56],climb:16,clone:[0,26,28],close:46,closer:16,cloud:[1,4,5,32,37,40,43,46],clue:26,cluster:26,cluster_nam:28,cn0wtdxxkxmqlgzvtmubcp20fulczq:56,code:[1,11,16,24,25,26,27,29,31,32,37,38,40,41,42,43,45,46],codesign:46,coffe:14,colleagu:64,colleciton:51,c
ollect:[4,5,12],collection_nam:13,collectionid:50,color:41,column:[14,16],com:[2,4,5,6,8,12,13,14,15,16,17,18,19,20,24,26,27,28,30,33,34,36,38,39,41,43,46,47,51,56,57,58,59,62,63,64,65,67,68,69,70],combin:[16,37,38,40,60,70],come:[23,25,26,28],comma:[12,38,51,58,62],comma_separated_list_of_permission_nam:58,command:[0,22,26,27,28,46,58,65],comment:[32,41,64],commit:0,committ:48,common:[12,60,64,70],commonli:63,commun:[40,42,67],compani:[35,36,67],compar:[12,40],comparison:63,compil:[46,55,56,60,61],complet:[12,25,26,29,30,32],completedsuccessfulli:[38,41],completemsg:50,completionhandl:38,complex:[15,16,25,32],compliant:32,complic:26,compon:[30,32],compromis:55,concept:[14,22],config:28,confim:50,confirm:[26,28,33,36,37,45,50,67],confirm_email:[33,36,50],conflict:67,conform:10,conjunct:[32,69],connect:[0,2,5,12,16],connected_collect:[17,18],connected_ent:[17,18],connecteeid:41,connectent:41,connectentitiesasync:41,connecting_collect:[17,18],connecting_ent:[17,18],connectorid:41,cons
id:[37,45,56,60,63],consider:[55,56,61],consol:25,constrain:14,constructor:1,consult:22,consum:[32,64],contact:43,contain:10,containslook:11,containswil:11,content_typ:4,context:[1,32,41],contextu:32,continu:[11,29,43,67],contrast:[16,68],contribut:[25,31],contributor:[31,48],control:[32,40,43,57,60,63,70],conveni:[9,55,65,67],convent:30,cooki:58,coordin:38,copi:[0,16,26,43,67],core:[27,28,32,46],cores:28,correct:[37,45,47,58,67],correl:[37,40,41,45],correspond:[12,13,15,24,30,41,43,46,50,51],cost:32,costli:16,could:[2,11,16,29,40,41,55,56,60,61,65,66,68,69],couldn:41,count:[7,8,12,13,14,15,50,51,64],counter_nam:[6,8],coupl:[31,40],cpu:40,creat:[2,5],createact:25,createadminus:25,createcollect:51,createent:[25,29],createev:25,creategroup:25,createnotif:25,createorg:25,createus:25,creation:[47,50,57,66],credenti:[25,26,28],credential:28,criteria:32,cross:64,css:[33,46,70],cumul:6,curiou:22,curl:[4,5,6,8,9,11,12,13,15,17,18,19,20,27,28,33,34,36],current:[6,13,20,30,31,37,41,50,62,64,7
0],custom:[9,13],custom_id:9,custompayload:38,d0d7d0ba:12,d16344f5a0e1:20,d20976ff:65,d28c:24,d503:[2,30],d7a8:[15,51],d86a:12,d878de4r:57,d87edec7:64,d9693ec3:64,da448955:64,da4a50dc:15,da67:70,da71:70,da83:64,dai:[7,8,57],daili:8,dashboard:[37,58],data:1,databas:[11,14,16,20,25],datacli:[9,38,41,51,56,59],date:[10,38],dave:49,david:49,db1e60a0:[17,65,70],dbf5228024a7:[18,19],dbm:[11,12,14,16],dc5d478e9c029853fbd025bed0dc51f8:24,debug:[37,40,41,46],decim:10,declar:41,decompil:60,dedic:6,defin:[7,14,15,23,28,30,41,51,54,56,57,62,63,64,65,69,70],definit:[50,62],deflat:39,degre:[38,57],deleat:50,deleg:51,delet:[11,12],deletecollect:51,deleteent:51,delimit:[10,62,66],deliv:[32,38,43,46,50],deliveri:[32,38,50],denot:[65,68],depend:[24,39,41,42,65,66],deploi:25,deploy:25,desc:11,descend:11,describ:[11,12,13,15,16,20,24,35,39,41,43,46,47,54,55,56,58,63,65,67],descript:[4,5,6,8,11,13,14,15,17,18,19,25,30,33,34,35,36,38,43,47,50,51,56,61,62,63,64],design:[14,16,20,26,32,46,64,65,66,67,69],d
esir:43,desktop:[39,43],destin:[1,38],destinationsingledevic:38,destroi:59,detail:[13,15,22,30,32,33,34,35,36,37,38,39,40,50,56,58,63,64,65,68,70],detect:[5,20],determin:[20,64,70],dev:[28,37,39,40],develop:[10,20,23,30,31,32,37,38,39,40,43,46,60,67,69],devic:[5,18,19,20,21,24,25,30,32,37],device_id:38,deviceid:[38,41,50],deviceregistrationcallback:41,devicetoken:41,deviceuuid:41,dfr4d5m1mjmoeeogvpncm:57,diagram:[37,40],dialog:[21,23,33,43,46],did:15,didfailtoregisterforremotenotificationswitherror:41,didfinishlaunchingwithopt:41,didregisterforremotenotificationswithdevicetoken:41,differenti:32,dimens:69,diner:11,dino:[24,68],dir:0,direct:[0,16],directli:[0,34,43],directori:[0,26,27,28,46,48,58,67],disabl:[23,26,33,36,47,50],disk:43,displai:[8,11,20,46,47,50,58,63,64,66,67],displayemail:50,displayemailaddress:[33,36],displaymessag:41,displaynam:[33,36,50,64],distanc:20,distance_in_met:20,distinctli:31,distribut:[14,16,60],div:[33,70],dk88fh4r:19,doctyp:[33,70],doe:[0,15,24,30,37,45,
47,50,51,55,56,57,58,64,65,70],doesn:[14,16,23,37,41,45,46],dog:[15,24,29,65,66,68],dogcreatecallback:29,doge:[65,66],domain:[43,58],don:[26,37,40,42,46,60,64,70],done:[0,26,32,39,41,43,50,58,60,61,70],dot:[6,10],doubl:[38,43],down:[10,21,31,38,41,43,63],download:25,drive:[1,32],drop:[21,38,43,63],dropdown:21,dskiptest:[26,27,28],dtd:[33,70],due:[11,12,16,56],duplic:16,durat:[2,5,6,8,12,13,14,15,16,17,18,19,24,26,33,34,36,50,51,57,59,62,63,64,65,70],dure:[60,63],duti:63,e13743a7f1db7f4246badd6fd6ff54ff:70,e694:65,e7127751:65,e7d0:64,e8f5:[15,51],e94123890c7a:[15,51],e978:70,e97b:12,each:[0,6,7,8,10,12,13,14,15,16,20,23,24,30,33,37,38,40,43,47,50,51,52,58,61,63,64,65,70],earlier:[37,39,40,46],eas:32,easi:[0,32,69],easier:[9,11,12,16,23,24,37,60,65,68],easiest:63,easili:[6,20,30,32,60,69],east:26,easy_instal:0,eb20e5bce407:17,ebc6f49d1fc4:[15,51],ec39:24,edit:[0,1,25,26,43],edort1:33,ee912c4b:10,ef0b:[15,51],effb:[15,51],effect:32,effici:[12,16],either:[1,13,17,50,55,58,63],elasticsea
rch:28,elev:60,elimin:[32,55,60],els:[29,41,58],email:[12,24,26,27,28,30,33,36,40,43,47,50,56,64,65,67,70],email_address:[24,70],embed:28,embed_cod:49,employe:65,empti:[13,51,67],emul:[37,40],enabl:[20,26,32,37,40,41,42,43,46,47,58,60,63,64],enabledremotenotificationtyp:41,enabledtyp:41,enclos:[12,50],encod:[9,11,12,15,39],end:[8,32,51],end_tim:8,endpoint:[0,6,18,25,34,37],engag:[20,32],engin:31,enhanc:20,enough:[23,46],ensur:[10,16,24,32,37,38,40,43,46,54,56,60],enter:[21,23,33,38,39,43,46,58,63,67,70],entir:[11,38,50],entit:16,entiti:[0,2],entity_nam:15,entity_typ:[15,51],entity_uuid:15,entityid1:50,entityid2:50,entityid:[50,51,63],entityproperti:50,entitytyp:[33,36,50,63],entri:[11,38,58],environ:[22,39,46,60],equal:[10,12,41,57],equiv:[33,70],err:[29,41,58],error:[6,25,29,36],errorcod:50,errormessag:50,escap:[38,51],essenti:[46,69],establish:[50,64,69],etag:[2,5],etc:[31,47],evalu:26,even:[8,11,16,26,30,40,55,56,60,61,68],event:6,everi:[8,9,24,30,55,60,61,63,65,66],everyth:[0,24
],exact:[20,69],exactli:11,examin:[8,60],exampl:[0,1],except:[15,37,41,45,55,60],exchang:43,execut:[9,11,12,29],exhaust:60,exist:[5,6,15,16,20,26,36,41,47,50,51,57,58,64,65],expect:[10,20,33,36,42,51,69],experi:[14,20,32,69],experiment:[23,54],expir:25,expires_in:[50,56],explain:[0,26],explan:29,explicit:43,explicitli:[41,55,59,63],expos:27,express:11,extend:68,extens:67,extern:48,extract:[26,27,28,55,56,58,61],f18e8f6fb3bc:70,f315e5aa568a:[15,51],f322:51,f34f4222:[5,6,8,13,15,24,51,62,63,65],f399:64,f3a8061a:[15,51],f3aa:64,f3be262a:[15,51],f3teeg:34,f42752aa:51,f8zemolceecubwbqvsaaca:56,f_gubelxeecfrgbqvsaaca:56,facebook:[24,25,32],facebookaccesstoken:58,facebooktoken:58,factor:26,fail:[37,38,41],failur:[14,50],fals:[10,26,28,33,36,50],famili:[14,20],familiar:[16,22],faq:26,far:21,fast:14,favorit:[40,41,70],favoritecolor:41,fb_access_token:[47,58],fbasynchinit:58,fbasyncinit:58,fc4d:64,fdd3:36,fe80:33,fe90:[33,36],featur:[16,20,22,24,25],feed:[5,12,18,19,24,25,32],feel:28,few:[11,
20,37,42,67,69],ffd79647:64,field:[1,11,15,32,33,38,39,43,50,63],fieldset:[33,70],file_loc:5,filenam:5,files:1,filter:[12,64,65,70],find:[0,11,20,26,37,41],fine:[28,32],finish:[37,40,50,67],first:[0,11,12,13,16,22,24,28,29,33,37,39,42,43,45,46,47,51,60,63],first_nam:24,firstnam:[11,12,47],fish:27,fit:61,five_minut:8,fix:[37,45],flash:40,flexibl:[14,16,25,30],flow:[58,70],fluffi:27,fobnszewobnioerabnoiawegbrn:[5,63],focu:[24,32],folder:1,follow:[0,2,4,5,6,8,9,10,11,12,13,14,15,16,18,19,20,22,23,24,25,26,27,28,29,30,35,37,38,39,40,41,43,45,46,47,50],foo9876a:70,foo:24,footprint:[40,42],forappl:41,force_refresh:28,ford:[18,19,68,69],forgot:70,fork:48,forkei:[38,51],form:[15,30,33,36,38,50,51],format:[0,2,12,13,14,15,20],fornotifi:41,fortun:8,forward:[37,39,40,41,58,65],found:[34,55,56],four:[56,61],foursquar:64,fragment:58,framebord:49,framework:[40,67],francisco:[20,33,65,66],fred:[11,65,68],free:[28,30,37],friend:[18,20,32,40,63,64],from:[0,4,9,11,12],full:[11,15,23,32,33,35,37,40,46
,55,56,60,61,63,68],fulli:[24,28,51],further:[24,29,35,41,47,55,58,60],furthest:[11,20],futur:[15,60],g9qgaaaurv_lfq7uu6ayhjjjn7qcrgovnvu:57,gain:[55,60],game:[7,40],ganyo:46,gatewai:43,gaufeolxeecfrgbqvsaaca:56,gcm:25,gcm_sender_id:46,gcmregistrar:41,gcmsenderid:41,gener:[0,6,7,24,25,27,28,30],geo:25,geocoordin:20,geograph:11,geoloc:11,get:[2,4,8,11,12,13,14,15],getapigeedeviceid:41,getclient:41,getcollect:51,getconnect:41,getdatacli:41,getent:51,getloggedinus:41,getregistrationid:41,getuniquedeviceid:[38,41],getuuid:41,ggkaaqmaggkabge5ffm1aqcadqaq_9ewr_ozeeguwxixowauaqcadqaqablaovoaeeguwxixowauaqa:64,ggkaaqmaggkabge5mlfh7gcadqaqjikhxefqeegw9hixowbregcadqaqjnep6ufqeegw9hixowbrega:64,ggkaaqmaggkabge5xc3r1gcadqaqz02yhp6qeegvybixoxisvgcadqaqz3soh_6qeegvybixoxisvga:36,ggkaaqmaggkabge5xc3r1gcadqaqz02yhp6qeegvybixoxisvgcadqaqz4zbyf6qeegvybixoxisvga:33,ggkaaqmaggkabge7pehcgwcadqaqvj9dljfzeekg9wloguza3acadqaqvkvrctfzeekg9wloguza3aa:64,git:[0,48],github:[26,31,46,48],give:[6,16,23,24,31,32,
40,43,57,62,63,69],given:[15,16,23,30,36,49,50,55,60],gladi:12,gmail:[28,33,64,70],goal:11,goe:26,gold:27,good:[0,23,60],googl:[25,32,33],gool:[37,45],got:[37,40],gotten:[37,40],govern:[54,56,61,65],grain:32,grant:[24,50,55,56,58,60,61,63],grant_typ:[27,34,50,56,57],granular:[6,8],graph:[25,32],graph_async:28,graph_us:28,gravatar:[12,24,64,65,70],great:[32,47,63,65,66],greater:[10,11,57],greatest:61,groovi:0,group:[5,12,14,15,18,19,24,25,30],group_path:38,groupid:50,groupnam:[64,65],grouppath:65,groupproperti:50,gte:10,guarante:29,guest:[23,41,55,60,63,64,70],guid:[9,26,48,51,58],guidanc:46,gzip:39,hacker:[55,56,60,61],had:38,half_hour:8,hand:16,handi:22,handl:[21,32,33,41,69],handlepushnotif:41,happen:[20,40],happi:[0,64],happy_cloud:5,hard:[1,61],hardwar:[37,40],hava:0,have:[0,12,14,15,16,19,22,24,30,31,34,36,37,38,39,40,41,46,47,50,56,57,58,60,61,63,64,65,66,67,69,70],head:[33,70],header:[4,55],heavi:40,height:[49,50,64],hello:64,help:[7,11,14,30,32,54,56],her:[16,33,40],here:[2,
12,16,20,24,26,27,30,40,48,58,64,65,67,70],hierarchi:[6,30,35,36,62,65],high:[14,16,38,40,41,42,54,57],higher:[27,61],highest:[35,36],highlight:16,hike:61,him:27,histori:38,hold:[5,51],home:20,homepag:6,host:[26,28,55,58],hotmail:36,hour:8,hous:16,howev:[8,11,12,13,15,28,29,30,37,40,46,47,58,60,63,64,67],href:[33,36,70],html4:[33,70],html5:[24,25,37],html:[0,33,43,46,50,58,67,70],htmldisplayemail:50,htmldisplayemailaddress:[33,36],http:[2,4,5,6,8,12,13,14,15,16,17,18,19,20],human:[33,70],hundr:11,hurrai:58,hystrix:28,icon:[43,64,67],idea:60,ident:[16,46],identif:[46,50],identifi:[9,16,30,33,39,41,43,47,51,70],ifram:49,illlustr:41,illustr:[14,37,38,40,41,54],imag:[2,4,5,14,32,37,40,46,50,64],imagemodel:25,imagin:[12,16,38,61],immedi:[32,38,63,70],immut:30,implement:[24,32,37,41,54,55,56,58,61,70],implicit:63,improv:[20,31,32],inact:[41,63],inbox:[47,64,66],includ:[6,11,12,14,15,16,21,22,23,24,30,32,33,37,38,39,40,41,46,50,51,55,56,57,58,60,63,65,70],incorpor:67,incorrect:[24,33],incr
eas:[13,20,32],increment_valu:6,index:[0,10,11,15,28,30,46,67],index_prefix:28,indic:[50,57,64,65],individu:[15,30,57,61],ineffici:[11,12,16],inflat:16,info:[33,50],inform:[4,8,11,12,13,14,15,16,20,22,24,26,30,32,33,35,37,38,39,40,41,43,46,47,48,51,54,55,58,60,64,65,67,68,70],infrastructur:[30,32],ing:64,inher:60,init:[38,51,58],initi:9,initil:28,initwithobject:51,initwithorganizationid:41,inner:16,input:[28,33,70],insecur:60,insert:58,insid:24,instal:[0,9,22,24,25],instanc:[26,27,30,41,51,56,59,67],instead:[16,24,28,32,56,60,61],instruct:[0,26,37,58,67,70],integ:[11,50],integr:[20,24,32,37,58],intend:30,intention:16,interact:[37,45],interest:[8,32],interfac:[26,67],intern:25,interpret:[24,62],intersect:10,intrins:24,introduct:[25,42],invalid:[47,58],invok:[37,40,41],iphon:67,isloggedin:41,isn:[14,22,24,41,54],iso:[33,70],isregisteredonserv:41,issu:[0,2],item:[10,12,13,15,24,38,51,64],items:13,itself:16,jane:70,jar:[27,46],java:[0,26,27],javascript:[6,9,12,14,24,25,26,29,31,33,37],j
avscript:29,jdk:[26,27,28],jdoe57:30,jenni:16,jim:33,jin:49,jinm:33,job:63,joex:41,john:[24,30,56,64,65,70],johnson:49,join:16,jpeg:[2,4,5],jpg:[2,5,14,16],json:[10,12,14,15,16,19,24,27,30,33,34,38,39,51,58,64,65,69],json_arrai:15,json_object:15,just:[14,16,17,20,23,24,26,37,40,42,46,64,69],k88dh4f:18,kbundledsoundnamewithext:38,keep:[1,7,9,11,12,23,32,37,40,42,55,56,60,61],kei:[13,15,16,24,25,32,37,39,40,41,43,45],keychain:[43,46],keyspac:[26,28],keyword:15,kid:16,kind:[11,12,16],know:[8,40,43],known:41,kravitz:12,kugclientresponsesuccess:41,label:33,lack:23,lag:29,languag:[10,14,15,24],larg:[0,11,64],last:[5,11,30,36,47,50],lastnam:[11,12,47],lat:38,latenc:29,later:[16,20,38,43],latest:[26,27,46],latitud:[11,20,38],latitude_coordin:20,launch:[8,37,40,41,43,45,46,60],launcher:25,launchopt:41,layer:27,lceecubwbqvsaaca:56,learn:[22,23,25,32,37,40],least:26,leav:[26,43,63],left:[21,31,38,39,43,46,63,64,67],length:[2,5],less:[10,14,57,64],let:[8,27,32,38,40,63],letter:70,level:[6,8,14,
15,21,22,23,25,27,30,32,34,35,36,37,38,41,46,54,55],leverag:[32,67],lib:[26,28,46],librari:[37,40,46],lightweight:69,like:[0,2,5,8,10,14,16,17,18,19,23,26,28,29,32,33,37,38,40,47,58,60,62,63,64,66,67,68,69,70],liked_bi:68,limit:1,line:[0,16,26,27],linear:[14,26],listen:40,live:[23,25,55],load:[27,58],localfilebinarystor:1,localhost:[26,27,28],localizeddescript:41,locat:5,log:[6,26,32,37,38,39,41,43,45,46,47,56,58,59,63,64,67,70],login:25,logincredenti:25,loginfacebook:58,loginus:41,logout:25,longer:[11,60],longitud:[11,20,38],longitude_coordin:20,look:[2,8,10,11,16,37,38,40,58,61,64,70],loos:[33,70],love:16,low:[40,42],lower:6,lte:10,ltixndg0nduxndpvdjb0jwrevls1vcd0xvr3nwt0jrqq:11,lunch:40,mac:[37,40,43],machin:[43,46],made:[19,24,62,68],magic:16,mai:[0,6,9,13,15,23,30,38,39,41,46,50,59,60,63,65],mail:[26,28,30,65],mailer:[26,28],mailto:[33,36],main:[0,1,58],maintain:[16,58],mainten:31,make:[0,9,11,12,14,16,22,23,24,28,29,30,32,35,37,41,45,46,47,55,56,58,59,60,64,67,68,69,70],makefi
l:0,maker:14,malici:[54,55,56,61],manag:[5,11,12,22,23,25,26,27,28,30,31],mandatori:[1,47,65,66,70],mani:[7,11,12,14,16,20,23,30,38,63,69],manual:[64,68],map:14,marginheight:49,marginwidth:49,market:40,massoddb:64,match:[11,15,37,45,46,51,62,70],matter:[32,37,40,46],mattress:14,maven:[0,26,27,28],max:28,maximum:[11,38,57],mayb:16,mean:[10,14,15,16,23,29,30,38,54,55,60,68,69],meant:64,meanwhil:29,measur:54,mechan:67,meet:26,member:[30,33,35,46,50,61,64,65,66],meme:[65,66],memori:[20,40],menu:[21,34,37,40,43,63,67],messag:[6,25,26,28,32,33],message:25,meta:[33,70],metadata:[2,4,5,6,10,12,13,14,15,16,17,18,19,20,24,25,33,36],metadataproperti:50,meter:[11,20,38],method:[6,8,11,15,19],mfdsadfdsaoabl:64,middl:47,middlenam:47,might:[7,8,9,11,12,14,15,16,22,26,30,32,34,37,38,40,41,43,45,60,63,65],mile:20,milk:[13,15,51],million:32,millisecond:[30,50,57],mind:[1,9,11,12,16,20,23,37,40],minim:[16,26,28],minimum:[30,34,36],minu:16,minut:[8,32],mix:24,moab:64,mobil:[14,16,20,23,25,34,37,39,40,4
1],model:14,modern:[30,64],modif:[47,66],modifi:[2,5,6,12,13,14,15,16,17,18,19,20,24,30,33,36,46,47,50,51,57,63,64,65,66,70],modul:6,monitor:32,month:[8,32],more:[4,6,8,9,11,12,13,14,15,16,20,21,22,23,24,25,26,30,32,36,37,38,39,40,41],morn:8,most:[8,11,16,22,28,29,30,31,32,34,60,64,68,69,70],mountain:61,move:[41,46],much:[10,14,16,60,67],multi:[15,51],multipl:[0,11],must:[0,10,15,16,27,28,30,36,38,39,40,41,43,46,50,51,55,57,63,64,65,67,68,70],mustach:0,mvn:[26,27,28],my_app:[14,16,47,58],my_org:[14,16,47,58],myadmin:27,myapp:[12,27],myasset:2,mycollect:10,myfirstorg:27,mygroup:[64,65],mynewapp:[65,70],mynewgroup:65,mynewpassword:33,myorg:[12,65],mypassword:27,myself:[16,26,28],myuser:27,name:[1,2,4,5,6,8,10,11,12,13,14,15,16,17,18,19,20,21,23,24,26,27,28,30,33,34,36,37,38,39,40,41,43,45,46,47,50,51,55,57,58,60,62,63,64,65,66,67,70],narrow:[10,63],nativ:[0,14,41,46],natur:[11,12],nav:[38,39,43],navig:[26,27,28,46],nearbi:20,nearest:[11,20],nearli:16,necessari:[16,32,37,40,41,46,63],n
eed:[0,1,2,8,9,11,12,13,14,15,16,21,22,24,26,28,30,31,32,33,34,35,36,37,38,40,41,42,43,46,47,55,56,58,59,60,61,63,64,65,67,68,69,70],neg:6,nest:[15,30,51],net:[24,49],network:32,never:[23,25,34,55,56,57],new_password:[33,70],new_review_uuid:16,newdevicetoken:41,newent:51,newli:[43,50,62,64],neword:38,newpassword:[33,50,70],next:[11,13,21],nil:[41,51],node:[24,26,28,51,52,56,59],nodej:28,non:[14,16],none:63,normal:[4,15,16],nosql:[11,12,14],notat:[10,12,14],note__:70,notic:[5,16,19,58,64],notif:[20,22,25,26,28,30],notifc:50,notifi:[25,30,37],notificationid:50,notificationupd:25,notifier_nam:38,notifiernam:41,notify_sysadmin_of_new_admin_us:[26,28],notify_sysadmin_of_new_organ:[26,28],now:[26,27,28,38,40,46,58,67],nsarrai:51,nsdata:41,nsdictionari:[41,51],nserror:41,nsexcept:51,nslog:41,nsmutablearrai:51,nsmutabledictionari:[38,51],nsstring:[38,51],number:[6,7,11,12,13,14,30,32,37,40,43,45,46,50,60,63,64,70],numebr:50,ob5ko:57,object:[5,9,10,12,14,15,24,25,30,32,33,34,36,38,41],object
forkei:41,objectproperti:50,objecttyp:[33,36,50],objectuuid:50,obtain:[47,55,57,58,60],occur:[7,20,37,45],occurr:11,octal:10,off:[26,38,41,58],offer:[20,23,24,32,60,68,69],offici:67,often:[8,10,16,30,32,64],old:[33,50,70],old_password:[33,70],oldpassword:[33,70],omit:12,onc:[0,11,16,26,29,37,39,40,43,45,46,58,60,63,70],onexcept:41,ongo:[32,64],onli:[5,9,11,12,16,21,23,24,26,29,30,34,50,54,55,56,57,60,61,62,64,65,68,70],onlin:64,onrespons:41,oop:58,opdata:51,open:[14,16,23,25,28,31,46],optim:[11,12,14,16],option:[5,9,26,28,30,41,46,51,55,58],order:2,orderl:11,org:[1,2,4,5,6,8,12,13,15,17,18,19,20,24,26,27,28,33,34,36,38,39,41,46,50],org_client_secret:56,org_clientid:56,org_id:[15,50,64,65,70],org_nam:[34,36,57,59],org_uuid:[34,36],organ:[0,2,4,5,6,8,12,13,14,15,16,17,18,19,21,23,24,25,26,27,28],organizationnam:57,organizations_require_activ:[26,28],orgid:50,orgnam:[9,41,46,50,56,58],orguuid:50,origin:[43,65],originali:66,oscar:27,our:[0,9,11,12,26,27,28,31,38,48,51,69],out:11,outbox:
64,outgo:28,outlin:5,output:[41,58],over:[8,40,57],overrid:[28,41,57],overview:[11,12,25,30],overwritten:15,own:[7,23,32,38,50,58,62,64,65,66,70],owner:[2,36,50,64,65],p12:[37,39,40],p12certif:39,packag:[26,58,67],page:[22,23,27,33,38,39,43,56,58],pair:[13,15,38,51],pane:[46,63],param:[2,5,6,8,12,13,14,15,16,17,18,19,24,41,51,57,62,63,64,65,70],paramet:[4,5,6,8,9],pars:58,part:[9,11,12,16,20,24,38,43],partial:[11,30],particular:[10,16,38,64],particularli:[14,16,62,64,68],partit:22,pass:[11,34,41],passiv:69,password:[24,25,26,27,28],path:[2,5,6,12,13,14,15,16,17,18,19,20,23,24,25,26,28,33,36,37,38,45,46,50,51,58],path_to_imag:16,pathnam:58,pattern:[41,50,62],payload:[38,46,50],peak:8,peopl:[7,30,64,65,66,67],per:[13,14,58,63],perceiv:29,perform:[4,5,13,14,16,18,29,32,33,35,37,47,55,56,61,62,64,66,70],period:[7,8,20,63],permiss:[5,12,18,19,23,24,25],persist:[24,27,28],person:[16,20,31,33,36,43,67],perspect:30,pertin:35,pet:27,phone:12,phone_numb:12,phone_typ:38,phonegap:25,photo:[20,6
9],physic:20,pictur:[4,5,12,20,24,47,50,65,70],pinterest:64,pip:0,place:[14,15,16,26,30,51,56,70],plai:[7,22,40],plain:4,plan:16,platform:[32,37,38,39,40,41,42,43,46],pleas:[10,33,38,55,57,63,68],plenti:0,plug:[37,41,46],plugin:[41,46],plural:[13,15,30,50],png:16,point:[10,11,14,20,28,29,32,58,67],polici:[48,60],pop:67,popul:[65,67,69],popular:[32,67],popup:63,port:[26,27,28],portal:[21,22,23,25,26],portion:[38,50],pose:57,posit:[11,20],possibl:[16,37,40,41,45,60,68],post:[2,5,6,7,13,15,16,17,18,21,23,24,25,27,33,34,35,36,38,39,41,46,50],postal:11,potenti:11,power:[20,27,30,32,49,56,61,68],practic:[11,12],preced:[12,16],precis:64,predefin:30,prefer:[11,24,26,37],prefix:34,prepar:60,present:[16,25],preserv:65,press:[37,45,46],prevent:[11,12],preview:0,previou:[43,64,67],previous:67,price:[10,13,15,51],primari:[16,47],prior:60,privaci:64,privat:32,privileg:36,probabl:[0,16,26,29],process:[27,30,33,40,41,50,69],product:[14,16,21,23,25,26,30,38,39,43,54],product_uuid:[14,16],productid:1
6,productimag:16,productnam:16,productuuid:16,profil:[20,32,37,40],program:29,programat:21,programmat:[25,34],progress:38,project:[0,27,35,36,37,40,43,45,46,48,67],prompt:[26,46,58],prone:64,proof:[33,70],prop:51,proper:46,properit:20,properli:[27,29],properti:[1,4,5,6,9,10,11],properties____:26,property_1:[13,15],property_2:[13,15],property_nam:11,props1:51,props2:51,propti:33,protect:[54,56],protocol:[26,28,58,60],prototyp:58,provid:[6,8,11,13,14,15,20,21,24,28,30,32,33,34,36,38,39,40,41,43,46,47,50,51,52,55,56,58,60,61,63,64,65,67,70],provis:[37,40],proxim:[11,20],pull:[31,40,41],pure:24,purpos:[10,23,26,30,34,63,69],push:[0,20,22,25],pushalert:38,pushapp:43,pushnotif:41,pushtest:46,pushtest_dev:39,put:[5,12,13,15],pw123:26,pwhere:28,python:0,qualifi:24,quantiti:10,query_stat:12,query_str:[65,70],querystat:50,querystr:51,queue:[38,50],quick:25,quicker:24,quickli:[11,12,16,30,32,69],quitwait:[26,28],quot:[12,38,50,51],radiu:38,raleigh:49,rang:8,rate:16,rather:[5,16,17,18,32,41,43]
,raw:0,rawrespons:[38,41],rdbm:[14,16],reach:[10,25,40],reactiv:25,read:[9,11,12,14,16,22,42,48,50,64],read_phone_st:46,readabl:16,readi:[11,22,28,67],readm:[0,37,41,48],real:50,reason:[40,65],recaptcha:[33,70],recaptcha_challeng:50,recaptcha_challenge_field:33,recaptcha_respons:50,recaptcha_response_field:33,recaptchaopt:33,receipt:[25,30],receiptid:50,receiv:[11,29,37,40,41,42,43,47,50,66,67,70],reciev:50,reciproc:68,recommend:[26,51,60],record:[30,32],recreat:[37,45],recurs:62,redefin:63,redirect:[26,28,46,58],redirect_root:[26,28],redirect_uri:58,reduc:[12,16],redund:16,regard:[6,30],regardless:15,regid:41,regionnam:1,regist:[25,32,37,39,40],registerdevic:41,registerdeviceforpushasync:41,registerforremotenotificationtyp:[37,40,41],registerpush:41,registerwithpushprovid:41,regularli:40,rel:[33,70],relat:[5,14],relationship:[16,17,18,19],relev:[20,32,58,60,69],reli:16,rememb:[10,38,43,58,67],remind:16,remot:[20,41],remov:[23,25,26,33],removeent:51,renam:30,repeat:67,replac:[1,16,4
6,58,67],replic:26,replication_factor:[26,28],repo:[26,28,48],report:[7,31],reposloc:1,repres:[11,14,21,24,30,32,33,36,37,39,41,50,61,62,64,65,70],represent:[11,15,24,30],request:2,requir:[0,6,13,17,18,20,23,25],resend:38,reserv:30,resetpw:[25,26,28,33],resetpwmsg:25,resolut:8,resourc:[0,1,24,35,37,47,55,58,61,62,63],resource_path:62,respect:55,respond:[37,45],respons:2,response_typ:58,restaur:[11,20,40],restkit:67,restrict:[60,63],restructuredtext:0,result:[10,11,13],retri:38,revers:43,review_entity_json:16,review_uuid:16,reviewed_product_uuid:16,reviewedbi:16,reviewedin:16,revok:25,revoketoken:59,rich:[32,69],right:[16,24,29,40,63,64,67,69],rigid:30,risk:57,rock:10,rockadero:20,rocki:61,role:[5,10,12,18,19,21,23,24,25,30],roleid:50,rolenam:[5,12,18,19,24,47,50,63,65,66,70],roleproperti:50,root:[0,26,27,28,46,60],rout:[32,64],row:14,rubi:[24,51,52],rule:[23,54,56,60,61,62,63,65,70],run:[0,7,25],safe:61,sai:[8,55,56,64],sake:28,sale:40,same:[5,6,11,16,18,19,20,28,30,32,37,38,41,45,4
6,50,61,63,64,65,66,67],sampl:25,san:[20,33,65,66],sandbox:[5,15,22],santa:49,save:[5,15],scalabl:[14,16,26],scale:16,scatter:16,scene:[47,58],schedul:[25,37],schema:[14,30,50,63],scope:[16,27,56,58,61],screen:[21,46,49],script:[0,33,61,70],scroll:49,sdk:[6,9,14,15,22],search:[8,11,32],second:[6,29,33,57,63,67],secondari:16,secret:[25,34,50],secretkei:1,section:[24,34,37,38,43,46,50,55,56,65,67,70],see:[2,4,8,9,10,11,12,13,14,15,19,20,21,22,23,24,26,27,30,32,33,34,35,36,37,38,39,40,41],seen:64,segment:62,select:[10,11,12,16,21,23,24,38,39,43,46,63,65,67,70],self:[38,41,58],send:[1,4,9,11,12,19,20,25,27,32,33,36],sender:[37,40,43,45],senderid:46,sendmyselfapushnotif:38,sens:[16,32],sensit:[23,54],sent:[9,12,24,25,33,34,36],separ:[6,12,16,30,37,38,39,40,41,43,51,58,63],seri:0,serv:[60,61,63],server:[11,23,26,29,32,34],servic:[1,12,20,23,24,25,27,32,33,35,36,37,38,39,40,41],session:[58,60],set:[0,4,5,6,8,11,12],setapiurl:41,setapplicationid:41,setdevicepushtoken:41,setlog:41,setobject:
51,setorganizationid:41,settoken:58,setup:25,setvalu:38,sever:[1,24],share:[27,36,64,69],sharedappl:51,she:40,shell:22,shorthand:11,should:[0,2,11,12,15,16,17,18,22,23,26,28,37,38,39,40,41,43,46,48,50,51,54,55,56,57,60,61,63,67],show:[12,13,16,37,38,51,63,67],shown:[9,11,12,13,15,19,33,37,38,40,45,46,55,58,64,65,70],side:[31,32,34,55,56,58,60,61,67],sidebar:63,sign:[25,26,28,30,32],similar:[16,43,64,67],simpl:[0,14,16,23,26,30,32,37,67,69],simplestrategi:[26,28],simpli:[13,19,24,32,63,64,67],simplifi:[16,32],simultan:38,sinc:[10,11,29,55,61],singl:[8,12,14,15,16,26,30,32],singular:30,site:[39,43],six_dai:8,skim:[15,51],sku:[14,15,51],slash:[65,66],slate:63,slideshar:49,slideshow:49,slightli:14,slower:10,small:26,smith:11,smtp:[26,28],snippet:58,social:[20,25],softwar:28,sojre5ywlkq7jrdcka:56,solid:49,solut:30,solv:32,some:[0,1,7,9,11,16,24,27,29,30,60,63,64,65,67],somegroup:65,someon:[8,38,63],somepassword:[26,57],somesubgroup:65,someth:[2,16,26],sometim:[0,14,37,45],someus:[24,26,5
7,59,63,65,70],soon:25,sort:[11,20,24],sound:[38,41],sourc:[0,14,16,25,31],space:16,span:[8,16],sparingli:61,special:[0,20,40,62,63,68],specif:[7,10,11,14,15,16,19,24,30,32,37,38,39,40,41,46,50,51,55,59,61,62,63,64,65,70],specifi:[6,11,12,13,15,17,18,19,20,24,26,35,36,38,39,41,50,51,55,56,57,62,64,65,67,70],split:8,sql:[10,16,32],squar:15,src:[0,1,33,46,49,70],ssl:[37,40],stack:[1,25,26,27],stage:28,standalon:27,standard:[20,24,41,46,60,61,70],start:[8,11,12,14,16,22,24,25],start_tim:8,startup:27,state:[24,33,41,50,58],statement:[12,29,50],statist:7,statu:[12,26,27,28,33,36,41,50,58,69],steventraut:[65,70],still:[22,37,45,60],stock:[13,15,26,40,51],stop:[11,38],store:[1,5,10,11,12],str:64,strateg:16,strategi:[26,28],stream:20,streamlin:[16,67],string:[9,10,11,12,13,15,16,30,33,34,36,38,41,47,50,51,55,58,64,65,66],stringifi:58,strong:33,stronger:20,structur:[16,24,27,35,68],struggl:64,style:[32,33,49,54,64,67,70],stylesheet:[33,70],sub_properti:15,subgroup:65,submit:[11,12,33,38,43,4
8,62,70],subproperti:51,subproperty1:51,subproperty2:51,subscrib:[64,65,66],subscript:[65,66,68],subsequ:[47,50,55,56,58],subset:[13,16,38],substitut:64,subtract:10,succe:[47,58,62],succeed:41,success:[26,29,46,50,51,60],successfulli:[37,45],sudo:0,suffix:43,suggest:[20,23,31],suit:[56,61,63],summit:49,sungju:49,superadmin:26,superus:[26,28],suppli:[33,36,50,56],support:[0,8,10,14,16,20,22],suppos:15,supprt:46,sure:[21,23,28,37,40,45,46,54,60,67],swagger:0,symbol:70,sync:25,synchron:25,sysadmin:[26,28],system:[0,14,26,28,30,41,43,47,48,50,57,64,65,67,70],tab:[37,39,40,46,63],tag:[41,50,58],take:[6,11,16,28,29,32,43,54,56,60],taken:[20,41,58],tale:[10,11],talk:[49,60,67],tap:46,tar:58,target:[0,25,26,27,28,32,37],task:63,team:[35,36,46,67],technic:58,techniqu:[11,16],technolog:46,tell:[37,40],temp:1,templat:[0,46],temporari:1,tempt:[16,43],tend:[65,66],termin:46,test12345:[33,36],test1234:70,test123:[33,36],test:[5,11,23,26,28,36,37,40,46,60,61,65,67],testadmin:56,testadminpw:56,test
app1:[34,36],testapp2:36,tester123:36,tester:50,testorg:[34,36],testpw:56,text:[4,10,11,32,33,38,64,67,70],text_field:33,than:[0,5,6,8,10,11,12,13,16,17,18,26,32,41,43,46,57,60],thank:32,thei:[0,11,12,15,16,20,30,36,40,41,42,54,55,56,60,61,63,64,65,66,70],them:[0,6,9,10,11,12,16,23,24,32,37,38,40,41,46,56,58,61,63,64],theme:[16,33],themselv:70,thereaft:54,thereof:38,thi:[0,1,2,6,8,9,10,11,12,13,14,15,16,20,21,22,24,26,27,28,29,30,31,32,33,34,37,38,39,40,41,42,43,45,46,47,48,50,51,54,55,56,57,58,59,60,61,63,64,65,66,67,68,69,70],thing:[7,10,22,23,31,37,40,42,49,54,65,66,70],think:64,those:[11,16,40,41,46,48,54,55,56,60,61,64,70],though:[11,16,38,43,50],thousand:14,threadpool:28,three:[6,11,26,37,61,63,67],through:[14,16,21,32,34,35,36,41,43,47,50,54,58,60,61,64,65,70],thumb:23,tier:27,time:[6,7],timeout:28,timestamp:[2,5,6,8,10,12,13,14,15,16,17,18,19,24,26,30,33,34,36,38,47,50,51,57,59,62,63,64,65,66,70],tip:[38,39,41,46],titl:[10,11,16,33,36,38,41,50,63,65,66,70],tld:[26,28],tmp:1,
toctre:0,todai:20,togeth:[0,61],token:[9,13,15,23,24,25,27,33,34,35,36,37,38,40,41,47],token_to_revok:59,tom:62,tomcat:25,too:0,tool:[9,11,12,25,32],top:[21,27,37,38,46,58,67],topic:[11,31,38,51,52,56,65,66,70],topolog:26,tostr:41,track:[6,7,47],trail:61,transactionst:41,transfer:24,transform:0,transit:[33,70],transport:[26,28],treat:[15,25],trend:32,trial:24,troubleshoot:25,truli:32,trust:43,tsefia:33,ttl:25,ttl_in_millisecond:57,tupl:14,turn:[38,40,58],tutori:[22,25],tweet:[32,64],twitter:[32,64,67],two:[11,12,27,29,30,33,39,41,51,55,67,68,69],type:[2,4,5,6],typic:[10,24,30,70],udpat:0,uffff:10,uiapplic:[41,51],uiapplicationlaunchoptionsremotenotificationkei:41,uiremotenotificationtyp:41,uiremotenotificationtypealert:41,uiremotenotificationtypesound:41,unauthent:63,under:[23,26,38,43,46,56,59,60,63,67],underli:[14,41],understand:[30,46],unencod:[9,11,12],unexpect:50,unfamiliar:14,unfortun:0,unicod:10,uninstal:[37,45],union:10,uniqu:[15,30,39,41,43,47,50,58,65,66,67,70],univers:30,
unix:[6,38,47,50,66],unix_timestamp:38,unless:[0,38,47,55,58,61,67],unlik:[14,15,30],unlock:[37,45],unnecesari:60,unregist:63,unreleas:28,unsecur:60,unsent:25,until:[29,37,45,50,63],untrust:60,untrustworthi:25,unus:63,upcom:20,updatecollect:51,updatedent:51,updateent:51,upon:24,upward:6,uri:[2,5,6,8,9,12,13,14,15,16,17,18,19,24],url:[9,11,12,13,15,16,19],usag:8,usegrid:[24,25],user:[5,7,10,11,12,13,15,16,17,18,19,20,21,22,23,24,25],user_uuid:16,user_uuid_or_usernam:59,usergrid_appl:28,usergriddatacli:[56,59],usergridsdk:58,userid:50,userinfo:41,usernam:[11,12,15,17,18,19,24,26,27,28,30,33,36,37,38,41,46,47,50,54,56,57,60,61,62,63,64,65,67,68,70],username_or_email:70,useruuid
<TRUNCATED>
[28/36] usergrid git commit: Update generated website content.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/push-notifications/adding-push-support.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/push-notifications/adding-push-support.txt b/content/docs/_sources/push-notifications/adding-push-support.txt
new file mode 100644
index 0000000..956ac86
--- /dev/null
+++ b/content/docs/_sources/push-notifications/adding-push-support.txt
@@ -0,0 +1,158 @@
+# Adding push notifications support
+You add push notification support by configuring services, then adding app code to receive messages. You'll set up an account with a notification service (such as Apple's APNs or Google's GCM). Then you'll configure your App Services application to send notifications to the service. Then you'll add code to receive messages.
+
+## Setting up push notification support
+The following steps get you set up so that your app can receive push notifications. Keep in mind that these steps build on one another. In other words, you'll need values generated in step 1 in order to complete step 2, and so on.
+
+For a walkthrough of these steps using a push sample app, see [Tutorial: Push notifications sample app].
+
+1. __Register your app__ with push notification services.
+Your notification messages will be forwarded to devices by Apple and/or Google. So you'll need to register with Apple APNs and/or Google's GCM. For more information, see Registering with a notification service.
+
+2. __Create a notifier__ to send notification messages from App Services to notification services.
+App Services will use your notifier to send your messages to a notification service. For details, see Creating notifiers. To create a notifier, you'll need information generated by registering with a push notification service. You'll need a separate notifier for each app/platform combination.
+
+3. __Register devices__ at run time.
+At run time, your code will register to receive notifications. To do this, your code uses information from the notification service and App Services notifier. For more, see Managing users and devices.
+
+4. __Send and manage push notifications__
+You use App Service API notification endpoints to target devices, users, or groups with your messages. To learn more, see Creating and managing notifications.
+
+### How the pieces connect
+Click a tab below to view more information about how the pieces connect once you've got it set up.
+
+### Apple APNs
+
+The diagram below illustrates what things should look like once you've gotten set up to send notifications that are received by your app.
+
+A. At configuration time, you create an App ID, then create an App Services notifier with a .p12 certificate you generate on your Mac. The .p12 certificate correlates the notifier (which you will use to send notification messages from App Services) with the App ID (so that APNs will forward your notifications to devices).
+
+B. A run time, your app's code registers with Apple for notifications by invoking the registerForRemoteNotificationTypes method to receive a token it can send to App Services.
+
+C. At run time, your app's code registers with App Services for notifications by sending the name of the App Services notifier you created. This ensure's that there's a device entity in your App Service application. That way, you can address the device with notification messages.
+
+For information on troubleshooting push notifications on iOS devices, see Troubleshooting Push Notifications
+
+### Google GCM
+
+Google GCM
+The diagram below illustrates what things should look like once you've gotten set up to send notifications that are received by your app.
+
+A. At configuration time, you create a Google API project, then create an App Services notifier with an API key from the project. The API key correlates the notifier (which you will use to send notification messages from App Services) with the API project (which will forward your notifications to devices).
+
+B. At run time, your app's code registers with App Services for notifications by sending the name of the App Services notifier you created. This ensure's that there's a device entity in your App Service application. That way, you can address the device with notification messages.
+
+C. A run time, your app's code registers with Google for notifications by sending the number of your API project as a "sender ID". The project is the actual notification "sender" that will forward notifications to your app. In other words, the app is telling Google that it wants to receive notifications from that sender.
+
+
+
+## Requirements
+Before you start adding support for push notifications, be sure you've got the following:
+
+An Apigee account (it’s free). If you don't yet have an Apigee account, you can create one.
+An App Services organization. Organizations are top-level containers for your APIs and other resources. By default, your Apigee account will include one organization that has the same name as your username. You can view your current organizations or create a new one by visiting your account dashboard.
+An App Services application. An App Services application is where you store you App Services data and where you schedule notifications. Data in the application represents devices, notifiers, notifications, users, and groups. For information on creating an app, see Registering apps.
+You will need to test with a mobile device running the platform you're developer for. In the case of Android, you might be able to use an emulator. It is not possible to test push notifications from a web browser.
+
+### iOS
+To develop push notifications for an iOS app, you'll need:
+
+A Mac to generate the necessary SSL certificate.
+An iOS developer account. You'll need this to register for an App ID and get a provisioning profile. To get an account, visit the iOS Dev Center.
+An actual iOS device to test push notifications. It's not yet possible to develop push notifications with an emulator.
+An iOS provisioning profile
+For iOS app testing, you need a provisioning profile that's associated with an Apple ID. You set up the provisioning profile in the Apple developer portal, download the profile, and import it into Xcode.
+
+To set up a provisioning profile, you need to create an "iOS App Development" certificate in the Apple developer portal. For example, in the Apple APNs setup earlier in this tutorial, you created a certificate in the Apple developer portal to be used for push notifications. However, you won't be able to create a provisioning portal with just that certificate. You also need to create an "iOS App Development" certificate (the configuration settings don't matter), as shown in the following image.
+
+ios dev certificate
+
+After you create an iOS App Development certificate, you can create a provisioning profile that includes your App ID/certificate for push notifications.
+
+### Android
+
+It's generally a best practice to develop Android apps by testing and debugging with an Android device. It's also possible to use an emulator.
+
+Before testing and debugging with an Android device, you'll need to set up your device for development. Be sure to see the Android documentation on using hardware devices.
+
+To test with an emulator, you will need to follow these steps:
+
+Ensure that you have Google API 8 (or above) and Android 2.2 (or above).
+Using the Android SDK Manager, install Google Cloud Messaging for Android Library.
+Using the Android Virtual Device Manager, create an emulator whose target is Google APIs.
+Ensure that the emulator you're using includes a Google account.
+Launch the emulator.
+In the emulator, click the Menu button, then go to Settings > Accounts & Sync.
+Add a Google account.
+Once you've finished these steps, you should have an emulator that can receive push notification messages.
+
+### PhoneGap
+
+You'll need to test with a device or emulator. It is not possible to test push notifications with a browser alone.
+PhoneGap Push plug-in. Developers using PhoneGap to develop their apps with HTML5 and Javascript will need to install the Apigee push notification PhoneGap plug-in to enable push notifications. Installation instructions are available in the plug-in Readme.md file, as well as in Tutorial: Push notifications sample app. The plug-in is already included in the above PhoneGap sample apps.
+
+## Tutorials
+Written tutorial
+For a full step-by-step tutorial using iOS, Android, or JavaScript, see Tutorial: Push notifications sample app.
+
+Video tutorial
+Click the tab for your preferred development platform to watch a full walkthrough video about how to integrate the App Services push notifications feature into your app.
+
+### iOS
+
+### Android
+
+## Sample Apps
+
+You'll find samples in SDKs that are specific to three mobile platforms: iOS, Android, and JavaScript. These show a simple implementation of push notifications in action. After you perform a few setup steps, running the sample app on your connected device or emulator, you will be able to send a push notification to it by clicking a button in the app's UI. You will also be able to send more pushes to it from the App Services console.
+
+To download the sample app and view the tutorial, see Tutorial: Push notifications sample app.
+
+When you create notifiers to run the samples, creating them in the default "sandbox" app in your Usergrid organization will make it easier to try out the feature. The sandbox app doesn't require authentication.
+
+## Troubleshooting
+
+### Android / PhoneGap
+
+App fails to install on the emulator
+When using the emulator, be sure to note the setup steps in the requirements section.
+
+Sometimes installation fails while the emulator is still being launched. Wait until the emulator is up and running (so that you can unlock and interact with the UI), then run the project again.
+
+Make sure that the order of your Java Build Path matches the order shown in Tutorial: Push notifications sample app.
+
+#### Push errors
+If pressing the button to send yourself a push throws an exception or doesn't respond:
+
+Make sure the emulator's target matches the Google API version used in the project.
+
+In the IDE log, wait until you see that the device has been registered before sending yourself a push.
+Sometimes waiting for the code to run and trying another click gets the push message to you.
+
+If you successfully send yourself a push message once but fail to again, try one of the following:
+
+Go to the apps list on the device and launch the app from there.
+
+Uninstall the app from the device, delete the device in the App Services console, and run the project again.
+
+#### MismatchSenderId error message from the server when it tries to send a message to your app.
+
+The sender ID is a number you send to GCM from app code when registering with GCM for notifications. The error might be occurring because the sender ID with which your app is registering at GCM for notifications does not correlate to the API project whose API key was used to create your App Services notifier. First, confirm the following:
+
+* The sender ID in your app code (used when registering with GCM) is the same as your Goole API project number.
+
+* The API key used to create your App Services notifier is the same as the API key in your Google API project.
+
+* The notifier name used in your app code is the same as for the notifier you created in App Services.
+
+It can be possible to make a fix (such as by correcting the sender ID in your app code) and still see this error. If you're still seeing the error, consider create a new API project and App Services notifier, then use their new values in your code:
+
+1. Recreate (or create anew) the Google API project. This will generate a new API key and project number. See Registering with a notification service.
+
+2. Create a new App Services notifier for GCM using the API key you generated with the new API project. See Creating notifiers.
+
+3. Use the new notifier name in your code, along with a new sender ID that is that same value as the Google API project number.
+
+#### INVALID_SENDER error message
+
+The sender ID is a number you send to GCM from app code when registering with GCM for notifications. The "sender" in this case is the Google API project you created to send notification messages. Confirm that the sender ID you're using in code is the same value as the API project number generated when you created your Google API project. See Registering with a notification service.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/push-notifications/creating-and-managing-notifications.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/push-notifications/creating-and-managing-notifications.txt b/content/docs/_sources/push-notifications/creating-and-managing-notifications.txt
new file mode 100644
index 0000000..72a2021
--- /dev/null
+++ b/content/docs/_sources/push-notifications/creating-and-managing-notifications.txt
@@ -0,0 +1,269 @@
+# Creating and managing notifications
+This topic provides information on setting up and sending push notifications with the Usergrid API backend as a service (BaaS). For high-level information, prerequisites, and tutorials, see [Push notifications overview](overview.html).
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">
+Although not shown in many of the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
+</p></div>
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">
+For an overview of how to set up push notifications, including troubleshooting tips, see [Adding push notifications support](adding-push-support.html).
+</p></div>
+
+## Creating notifications
+When you create a notification, it is scheduled to be delivered to all applicable devices immediately unless the deliver property has been set. A notification may contain multiple messages (payloads), and each payload must be associated with a notifier in order to deliver that message to the associated app. This allows a single notification to be delivered to multiple apps across various services, and is useful if you want to send messages to multiple notifiers, such as development and production versions of both Apple and Google simultaneously.
+
+Notification can be created via POST request to the BaaS API, or in the admin portal:
+
+### Creating notificastions with cURL
+
+#### Targeting a single device
+This request will target a specific device entity.
+
+Request Syntax
+
+ curl -X POST https://api.usergrid.com/<org>/<app>/devices/<device_ID>/notifications -d '{"payloads":{<notifier>:<message>}}'
+
+#### Targeting all devices
+This request will target all device entities.
+
+Request Syntax
+
+ curl -X POST https://api.usergrid.com/<org>/<app>/devices/*/notifications -d '{"payloads":{<notifier>:<message>}}'
+
+#### Targeting a single user
+This request will target a specific user entity.
+
+Request Syntax
+
+ curl -X POST https://api.usergrid.com/<org>/<app>/users/<username>/notifications -d '{"payloads":{<notifier>:<message>}}'
+
+#### Targeting a group
+This request will target all users associated with a specific group entity.
+
+Request Syntax
+
+ curl -X POST https://api.usergrid.com/<org>/<app>/groups/<group_path>/notifications -d '{"payloads":{<notifier>:<message>}}'
+
+#### Targeting users by location
+This request will target all device entities that are within a set radius of a latitude/longitude coordinate.
+
+Request Syntax
+
+ curl -X POST https://api.usergrid.com/<org>/<app>/devices;ql=location within <radius> of <lat>,<long>/notifications -d '{"payloads":{<notifier>:<message>}}'
+
+#### Request Parameters
+
+The following parameters can be specified when targeting push notifications.
+
+Base URL
+
+These parameters are used in forming the base URL of the request:
+
+Parameter Description
+--------- -----------
+org Organization UUID or organization name
+app Application UUID or application name
+
+Notification
+
+These parameters are used when forming the notification portion of the request:
+
+Parameter Description
+--------- -----------
+notifier The ``notifier`` entity you wish to associate with the notification (see [Creating notifiers](creating-notifiers.html) for information on creating notifiers)
+message The push notification message that will be delivered to the user
+
+__Note__: If your message contains double-quotes ("") you must escape them with a backslash
+
+Targets
+
+These parameters are used when specifying the notification target in the request.
+
+Parameter Description
+--------- -----------
+device UUID of a device entity.
+user UUID or username of a user entity.
+phone_type Specified in a appended query string. The type property of a device entity.
+group UUID or name of the group entity.
+latitude, longitude, radius Specified in a appended query string. The radius in meters of a user device from a latitude/longitude coordinate.
+
+
+### Creating notificastions with Admin portal
+
+To create the new notification with the admin portal, do the following:
+
+1. Log in to the admin portal.
+2. In the left nav, click __Push > Send Notification__.
+3. From the __Notifier__ drop-down, select the appropriate notifier.
+4. Under the notifier name, select one of the following to specify where your notification message should go:
+
+* __All Devices__ to have the message sent to all devices.
+* __Devices__ to have the message sent to a particular subset of devices. Enter a comma-separated list of device UUIDs in the box provided.
+* __Users__ to have the message sent to a particular subset of users. Enter a comma-separated list of username values in the box provided.
+* __Groups__ to have the message sent to a particular subset of user groups. Enter a comma-separated list of group paths in the box provided.
+
+5. In the __Notifier Message__ field, enter the message (payload) you want delivered.
+6. If double-quotes are included in your message, you must escape them with a backslash.
+7, Under __Delivery__, select one of the following to specify when the notification should be delivered:
+
+* __Now__ to have the message delivered immediately.
+* Schedule for later to choose a date and time at which the message should be delivered.
+
+7. Click __Submit__.
+
+To create a notification to send multiple messages or target multiple platforms, see the cURL syntax for creating notifications.
+
+### Creating notificastions with iOS
+
+To send notifications from iOS app code, you use the 11ApigeeAPSDestination11 and ``ApigeeAPSPayload`` classes.
+
+With ``ApigeeAPSDestination``, you specify where the notification should go (a particular user or device or user group, for example). With ``ApigeeAPSPayload``, you specify the contents of the message, including any alert text, sound, or badge (items specified by Apple as allowable notification content types). You then use ``ApigeeDataClient`` to send the message via Apigee and Apple APNs.
+
+The following code illustrates how to send a notification to a single user. Though this is the device on which the app itself is installed, you can imagine how you might send a notification to another device, such as one belonging to someone "following" this user. For more, see the iOS push sample application included with the [Apigee iOS SDK](../sdks/tbd.html).
+
+ - (void)sendMyselfAPushNotification:(NSString *)message
+ completionHandler:(ApigeeDataClientCompletionHandler)completionHandler
+ {
+ // send to a single device -- our own device
+ NSString *deviceId = [ApigeeDataClient getUniqueDeviceID];
+ ApigeeAPSDestination* destination =
+ [ApigeeAPSDestination destinationSingleDevice:deviceId];
+
+ // set our APS payload
+ ApigeeAPSPayload* apsPayload = [[ApigeeAPSPayload alloc] init];
+ apsPayload.sound = kBundledSoundNameWithExt;
+ apsPayload.alertText = message;
+
+ // Example of what a custom payload might look like -- remember that
+ // APNS payloads are limited to a maximum of 256 bytes (for the entire
+ // payload -- including the 'aps' part)
+ NSMutableDictionary* customPayload = [[NSMutableDictionary alloc] init];
+ [customPayload setValue:@"72" forKey:@"degrees"];
+ [customPayload setValue:@"3" forKey:@"newOrders"];
+
+ __weak AppDelegate* weakSelf = self;
+
+ // send the push notification
+ [dataClient pushAlert:apsPayload
+ customPayload:customPayload
+ destination:destination
+ usingNotifier:notifier
+ completionHandler:^(ApigeeClientResponse *response) {
+ if ( ! [response completedSuccessfully]) {
+ [weakSelf alert:response.rawResponse
+ title: @"Error"];
+ }
+
+ if (completionHandler) {
+ completionHandler(response);
+ }
+ }];
+ }
+
+## Scheduling notifications
+
+### cURL
+
+To schedule a notification for a later time, add the deliver parameter with a UNIX timestamp to the body of your request.
+
+Request body syntax
+
+ '{"deliver":<unix_timestamp>,"payloads":{<notifier>:<message>}}'
+
+## Targeting multiple notifiers or messages
+To send multiple messages or target multiple platforms with a single notification entity, include multiple notifier-message pairs as a comma-separated list in the payloads object of the request body:
+
+Request body syntax
+
+ '{"payloads":{<notifier>:<message>, <notifier>:<message>, ...}}'
+
+## Setting a notification expiration
+If a push service can't deliver a message to a device and needs to resend it (for example, if the device is turned off), you can set a notification to expire after a certain date/time.
+
+To do this, adding the expire parameter with a UNIX timestamp to your request body. This specifies when the service should stop trying to send the notification.
+
+<div class="admonition warning"> <p class="first admonition-title">Warning</p> <p class="last">
+Please note that if the expire property is not set and Apple APNS or Google GCM are not able to immediately deliver your push notification, delivery will not be retried. This means your notification will not be delivered. As a best practice, you should always set an expire timestamp to ensure your notification is delivered in the event the delivery initially fails.
+</p></div>
+
+Request body syntax
+
+ '{"expire":<unix_timestamp>,"payloads":{"<notifier_name>":"<message>"}}'
+
+
+## Getting notifications
+
+### cURL
+
+The following are endpoints can be used to get notifications. For details on the notification properties you can get, see Notifier, Receipt, and Notification.
+
+Getting one or more notifications:
+
+ /notifications
+
+Getting notifications associated with one or more receipts:
+
+ /receipts/*/notification
+
+Getting the list of devices associated with one or more notifications before the notifications are sent:
+
+ /notifications/*/queue
+
+## Canceling sent notifications
+
+You can cancel a notification that's already in progress by doing the following:
+
+ curl -X PUT "https://api.usergrid.com/my-org/sandbox/notifications/<notification-uuid>" -d '{"canceled": true}'
+
+### Admin portal
+
+You can view JSON for notifications by viewing their entity entries in the Data section of your application.
+
+In the admin portal, click Data, then click the __/notifications__ collection.
+You can also view notification data in the message history.
+
+In the admin portal, click Push, then click Message History.
+Locate the notification for which you want to view data, then click its view details link.
+
+## Deleting unsent notifications
+
+### Deleting unsent notifications with cURL
+
+ curl -X DELETE "https://api.usergrid.com/<you-org>/<app>/notifications/<notification-uuid>"
+
+### Deleting unsent notifications with Admin Portal
+
+1. In the admin portal, click Push, then Message History.
+2. On the Message History page, click Scheduled.
+3. In the list of scheduled messages, locate the message you want to delete.
+4. In the top area of the message item, click the delete link.
+
+## Getting receipts
+After sending a notification, the BaaS generates a receipt entity that contains details about the notification. Receipts show details such as timestamps, payloads sent, and the receipt endpoints.
+
+For information about what's contained in a receipt, see [Notifier](..//rest-endpoints/api-docs.html#notifier), [Receipt](..//rest-endpoints/api-docs.html#receipt), and [Notification](..//rest-endpoints/api-docs.html#notification). Use the following endpoints to get receipts.
+
+To get one or more receipts:
+
+ /receipts
+
+To get receipts associated with one or more devices:
+
+ /devices/*/receipts
+
+To get receipts for one or more notifications. For example, get receipts for notifications that had errors.
+
+ /notifications/*/receipts
+
+## Notification endpoints
+The ``/notifications`` endpoints let you create, schedule, cancel, and delete notifications. You can also use the following endpoints to accomplish the same actions for specific groups, users, devices, or any combination thereof.
+
+Base URL: ``https://api.usergrid.com/my-org/my-app``
+
+ /groups/*/notifications
+ /groups/*/users/*/notifications
+ /groups/*/users/*/devices/*/notifications
+ /users/*/notifications
+ /users/*/devices/*/notifications
+ /devices/*/notifications
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/push-notifications/creating-notifiers.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/push-notifications/creating-notifiers.txt b/content/docs/_sources/push-notifications/creating-notifiers.txt
new file mode 100644
index 0000000..9e07176
--- /dev/null
+++ b/content/docs/_sources/push-notifications/creating-notifiers.txt
@@ -0,0 +1,69 @@
+# Creating notifiers
+When you request that a push notification be sent to your app on devices, an Usergrid notifier carries the request to the notification service (Google GCM or Apple APNs).
+
+A notifier is represented by an entity in your Usergrid application (see the [API Docs](../rest-endpoints/api-docs.html) for reference information). It carries the credentials that authorize your request. Once a notification service has verified that your notifier contains valid credentials, it will forward your push notification to your app on devices.
+
+You can create a notifier in two ways: using the admin portal and programmatically.
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">
+For an overview of how to set up push notifications, including troubleshooting tips, see [Adding push notifications support](adding-push-support.html).
+</p></div>
+
+## Requirements
+To create a notifier, you must first register your app with the appropriate notification service, as described in [Registering with a notification service](registration.html).
+
+## Creating notifiers with the admin portal
+To create a notifier with the admin portal, do the following:
+
+1. Log in to the admin portal.
+2. In the left nav, select __Push > Configuration__.
+3. Click the __Apple__ or __Android__ tab.
+4. If you have not already done so, retrieve your .p12 certificate (iOS apps) or API key (Android apps) by following the steps in the [Registering with a notification service](registration.html).
+5. In the admin portal's Configuration page, enter values for the platform on which your mobile app will be installed.
+
+The fields are different depending on whether you are on the Apple or Android tab:
+
+__Fields for Apple__
+
+<table class="usergrid-table">
+<tr><td>Name this notifier</td> <td>Enter a unique name that can be used to identify this notifiers.</td></tr>
+<tr><td>Certificate</td> <td>Click __Choose File__ to select the .p12 certificate you generated and saved to your desktop earlier in this tutorial.</td></tr>
+<tr><td>Environment</td> <td>Select the environment appropriate to your app. You may select development or production. Note that for the environment you select, you should have a separate .p12 certificate -- different certificates for development and production.</td></tr>
+<tr><td>Certificate Password</td>
+<td>Enter a certificate password if one was specified when you created your .p12 certificate.</td></tr>
+</table>
+
+__Fields for Android__
+
+<table class="usergrid-table">
+<tr><td>Name this notifier</td> <td>Enter a unique name that can be used to identify this notifiers.</td></tr>
+<tr><td>API Key</td>
+<td>Enter the API key that was generated when you registered your app with GCM. To retrieve your API key, go to the [Google API developer web site](https://code.google.com/apis/console/), then select __APIs & Auth > Credentials__.</td></tr>
+</table>
+
+6. Click __Create Notifier__. The Usergrid will create a notifier entity in the /notifiers collection. The notifier will also appear in the list of notifiers in the notifications console.
+
+## Creating notifiers programmatically
+You can create an App BaaS notifier programmatically by sending requests to the Usergrid API.
+
+### For Apple
+
+ curl -X POST -i -H "Accept: application/json" -H "Accept-Encoding: gzip, deflate" -H "Authorization: Bearer YWMtFeeWEMyNEeKtbNX3o4PU0QAAAT8vzK3xz3utVZat0CosiYm75C2qpiGT79c" -F "name=applenotifier" -F "provider=apple" -F "environment=development" -F "p12Certificate=@/Users/me/dev/pushtest_dev.p12" 'https://api.usergrid.com/my-org/my-app/notifiers'
+
+### For Google
+
+ curl -X POST "https://api.usergrid.com/my-org/my-app/notifiers" -d '{"name":"androiddev", "provider":"google", "apiKey":"AIzaSyCkXOtBQ7A9GoJsSLqZlod_YjEfxxxxxxx"}'
+
+## Notifier endpoints
+
+The following are the available notifier endpoints. For details on notifier properties, see the [API Docs](../rest-endpoints/api-docs.html).
+
+Base URL: ``https://api.usergrid.com/my-org/my-app/``
+
+Working with one or more notifiers:
+
+ /notifiers
+
+Working with notifiers associated with specific devices:
+
+ /devices/{device-id}/notifier
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/push-notifications/getting-started.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/push-notifications/getting-started.txt b/content/docs/_sources/push-notifications/getting-started.txt
new file mode 100644
index 0000000..6f1b80f
--- /dev/null
+++ b/content/docs/_sources/push-notifications/getting-started.txt
@@ -0,0 +1,102 @@
+# Getting started with push notifications
+
+## What are push notifications?
+Usergrid provides a RESTful framework for sending push notifications to your apps, giving you full control over which app users you target, as well as when you send notifications. You can send messages to devices, users, or groups that have specific characteristics and locations. (To receive push notifications, users must be using devices that can connect to the Usergrid). Here are just a couple reasons for enabling push notification support in your app with Usergrid:
+
+* __Reach your app's users__ with messages they care about. This could be a flash sale happening near them right now (use [geolocation](../geolocation/geolocation.html)!) or a lunch special at a favorite restaurant. You could even let a user know it's her turn in a game she's playing with a friend.
+* __Keep your app footprint low__ while communicating in a high-value way with your app's users. Compare pushing data with CPU- and memory-heavy pull processes. In those, an app actively listens on an endpoint, regularly pulling data (such as news feeds, new emails, or stock market updates) to the device.
+
+<center>
+<iframe allowfullscreen="" frameborder="0" height="315" src="http://www.youtube.com/embed/W560tZ5fSIc" width="560"></iframe>
+</center>
+
+<p></p>
+
+## Prerequisites
+You will need to test with a mobile device running the platform you're developer for. In the case of Android, you might be able to use an emulator. It is not possible to test push notifications from a web browser.
+
+### iOS Prerequisites
+To develop push notifications for an iOS app, you'll need:
+
+* A Mac to generate the necessary SSL certificate.
+* An iOS developer account. You'll need this to register for an App ID and get a provisioning profile. To get an account, visit the [iOS Dev Center](https://developer.apple.com/ios/download/).
+* An actual iOS device to test push notifications. It's not yet possible to develop push notifications with an emulator.
+* An iOS provisioning profile
+For iOS app testing, you need a provisioning profile that's associated with an Apple ID. You set up the provisioning profile in the Apple developer portal, download the profile, and import it into Xcode.
+
+To set up a provisioning profile, you need to create an "iOS App Development" certificate in the Apple developer portal. For example, in the Apple APNs setup earlier in this tutorial, you created a certificate in the Apple developer portal to be used for push notifications. However, you won't be able to create a provisioning portal with just that certificate. You also need to create an "iOS App Development" certificate (the configuration settings don't matter), as shown in the following image.
+
+.. image:: ios-cert.png
+
+After you create an iOS App Development certificate, you can create a provisioning profile that includes your App ID/certificate for push notifications.
+
+### Android Prerequisites
+
+It's generally a best practice to develop Android apps by testing and debugging with an Android device. It's also possible to use an emulator.
+
+Before testing and debugging with an Android device, you'll need to set up your device for development. Be sure to see the Android documentation on [using hardware devices](http://developer.android.com/tools/device.html).
+
+To test with an emulator, you will need to follow these steps:
+
+1. Ensure that you have Google API 8 (or above) and Android 2.2 (or above).
+2. Using the Android SDK Manager, install Google Cloud Messaging for Android Library.
+3. Using the Android Virtual Device Manager, create an emulator whose target is Google APIs.
+4. Ensure that the emulator you're using includes a Google account.
+
+Next:
+
+* Launch the emulator.
+* In the emulator, click the Menu button, then go to Settings > Accounts & Sync.
+* Add a Google account.
+* Once you've finished these steps, you should have an emulator that can receive push notification messages.
+
+### PhoneGap Prerequisites
+
+You'll need to test with a device or emulator. It is not possible to test push notifications with a browser alone.
+
+## Setup overview
+The following steps get you set up so that your app can receive push notifications. Keep in mind that these steps build on one another. In other words, you'll need values generated in step 1 in order to complete step 2, and so on.
+
+For a walkthrough of these steps using a push sample app, see Tutorial: Push notifications sample app.
+
+1. __Register__ your app with push notification services. Your notification messages will be forwarded to devices by Apple and/or Google. So you'll need to register with Apple APNs and/or Google's GCM. For more information, see Registering with a notification service.
+
+2. __Create a notifier__ to send notification messages from the Usergrid to notification services.
+The Usergrid will use your notifier to send your messages to a notification service. For details, see Creating notifiers. To create a notifier, you'll need information generated by registering with a push notification service. You'll need a separate notifier for each app/platform combination.
+
+3. __Register devices at run time__.
+At run time, your code will register to receive notifications. To do this, your code uses information from the notification service and your notifier. For more, see Managing users and devices.
+
+4. __Send and manage push notifications__.
+You use Usergrid API notification endpoints to target devices, users, or groups with your messages. To learn more, see Creating and managing notifications.
+
+
+## How it works
+Click a tab below to view more information about how the pieces connect once you've got it set up.
+
+### Apple APNs
+
+The diagram below illustrates what things should look like once you've gotten set up to send notifications that are received by your app.
+
+__A.__ At configuration time, you [create an App ID](registering.html), then [create a notifier](creating-notifiers.html) with a .p12 certificate you generate on your Mac. The .p12 certificate correlates the notifier (which you will use to send notification messages) with the App ID (so that APNs will forward your notifications to devices).
+
+__B.__ A run time, your app's code [registers with Apple for notifications](managing-users-and-devices.html) by invoking the ``registerForRemoteNotificationTypes`` method to receive a token it can send to Usergrid.
+
+__C.__ At run time, your app's code [registers with the Usergrid for notifications](managing-users-and-devices.html) by sending the name of the notifier you created. This ensure's that there's a device entity in your Usergrid application. That way, you can address the device with notification messages.
+
+.. image:: pushmiddleios0.png
+
+__Note__: For information on troubleshooting push notifications on iOS devices, see [Troubleshooting Push Notifications](troubleshooting.html)
+
+### Google GCM
+
+The diagram below illustrates what things should look like once you've gotten set up to send notifications that are received by your app.
+
+__A.__ At configuration time, you [create a Google API project](registering.html)), then [create an Usergrid notifier](creating-notifiers.html) with an API key from the project. The API key correlates the notifier (which you will use to send notification messages from the Usergrid) with the API project (which will forward your notifications to devices).
+
+__B.__ At run time, your app's code [registers with the Usergrid](managing-users-and-devices.html)) for notifications by sending the name of the notifier you created. This ensure's that there's a device entity in your Usergrid application. That way, you can address the device with notification messages.
+
+__C.__ A run time, your app's code [registers with Google for notifications](managing-users-and-devices.html)) by sending the number of your API project as a "sender ID". The project is the actual notification "sender" that will forward notifications to your app. In other words, the app is telling Google that it wants to receive notifications from that sender.
+
+.. image:: pushmiddleandroid0.png
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/push-notifications/managing-users-and-devices.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/push-notifications/managing-users-and-devices.txt b/content/docs/_sources/push-notifications/managing-users-and-devices.txt
new file mode 100644
index 0000000..4f04f9a
--- /dev/null
+++ b/content/docs/_sources/push-notifications/managing-users-and-devices.txt
@@ -0,0 +1,313 @@
+# Managing users and devices
+Before your app can receive notifications on a user's device, the app's code will need to register the device with both the Usergrid and the appropriate push notification service (Apple APNs or Google GCM).
+
+By registering with the Usergrid, your app adds the device on which it is installed to your data store. The device is represented as a Device entity. This makes it possible for you to target that device when sending notifications. (For more on the Device entity, see the [API Docs](../rest-endpoints/api-docs.html).) Any devices, users, and groups that have been registered in this way may be targeted with push notifications.
+
+By registering with the notification service, you make the device known to the service. This way, the service can forward your notifications to the device.
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">
+For an overview of how to set up push notifications, including troubleshooting tips, see [Adding push notifications support](adding-push-support.html).
+</p></div>
+
+## Registering devices
+The following samples illustrate how to register a device with a notification service and with the Usergrid. At a high level, your code will send a registration request to the notification service, then use information in the service's response to send a separate request to the Usergrid. The two requests correlate the notification service, Usergrid, and your mobile app.
+
+You can also create device entities separately by using the /devices endpoint. For more information on using the ``/devices`` endpoint in the Usergrid, see the [API Docs](../rest-endpoints/api-docs.html).
+
+Registering a device with a notification service is a standard coding activity for implementing push notifications. This is not specific to the Usergrid.
+
+
+### Registering for iOS
+
+The following code illustrates how you can use the iOS SDK to register a device with both the Usergrid server and with the APNs, the Apple push notification service. This example assumes that your code has already property initialized the SDK. For more information, see [Installing the Apigee SDK for iOS](../sdks/tbd.html).
+
+ // Register with Apple to receive notifications.
+
+ // Invoked when the application moves from an inactive to active state. Use this
+ // method to register with Apple for notifications.
+ - (void)applicationDidBecomeActive:(UIApplication *)application
+ {
+ // Find out what notification types the user has enabled.
+ UIRemoteNotificationType enabledTypes =
+ [application enabledRemoteNotificationTypes];
+
+ // If the user has enabled alert or sound notifications, then
+ // register for those notification types from Apple.
+ if (enabledTypes & (UIRemoteNotificationTypeAlert|UIRemoteNotificationTypeSound)) {
+
+ // Register for push notifications with Apple
+ NSLog(@"registering for remote notifications");
+ [application registerForRemoteNotificationTypes:UIRemoteNotificationTypeAlert |
+ UIRemoteNotificationTypeSound];
+ }
+ }
+
+ // Invoked as a callback from calling registerForRemoteNotificationTypes.
+ // newDeviceToken is a token received from registering with Apple APNs.
+ // Use this method to register with Apigee.
+ - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)newDeviceToken
+ {
+ // Register device token with the Usergrid (will create the Device entity if it doesn't exist)
+ // Sends the name of the notifier you created with Apigee, along with the token your code
+ // received from Apple.
+ ApigeeClientResponse *response = [dataClient setDevicePushToken: newDeviceToken
+ forNotifier: notifier];
+
+ if ( ! [response completedSuccessfully]) {
+ [self alert: response.rawResponse title: @"Error"];
+ }
+ }
+
+ // Invoked as a callback from calling registerForRemoteNotificationTypes if registration
+ // failed.
+ - (void)application:(UIApplication*)application didFailToRegisterForRemoteNotificationsWithError:(NSError*)error
+ {
+ [self alert: error.localizedDescription title: @"Error"];
+ }
+
+Initialize the Apigee client and check for notifications that might have been sent while the app was off.
+
+ // Invoked as a callback after the application launches.
+ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+ {
+ // Connect and login
+ ApigeeClient *apigeeClient =
+ [[ApigeeClient alloc] initWithOrganizationId:orgName
+ applicationId:appName
+ baseURL:baseURL];
+ dataClient = [apigeeClient dataClient];
+ [dataClient setLogging:true]; //comment out to remove debug output from the console window
+
+ // Find out if there's a notification waiting to be handled after the
+ // app launches.
+ if (launchOptions != nil) {
+ NSDictionary* userInfo =
+ [launchOptions objectForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
+
+ // If there's notification data waiting, send it to be processed.
+ if (userInfo) {
+ [self handlePushNotification:userInfo
+ forApplication:application];
+ }
+ }
+
+ // It's not necessary to explicitly login if the Guest role allows access.
+ // But this is how you can do it.
+ // [apigeeClient logInUser: userName password: password];
+
+ NSLog(@"done launching");
+ return YES;
+ }
+
+### Registering for Android
+
+The following code illustrates how to register a client device with GCM, register the device with Apigee, and associate the device with the user. Methods used in this code are defined in the Apigee Android SDK. For more information on downloading and installing the SDK, see Installing the Apigee SDK for Android.
+
+ import android.content.Context;
+ import com.google.android.gcm.GCMRegistrar;
+ import com.apigee.sdk.ApigeeClient;
+ import com.apigee.sdk.data.client.entities.Device;
+
+ /**
+ * Registers this device with GCM, Google's messaging
+ * service.
+ *
+ * @param context An Android context with information specific to this
+ * application's context on the device.
+ */
+ static void registerPush(Context context) {
+
+ //Get an instance of the Apigee DataClient class from the ApigeeClient object
+ dataClient = getClient().getDataClient();
+
+ // Get the registration ID (GCM API key) for this application.
+ final String regId = GCMRegistrar.getRegistrationId(context);
+
+ // If this device isn't already registered with GCM, register it
+ // using the the application context and an ID for the Google account
+ // authorized to send messages to this application. This is the
+ // Google Client ID from Google API Console.
+ if ("".equals(regId)) {
+ GCMRegistrar.register(context, gcmSenderId);
+ } else {
+ if (GCMRegistrar.isRegisteredOnServer(context)) {
+ Log.i(TAG, "Already registered with GCM");
+ } else {
+
+ // Use an instance of the Client class (SDK for Android)
+ // to register this device with the Usergrid. Pass as arguments
+ // the device unique identifier, the unique name of the notifier you
+ // created in the Usergrid, the GCM API key, and a callback that will
+ // receive an instance of a Device class representing the registered
+ // device on the system.
+ dataClient.registerDeviceForPushAsync(dataClient.getUniqueDeviceID(), notifierName, regId, null,
+ new DeviceRegistrationCallback() {
+ @Override
+ public void onResponse(Device device) {
+ AppServices.device = device;
+
+ // Associate the logged in user with this device.
+ if (dataClient.getLoggedInUser() != null) {
+ dataClient.connectEntitiesAsync("users",
+ dataClient.getLoggedInUser().getUuid().toString(),
+ "devices", device.getUuid().toString(),
+ new ApiResponseCallback() {
+ @Override
+ public void onResponse(ApiResponse apiResponse) {
+ Log.i(TAG, "connect response: " + apiResponse);
+ }
+
+ @Override
+ public void onException(Exception e) {
+ displayMessage(context, "Connect Exception: " + e);
+ Log.i(TAG, "connect exception: " + e);
+ }
+ });
+ }
+ }
+
+ });
+ }
+ }
+ }
+
+ /**
+ * Create an instance of the SDK ApigeeClient class, setting
+ * values from your Apigee registration.
+ */
+ static synchronized ApigeeClient getClient() {
+ if (client == null) {
+ client = new ApigeeClient();
+ client.setApiUrl("https://api.usergrid.com");
+ client.setOrganizationId("your-org");
+ client.setApplicationId("your-app");
+ }
+ return client;
+ }
+
+
+### Registering for HTML5/PhoneGap
+
+The following code illustrates how you can use the JavaScript functions included with the PhoneGap plugin to register a device with both the Apigee server and with the APNs, the Apple push notification service.
+
+ // Declare a variable for calling push notification APIs.
+ var pushNotification = window.plugins.pushNotification;
+ // Collect configuration options to specify that this device accepts
+ // an alert message, an application badge, and a sound.
+ var appleOptions = {
+ alert:true, badge:true, sound:true
+ };
+ // Register the device with the Usergrid, passing options for configuration
+ // along with a callback from which you can retrieve the device token
+ // sent by Apigee.
+ pushNotification.registerDevice(appleOptions, function(status) {
+ console.log(status);
+ // If a token was received, bundle options to pass when registering the device
+ // with the push notification service. The provider value must be "apigee" to
+ // support push notification through Apigee. orgName and appName should be
+ // values corresponding to those used in your Apigee account.
+ // notifier is the unique name you associated with the Apigee notifier you created.
+ // token is the device token this code received from Apigee after registering the
+ // device.
+ if(status.deviceToken) {
+ var options = {
+ "provider":"apigee",
+ "orgName":"YOUR APIGEE.COM USERNAME",
+ "appName":"sandbox",
+ "notifier":"YOUR NOTIFIER",
+ "token":status.deviceToken
+ };
+
+ // Use the device token and other options to register this device with the
+ // push notification provider.
+ pushNotification.registerWithPushProvider(options, function(status){
+ console.log(status);
+ });
+ }
+ });
+
+The functions used in this code are defined in the PhoneGap plugin. JavaScript functions invoke underlying Objective-C or Java code (depending on platform). You'll find that code in these files, included in the Apigee PhoneGap push notification plug-in.
+
+Information about installing the plugin is available in its Readme file. For more complete examples, see [Tutorial: Push notifications sample app](tutorial.html).
+
+
+## Connecting devices to users
+You can associate user entities with device entities in the Usergrid. Doing so allows you to target your push notifications at users with specific characteristics. The following describes how to connect a user to a specific device in the Usergrid.
+
+For more information on creating a device in your Usergrid data store, see "Registering Devices" above.
+
+For more information on creating a user in your Usergrid data store, see [User](../rest-endpoints/api-docs.html#user).
+
+The following code examples all use the same basic endpoint pattern for connecting devices with users:
+
+ POST /users/{userUUID or name}/devices/{deviceUUID}
+
+### Connecting with curl
+The following call connects user "joex" with device 7a0a1cba-9a18-3bee-8ae3-4f511f12a386 (the device UUID). After this connection, you can send a push notification to joex rather than the device. Further, if joex has specific properties set--such as {"favoritecolor": "blue"}--you can send a push notification to all users whose favorite color is blue (assuming they're connected to devices in the Usergrid).
+
+ curl -X POST "https://api.usergrid.com/my-org/sandbox/users/joex/devices/7a0a1cba-9a18-3bee-8ae3-4f511f12a386"
+
+### Connecting with iOS
+
+The following sample code, taken from AppDelegate.m in the native iOS push sample, uses the connectEntities method from the iOS SDK to connect a device to a user.
+
+ ApigeeClientResponse *response = [dataClient setDevicePushToken: newDeviceToken forNotifier: notifier];
+
+ // You could use this if you log in as an Usergrid user to associate the Device to your User
+ if (response.transactionState == kUGClientResponseSuccess) {
+ response = [self connectEntities: @"users" connectorID: @"me" type: @"devices" connecteeID: deviceId];
+ }
+
+### Connecting with Android
+
+The following sample code, taken from [AppServices.java](https://github.com/apigee/appservices-android-push-example/blob/master/src/com/ganyo/pushtest/AppServices.java) in the native Android push sample, uses the connectEntitiesAsync method from the Android SDK to connect a device to an authenticated user.
+
+ // connect Device to current User - if there is one
+ if (dataClient.getLoggedInUser() != null) {
+ dataClient.connectEntitiesAsync("users", dataClient.getLoggedInUser().getUuid().toString(),
+ "devices", device.getUuid().toString(),
+ new ApiResponseCallback() {...
+
+### Connecting with HTML5/JavaScript
+
+The following code illlustrates how to associate the currently logged in user with their device.
+
+ // You'll need a client from the JavaScript SDK.
+ var client = new Apigee.Client({
+ // Initialize client.
+ });
+
+ // Get information about the current user so you can use
+ // it to connect them with their device.
+ client.getLoggedInUser(function(err, data, user) {
+ if(err) {
+ // Could not get the logged in user.
+ } else {
+ if (client.isLoggedIn()) {
+ // Using a PushNotification function to get the device ID as
+ // it is known to the Apigee system.
+ pushNotification.getApigeeDeviceId(function(results) {
+ if (results.deviceId) {
+ // Use the JavaScript SDK connect function to register
+ // a connection between the current user and their device.
+ user.connect('devices', results.deviceId, function (err, data) {
+ if (err) {
+ // Could not make the connection.
+ } else {
+ // Call succeeded, so pull the connections back down.
+ user.getConnections('devices', function (err, data) {
+ if (err) {
+ // Couldn't get the connections.
+ } else {
+ // Connection exists.
+ });
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+You can also connect users with groups so that you can send push notifications to groups of users (and their associated devices), see [Working with group data](../user-management/group.html).
+
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/push-notifications/overview.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/push-notifications/overview.txt b/content/docs/_sources/push-notifications/overview.txt
new file mode 100644
index 0000000..32fb451
--- /dev/null
+++ b/content/docs/_sources/push-notifications/overview.txt
@@ -0,0 +1,58 @@
+# Push notifications overview
+
+<table style="border: solid 1px grey">
+<tr>
+<td width="40%" style="padding:1em">
+
+.. image:: iphonemessage.png
+
+</td>
+<td>
+
+## Reach your users with push
+With the new push notifications feature in the Usergrid, you can send announcements to your app's users.
+
+* __Reach your app's users__ with messages they care about.
+* __Keep your app footprint low__ while communicating in a high-value way with your app's users.
+
+[Read more](getting-started.html)
+
+</td>
+</tr>
+</table>
+
+<p></p>
+
+## Get started
+
+#### [Get started with a tutorial](tutorial.html)
+Build your first push-enabled app using an Apigee sample.
+
+#### [Find what you can do with it](getting-started.html)
+A video and introduction.
+
+#### [See the prerequisites](getting-started.html#prerequisites)
+Depending on your supported app platforms, you'll need just a few things.
+
+
+## Build push support
+
+#### [Setting up push notifications support](getting-started.html)
+Connect Apple or Google with Usergrid and your app.
+
+#### [Register your app](registering.html)
+Register with Apple or Google.
+
+#### [Create a notifier](creating-notifiers.html)
+Your application uses this to send messages.
+
+#### [Register client devices](managing-users-and-devices.html)
+Your app code registers to receive notifications.
+
+#### [Send and manage notifications](creating-and-managing-notifications.html)
+You can do this from app code or the admin portal.
+
+## Learn more
+
+#### [Troubleshoot your push support](troubleshooting.html)
+Things don't work as you expect?
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/push-notifications/registering.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/push-notifications/registering.txt b/content/docs/_sources/push-notifications/registering.txt
new file mode 100644
index 0000000..8930583
--- /dev/null
+++ b/content/docs/_sources/push-notifications/registering.txt
@@ -0,0 +1,102 @@
+# Registering with a notification service
+To send push notifications, you will need to first register your app with the push notification service (Apple APNs or Google GCM) that corresponds to your app's platform. Once you've registered, the service will provide you with a certificate or key that you will need when you create an Usergrid notifier. (See [Creating notifiers](creating-notifiers.html) for more information.)
+
+Push notification services are gateways controlled by platform services (such as Apple and Google). These gateways ensure that push notifications are delivered securely and originate from trusted apps.
+
+To send push notifications to your app on iOS devices, you’ll register the the Apple Push Notification service (APNs). For app on Android, you’ll register with Google Cloud Messaging for Android (GCM).
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">
+For an overview of how to set up push notifications, see [Setting up push notification support](adding-push-support.html).
+</p></div>
+
+## Registering with Apple APNs
+Before you can send push notifications to your app on iOS devices, you'll need to get set up so that Apple knows you'll be sending notifications. To do that, you'll need to do the following:
+
+* Generate an SSL signing certificate you can use to generate a .p12 certificate.
+* Create an Apple App ID through which you can associate push notifications support with your app.
+* Generate a .p12 certificate you can use to create an Usergrid notifier. The certificate will be sent to APNs with push notification requests.
+
+For more information see "How the pieces connect" in [Setting up push notification support](getting-started.html).
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">
+You'll need a Mac to generate a .p12 certificate and work with APNs.
+</p></div>
+
+### Generating an SSL signing certificate
+First, you'll create an SSL signing certificate that you can use to generate a .p12 certificate. To generate an SSL signing certificate, do the following:
+
+1. On your development machine, launch the Keychain Access application.
+2. From the Keychain Access menu, select __Certificate Assistant > Request a Certificate From a Certificate Authority__.
+3. Enter a contact email address and a name you will use to sign your apps.
+4. Select __Saved to disk__, then click __Continue__.
+5. Select __Desktop__ from the Where drop-down, then click __Save__ to download the .certSigningRequest file.
+6. Click __Done__ once the download has completed.
+
+### Creating an App ID
+
+Next, you must create an App ID for your app. The App ID uniquely identifies your app and provides a way for you to configure the app for push notification support. (For more on App IDs, see [Creating and Configuring App IDs](https://developer.apple.com/library/ios/documentation/IDEs/Conceptual/AppDistributionGuide/MaintainingProfiles/MaintainingProfiles.html).)
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">
+An iOS developer account is required to complete these steps. To register for an iOS developer account, visit the [Apple Developer site](https://developer.apple.com/).
+</p></div>
+
+1. Log in to [Apple's iOS developer portal](https://developer.apple.com/ios/manage/overview/index.action).
+2. In the iOS Apps section, click __Identifiers__, then select __App IDs__.
+3. Click the + icon to create a new App ID, and enter the following:
+
+* __App ID Description - Name__: A unique name that identifies your app.
+* __App BaaS__: Select Push Notifications.
+* __App ID Suffix__: Select Explicit App ID, and enter your desired App ID in reverse-domain format. For example, com.apigee.pushapp.
+
+4. Click __Submit__ to create the App ID, then click __Done__. You will be returned to the App IDs page.
+
+### Generating a .p12 certificate
+
+Finally, you will generate the .p12 certificate using the App ID and signing certificate you created in the previous steps. The .p12 certificate will be sent by Apigee to Apple APNs with all push notification requests. A unique .p12 certificate is required for each app. In addition, you should create separate .p12 certificates for development and production versions of your app.
+
+1. On the App IDs page, click your new App ID, then click Edit.
+2. In the Push Notifications section, under Development SSL Certificate, click Create Certificate.
+
+.. image:: pushsslcertificate.png
+
+3. Click __Choose File__, select the .certSigningRequest file you saved to your Desktop in the previous section, then click __Generate__.
+4. Click __Done__. You will be returned to the App ID settings window.
+5. In the Push Notifications section, click __Download__ to save the certificate (aps_development.cer file) to your Desktop.
+6. Double-click the .cer file to install it in your keychain. The newly installed certificate will appear in your Keychain Access application under My Certificates with a name similar to "Apple Development iOS Push Services: <bundle identifier>".
+7. Control-click the certificate and select __Export__.
+8. Save the certificate to your Desktop as a 'Personal Information Exchange (.p12)' file. (You'll need this file when you create a notifier. For more information, see [Creating notifiers](creating-notifiers.html).
+9. In the password dialog, leave the password field blank, then click __OK__.
+10. In the next dialog, enter your system password, then click __Allow__.
+
+
+## Registering with Google GCM
+To create a notifier for sending notifications, you'll need a Google API project and register your app as part of that project. The project's identifier (project number) will become the sender ID your client code will send when registering. Registering your app will give you an API key you'll use to create a notifier. (For more information see "How the pieces connect" in [Adding push notifications support](adding-push-support.html).)
+
+The following is an abbreviated version of the steps described in the Google documentation on [getting started with Google Cloud Messaging](http://developer.android.com/google/gcm/gs.html).
+
+To generate a project number and API key, do the following:
+
+1. Go to the [Google API developer web site](https://code.google.com/apis/console/) and log in with your Google ID.
+
+2. Click __Create Project__, enter a project name and ID, then follow the steps required to verify.
+
+3. In the left nav, click __Overview__ to view the project number. Note this number for later use in client code.
+
+.. image:: googleproj0.png
+
+4. Click __APIs__ in the left nav area, then click the button to enable __Google Cloud Messaging for Android__.
+
+.. image:: gcmsetting.png
+
+5. In the left nav, under __APIs and auth__, click __Credentials__.
+
+6. Under __Public API access__, click __Create New Key__.
+
+7. In the __Create a new key__ dialog, click __Server key__. Take care not to choose "Android key," though you might be tempted to. Remember that your push notification requests will be received by Google from Apigee's server (via the notifier your code sends to Apigee), rather than directly from the device your app is installed on.
+
+8. On the __Create a server key...__ dialog, enter the IP address of the server that will be sending the notification request to Google.
+
+9. Click __Create__.
+
+10. On the Credentials page, under __Key for server applications__, copy the __API key__ value for use when creating a notifier to request push notifications from GCM. (For more information, see [Creating notifiers](creating-notifiers.html).)
+
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/push-notifications/troubleshooting.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/push-notifications/troubleshooting.txt b/content/docs/_sources/push-notifications/troubleshooting.txt
new file mode 100644
index 0000000..15cab02
--- /dev/null
+++ b/content/docs/_sources/push-notifications/troubleshooting.txt
@@ -0,0 +1,93 @@
+# Troubleshooting
+
+## Working with Android
+
+### App fails to install on the emulator
+
+* When using the emulator, be sure to note the setup steps in [Push notifications prerequisites](getting-started.html#prerequisites).
+
+* Sometimes installation fails while the emulator is still being launched. Wait until the emulator is up and running (so that you can unlock and interact with the UI), then run the project again.
+
+* Make sure that the order of your Java Build Path matches the order shown in [Tutorial: Push notifications sample app](tutorial.html).
+
+### Push errors
+If pressing the button to send yourself a push throws an exception or doesn't respond:
+
+* Make sure the emulator's target matches the Google API version used in the project.
+
+* In the IDE log, wait until you see that the device has been registered before sending yourself a push.
+Sometimes waiting for the code to run and trying another click gets the push message to you.
+
+* If you successfully send yourself a push message once but fail to again, try one of the following:
+
+Go to the apps list on the device and launch the app from there.
+
+OR
+
+Uninstall the app from the device, delete the device in the admin portal, and run the project again.
+
+### MismatchSenderId error message from the server when it tries to send a message to your app.
+The sender ID is a number you send to GCM from app code when registering with GCM for notifications. The error might be occurring because the sender ID with which your app is registering at GCM for notifications does not correlate to the API project whose API key was used to create your notifier. First, confirm the following:
+
+* The sender ID in your app code (used when registering with GCM) is the same as your Goole API project number.
+
+* The API key used to create your notifier is the same as the API key in your Google API project.
+
+* The notifier name used in your app code is the same as for the notifier you created in the Usergrid.
+
+It can be possible to make a fix (such as by correcting the sender ID in your app code) and still see this error. If you're still seeing the error, consider create a new API project and notifier, then use their new values in your code:
+
+1. Recreate (or create anew) the Google API project. This will generate a new API key and project number. See Registering with a notification service.
+
+2. Create a new notifier for GCM using the API key you generated with the new API project. See Creating notifiers.
+
+3. Use the new notifier name in your code, along with a new sender ID that is that same value as the Google API project number.
+
+### INVALID_SENDER error message
+The sender ID is a number you send to GCM from app code when registering with GCM for notifications. The "sender" in this case is the Google API project you created to send notification messages. Confirm that the sender ID you're using in code is the same value as the API project number generated when you created your Google API project. See Registering with a notification service.
+
+## Working with PhoneGap Android
+
+### App fails to install on the emulator
+
+* When using the emulator, be sure to note the setup steps in [Tutorial: Push notifications sample app](tutorial.html).
+
+* Sometimes installation fails while the emulator is still being launched. Wait until the emulator is up and running (so that you can unlock and interact with the UI), then run the project again.
+
+* Make sure that the order of your Java Build Path matches the order shown in [Tutorial: Push notifications sample app](tutorial.html).
+
+### Push errors
+If pressing the button to send yourself a push throws an exception or doesn't respond:
+
+* Make sure the emulator's target matches the Google API version used in the project.
+
+* In the IDE log, wait until you see that the device has been registered before sending yourself a push.
+Sometimes waiting for the code to run and trying another click gets the push message to you.
+
+* If you successfully send yourself a push message once but fail to again, try one of the following:
+
+Go to the apps list on the device and launch the app from there.
+
+OR
+
+Uninstall the app from the device, delete the device using the admin portal, then run the project again.
+
+### MismatchSenderId error message from the server when it tries to send a message to your app.
+The sender ID is a number you send to GCM from app code when registering with GCM for notifications. The error might be occurring because the sender ID with which your app is registering at GCM for notifications does not correlate to the API project whose API key was used to create your notifier. First, confirm the following:
+
+* The sender ID in your app code (used when registering with GCM) is the same as your Google API project number.
+
+* The API key used to create your notifier is the same as the API key in your Google API project.
+
+* The notifier name used in your app code is the same as for the notifier you created in the Usergrid.
+
+It can be possible to make a fix (such as by correcting the sender ID in your app code) and still see this error. If you're still seeing the error, consider create a new API project and notifier, then use their new values in your code:
+
+1. Recreate (or create anew) the Google API project. This will generate a new API key and project number. See [Registering with a notification service](registration.html).
+
+2. Create a new notifier for GCM using the API key you generated with the new API project. See [Creating notifiers](creating-notifiers.html).
+
+3. Use the new notifier name in your code, along with a new sender ID that is that same value as the Google API project number.
+
+### INVALID_SENDER error message
+The sender ID is a number you send to GCM from app code when registering with GCM for notifications. The "sender" in this case is the Google API project you created to send notification messages. Confirm that the sender ID you're using in code is the same value as the API project number generated when you created your Google API project. See [Registering with a notification service](registration.html).
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/push-notifications/tutorial.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/push-notifications/tutorial.txt b/content/docs/_sources/push-notifications/tutorial.txt
new file mode 100644
index 0000000..8ebecfe
--- /dev/null
+++ b/content/docs/_sources/push-notifications/tutorial.txt
@@ -0,0 +1,251 @@
+# Tutorial: Push notifications sample app
+In this tutorial, you'll use a sample app (iOS, Android, or PhoneGap) to send yourself a push notification with the Usergrid push notification API. You'll register with a push notification services (Apple APNs or Google GCM) to create the required security certificate or key, create the required Usergrid notifier to send a message, then modify, compile and run the sample app to see push notifications in action.
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">
+For an overview of how to set up push notifications, including troubleshooting tips, see [Adding push notifications support](adding-push-support.html).
+</p></div>
+
+## Before you begin
+Before you can add support for push notifications, be sure that you're set up for the requirements described in Adding push notifications support.
+
+## Step 1: Download a sample app
+Sample push notification apps are included in the /samples directory of the following platform SDKs and plugins:
+
+* Native iOS [Download the SDK](http://www.apigee.com/docs/content/ios-sdk-redirect)
+
+* Native Android [Download the SDK](http://www.apigee.com/docs/content/android-sdk-redirect)
+
+* PhoneGap iOS & Android (HTML5) [Download the SDK](http://www.apigee.com/docs/content/javascript-sdk-redirect
+
+To begin this tutorial, download the sample app for the platform of your choice.
+
+__A note to PhoneGap developers__: PhoneGap requires a plugin to enable push notifications. The plugin is included in the sample apps in the JavaScript SDK. For new PhoneGap applications, [download the PhoneGap push plugin](https://github.com/phonegap-build/PushPlugin).
+
+## Step 2: Register with a notification service and generate a certificate/key
+To send push notifications you must register your app with the push notification service that corresponds to your app's platform. Once registered, the service will provide you with a certificate or key that you will provide when creating an Usergrid notifier.
+
+For a full walkthrough of how to register an app with a notification service and generate the necessary certificate/key, see [Registering with a notification service](registration.html).
+
+## Step 3: Create a notifier
+Notifiers are entities that carry your push notifications to a notification service. Once a notification service has verified that your notifier contains valid credentials, it will deliver your push notification to the devices of your app's users.
+
+For information on how to use the admin portal to create a notifier, see [Creating notifiers](creating-notifiers.html).
+
+## Step 4: Configure and run the sample app
+In this step, you'll open your sample app of choice in your IDE and configure it. The Android sample app can be run with an emulator, included in the Android Developer Tools. The iOS sample app must be run on an actual iOS device.
+
+The following sections provide platform-specific guidance for setting up and running the samples. However, this content assumes that you understand your development environment well enough to configure and work with projects.
+
+### iOS Dev Setup
+
+To configure and run the Native iOS push notification sample app, do the following:
+
+1. Open the iOS sample app with XCode by opening its .xcodeproj file.
+
+2. Make the following changes to __/Push Test/AppDelegate.m__:
+
+* __orgName__: Your Apigee organization.
+
+* __appName__: The app in your organization where you created the notifier. (For the sample, make sure it's "sandbox".)
+
+* __notifier__: Name of the notifier you created. (For the sample, make sure it's "appledev".).
+
+3. Plug your iOS device into your development machine.
+
+4. In Xcode, select __Window > Organizer__ to open the Xcode Organizer.
+
+5. Under __Devices__, select the device you plugged in, then click __Add to Member Center__. You may be prompted to log in with the Apple ID associated with your Apple Developer account.
+
+6. If prompted, select a Development Team to use for provisioning. This will be a team you've registered at the Apple developer portal.
+
+7. Log in to the [Apple Developer portal](https://developer.apple.com/) and create a provisioning profile that includes the App ID you chose when you registered the sample app with Apple APNs. For more information on how to create a provisioning profile, see "About provisioning profiles" below.
+
+8. Download the profile and add it into Xcode Organizer, in the Provisioning Profiles group under your plugged-in device.
+
+9. Close the Organizer.
+
+10. In Xcode, select the Project Navigator, then select the project root folder.
+
+11. In the __General__ tab, in the __Bundle Identifer__ box, enter the App ID associated with your provisioning profile.
+
+12. In the __Build Settings__ tab, under __Deployment__, for the __iOS Deployment Target__ select the iOS version on your connected device. The version is displayed in the Xcode Organizer.
+
+13. In the __Build Settings__ tab, under __Code Signing__, under __Code Signing Identity > Debug__, select the Apple signing certificate corresponding to your developer identity.
+
+.. image:: iospushsettings.png
+
+14. Click __Run__ to launch the sample on your iOS device.
+
+15. When the "codesign wants to sign using key <Your Name> in your keychain." dialog is displayed, click __Allow__.
+
+16. The project is now built, and the app is installed on your device. The first time you run the push sample app, your device will ask permission to allow push notifications. Tap __OK__.
+
+.. image:: iospushauth.png
+
+17. In the app, tap the __push to this device__ button to send yourself a push notification. If you have configured your notification to go to multiple devices, tap the __push to all devices__ button to send the push notification to all devices.
+
+.. image:: iospushfinal.png
+
+### PhoneGap iOS Dev Setup
+
+To configure and run the PhoneGap iOS push notification sample app, do the following:
+
+1. Open the iOS PhoneGap sample app with Xcode by opening its .xcodeproj file.
+
+2. Make the following changes in __/www/js/index.js__:
+
+* __orgName__: Your Apigee organization.
+
+* __appName__: The app in your organization where you created the notifier. (For the sample, make sure it's "sandbox".)
+
+* __notifier__: Name of the notifier you created.
+
+3. Plug your iOS device into your development machine.
+
+4. In Xcode, select __Window > Organizer__ to open the Xcode Organizer.
+
+5. Under __Devices__, select the device you plugged in, then click __Add to Member Center__. You may be prompted to log in with the Apple ID associated with your Apple Developer account.
+
+6. If prompted, select a Development Team to use for provisioning. This will be a team you've registered at the Apple developer portal.
+
+7. Log in to the [Apple Developer portal](https://developer.apple.com/) and create a provisioning profile that includes the App ID you chose when you registered the sample app with Apple APNs. For more information on how to create a provisioning profile, see "About provisioning profiles" below.
+
+8. Download the profile and add it into Xcode Organizer, in the Provisioning Profiles group under your plugged-in device.
+
+9. Close the Organizer.
+
+10. In Xcode, select the Project Navigator, then select the project root folder.
+
+11. In the __General__ tab, in the __Bundle Identifer__ box, enter the App ID associated with your provisioning profile.
+
+12. In the __Build Settings__ tab, under __Deployment__, for the __iOS Deployment Target__ select the iOS version on your connected device. The version is displayed in the Xcode Organizer.
+
+13. In the __Build Settings__ tab, under __Code Signing__, under __Code Signing Identity > Debug__, select the Apple signing certificate corresponding to your developer identity.
+
+.. image:: iospgsettings.png
+
+14. At the top of the IDE, ensure that the name for your plugged in device is displayed next to the target name, then click the Run button to launch the sample on your iOS device.
+
+15. If the "codesign wants to sign using key <your name> in your keychain" dialog is displayed, click __Allow__.
+
+16. The project is now built, and the app is installed on your device. The first time you run the push sample app, your device will ask permission to allow push notifications. Tap OK.
+
+17. In the app, tap the __Send a push with Phonegap!__ button to send yourself a push notification.
+
+.. image:: iospgapp.png
+
+### About iOS provisioning profiles
+For iOS app testing, you need a provisioning profile that's associated with an Apple ID. You set up the provisioning profile in the Apple developer portal, download the profile, and import it into Xcode.
+
+To set up a provisioning profile, you need to create an "iOS App Development" certificate in the Apple developer portal. For example, in the Apple APNs setup earlier in this tutorial, you created a certificate in the Apple developer portal to be used for push notifications. However, you won't be able to create a provisioning portal with just that certificate. You also need to create an "iOS App Development" certificate (the configuration settings don't matter), as shown in the following image.
+
+.. image:: iospgcert.png
+
+After you create an iOS App Development certificate, you can create a provisioning profile that includes your App ID/certificate for push notifications.
+
+### Android Dev Setup
+
+To configure and run the native Android push notification sample app, do the following:
+
+1. Make sure you have the latest Android SDK installed in your IDE, and that Android APIs have been installed via the Android SDK Manager.
+
+2. Import the native Android sample app project into your IDE
+
+3. Modify the following in __/src/com.ganyo.pushtest/Settings.java__:
+
+* __GCM_SENDER_ID__: Your Google Cloud Messaging (GCM) project number, as described in the Tutorial: Push notifications sample app.
+
+* __NOTIFIER__: Name of your notifier. (For the sample, make sure it's the name of the notifier you created.)
+
+* __ORG__: Your Apigee organization.
+
+* __APP__: The app in your organization where you created the notifier. (For the sample, make sure it's "sandbox".)
+
+* __USER__ and __PASSWORD__: Optional. If you created your notifier in an app other than "sandbox" (which doesn't require authentication), enter the username and password of one of your Usergrid admin users.
+
+4. In AndroidManifest.xml, be sure the proper Android permissions are included, such as READ_PHONE_STATE and VIBRATE.
+
+5. In your project properties, go to __Java Build Path > Libraries__ and add all the JAR files from the project's /libs directory.
+
+6. In the __Order and Export__ tab, move the JARs to the top of the list and select all the check boxes. Make sure the order and selections match the following image:
+
+.. image:: assettings.png
+
+7. If you're using an emulator, configure the emulator to use the Google APIs Level 16 target.
+
+.. image:: asemu.png
+
+8. Run the project as an Android Application. The IDE should compile the project and install the app on your device.
+
+9. Press the button on the app to send yourself a push notification.
+
+.. image:: asapp.png
+
+### PhoneGap Android Dev Setup
+
+To configure and run the PhoneGap Android push notification sample app, do the following:
+
+1. Make sure you have the latest Android SDK installed in your IDE, and that Android APIs have been installed via the Android SDK Manager.
+
+2. Import the PhoneGap Android sample app project into your IDE.
+
+3. Modify the following in __/assets/www/js/index.js__:
+
+* __orgName__: Your apigee organization.
+
+* __appName__: The app in your organization where you created the notifier. (For the sample, make sure it's "sandbox".)
+
+* __notifier__: Name of your notifier.
+
+* __senderID__: Your API project number (the project must support Google Cloud Messaging for Android (GCM)), as described in the [Registering with a notification service](registration.html).
+
+4. In __AndroidManifest.xml__, be sure the proper Android permissions are included. This includes READ_PHONE_STATE and VIBRATE.
+
+5. In your project properties, go to __Java Build Path > Libraries__ and add all the JAR files from the project's /libs directory.
+
+6. In the __Order and Export__ tab, move the JARs to the top of the list and select all the check boxes. Make sure the order and selections match the following image:
+
+.. image:: pgasettings.png
+
+7. If you're using an emulator, configure the emulator to use the Google APIs Level 16 target or above. Also, be sure to see the Android requirements in [Adding push notifications support](adding-push-supprt.html) for steps on setting up the emulator to support push notifications.
+
+.. image:: pgaspath.png
+
+8. Run the project as an Android Application. The IDE should compile the project and install the app on your device.
+
+9. Press the button on the app to send yourself a push notification.
+
+.. image:: pgaapp.png
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">
+For troubleshooting tips, see [Adding push notifications support](adding-push-supprt.html.
+</p></div>
+
+### More about PhoneGap
+The [PhoneGap](http://phonegap.com/) iOS push notification sample was created using standard web technologies such as HTML5, JavaScript, and CSS. You build the app with those technologies, and PhoneGap provides project templates for iOS, Android, and other platforms. For example, atop platform-specific PhoneGap code, core app code between the iOS and Android samples is essentially the same.
+
+When using PhoneGap to develop push notification apps, you use a PhoneGap plugin designed to support push notifications. That plugin is included in the Apigee samples. For more about the plugin, see the [plugin's GitHub project](https://github.com/phonegap-build/PushPlugin/blob/master/README.md).
+
+## Step 5: Review the data entities created by the sample app
+
+1. Log in to the admin portal, and select Data in the left navigation pane.
+
+2. Select any of the following collections to view the entities that were created in them by the push notification sample app:
+
+* ``/devices`` - To see the device that was added.
+
+* ``/notifications`` - To see the notification that was sent.
+
+* ``/receipts`` - To see the receipt generated from the successful push.
+
+## Step 6: Send additional push notifications using other Usergrid tools
+Send a push notification from the Usergrid Notifications console
+On the Send Notification screen. Select your notifier, select All Devices, enter a message, select Now, and click to send it.
+
+.. image:: sendnotification.png
+
+### Send a push notification directly via the push notifications API
+Use the following curl command in a terminal window, replacing your-org, your-app and notifier-name.
+
+ curl -X POST "https://api.usergrid.com/your-org/your-app/devices/*/notifications" -d '{"payloads":{"notifier-name":"I just sent another notification! Yea, me!"}}'
+
\ No newline at end of file
[09/36] usergrid git commit: Cherry pick: Update website to remove
reference to incubator.
Posted by sf...@apache.org.
Cherry pick: Update website to remove reference to incubator.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/d0f10bcf
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/d0f10bcf
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/d0f10bcf
Branch: refs/heads/entity-size
Commit: d0f10bcfe25aaa69500592d5ce0569a3ed721b32
Parents: 106d8fa
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Aug 25 10:20:54 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Aug 25 10:24:23 2015 -0400
----------------------------------------------------------------------
.../installation/ug1-deploy-to-tomcat.txt | 6 +-
.../installation/ug1-launcher-quick-start.txt | 2 +-
.../installation/ug2-deploy-to-tomcat.txt | 4 +-
.../docs/_sources/reference/contribute-code.txt | 2 +-
content/docs/_sources/sdks/usage.txt | 16 -
.../user-management/messagee-example.txt | 6 +-
.../docs/installation/ug1-deploy-to-tomcat.html | 11 +-
.../installation/ug1-launcher-quick-start.html | 6 +-
.../docs/installation/ug2-deploy-to-tomcat.html | 5 +-
content/docs/reference/contribute-code.html | 4 +-
content/docs/sdks/usage.html | 308 -------------------
content/docs/searchindex.js | 2 +-
.../docs/user-management/messagee-example.html | 6 +-
content/releases/index.html | 6 +-
website/content/releases/index.html | 6 +-
15 files changed, 32 insertions(+), 358 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d0f10bcf/content/docs/_sources/installation/ug1-deploy-to-tomcat.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/installation/ug1-deploy-to-tomcat.txt b/content/docs/_sources/installation/ug1-deploy-to-tomcat.txt
index 5356a94..4c88387 100644
--- a/content/docs/_sources/installation/ug1-deploy-to-tomcat.txt
+++ b/content/docs/_sources/installation/ug1-deploy-to-tomcat.txt
@@ -16,9 +16,9 @@ For more information:
## Download
-Use GitHub to clone the [apache/incubator-usergrid](https://github.com/apache/incubator-usergrid) repo.
+Use GitHub to clone the [apache/usergrid](https://github.com/apache/usergrid) repo.
-Or you can start by [downloading our latest code](https://github.com/apache/incubator-usergrid/archive/master.zip) and extract it.
+Or you can start by [downloading our latest code](https://github.com/apache/usergrid/archive/master.zip) and extract it.
## Building
@@ -89,7 +89,7 @@ You should not be prompted for login because you already logged into for the Dat
Build the Usergrid Console
---
-The Usergrid Console is an admin interface written in JavaScript that connects to your running Usergrid instance. For evaluation purposes, you can run it within Tomcat. Build it by following the steps [here](https://github.com/apache/incubator-usergrid/blob/master/portal/README.md). Once built, copy the directory _portal/build/usergrid-portal_ to _tomcat/webapps_.
+The Usergrid Console is an admin interface written in JavaScript that connects to your running Usergrid instance. For evaluation purposes, you can run it within Tomcat. Build it by following the steps [here](https://github.com/apache/usergrid/blob/master/portal/README.md). Once built, copy the directory _portal/build/usergrid-portal_ to _tomcat/webapps_.
Login to the Usergrid Console & get started
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d0f10bcf/content/docs/_sources/installation/ug1-launcher-quick-start.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/installation/ug1-launcher-quick-start.txt b/content/docs/_sources/installation/ug1-launcher-quick-start.txt
index 8399522..fe25e21 100644
--- a/content/docs/_sources/installation/ug1-launcher-quick-start.txt
+++ b/content/docs/_sources/installation/ug1-launcher-quick-start.txt
@@ -9,7 +9,7 @@
### Download2
-Start by [downloading our latest code](https://github.com/apache/incubator-usergrid/archive/master.zip) and extract it.
+Start by [downloading our latest code](https://github.com/apache/usergrid/archive/master.zip) and extract it.
#### Building 3
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d0f10bcf/content/docs/_sources/installation/ug2-deploy-to-tomcat.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/installation/ug2-deploy-to-tomcat.txt b/content/docs/_sources/installation/ug2-deploy-to-tomcat.txt
index 10ed013..a07f13a 100644
--- a/content/docs/_sources/installation/ug2-deploy-to-tomcat.txt
+++ b/content/docs/_sources/installation/ug2-deploy-to-tomcat.txt
@@ -9,7 +9,7 @@ __NOTE__: Beware that Usergrid 2 is UNRELEASED SOFTWARE
* [Tomcat 7+](https://tomcat.apache.org/download-70.cgi)
* [Cassandra 1.2.1*](http://cassandra.apache.org/download/)
* [ElasticSearch 1.4+](https://www.elastic.co/downloads/elasticsearch)
-* [Usergrid 2.0](https://github.com/apache/incubator-usergrid/tree/two-dot-o)
+* [Usergrid 2.0](https://github.com/apache/usergrid/tree/two-dot-o)
##Running
@@ -50,7 +50,7 @@ The stack is now ready to be queried against, but to get the most out of it you'
[nodejs 0.10+](https://nodejs.org/download/)
1. Make sure you've installed node.js above. Any version above .10 or .10 should work fine.
-2. Navigate to ```incubator-usergrid/portal```.
+2. Navigate to ```usergrid/portal```.
3. Open config.js and make sure the override URL is pointing to your local tomcat.
4. Now in the portal folder run the following command ```./build.sh dev```
5. The portal should automatically open ready for use!
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d0f10bcf/content/docs/_sources/reference/contribute-code.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/reference/contribute-code.txt b/content/docs/_sources/reference/contribute-code.txt
index 5bfd0ce..cfd3073 100644
--- a/content/docs/_sources/reference/contribute-code.txt
+++ b/content/docs/_sources/reference/contribute-code.txt
@@ -7,7 +7,7 @@ by external contributors, and by those who are committers on the project.
You can read this policy here [Usergrid Contribution Workflow](https://cwiki.apache.org/confluence/display/usergrid/Usergrid+Contribution+Workflow).
Basically, we use GitHub as our code review system. So you should fork the
-apache/incubator-usergrid repo and submit PRs back to the project. Here
+apache/usergrid repo and submit PRs back to the project. Here
are are step-by-step guide for both both external contributors and committers:
* [External Contributors Guide](https://cwiki.apache.org/confluence/display/usergrid/Usergrid+External+Contributors+Guide)
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d0f10bcf/content/docs/_sources/sdks/usage.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/sdks/usage.txt b/content/docs/_sources/sdks/usage.txt
deleted file mode 100644
index 2d2f139..0000000
--- a/content/docs/_sources/sdks/usage.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# SDKs & Tools
-
-## SDKs
-
-* [iOS SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/ios)
-* [Android SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/android)
-* [HTML5 / JavaScript SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/html5-javascript)
-* [Windows 8 / Windows Phone / .net SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/dotnet)
-* [Ruby gem](https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby)
-* [Ruby on Rails gem](https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby-on-rails)
-* [PHP library](https://github.com/apache/incubator-usergrid/tree/master/sdks/php)
-* [Java library](https://github.com/apache/incubator-usergrid/tree/master/sdks/java)
-* [Perl module](https://github.com/apache/incubator-usergrid/tree/master/sdks/perl)
-
-## Tools
-[ugc — the Command-line Client](https://github.com/apache/incubator-usergrid/tree/master/ugc#usergrid-command-line-ugc)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d0f10bcf/content/docs/_sources/user-management/messagee-example.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/user-management/messagee-example.txt b/content/docs/_sources/user-management/messagee-example.txt
index eb3e560..29a61e7 100644
--- a/content/docs/_sources/user-management/messagee-example.txt
+++ b/content/docs/_sources/user-management/messagee-example.txt
@@ -122,16 +122,16 @@ Because test-user-1 follows test-user-2, you should see the message sent by test
## iOS SDK
-If you want to write iOS applications that connect to Usergrid, [download the Usergrid iOS SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/ios).
+If you want to write iOS applications that connect to Usergrid, [download the Usergrid iOS SDK](https://github.com/apache/usergrid/tree/master/sdks/ios).
__Note__: The Messagee iOS application uses RestKit, a popular REST framework for iOS, to communicate with Usergrid. Because Usergrid use a REST API, you can use any REST framework to talk with the service. However, the official Usergrid iOS SDK provides a more convenient communication mechanism that you should use unless you're already using RestKit or some other framework in your project.
## Android client and SDK
Messagee is available as a sample Android app that acts as a Usergrid client. The source for the Android version is packaged with the Usergrid Android SDK in the /samples/messagee directory.
-[Download the Usergrid Android SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/android)
+[Download the Usergrid Android SDK](https://github.com/apache/usergrid/tree/master/sdks/android)
## Javascript/HTML5 client and SDK
Messagee is also available as a sample HTML5 app that behaves in much the same way as the two previous examples. The source for the HTML5 version is packaged with the Usergrid Javascript/HTML5 SDK in the /samples/messagee directory.
-[Download the Usergrid Javascript/HTML5 SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/html5-javascript)
+[Download the Usergrid Javascript/HTML5 SDK](https://github.com/apache/usergrid/tree/master/sdks/html5-javascript)
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d0f10bcf/content/docs/installation/ug1-deploy-to-tomcat.html
----------------------------------------------------------------------
diff --git a/content/docs/installation/ug1-deploy-to-tomcat.html b/content/docs/installation/ug1-deploy-to-tomcat.html
index 5a13447..e7db71c 100644
--- a/content/docs/installation/ug1-deploy-to-tomcat.html
+++ b/content/docs/installation/ug1-deploy-to-tomcat.html
@@ -256,11 +256,10 @@ server</a></li>
<div class="section" id="download">
<h2>Download<a class="headerlink" href="#download" title="Permalink to this headline">¶</a></h2>
<p>Use GitHub to clone the
-<a class="reference external" href="https://github.com/apache/incubator-usergrid">apache/incubator-usergrid</a>
-repo.</p>
-<p>Or you can start by <a class="reference external" href="https://github.com/apache/incubator-usergrid/archive/master.zip">downloading our latest
-code</a>
-and extract it.</p>
+<a class="reference external" href="https://github.com/apache/usergrid">apache/usergrid</a> repo.</p>
+<p>Or you can start by <a class="reference external" href="https://github.com/apache/usergrid/archive/master.zip">downloading our latest
+code</a> and
+extract it.</p>
</div>
<div class="section" id="building">
<h2>Building<a class="headerlink" href="#building" title="Permalink to this headline">¶</a></h2>
@@ -346,7 +345,7 @@ the Database Setup. If setup works, you should see a message like this:</p>
<p>The Usergrid Console is an admin interface written in JavaScript that
connects to your running Usergrid instance. For evaluation purposes, you
can run it within Tomcat. Build it by following the steps
-<a class="reference external" href="https://github.com/apache/incubator-usergrid/blob/master/portal/README.md">here</a>.
+<a class="reference external" href="https://github.com/apache/usergrid/blob/master/portal/README.md">here</a>.
Once built, copy the directory <em>portal/build/usergrid-portal</em> to
<em>tomcat/webapps</em>.</p>
</div>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d0f10bcf/content/docs/installation/ug1-launcher-quick-start.html
----------------------------------------------------------------------
diff --git a/content/docs/installation/ug1-launcher-quick-start.html b/content/docs/installation/ug1-launcher-quick-start.html
index 5ae2501..9a54005 100644
--- a/content/docs/installation/ug1-launcher-quick-start.html
+++ b/content/docs/installation/ug1-launcher-quick-start.html
@@ -242,9 +242,9 @@
<h2>Download<a class="headerlink" href="#download" title="Permalink to this headline">¶</a></h2>
<div class="section" id="download2">
<h3>Download2<a class="headerlink" href="#download2" title="Permalink to this headline">¶</a></h3>
-<p>Start by <a class="reference external" href="https://github.com/apache/incubator-usergrid/archive/master.zip">downloading our latest
-code</a>
-and extract it.</p>
+<p>Start by <a class="reference external" href="https://github.com/apache/usergrid/archive/master.zip">downloading our latest
+code</a> and
+extract it.</p>
<div class="section" id="building-3">
<h4>Building 3<a class="headerlink" href="#building-3" title="Permalink to this headline">¶</a></h4>
<p>From the command line, navigate to stack directory and type the
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d0f10bcf/content/docs/installation/ug2-deploy-to-tomcat.html
----------------------------------------------------------------------
diff --git a/content/docs/installation/ug2-deploy-to-tomcat.html b/content/docs/installation/ug2-deploy-to-tomcat.html
index 1557115..96d5523 100644
--- a/content/docs/installation/ug2-deploy-to-tomcat.html
+++ b/content/docs/installation/ug2-deploy-to-tomcat.html
@@ -243,8 +243,7 @@
<li><a class="reference external" href="http://cassandra.apache.org/download/">Cassandra 1.2.1*</a></li>
<li><a class="reference external" href="https://www.elastic.co/downloads/elasticsearch">ElasticSearch
1.4+</a></li>
-<li><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/two-dot-o">Usergrid
-2.0</a></li>
+<li><a class="reference external" href="https://github.com/apache/usergrid/tree/two-dot-o">Usergrid 2.0</a></li>
</ul>
</div>
<div class="section" id="running">
@@ -312,7 +311,7 @@ it you’ll need to initilize and use our portal!</p>
<ol class="arabic simple">
<li>Make sure you’ve installed node.js above. Any version above .10 or
.10 should work fine.</li>
-<li>Navigate to <code class="docutils literal"><span class="pre">incubator-usergrid/portal</span></code>.</li>
+<li>Navigate to <code class="docutils literal"><span class="pre">usergrid/portal</span></code>.</li>
<li>Open config.js and make sure the override URL is pointing to your
local tomcat.</li>
<li>Now in the portal folder run the following command <code class="docutils literal"><span class="pre">./build.sh</span> <span class="pre">dev</span></code></li>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d0f10bcf/content/docs/reference/contribute-code.html
----------------------------------------------------------------------
diff --git a/content/docs/reference/contribute-code.html b/content/docs/reference/contribute-code.html
index 03fc9c8..d86a3cc 100644
--- a/content/docs/reference/contribute-code.html
+++ b/content/docs/reference/contribute-code.html
@@ -228,8 +228,8 @@ contributed by external contributors, and by those who are committers on
the project. You can read this policy here <a class="reference external" href="https://cwiki.apache.org/confluence/display/usergrid/Usergrid+Contribution+Workflow">Usergrid Contribution
Workflow</a>.</p>
<p>Basically, we use GitHub as our code review system. So you should fork
-the apache/incubator-usergrid repo and submit PRs back to the project.
-Here are are step-by-step guide for both both external contributors and
+the apache/usergrid repo and submit PRs back to the project. Here are
+are step-by-step guide for both both external contributors and
committers:</p>
<ul class="simple">
<li><a class="reference external" href="https://cwiki.apache.org/confluence/display/usergrid/Usergrid+External+Contributors+Guide">External Contributors
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d0f10bcf/content/docs/sdks/usage.html
----------------------------------------------------------------------
diff --git a/content/docs/sdks/usage.html b/content/docs/sdks/usage.html
deleted file mode 100644
index 9c95dcc..0000000
--- a/content/docs/sdks/usage.html
+++ /dev/null
@@ -1,308 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
- <meta charset="utf-8">
-
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
- <title>SDKs & Tools — Apache Usergrid 1.0 documentation</title>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
-
-
-
-
-
- <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
-
-
- <script src="../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
- <div class="wy-grid-for-nav">
-
-
- <nav data-toggle="wy-nav-shift" class="wy-nav-side">
- <div class="wy-side-nav-search">
-
-
-
- <a href="../index.html" class="icon icon-home"> Apache Usergrid
-
-
-
- </a>
-
-
-
-
- <div class="version">
- 1.0
- </div>
-
-
-
-
-<div role="search">
- <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
- <input type="text" name="q" placeholder="Search docs" />
- <input type="hidden" name="check_keywords" value="yes" />
- <input type="hidden" name="area" value="default" />
- </form>
-</div>
-
-
- </div>
-
- <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-
-
-
- <p class="caption"><span class="caption-text">Introduction</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
-</ul>
-<p class="caption"><span class="caption-text">Getting Started</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
-</ul>
-<p class="caption"><span class="caption-text">Data Storage</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
-</ul>
-<p class="caption"><span class="caption-text">Data Queries</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters & clauses</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators & data types</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
-</ul>
-<p class="caption"><span class="caption-text">Entity Connections</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
-</ul>
-<p class="caption"><span class="caption-text">Security & Authentication</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
-</ul>
-<p class="caption"><span class="caption-text">User Management & Social Graph</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management & social graph</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
-</ul>
-<p class="caption"><span class="caption-text">Geo-location</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
-</ul>
-<p class="caption"><span class="caption-text">Assets & Files</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
-</ul>
-<p class="caption"><span class="caption-text">Counters & Events</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters & events</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating & incrementing counters</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
-</ul>
-<p class="caption"><span class="caption-text">Organizations & Applications</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
-</ul>
-<p class="caption"><span class="caption-text">API Reference</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
-</ul>
-<p class="caption"><span class="caption-text">Client SDKs</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="tbd.html">COMING SOON...</a></li>
-</ul>
-<p class="caption"><span class="caption-text">Installing the Stack</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
-</ul>
-<p class="caption"><span class="caption-text">More about Usergrid</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations & Videos</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code & Docs</a></li>
-</ul>
-
-
-
- </div>
-
- </nav>
-
- <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-
- <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
- <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
- <a href="../index.html">Apache Usergrid</a>
- </nav>
-
-
-
- <div class="wy-nav-content">
- <div class="rst-content">
- <div role="navigation" aria-label="breadcrumbs navigation">
- <ul class="wy-breadcrumbs">
- <li><a href="../index.html">Docs</a> »</li>
-
- <li>SDKs & Tools</li>
- <li class="wy-breadcrumbs-aside">
-
-
- <a href="../_sources/sdks/usage.txt" rel="nofollow"> View page source</a>
-
-
- </li>
- </ul>
- <hr/>
-</div>
- <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
- <div itemprop="articleBody">
-
- <div class="section" id="sdks-tools">
-<h1>SDKs & Tools<a class="headerlink" href="#sdks-tools" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="sdks">
-<h2>SDKs<a class="headerlink" href="#sdks" title="Permalink to this headline">¶</a></h2>
-<ul class="simple">
-<li><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ios">iOS
-SDK</a></li>
-<li><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/android">Android
-SDK</a></li>
-<li><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/html5-javascript">HTML5 / JavaScript
-SDK</a></li>
-<li><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/dotnet">Windows 8 / Windows Phone / .net
-SDK</a></li>
-<li><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby">Ruby
-gem</a></li>
-<li><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails
-gem</a></li>
-<li><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/php">PHP
-library</a></li>
-<li><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/java">Java
-library</a></li>
-<li><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/perl">Perl
-module</a></li>
-</ul>
-</div>
-<div class="section" id="tools">
-<h2>Tools<a class="headerlink" href="#tools" title="Permalink to this headline">¶</a></h2>
-<p><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/ugc#usergrid-command-line-ugc">ugc — the Command-line
-Client</a></p>
-</div>
-</div>
-
-
- </div>
- </div>
- <footer>
-
-
- <hr/>
-
- <div role="contentinfo">
- <p>
- © Copyright 2013-2015, Apache Usergrid.
-
- </p>
- </div>
- Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
-
-</footer>
-
- </div>
- </div>
-
- </section>
-
- </div>
-
-
-
-
-
- <script type="text/javascript">
- var DOCUMENTATION_OPTIONS = {
- URL_ROOT:'../',
- VERSION:'1.0',
- COLLAPSE_INDEX:false,
- FILE_SUFFIX:'.html',
- HAS_SOURCE: true
- };
- </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
-
-
-
-
-
- <script type="text/javascript" src="../_static/js/theme.js"></script>
-
-
-
-
- <script type="text/javascript">
- jQuery(function () {
- SphinxRtdTheme.StickyNav.enable();
- });
- </script>
-
-
-</body>
-</html>
\ No newline at end of file
[31/36] usergrid git commit: Cherry pick: Remove operation cross
references from Markdown representation as Sphinx will not allow me to set
anchors.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/2303eeac/docs/rest-endpoints/api-docs.html
----------------------------------------------------------------------
diff --git a/docs/rest-endpoints/api-docs.html b/docs/rest-endpoints/api-docs.html
index d04b4b5..50ac3d9 100644
--- a/docs/rest-endpoints/api-docs.html
+++ b/docs/rest-endpoints/api-docs.html
@@ -57,18 +57,18 @@
<a name='Access-Tokens-method'></a>
<h2>Access-Tokens</h2>
-<a name="op-9tip2KQOJU"/>
+<a name="op-jltfzperrd"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /management/token
- <a data-toggle="collapse" data-target="#op-9tip2KQOJU"
- href="#op-9tip2KQOJU" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-jltfzperrd"
+ href="#op-jltfzperrd" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-9tip2KQOJU" class="panel-body collapse">
+ <div id="op-jltfzperrd" class="panel-body collapse">
<p>Login with Admin-User or Organization credentials.</p>
@@ -88,14 +88,14 @@
<b>200</b>
<ul>
<li>Description: Object containing access_token.</li>
- <li>Schema: [<a href="#AccessTokenResponse">AccessTokenResponse</a>]</li>
+ <li>Schema: [<a href="#accesstokenresponse">AccessTokenResponse</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -104,18 +104,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-IUf19l1qrH"/>
+<a name="op-pf4k08eh6b"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{appId}/token
- <a data-toggle="collapse" data-target="#op-IUf19l1qrH"
- href="#op-IUf19l1qrH" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-pf4k08eh6b"
+ href="#op-pf4k08eh6b" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-IUf19l1qrH" class="panel-body collapse">
+ <div id="op-pf4k08eh6b" class="panel-body collapse">
<p>Login with App-User or Application credentials.</p>
@@ -135,14 +135,14 @@
<b>200</b>
<ul>
<li>Description: Object containing access_token.</li>
- <li>Schema: [<a href="#AccessTokenResponse">AccessTokenResponse</a>]</li>
+ <li>Schema: [<a href="#accesstokenresponse">AccessTokenResponse</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -153,18 +153,18 @@
<a name='Activities-method'></a>
<h2>Activities</h2>
-<a name="op-s4NWZiHc78"/>
+<a name="op-oelvmrj75o"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{appId}/groups/{groupId}/feed
- <a data-toggle="collapse" data-target="#op-s4NWZiHc78"
- href="#op-s4NWZiHc78" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-oelvmrj75o"
+ href="#op-oelvmrj75o" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-s4NWZiHc78" class="panel-body collapse">
+ <div id="op-oelvmrj75o" class="panel-body collapse">
<p>Get a group's feed through providing all the identifications.</p>
@@ -192,14 +192,14 @@
<b>200</b>
<ul>
<li>Description: An array of group's activity.</li>
- <li>Schema: [<a href="#ActivityFeed">ActivityFeed</a>]</li>
+ <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -208,18 +208,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-HDAhoX69jZ"/>
+<a name="op-qijgihm8op"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{appId}/users/{userId}/activities
- <a data-toggle="collapse" data-target="#op-HDAhoX69jZ"
- href="#op-HDAhoX69jZ" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-qijgihm8op"
+ href="#op-qijgihm8op" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-HDAhoX69jZ" class="panel-body collapse">
+ <div id="op-qijgihm8op" class="panel-body collapse">
<p>Create an activity in the activities collection.</p>
@@ -251,14 +251,14 @@
<b>200</b>
<ul>
<li>Description: An array of user's activity.</li>
- <li>Schema: [<a href="#ActivityFeed">ActivityFeed</a>]</li>
+ <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -267,18 +267,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-twzitiiIB6"/>
+<a name="op-abeniyh5dn"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{appId}/users/{userId}/feed
- <a data-toggle="collapse" data-target="#op-twzitiiIB6"
- href="#op-twzitiiIB6" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-abeniyh5dn"
+ href="#op-abeniyh5dn" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-twzitiiIB6" class="panel-body collapse">
+ <div id="op-abeniyh5dn" class="panel-body collapse">
<p>Retrieve a user's feed through providing all the identifications.</p>
@@ -306,14 +306,14 @@
<b>200</b>
<ul>
<li>Description: An array of user's activity feed.</li>
- <li>Schema: [<a href="#ActivityFeed">ActivityFeed</a>]</li>
+ <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -324,18 +324,18 @@
<a name='Admin-Users-method'></a>
<h2>Admin-Users</h2>
-<a name="op-fY1suiC9CG"/>
+<a name="op-0k8ni3xj3d"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/users
- <a data-toggle="collapse" data-target="#op-fY1suiC9CG"
- href="#op-fY1suiC9CG" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-0k8ni3xj3d"
+ href="#op-0k8ni3xj3d" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-fY1suiC9CG" class="panel-body collapse">
+ <div id="op-0k8ni3xj3d" class="panel-body collapse">
<p>Retrieve details about the admin users in an organization.</p>
@@ -355,14 +355,14 @@
<b>200</b>
<ul>
<li>Description: An array of retrieved Admin user's info.</li>
- <li>Schema: [<a href="#User">User</a>]</li>
+ <li>Schema: [<a href="#user">User</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -371,18 +371,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-9ay9DuEBu7"/>
+<a name="op-vh9ngi9fmx"/>
<div class="panel panel-default">
<div class="panel-heading DELETE">
<h2 class="panel-title DELETE-heading">DELETE /management/orgs/{orgId}/users/{userId}
- <a data-toggle="collapse" data-target="#op-9ay9DuEBu7"
- href="#op-9ay9DuEBu7" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-vh9ngi9fmx"
+ href="#op-vh9ngi9fmx" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-9ay9DuEBu7" class="panel-body collapse">
+ <div id="op-vh9ngi9fmx" class="panel-body collapse">
<p>Remove an admin user from an organization through providing both Id of application and organization.</p>
@@ -406,14 +406,14 @@
<b>200</b>
<ul>
<li>Description: An array of deleted Admin user's info.</li>
- <li>Schema: [<a href="#User">User</a>]</li>
+ <li>Schema: [<a href="#user">User</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -422,18 +422,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-K7dHVMcYsP"/>
+<a name="op-u0gzbrduqw"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /management/users
- <a data-toggle="collapse" data-target="#op-K7dHVMcYsP"
- href="#op-K7dHVMcYsP" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-u0gzbrduqw"
+ href="#op-u0gzbrduqw" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-K7dHVMcYsP" class="panel-body collapse">
+ <div id="op-u0gzbrduqw" class="panel-body collapse">
<p>Create a whole new admin user.</p>
@@ -453,14 +453,14 @@
<b>200</b>
<ul>
<li>Description: An API Response with a entities array containing the newly created Admin User.</li>
- <li>Schema: [<a href="#User">User</a>]</li>
+ <li>Schema: [<a href="#user">User</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -469,18 +469,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-o2wkBkogfI"/>
+<a name="op-uqzrvknezr"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /management/users/resetpw
- <a data-toggle="collapse" data-target="#op-o2wkBkogfI"
- href="#op-o2wkBkogfI" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-uqzrvknezr"
+ href="#op-uqzrvknezr" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-o2wkBkogfI" class="panel-body collapse">
+ <div id="op-uqzrvknezr" class="panel-body collapse">
<p>Initiate the reset of an admin user's password.</p>
@@ -496,14 +496,14 @@
<b>200</b>
<ul>
<li>Description: An array of complete messages.</li>
- <li>Schema: [<a href="#Action">Action</a>]</li>
+ <li>Schema: [<a href="#action">Action</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -512,18 +512,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-cpX0wpzVCy"/>
+<a name="op-hdejths3zf"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /management/users/resetpw
- <a data-toggle="collapse" data-target="#op-cpX0wpzVCy"
- href="#op-cpX0wpzVCy" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-hdejths3zf"
+ href="#op-hdejths3zf" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-cpX0wpzVCy" class="panel-body collapse">
+ <div id="op-hdejths3zf" class="panel-body collapse">
<p>Complete the password reset through getting the newpassword and the old one for identification.</p>
@@ -550,7 +550,7 @@
<b>default</b>
<ul>
<li>Description: </li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -559,18 +559,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-7hDdXim1A9"/>
+<a name="op-lbof08ngzj"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /management/users/{userId}
- <a data-toggle="collapse" data-target="#op-7hDdXim1A9"
- href="#op-7hDdXim1A9" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-lbof08ngzj"
+ href="#op-lbof08ngzj" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-7hDdXim1A9" class="panel-body collapse">
+ <div id="op-lbof08ngzj" class="panel-body collapse">
<p>Retrieve details about an admin user.</p>
@@ -590,14 +590,14 @@
<b>200</b>
<ul>
<li>Description: An API Response with a entities array containing the Admin User.</li>
- <li>Schema: [<a href="#User">User</a>]</li>
+ <li>Schema: [<a href="#user">User</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -606,18 +606,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-9OBDSmeQMQ"/>
+<a name="op-e0xzsb83mx"/>
<div class="panel panel-default">
<div class="panel-heading PUT">
<h2 class="panel-title PUT-heading">PUT /management/users/{userId}
- <a data-toggle="collapse" data-target="#op-9OBDSmeQMQ"
- href="#op-9OBDSmeQMQ" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-e0xzsb83mx"
+ href="#op-e0xzsb83mx" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-9OBDSmeQMQ" class="panel-body collapse">
+ <div id="op-e0xzsb83mx" class="panel-body collapse">
<p>Update the info of an admin user.</p>
@@ -637,14 +637,14 @@
<b>200</b>
<ul>
<li>Description: An API Response with a entities array containing the updated Admin User</li>
- <li>Schema: [<a href="#User">User</a>]</li>
+ <li>Schema: [<a href="#user">User</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -653,18 +653,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-w5LTUIm8Aa"/>
+<a name="op-tomptkkm0s"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /management/users/{userId}/activate
- <a data-toggle="collapse" data-target="#op-w5LTUIm8Aa"
- href="#op-w5LTUIm8Aa" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-tomptkkm0s"
+ href="#op-tomptkkm0s" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-w5LTUIm8Aa" class="panel-body collapse">
+ <div id="op-tomptkkm0s" class="panel-body collapse">
<p>Activate an admin user from a link provIded in an email notification.</p>
@@ -692,14 +692,14 @@
<b>200</b>
<ul>
<li>Description: An array of complete messages.</li>
- <li>Schema: [<a href="#Action">Action</a>]</li>
+ <li>Schema: [<a href="#action">Action</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -708,18 +708,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-5cCk6VmfP1"/>
+<a name="op-nghoyv2wcb"/>
<div class="panel panel-default">
<div class="panel-heading PUT">
<h2 class="panel-title PUT-heading">PUT /management/users/{userId}/password
- <a data-toggle="collapse" data-target="#op-5cCk6VmfP1"
- href="#op-5cCk6VmfP1" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-nghoyv2wcb"
+ href="#op-nghoyv2wcb" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-5cCk6VmfP1" class="panel-body collapse">
+ <div id="op-nghoyv2wcb" class="panel-body collapse">
<p>Update an admin user's password through getting the newpassword and the old one for identification.</p>
@@ -743,14 +743,14 @@
<b>200</b>
<ul>
<li>Description: An array of complete messages.</li>
- <li>Schema: [<a href="#Action">Action</a>]</li>
+ <li>Schema: [<a href="#action">Action</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -759,18 +759,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-DHHGIVnyXy"/>
+<a name="op-z6wihrgdkd"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /management/users/{userId}/reactivate
- <a data-toggle="collapse" data-target="#op-DHHGIVnyXy"
- href="#op-DHHGIVnyXy" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-z6wihrgdkd"
+ href="#op-z6wihrgdkd" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-DHHGIVnyXy" class="panel-body collapse">
+ <div id="op-z6wihrgdkd" class="panel-body collapse">
<p>Reactivate an expired admin user.</p>
@@ -790,14 +790,14 @@
<b>200</b>
<ul>
<li>Description: An array of complete messages.</li>
- <li>Schema: [<a href="#Action">Action</a>]</li>
+ <li>Schema: [<a href="#action">Action</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -808,18 +808,18 @@
<a name='App-Users-method'></a>
<h2>App-Users</h2>
-<a name="op-Lx5NaI3isH"/>
+<a name="op-rjc6xigqey"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{appId}/users
- <a data-toggle="collapse" data-target="#op-Lx5NaI3isH"
- href="#op-Lx5NaI3isH" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-rjc6xigqey"
+ href="#op-rjc6xigqey" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-Lx5NaI3isH" class="panel-body collapse">
+ <div id="op-rjc6xigqey" class="panel-body collapse">
<p>Retrieve users though query statement.</p>
@@ -847,14 +847,14 @@
<b>200</b>
<ul>
<li>Description: An array of retrieved user's info.</li>
- <li>Schema: [<a href="#User">User</a>]</li>
+ <li>Schema: [<a href="#user">User</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -863,18 +863,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-Eosn4udGUG"/>
+<a name="op-auocxo8sbd"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{appId}/users
- <a data-toggle="collapse" data-target="#op-Eosn4udGUG"
- href="#op-Eosn4udGUG" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-auocxo8sbd"
+ href="#op-auocxo8sbd" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-Eosn4udGUG" class="panel-body collapse">
+ <div id="op-auocxo8sbd" class="panel-body collapse">
<p>Create a user in the users collection through providing all the identifications.</p>
@@ -902,14 +902,14 @@
<b>200</b>
<ul>
<li>Description: An array of created user's info.</li>
- <li>Schema: [<a href="#User">User</a>]</li>
+ <li>Schema: [<a href="#user">User</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -918,18 +918,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-f2fcMcbq2u"/>
+<a name="op-fed3e3rttw"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{appId}/users/{userId}
- <a data-toggle="collapse" data-target="#op-f2fcMcbq2u"
- href="#op-f2fcMcbq2u" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-fed3e3rttw"
+ href="#op-fed3e3rttw" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-f2fcMcbq2u" class="panel-body collapse">
+ <div id="op-fed3e3rttw" class="panel-body collapse">
<p>Retrieve a user through providing all the identifications.</p>
@@ -957,14 +957,14 @@
<b>200</b>
<ul>
<li>Description: An array of retrieved user's info.</li>
- <li>Schema: [<a href="#User">User</a>]</li>
+ <li>Schema: [<a href="#user">User</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -973,18 +973,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-1WRy7Zxrom"/>
+<a name="op-ubyjuplh34"/>
<div class="panel panel-default">
<div class="panel-heading PUT">
<h2 class="panel-title PUT-heading">PUT /{orgId}/{appId}/users/{userId}
- <a data-toggle="collapse" data-target="#op-1WRy7Zxrom"
- href="#op-1WRy7Zxrom" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-ubyjuplh34"
+ href="#op-ubyjuplh34" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-1WRy7Zxrom" class="panel-body collapse">
+ <div id="op-ubyjuplh34" class="panel-body collapse">
<p>Update a user through providing all the identifications.</p>
@@ -1012,14 +1012,14 @@
<b>200</b>
<ul>
<li>Description: An array of updated user's info.</li>
- <li>Schema: [<a href="#User">User</a>]</li>
+ <li>Schema: [<a href="#user">User</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -1028,18 +1028,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-wAYA0cyL6U"/>
+<a name="op-xo78yrnje9"/>
<div class="panel panel-default">
<div class="panel-heading DELETE">
<h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/users/{userId}
- <a data-toggle="collapse" data-target="#op-wAYA0cyL6U"
- href="#op-wAYA0cyL6U" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-xo78yrnje9"
+ href="#op-xo78yrnje9" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-wAYA0cyL6U" class="panel-body collapse">
+ <div id="op-xo78yrnje9" class="panel-body collapse">
<p>Remove a user through providing all the identifications.</p>
@@ -1067,14 +1067,14 @@
<b>200</b>
<ul>
<li>Description: An array of deleted user's info.</li>
- <li>Schema: [<a href="#User">User</a>]</li>
+ <li>Schema: [<a href="#user">User</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -1083,18 +1083,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-2gWkZmGFej"/>
+<a name="op-atwo87tjks"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{appId}/users/{user}/password
- <a data-toggle="collapse" data-target="#op-2gWkZmGFej"
- href="#op-2gWkZmGFej" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-atwo87tjks"
+ href="#op-atwo87tjks" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-2gWkZmGFej" class="panel-body collapse">
+ <div id="op-atwo87tjks" class="panel-body collapse">
<p>Set a user's password or reset the user's existing password.</p>
@@ -1126,14 +1126,14 @@
<b>200</b>
<ul>
<li>Description: An array of complete messages.</li>
- <li>Schema: [<a href="#Action">Action</a>]</li>
+ <li>Schema: [<a href="#action">Action</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -1144,18 +1144,18 @@
<a name='Entities-Collections-method'></a>
<h2>Entities-Collections</h2>
-<a name="op-MPJEDNveAg"/>
+<a name="op-qfvlknxj23"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{appId}/users/{userId}/{relation}
- <a data-toggle="collapse" data-target="#op-MPJEDNveAg"
- href="#op-MPJEDNveAg" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-qfvlknxj23"
+ href="#op-qfvlknxj23" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-MPJEDNveAg" class="panel-body collapse">
+ <div id="op-qfvlknxj23" class="panel-body collapse">
<p>Retrieve a user's collections or connections through query statement.</p>
@@ -1191,14 +1191,14 @@
<b>200</b>
<ul>
<li>Description: An array of user's collections info.</li>
- <li>Schema: [<a href="#Entity">Entity</a>]</li>
+ <li>Schema: [<a href="#entity">Entity</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -1207,18 +1207,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-IPmIu3acQ6"/>
+<a name="op-iryk6kw39t"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{appId}/{collectionId}
- <a data-toggle="collapse" data-target="#op-IPmIu3acQ6"
- href="#op-IPmIu3acQ6" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-iryk6kw39t"
+ href="#op-iryk6kw39t" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-IPmIu3acQ6" class="panel-body collapse">
+ <div id="op-iryk6kw39t" class="panel-body collapse">
<p>Retrieve collection through query statement.</p>
@@ -1250,14 +1250,14 @@
<b>200</b>
<ul>
<li>Description: An array of retrieved collection's info.</li>
- <li>Schema: [<a href="#Entity">Entity</a>]</li>
+ <li>Schema: [<a href="#entity">Entity</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -1266,18 +1266,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-BamEimBRA0"/>
+<a name="op-7928vzxtic"/>
<div class="panel panel-default">
<div class="panel-heading PUT">
<h2 class="panel-title PUT-heading">PUT /{orgId}/{appId}/{collectionId}
- <a data-toggle="collapse" data-target="#op-BamEimBRA0"
- href="#op-BamEimBRA0" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-7928vzxtic"
+ href="#op-7928vzxtic" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-BamEimBRA0" class="panel-body collapse">
+ <div id="op-7928vzxtic" class="panel-body collapse">
<p>Update collection through query statement.</p>
@@ -1309,14 +1309,14 @@
<b>200</b>
<ul>
<li>Description: An array of updated collection's info.</li>
- <li>Schema: [<a href="#Entity">Entity</a>]</li>
+ <li>Schema: [<a href="#entity">Entity</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -1325,18 +1325,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-vbbvVAAgj9"/>
+<a name="op-gzjjo0gt4n"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2}
- <a data-toggle="collapse" data-target="#op-vbbvVAAgj9"
- href="#op-vbbvVAAgj9" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-gzjjo0gt4n"
+ href="#op-gzjjo0gt4n" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-vbbvVAAgj9" class="panel-body collapse">
+ <div id="op-gzjjo0gt4n" class="panel-body collapse">
<p>Add an entity to a collection through providing all the identifications.</p>
@@ -1376,14 +1376,14 @@
<b>200</b>
<ul>
<li>Description: An array of added entity's info.</li>
- <li>Schema: [<a href="#Entity">Entity</a>]</li>
+ <li>Schema: [<a href="#entity">Entity</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -1392,18 +1392,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-fRuzilDgtX"/>
+<a name="op-ubvz0iw6sr"/>
<div class="panel panel-default">
<div class="panel-heading DELETE">
<h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2}
- <a data-toggle="collapse" data-target="#op-fRuzilDgtX"
- href="#op-fRuzilDgtX" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-ubvz0iw6sr"
+ href="#op-ubvz0iw6sr" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-fRuzilDgtX" class="panel-body collapse">
+ <div id="op-ubvz0iw6sr" class="panel-body collapse">
<p>Remove an entity from a collection through providing all the identifications.</p>
@@ -1443,14 +1443,14 @@
<b>200</b>
<ul>
<li>Description: An array of deleted entity's info.</li>
- <li>Schema: [<a href="#Entity">Entity</a>]</li>
+ <li>Schema: [<a href="#entity">Entity</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -1459,18 +1459,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-OTebyGbCOB"/>
+<a name="op-ncyiutohja"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{appId}/{collectionId}/{entityId}
- <a data-toggle="collapse" data-target="#op-OTebyGbCOB"
- href="#op-OTebyGbCOB" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-ncyiutohja"
+ href="#op-ncyiutohja" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-OTebyGbCOB" class="panel-body collapse">
+ <div id="op-ncyiutohja" class="panel-body collapse">
<p>Retrieve an entity through providing Id of application, organization, collection and entity.</p>
@@ -1502,14 +1502,14 @@
<b>200</b>
<ul>
<li>Description: An array of retrieved entity's info.</li>
- <li>Schema: [<a href="#Entity">Entity</a>]</li>
+ <li>Schema: [<a href="#entity">Entity</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -1518,18 +1518,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-vMFmKcb2Gg"/>
+<a name="op-zcq75rqupy"/>
<div class="panel panel-default">
<div class="panel-heading PUT">
<h2 class="panel-title PUT-heading">PUT /{orgId}/{appId}/{collectionId}/{entityId}
- <a data-toggle="collapse" data-target="#op-vMFmKcb2Gg"
- href="#op-vMFmKcb2Gg" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-zcq75rqupy"
+ href="#op-zcq75rqupy" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-vMFmKcb2Gg" class="panel-body collapse">
+ <div id="op-zcq75rqupy" class="panel-body collapse">
<p>One or more properties can be updated with a single request.</p>
@@ -1565,14 +1565,14 @@
<b>200</b>
<ul>
<li>Description: An array of updated entity's info.</li>
- <li>Schema: [<a href="#Entity">Entity</a>]</li>
+ <li>Schema: [<a href="#entity">Entity</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -1581,18 +1581,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-iHyMbJUKhn"/>
+<a name="op-cxha8mfn5b"/>
<div class="panel panel-default">
<div class="panel-heading DELETE">
<h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId}
- <a data-toggle="collapse" data-target="#op-iHyMbJUKhn"
- href="#op-iHyMbJUKhn" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-cxha8mfn5b"
+ href="#op-cxha8mfn5b" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-iHyMbJUKhn" class="panel-body collapse">
+ <div id="op-cxha8mfn5b" class="panel-body collapse">
<p>Delete an entity from the collection.</p>
@@ -1624,14 +1624,14 @@
<b>200</b>
<ul>
<li>Description: An array of deleted entity's info.</li>
- <li>Schema: [<a href="#Entity">Entity</a>]</li>
+ <li>Schema: [<a href="#entity">Entity</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -1640,18 +1640,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-zWXoRjHTur"/>
+<a name="op-ghkfksvzjn"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{appId}/{entitytype}
- <a data-toggle="collapse" data-target="#op-zWXoRjHTur"
- href="#op-zWXoRjHTur" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-ghkfksvzjn"
+ href="#op-ghkfksvzjn" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-zWXoRjHTur" class="panel-body collapse">
+ <div id="op-ghkfksvzjn" class="panel-body collapse">
<p>When a new entity is created, Usergrid will automatically create a corresponding collection if one does not already exist. The collection will automatically be named with the plural form of the entity type.</p>
@@ -1683,14 +1683,14 @@
<b>200</b>
<ul>
<li>Description: An array of created custom entity's info.</li>
- <li>Schema: [<a href="#Entity">Entity</a>]</li>
+ <li>Schema: [<a href="#entity">Entity</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -1701,18 +1701,18 @@
<a name='Events-method'></a>
<h2>Events</h2>
-<a name="op-0XTUnMPL6J"/>
+<a name="op-wnqxopkwwz"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{appId}/events
- <a data-toggle="collapse" data-target="#op-0XTUnMPL6J"
- href="#op-0XTUnMPL6J" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-wnqxopkwwz"
+ href="#op-wnqxopkwwz" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-0XTUnMPL6J" class="panel-body collapse">
+ <div id="op-wnqxopkwwz" class="panel-body collapse">
<p>Create an event through providing both Id of organization and application.</p>
@@ -1740,14 +1740,14 @@
<b>200</b>
<ul>
<li>Description: An array of created event's info.</li>
- <li>Schema: [<a href="#Event">Event</a>]</li>
+ <li>Schema: [<a href="#event">Event</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -1758,18 +1758,18 @@
<a name='Groups-method'></a>
<h2>Groups</h2>
-<a name="op-xrKwMqxkJL"/>
+<a name="op-ahwwobry7b"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{appId}/groups
- <a data-toggle="collapse" data-target="#op-xrKwMqxkJL"
- href="#op-xrKwMqxkJL" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-ahwwobry7b"
+ href="#op-ahwwobry7b" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-xrKwMqxkJL" class="panel-body collapse">
+ <div id="op-ahwwobry7b" class="panel-body collapse">
<p>Create a new group through providing both Id of organization and application.</p>
@@ -1797,14 +1797,14 @@
<b>200</b>
<ul>
<li>Description: An array of created group's info.</li>
- <li>Schema: [<a href="#Group">Group</a>]</li>
+ <li>Schema: [<a href="#group">Group</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -1813,18 +1813,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-mWlMUxvD5o"/>
+<a name="op-9agwcnszo1"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{appId}/groups/{groupId}/activities
- <a data-toggle="collapse" data-target="#op-mWlMUxvD5o"
- href="#op-mWlMUxvD5o" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-9agwcnszo1"
+ href="#op-9agwcnszo1" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-mWlMUxvD5o" class="panel-body collapse">
+ <div id="op-9agwcnszo1" class="panel-body collapse">
<p>Create an activity to a specific group. In this case the activity is created in the activities collection and is accessible at the /activities endpoint to users who have the permission to read that endpoint. In addition, a relationship is established between the activity and the group, and because of that, the activity will appear in the group’s feed. The group 'owns' the activity. Also, the activity will be published in the feed of all users that are members of the group.</p>
@@ -1856,14 +1856,14 @@
<b>200</b>
<ul>
<li>Description: </li>
- <li>Schema: [<a href="#ActivityFeed">ActivityFeed</a>]</li>
+ <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -1872,18 +1872,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-HZtvmcWXif"/>
+<a name="op-ndfc9lpvfb"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{appId}/groups/{groupId}/users/{userId}
- <a data-toggle="collapse" data-target="#op-HZtvmcWXif"
- href="#op-HZtvmcWXif" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-ndfc9lpvfb"
+ href="#op-ndfc9lpvfb" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-HZtvmcWXif" class="panel-body collapse">
+ <div id="op-ndfc9lpvfb" class="panel-body collapse">
<p>Add a user to a group through providing all the identifications.</p>
@@ -1915,14 +1915,14 @@
<b>200</b>
<ul>
<li>Description: An array of added user's info.</li>
- <li>Schema: [<a href="#User">User</a>]</li>
+ <li>Schema: [<a href="#user">User</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -1931,18 +1931,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-hUi9lLujEi"/>
+<a name="op-d0g0l32tf1"/>
<div class="panel panel-default">
<div class="panel-heading DELETE">
<h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/groups/{groupId}/users/{userId}
- <a data-toggle="collapse" data-target="#op-hUi9lLujEi"
- href="#op-hUi9lLujEi" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-d0g0l32tf1"
+ href="#op-d0g0l32tf1" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-hUi9lLujEi" class="panel-body collapse">
+ <div id="op-d0g0l32tf1" class="panel-body collapse">
<p>Delete user from a group through providing all the identifications.</p>
@@ -1974,14 +1974,14 @@
<b>200</b>
<ul>
<li>Description: An array of deleted user's info.</li>
- <li>Schema: [<a href="#User">User</a>]</li>
+ <li>Schema: [<a href="#user">User</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -1990,18 +1990,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-DxaIyZ7H6X"/>
+<a name="op-1yb8oe6y0s"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{org_Id}/{app_Id}/groups/{groupId}
- <a data-toggle="collapse" data-target="#op-DxaIyZ7H6X"
- href="#op-DxaIyZ7H6X" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-1yb8oe6y0s"
+ href="#op-1yb8oe6y0s" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-DxaIyZ7H6X" class="panel-body collapse">
+ <div id="op-1yb8oe6y0s" class="panel-body collapse">
<p>Get a group through through providing all the identifications.</p>
@@ -2029,14 +2029,14 @@
<b>200</b>
<ul>
<li>Description: An array of retrieved group's info.</li>
- <li>Schema: [<a href="#Group">Group</a>]</li>
+ <li>Schema: [<a href="#group">Group</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -2045,18 +2045,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-xMH6UvAiJQ"/>
+<a name="op-theoah23fu"/>
<div class="panel panel-default">
<div class="panel-heading PUT">
<h2 class="panel-title PUT-heading">PUT /{org_Id}/{app_Id}/groups/{groupId}
- <a data-toggle="collapse" data-target="#op-xMH6UvAiJQ"
- href="#op-xMH6UvAiJQ" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-theoah23fu"
+ href="#op-theoah23fu" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-xMH6UvAiJQ" class="panel-body collapse">
+ <div id="op-theoah23fu" class="panel-body collapse">
<p>Update a group through providing all the identifications.</p>
@@ -2084,14 +2084,14 @@
<b>200</b>
<ul>
<li>Description: An array of updated group's info.</li>
- <li>Schema: [<a href="#Group">Group</a>]</li>
+ <li>Schema: [<a href="#group">Group</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -2102,18 +2102,18 @@
<a name='Notifications-method'></a>
<h2>Notifications</h2>
-<a name="op-NNv36bcjPY"/>
+<a name="op-icufrwozlt"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{applicationId}/devices
- <a data-toggle="collapse" data-target="#op-NNv36bcjPY"
- href="#op-NNv36bcjPY" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-icufrwozlt"
+ href="#op-icufrwozlt" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-NNv36bcjPY" class="panel-body collapse">
+ <div id="op-icufrwozlt" class="panel-body collapse">
<p>Create notifications for user through targeting by location and providing all the identifications.</p>
@@ -2145,14 +2145,14 @@
<b>200</b>
<ul>
<li>Description: An array of created notification's info.</li>
- <li>Schema: [<a href="#Notification">Notification</a>]</li>
+ <li>Schema: [<a href="#notification">Notification</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -2161,18 +2161,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-NgZ9u50tmC"/>
+<a name="op-eaayzms3bs"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{applicationId}/devices/*/notifications
- <a data-toggle="collapse" data-target="#op-NgZ9u50tmC"
- href="#op-NgZ9u50tmC" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-eaayzms3bs"
+ href="#op-eaayzms3bs" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-NgZ9u50tmC" class="panel-body collapse">
+ <div id="op-eaayzms3bs" class="panel-body collapse">
<p>Create notifications for all devices. This request will target all device entities.</p>
@@ -2200,14 +2200,14 @@
<b>200</b>
<ul>
<li>Description: An array of created notification's info.</li>
- <li>Schema: [<a href="#Notification">Notification</a>]</li>
+ <li>Schema: [<a href="#notification">Notification</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -2216,18 +2216,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-O74c4Dc27b"/>
+<a name="op-kd9yvryvuo"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{applicationId}/devices/{deviceId}/notifications
- <a data-toggle="collapse" data-target="#op-O74c4Dc27b"
- href="#op-O74c4Dc27b" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-kd9yvryvuo"
+ href="#op-kd9yvryvuo" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-O74c4Dc27b" class="panel-body collapse">
+ <div id="op-kd9yvryvuo" class="panel-body collapse">
<p>Create notifications for a single device. This request will target a specific device entity.</p>
@@ -2259,14 +2259,14 @@
<b>200</b>
<ul>
<li>Description: An array of created notification's info.</li>
- <li>Schema: [<a href="#Notification">Notification</a>]</li>
+ <li>Schema: [<a href="#notification">Notification</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -2275,18 +2275,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-wG8IK0i2tT"/>
+<a name="op-agrod0oatq"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{applicationId}/groups/{path}/notifications
- <a data-toggle="collapse" data-target="#op-wG8IK0i2tT"
- href="#op-wG8IK0i2tT" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-agrod0oatq"
+ href="#op-agrod0oatq" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-wG8IK0i2tT" class="panel-body collapse">
+ <div id="op-agrod0oatq" class="panel-body collapse">
<p>Create notifications for a group. This request will target all users associated with a specific group entity.</p>
@@ -2318,14 +2318,14 @@
<b>200</b>
<ul>
<li>Description: An array of created notification's info.</li>
- <li>Schema: [<a href="#Notification">Notification</a>]</li>
+ <li>Schema: [<a href="#notification">Notification</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -2334,18 +2334,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-S0nZNfKyl2"/>
+<a name="op-uiar9izp1w"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{applicationId}/notifications
- <a data-toggle="collapse" data-target="#op-S0nZNfKyl2"
- href="#op-S0nZNfKyl2" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-uiar9izp1w"
+ href="#op-uiar9izp1w" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-S0nZNfKyl2" class="panel-body collapse">
+ <div id="op-uiar9izp1w" class="panel-body collapse">
<p>Retrieve one or more notifications through providing all the identifications.</p>
@@ -2369,14 +2369,14 @@
<b>200</b>
<ul>
<li>Description: An array of retrieved notification's info.</li>
- <li>Schema: [<a href="#Notification">Notification</a>]</li>
+ <li>Schema: [<a href="#notification">Notification</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -2385,18 +2385,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-8DEOQ9kfjU"/>
+<a name="op-olgda8yl8e"/>
<div class="panel panel-default">
<div class="panel-heading PUT">
<h2 class="panel-title PUT-heading">PUT /{orgId}/{applicationId}/notifications/{notificationId}
- <a data-toggle="collapse" data-target="#op-8DEOQ9kfjU"
- href="#op-8DEOQ9kfjU" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-olgda8yl8e"
+ href="#op-olgda8yl8e" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-8DEOQ9kfjU" class="panel-body collapse">
+ <div id="op-olgda8yl8e" class="panel-body collapse">
<p>Update a Notification in order to cancel the notifcation or set a new expiration time.</p>
@@ -2428,14 +2428,14 @@
<b>200</b>
<ul>
<li>Description: An API Response object containing an entity of type Notification.</li>
- <li>Schema: [<a href="#Notification">Notification</a>]</li>
+ <li>Schema: [<a href="#notification">Notification</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -2444,18 +2444,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-aC0kSX5B8s"/>
+<a name="op-kvvxeyt4ac"/>
<div class="panel panel-default">
<div class="panel-heading DELETE">
<h2 class="panel-title DELETE-heading">DELETE /{orgId}/{applicationId}/notifications/{notificationId}
- <a data-toggle="collapse" data-target="#op-aC0kSX5B8s"
- href="#op-aC0kSX5B8s" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-kvvxeyt4ac"
+ href="#op-kvvxeyt4ac" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-aC0kSX5B8s" class="panel-body collapse">
+ <div id="op-kvvxeyt4ac" class="panel-body collapse">
<p>Delete an unsent Notification from the system.</p>
@@ -2483,14 +2483,14 @@
<b>200</b>
<ul>
<li>Description: API Response containing Notification entity that was deleted.</li>
- <li>Schema: [<a href="#Notification">Notification</a>]</li>
+ <li>Schema: [<a href="#notification">Notification</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -2499,18 +2499,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-4Xtwetp0KU"/>
+<a name="op-5gnb0cdb4l"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{applicationId}/receipts
- <a data-toggle="collapse" data-target="#op-4Xtwetp0KU"
- href="#op-4Xtwetp0KU" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-5gnb0cdb4l"
+ href="#op-5gnb0cdb4l" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-4Xtwetp0KU" class="panel-body collapse">
+ <div id="op-5gnb0cdb4l" class="panel-body collapse">
<p>Retrieve one or more receipts through providing all the identifications.</p>
@@ -2534,14 +2534,14 @@
<b>200</b>
<ul>
<li>Description: An array of retrieved receipt's info.</li>
- <li>Schema: [<a href="#Receipt">Receipt</a>]</li>
+ <li>Schema: [<a href="#receipt">Receipt</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -2550,18 +2550,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-hW1QIhZgB5"/>
+<a name="op-aw0uwxfth7"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{applicationId}/users/{userId}/notifications
- <a data-toggle="collapse" data-target="#op-hW1QIhZgB5"
- href="#op-hW1QIhZgB5" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-aw0uwxfth7"
+ href="#op-aw0uwxfth7" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-hW1QIhZgB5" class="panel-body collapse">
+ <div id="op-aw0uwxfth7" class="panel-body collapse">
<p>Create notifications for a user. This request will target a specific user entity.</p>
@@ -2593,14 +2593,14 @@
<b>200</b>
<ul>
<li>Description: An array of created notification's info.</li>
- <li>Schema: [<a href="#Notification">Notification</a>]</li>
+ <li>Schema: [<a href="#notification">Notification</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -2609,18 +2609,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-eTSjnhDjNu"/>
+<a name="op-keyhzudnpa"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{applicationId}/{deviceId}/*/receipts
- <a data-toggle="collapse" data-target="#op-eTSjnhDjNu"
- href="#op-eTSjnhDjNu" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-keyhzudnpa"
+ href="#op-keyhzudnpa" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-eTSjnhDjNu" class="panel-body collapse">
+ <div id="op-keyhzudnpa" class="panel-body collapse">
<p>Retrieve receipts associated with one or more devices through providing all the identifications.</p>
@@ -2648,14 +2648,14 @@
<b>200</b>
<ul>
<li>Description: An array of retrieved receipt's info.</li>
- <li>Schema: [<a href="#Receipt">Receipt</a>]</li>
+ <li>Schema: [<a href="#receipt">Receipt</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -2664,18 +2664,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-yyhbsQF7wa"/>
+<a name="op-uvv9djxk0b"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{applicationId}/{notificationId}/*/queue
- <a data-toggle="collapse" data-target="#op-yyhbsQF7wa"
- href="#op-yyhbsQF7wa" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-uvv9djxk0b"
+ href="#op-uvv9djxk0b" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-yyhbsQF7wa" class="panel-body collapse">
+ <div id="op-uvv9djxk0b" class="panel-body collapse">
<p>Retrieve the list of devices associated with one or more notifications before the notifications are sent through providing all the identifications.</p>
@@ -2703,14 +2703,14 @@
<b>200</b>
<ul>
<li>Description: An array of retrieved device's info.</li>
- <li>Schema: [<a href="#Device">Device</a>]</li>
+ <li>Schema: [<a href="#device">Device</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -2719,18 +2719,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-u4auTY46zf"/>
+<a name="op-ncdxrkaoo0"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{applicationId}/{notificationId}/*/receipts
- <a data-toggle="collapse" data-target="#op-u4auTY46zf"
- href="#op-u4auTY46zf" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-ncdxrkaoo0"
+ href="#op-ncdxrkaoo0" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-u4auTY46zf" class="panel-body collapse">
+ <div id="op-ncdxrkaoo0" class="panel-body collapse">
<p>Retrieve receipts for one or more notifications through providing all the identifications.</p>
@@ -2758,14 +2758,14 @@
<b>200</b>
<ul>
<li>Description: An array of retrieved receipt's info.</li>
- <li>Schema: [<a href="#Receipt">Receipt</a>]</li>
+ <li>Schema: [<a href="#receipt">Receipt</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -2774,18 +2774,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-gjVuYSXEco"/>
+<a name="op-pirmrjnltl"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{applicationId}/{receiptId}/*/notifications
- <a data-toggle="collapse" data-target="#op-gjVuYSXEco"
- href="#op-gjVuYSXEco" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-pirmrjnltl"
+ href="#op-pirmrjnltl" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-gjVuYSXEco" class="panel-body collapse">
+ <div id="op-pirmrjnltl" class="panel-body collapse">
<p>Retrieve notifications associated with one or more receipts through providing all the identifications.</p>
@@ -2813,14 +2813,14 @@
<b>200</b>
<ul>
<li>Description: An array of retrieved notification's info.</li>
- <li>Schema: [<a href="#Notification">Notification</a>]</li>
+ <li>Schema: [<a href="#notification">Notification</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -2831,18 +2831,18 @@
<a name='Organizations-Applications-method'></a>
<h2>Organizations-Applications</h2>
-<a name="op-W0ze85sgr5"/>
+<a name="op-qtkpsiex1b"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /management/orgs
- <a data-toggle="collapse" data-target="#op-W0ze85sgr5"
- href="#op-W0ze85sgr5" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-qtkpsiex1b"
+ href="#op-qtkpsiex1b" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-W0ze85sgr5" class="panel-body collapse">
+ <div id="op-qtkpsiex1b" class="panel-body collapse">
<p>Create an organization through a form post.</p>
@@ -2862,14 +2862,14 @@
<b>200</b>
<ul>
<li>Description: An array of created Organization.</li>
- <li>Schema: [<a href="#Organization">Organization</a>]</li>
+ <li>Schema: [<a href="#organization">Organization</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -2878,18 +2878,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-UnwMezvstn"/>
+<a name="op-0xiial2hla"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /management/orgs/{orgId}
- <a data-toggle="collapse" data-target="#op-UnwMezvstn"
- href="#op-UnwMezvstn" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-0xiial2hla"
+ href="#op-0xiial2hla" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-UnwMezvstn" class="panel-body collapse">
+ <div id="op-0xiial2hla" class="panel-body collapse">
<p>Retrieve an organization given a specified UUID or username.</p>
@@ -2909,14 +2909,14 @@
<b>200</b>
<ul>
<li>Description: An array of created Organization.</li>
- <li>Schema: [<a href="#Organization">Organization</a>]</li>
+ <li>Schema: [<a href="#organization">Organization</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -2925,18 +2925,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-opQwOliCay"/>
+<a name="op-x83q8zzdhu"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/activate
- <a data-toggle="collapse" data-target="#op-opQwOliCay"
- href="#op-opQwOliCay" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-x83q8zzdhu"
+ href="#op-x83q8zzdhu" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-opQwOliCay" class="panel-body collapse">
+ <div id="op-x83q8zzdhu" class="panel-body collapse">
<p>Activate an organization from a link provIded in an email notification.</p>
@@ -2964,14 +2964,14 @@
<b>200</b>
<ul>
<li>Description: An array of complete messages.</li>
- <li>Schema: [<a href="#Action">Action</a>]</li>
+ <li>Schema: [<a href="#action">Action</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -2980,18 +2980,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-D4yiCJmiTC"/>
+<a name="op-vum0sq8sx7"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/apps
- <a data-toggle="collapse" data-target="#op-D4yiCJmiTC"
- href="#op-D4yiCJmiTC" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-vum0sq8sx7"
+ href="#op-vum0sq8sx7" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-D4yiCJmiTC" class="panel-body collapse">
+ <div id="op-vum0sq8sx7" class="panel-body collapse">
<p>Retrieve the applications in an organization through providing both Id of application and organization.</p>
@@ -3011,14 +3011,14 @@
<b>200</b>
<ul>
<li>Description: An array of retrieved application data.</li>
- <li>Schema: [<a href="#AppData">AppData</a>]</li>
+ <li>Schema: [<a href="#appdata">AppData</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -3027,18 +3027,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-FEhXoTZwDz"/>
+<a name="op-ggjkvsmyl6"/>
<div class="panel panel-default">
<div class="panel-heading DELETE">
<h2 class="panel-title DELETE-heading">DELETE /management/orgs/{orgId}/apps/{appId}
- <a data-toggle="collapse" data-target="#op-FEhXoTZwDz"
- href="#op-FEhXoTZwDz" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-ggjkvsmyl6"
+ href="#op-ggjkvsmyl6" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-FEhXoTZwDz" class="panel-body collapse">
+ <div id="op-ggjkvsmyl6" class="panel-body collapse">
<p>Remove an application from an organization through providing both Id of application and organization.</p>
@@ -3062,14 +3062,14 @@
<b>200</b>
<ul>
<li>Description: An array of deleted application info.</li>
- <li>Schema: [<a href="#AppData">AppData</a>]</li>
+ <li>Schema: [<a href="#appdata">AppData</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -3078,18 +3078,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-4joizUedFL"/>
+<a name="op-cp7szqktjh"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/apps/{appId}/credentials
- <a data-toggle="collapse" data-target="#op-4joizUedFL"
- href="#op-4joizUedFL" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-cp7szqktjh"
+ href="#op-cp7szqktjh" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-4joizUedFL" class="panel-body collapse">
+ <div id="op-cp7szqktjh" class="panel-body collapse">
<p>Retrieve the client Id and client secret credentials for an application in an organization.</p>
@@ -3113,14 +3113,14 @@
<b>200</b>
<ul>
<li>Description: An array of retrieved credentials info.</li>
- <li>Schema: [<a href="#Credential">Credential</a>]</li>
+ <li>Schema: [<a href="#credential">Credential</a>]</li>
</ul>
</li>
<li>
<b>default</b>
<ul>
<li>Description: Unexpected error.</li>
- <li>Schema: [<a href="#Error">Error</a>]</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
</ul>
</li>
</ul>
@@ -3129,18 +3129,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-961ASlc5BR"/>
+<a name="op-mh1t539dpp"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /management/orgs/{orgId}/apps/{appId}/credentials
- <a data-toggle="collapse" data-target="#op-961ASlc5BR"
- href="#op-961ASlc5BR" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-mh1t539dpp"
+ href="#op-mh1t539dpp" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-961ASlc5BR" class="panel-body collapse">
+ <div id="op-mh1t539dpp" class="panel-body collapse">
<p>Generate the client Id and client secret credentials for an application in an organization.</p>
@@ -3164,14 +3164,14 @@
<b>200</b>
<ul>
<li>
<TRUNCATED>
[07/36] usergrid git commit: Cherry pick: Update website to remove
reference to incubator.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d0f10bcf/content/docs/user-management/messagee-example.html
----------------------------------------------------------------------
diff --git a/content/docs/user-management/messagee-example.html b/content/docs/user-management/messagee-example.html
index fa24fbd..68da004 100644
--- a/content/docs/user-management/messagee-example.html
+++ b/content/docs/user-management/messagee-example.html
@@ -386,7 +386,7 @@ message board.</p>
<div class="section" id="ios-sdk">
<h2>iOS SDK<a class="headerlink" href="#ios-sdk" title="Permalink to this headline">¶</a></h2>
<p>If you want to write iOS applications that connect to Usergrid,
-<a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ios">download the Usergrid iOS
+<a class="reference external" href="https://github.com/apache/usergrid/tree/master/sdks/ios">download the Usergrid iOS
SDK</a>.</p>
<p><strong>Note</strong>: The Messagee iOS application uses RestKit, a popular REST
framework for iOS, to communicate with Usergrid. Because Usergrid use a
@@ -400,7 +400,7 @@ RestKit or some other framework in your project.</p>
<p>Messagee is available as a sample Android app that acts as a Usergrid
client. The source for the Android version is packaged with the Usergrid
Android SDK in the /samples/messagee directory.</p>
-<p><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/android">Download the Usergrid Android
+<p><a class="reference external" href="https://github.com/apache/usergrid/tree/master/sdks/android">Download the Usergrid Android
SDK</a></p>
</div>
<div class="section" id="javascript-html5-client-and-sdk">
@@ -409,7 +409,7 @@ SDK</a></p>
the same way as the two previous examples. The source for the HTML5
version is packaged with the Usergrid Javascript/HTML5 SDK in the
/samples/messagee directory.</p>
-<p><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/html5-javascript">Download the Usergrid Javascript/HTML5
+<p><a class="reference external" href="https://github.com/apache/usergrid/tree/master/sdks/html5-javascript">Download the Usergrid Javascript/HTML5
SDK</a></p>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d0f10bcf/content/releases/index.html
----------------------------------------------------------------------
diff --git a/content/releases/index.html b/content/releases/index.html
index d3ad9d1..4dba403 100644
--- a/content/releases/index.html
+++ b/content/releases/index.html
@@ -92,16 +92,16 @@
General Availability (GA) Releases - Usergrid 1.0.2
</p>
<p>
- Download the release from a <a href="http://www.apache.org/dyn/closer.cgi/incubator/usergrid/usergrid-1/v1.0.2">mirror: http://www.apache.org/dyn/closer.cgi/incubator/usergrid/usergrid-1/v1.0.2</a>
+ Download the release from a <a href="http://www.apache.org/dyn/closer.cgi/usergrid/usergrid-1/v1.0.2">mirror: http://www.apache.org/dyn/closer.cgi/usergrid/usergrid-1/v1.0.2</a>
</p>
<p>
Project releases are approved by vote of the Apache Usergrid Project Management Committee (PMC). Support for a release is provided by project volunteers on the project <a href="http://usergrid.apache.org/community/#mailing-lists">mailing lists</a>. Bugs found in a release may be discussed on the list and reported through the <a href="https://issues.apache.org/jira/browse/USERGRID">issue tracker</a>. The user mailing list and issue tracker are the only support options hosted by the Apache Usergrid project.
</p>
<p>
- Note: When downloading from a mirror, please be sure to verify that checksums and signatures are correct. To do so, use the checksum and signature files from the main Apache site at <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/usergrid-1/v1.0.2/">https://dist.apache.org/repos/dist/release/incubator/usergrid/usergrid-1/v1.0.2/</a>. Find here the KEYS file, which contains all OpenPGP keys we use to sign releases here: <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/KEYS">https://dist.apache.org/repos/dist/release/incubator/usergrid/KEYS</a>
+ Note: When downloading from a mirror, please be sure to verify that checksums and signatures are correct. To do so, use the checksum and signature files from the main Apache site at <a href="https://dist.apache.org/repos/dist/release/usergrid/usergrid-1/v1.0.2/">https://dist.apache.org/repos/dist/release/usergrid/usergrid-1/v1.0.2/</a>. Find here the KEYS file, which contains all OpenPGP keys we use to sign releases here: <a href="https://dist.apache.org/repos/dist/release/usergrid/KEYS">https://dist.apache.org/repos/dist/release/usergrid/KEYS</a>
</p>
<p>
- The PGP signatures can be verified using PGP or GPG. First download the <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/KEYS">KEYS</a> as well as the <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/usergrid-1/v1.0.2/">asc signature</a> file for the particular distribution. Then verify the signatures using:
+ The PGP signatures can be verified using PGP or GPG. First download the <a href="https://dist.apache.org/repos/dist/release/usergrid/KEYS">KEYS</a> as well as the <a href="https://dist.apache.org/repos/dist/release/usergrid/usergrid-1/v1.0.2/">asc signature</a> file for the particular distribution. Then verify the signatures using:
</p>
<p>
% pgpk -a KEYS
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d0f10bcf/website/content/releases/index.html
----------------------------------------------------------------------
diff --git a/website/content/releases/index.html b/website/content/releases/index.html
index 10e6a2c..8c62e44 100644
--- a/website/content/releases/index.html
+++ b/website/content/releases/index.html
@@ -25,16 +25,16 @@
General Availability (GA) Releases - Usergrid 1.0.2
</p>
<p>
- Download the release from a <a href="http://www.apache.org/dyn/closer.cgi/incubator/usergrid/usergrid-1/v1.0.2">mirror: http://www.apache.org/dyn/closer.cgi/incubator/usergrid/usergrid-1/v1.0.2</a>
+ Download the release from a <a href="http://www.apache.org/dyn/closer.cgi/usergrid/usergrid-1/v1.0.2">mirror: http://www.apache.org/dyn/closer.cgi/usergrid/usergrid-1/v1.0.2</a>
</p>
<p>
Project releases are approved by vote of the Apache Usergrid Project Management Committee (PMC). Support for a release is provided by project volunteers on the project <a href="http://usergrid.apache.org/community/#mailing-lists">mailing lists</a>. Bugs found in a release may be discussed on the list and reported through the <a href="https://issues.apache.org/jira/browse/USERGRID">issue tracker</a>. The user mailing list and issue tracker are the only support options hosted by the Apache Usergrid project.
</p>
<p>
- Note: When downloading from a mirror, please be sure to verify that checksums and signatures are correct. To do so, use the checksum and signature files from the main Apache site at <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/usergrid-1/v1.0.2/">https://dist.apache.org/repos/dist/release/incubator/usergrid/usergrid-1/v1.0.2/</a>. Find here the KEYS file, which contains all OpenPGP keys we use to sign releases here: <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/KEYS">https://dist.apache.org/repos/dist/release/incubator/usergrid/KEYS</a>
+ Note: When downloading from a mirror, please be sure to verify that checksums and signatures are correct. To do so, use the checksum and signature files from the main Apache site at <a href="https://dist.apache.org/repos/dist/release/usergrid/usergrid-1/v1.0.2/">https://dist.apache.org/repos/dist/release/usergrid/usergrid-1/v1.0.2/</a>. Find here the KEYS file, which contains all OpenPGP keys we use to sign releases here: <a href="https://dist.apache.org/repos/dist/release/usergrid/KEYS">https://dist.apache.org/repos/dist/release/usergrid/KEYS</a>
</p>
<p>
- The PGP signatures can be verified using PGP or GPG. First download the <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/KEYS">KEYS</a> as well as the <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/usergrid-1/v1.0.2/">asc signature</a> file for the particular distribution. Then verify the signatures using:
+ The PGP signatures can be verified using PGP or GPG. First download the <a href="https://dist.apache.org/repos/dist/release/usergrid/KEYS">KEYS</a> as well as the <a href="https://dist.apache.org/repos/dist/release/usergrid/usergrid-1/v1.0.2/">asc signature</a> file for the particular distribution. Then verify the signatures using:
</p>
<p>
% pgpk -a KEYS
[05/36] usergrid git commit: Cherry pick: Remove references to
incubator from docs, README files and POMs.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/website/layouts/footer.html
----------------------------------------------------------------------
diff --git a/website/layouts/footer.html b/website/layouts/footer.html
index 143ba53..6101e04 100644
--- a/website/layouts/footer.html
+++ b/website/layouts/footer.html
@@ -13,32 +13,31 @@
</div>
<div class="col-md-2">
<ul class="nav nav-list">
- <li class="nav-header"><a href="https://github.com/apache/incubator-usergrid/" target="_blank">Code</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/dotnet" target="_blank">.NET / Windows SDK</a></li>
+ <li class="nav-header"><a href="https://github.com/apache/usergrid/" target="_blank">Code</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/dotnet" target="_blank">.NET / Windows SDK</a></li>
</ul>
</div>
<div class="col-md-2">
<ul class="nav nav-list">
<li class="nav-header">Resources</li>
- <li><a href="http://github.com/apache/incubator-usergrid" target="_blank">GitHub Code</a></li>
+ <li><a href="http://github.com/apache/usergrid" target="_blank">GitHub Code</a></li>
<li><a href="docs" target="_blank">Docs</a></li>
<li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" target="_blank">JIRA Bug Tracker</a></li>
<li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
<li><a href="/community/#live">Live Chat</a></li>
<li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
- <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
<li><a href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow" target="_blank">Contribution Guidelines</a></li>
</ul>
</div>
@@ -69,7 +68,6 @@
<div class="row">
<div id="copyright">
<img src="/img/egg-logo.png" /><br/><br/>
- <p>Apache Usergrid is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>
<p>Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.<br>
Apache and the Apache feather logos are trademarks of The Apache Software Foundation.</p>
<p class="credits">Site designed & assembled with love by <a href="https://github.com/ryuneeee">@ryuneeee</a> + <a href="https://github.com/realbeast">@realbeast</a> + <a href="https://twitter.com/timanglade">@timanglade</a> + <a href="https://twitter.com/snoopdave">@snoopdave</a> .</p>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/website/layouts/header.html
----------------------------------------------------------------------
diff --git a/website/layouts/header.html b/website/layouts/header.html
index fa1b189..e08dceb 100644
--- a/website/layouts/header.html
+++ b/website/layouts/header.html
@@ -1,6 +1,6 @@
<head>
<meta charset="utf-8">
- <title>Apache Usergrid (incubating) — <%= @item[:title] %></title>
+ <title>Apache Usergrid — <%= @item[:title] %></title>
<meta http-equiv="x-ua-compatible" content="ie=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
<meta name="keywords" content="Apache Usergrid, Usergrid, BaaS, Backend-as-a-Service">
@@ -213,7 +213,7 @@
<ul class="nav navbar-nav navbar-right">
<li class="<%= 'active' if @community %>"><a href="/community/"><span class="icns icon-group"></span></a></li>
<li><a href="/docs" target="_blank"><span class="icns icon-book"></span></a></li>
- <li><a href="http://github.com/apache/incubator-usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
+ <li><a href="http://github.com/apache/usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
<!--<li><a href="https://trello.com/b/exQmJIOn/usergrid" target="_blank"><span class="icns icon-trello"></span></a></li>-->
<li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible"
target="_blank"><span class="icns icon-bug"></span></a></li>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/website/tmp/checksums
----------------------------------------------------------------------
diff --git a/website/tmp/checksums b/website/tmp/checksums
index 8b98080..3a01b9f 100644
--- a/website/tmp/checksums
+++ b/website/tmp/checksums
@@ -1,2 +1,2 @@
-{: data{�[: itemI"/bootstrap/bootstrap/:ETI"!BE+tNcz6Zg8cRMWhaJmN6la4un0=;F[;I"/community/;TI"!ASG8rvE9GWQssx+35fxCx+7cwRo=;F[;I" /css/bootflat-extensions/;TI"!PSQFihOUJ0wESX59td1x+pY+qwQ=;F[;I"/css/bootflat-square/;TI"!3El/bCjbRO2H1LeGDot/CQkUh4o=;F[;I"/css/bootflat/;TI"!SNXjafQ9KpFGj5c14y6cc0ZowVw=;F[;I"/css/font-awesome/;TI"!VUAyztBHgoBvxDTFbIpQIkGFSss=;F[;I"/css/usergrid-site/;TI"!spXooBCkoYeICSEGSzs+ZMfA5U4=;F[;I"/docs/access-token/;TI"!sJ5bFNSo5YkKLDml2z68geJ8dAs=;F[;I"/docs/activity/;TI"!KiGgHHaVhxlsDBHK4wSHU4Kal44=;F[;I"/docs/admin-portal/;TI"!XMUamB9Zbv4UNaBwlUvb6lQpa+U=;F[;I"/docs/admin-user/;TI"!+hqD4loedhmClr+7mduSasvmvho=;F[;I"/docs/app-security/;TI"!qDvCJDxgowf84A/EhuDwO+djtvE=;F[;I"/docs/application/;TI"!vkBomFaAB128x+WbwlvliEfoclE=;F[;I"/docs/applications/;TI"!RBWNfDDIOrpnG4OJYwawdsT4gLY=;F[;I"/docs/assets/;TI"!Rs2i48JEuZfagYUx50eYPZvr3QQ=;F[;I"8/docs/authen
ticating-users-and-application-clients/;TI"!Wlb0rR0rzBdc1Wol3U+rmAKCFBY=;F[;I"4/docs/authentication-and-access-app-services-0/;TI"!E0jP0LC3vAlLC6Gk5rVeau15vDU=;F[;I" /docs/client-authorization/;TI"!E+099lPotfl3VTpr9Mo2p7GPjKE=;F[;I"/docs/collections/;TI"!7XvRP9SGsCEWTJC5FFg88irvDNg=;F[;I" /docs/creating-collections/;TI"!GgK4/uH7LgLxA5SXngBHt5yG/sg=;F[;I")/docs/creating-custom-data-entities/;TI"!cNJmM0RyZm9W2j/PHxe9HOi+XzA=;F[;I"2/docs/creating-new-application-admin-console/;TI"!RwLQY/flqMOY6cfnYjxnYWdycGw=;F[;I"/docs/data-model/;TI"!d3hy3KjyRuCoZiAUbSOV6ZjxvfI=;F[;I" /docs/data-query-overview/;TI"!lMFiYi0KjHuxAMoo5pPb9iZOmxo=;F[;I"!/docs/default-data-entities/;TI"!N8SRsqPk3NUsKz+xMpG/hCiaXpY=;F[;I" /docs/deleting-collections/;TI"!6k7X+Y5UMjagZXgJ83Y7C+qCEiQ=;F[;I""/docs/deleting-data-entities/;TI"!XhKPWMNLoz9yR/GTb8wEDLmhAng=;F[;I"/docs/device/;TI"!0fhnCWW0jAfyQuymmbHanhVdXIU=;F[;I";/docs/displaying-app
-services-api-calls-curl-commands/;TI"!hD4+YkGiJ7D1nDvN1Rc3D2tdppY=;F[;I"!/docs/events-and-counters 2/;TI"!0X4WXNhMX1yEgSayQVcaL9vJYfQ=;F[;I" /docs/events-and-counters/;TI"!zYZiuwam5Kgw0v5l/e5eLLGSPTc=;F[;I"/docs/facebook-sign/;TI"!cWucJI/rNBbFZ22w4Y1jgLmryco=;F[;I"/docs/features/;TI"!dt3/nmR9h32O/48gZBIpv4TA+6g=;F[;I"/docs/folder/;TI"!NCc8GlSq7oWSqBFFA2XYjKwNqE4=;F[;I"/docs/geolocation/;TI"!o0jvHi8IDiQMecZW52hXBHOWOLc=;F[;I"*/docs/getting-up-and-running-locally/;TI"!e6jt4UPmK5OzYNLuDQ44XlHagHI=;F[;I"/docs/group 2/;TI"!dbfHreBluYQZEi/qHaXLXNGFquA=;F[;I"/docs/group/;TI"!7qfz7VpryLhSO5r+JfufWn8nxHo=;F[;I"/docs/groups/;TI"!lTAadPa1T79P/H7UE27MuShBH9A=;F[;I"#/docs/html-5-example-messagee/;TI"!asQgmDRF10/zn4ZAbTPwr42Cuf4=;F[;I" /docs/;TI"!0Gc0eBNvMPBoqsifWOJkx9RJ3Jg=;F[;I"5/docs/managing-access-defining-permission-rules/;TI"!EVOxJAt7wHJFQnTVTDMaVzzdn30=;F[;I" /docs/messagee-example/;TI"!H9snglQUO
iqEnt4DAdpfaq1kWOM=;F[;I"/docs/nodejs-module/;TI"!tjCOmaE8Iqy+1xnnApnzwSMVQOI=;F[;I"/docs/organization/;TI"!Ro2MEXd9f/Ey005gwBqWommH12g=;F[;I""/docs/organizations-admins 2/;TI"!SyzmVE6JhswIYyfkZ8LM3k7GGGQ=;F[;I" /docs/organizations-admins/;TI"!LGMnDOIJyNiaA05u/YFYA4pFTFE=;F[;I"/docs/overview/;TI"!IM616gkwwWCLYA1cyuYcYV1SlJA=;F[;I"/docs/query-language/;TI"!FXh38MitlyTgvfavxf9oeVDYB04=;F[;I"&/docs/querying-data-admin-portal/;TI"!d1SmVP4424Upyd53X7VsKWg6WWs=;F[;I"+/docs/querying-your-app-services-data/;TI"!OjvFQQI/P+utnPIOWPTnKYsvbjM=;F[;I"/docs/relationships/;TI"!i6s/7OInIhyELY+jhpcJn6ze1XQ=;F[;I"/docs/rest-api/;TI"!zkSo5PrH4bNT9Fkg9IotmpUlF3w=;F[;I"/docs/rest-endpoints/;TI"!XsjMPez5lIGzwp21XS4fE27kRvc=;F[;I""/docs/retrieving-collections/;TI"!Rwoo5Ac7/GlSNzXOwNM1ODnhYqM=;F[;I"$/docs/retrieving-data-entities/;TI"!NCxcYpGq+lM5+G96/Alj8r0F5r4=;F[;I"/docs/role/;TI"!30Miopbr8+vTF3ofRrAc65ejkVY=;F[
;I"!/docs/roles-and-permissions/;TI"!x6yz2EHMvCwroiAex/fbdSpyS3Y=;F[;I"/docs/ruby-gem/;TI"!FWS8NAksszPnlzGPVRWmzHc6MfA=;F[;I" /docs/securing-your-app/;TI"!O/LZpfS6mHX83Ot5o846lJpjH1c=;F[;I"/docs/security-model/;TI"!zgeJsYPhkvGJ494pYzQdhkbtZqs=;F[;I" /docs/updating-collections/;TI"!MU5pYESVEfLJ9zNxmYrcCZxjyGE=;F[;I""/docs/updating-data-entities/;TI"!Un1y0x108XS1qLe4kKe92sg7vEs=;F[;I"/docs/upgrading/;TI"!/Gagi05VTncMU2dVig8Tm6DhX1U=;F[;I"&/docs/uploading-files-and-assets/;TI"!pslYeOoUmk6B9Y09vtzuXQ995zs=;F[;I"/docs/user/;TI"!GIff/8+sc4WsHVfbFjqiJl4PnPs=;F[;I"/docs/users-devices/;TI"!8FsDxWVeQhd/8WW/DCtrURhC8yo=;F[;I"/docs/using-api/;TI"!DWLCS7/PYLtZ2iDbnk5tJ05pkVg=;F[;I"%/docs/using-sandbox-application/;TI"!RWzmW0icE4mkU6h41PvCf85o1O8=;F[;I"/favicon/;TI"!X4PIbApzeRU6s+oNiLbzvuF9L5g=;F[;I"#/font/fontawesome-webfont-eot/;TI"!3B+LEIodD3hze44yMpJ52B2544E=;F[;I"#/font/fontawesome-webfont-svg/;TI"
!ltNbRWDhxN+Hvlm+kKfkuuA1YxA=;F[;I"#/font/fontawesome-webfont-ttf/;TI"!2bB5HSdyXYf4kCaiu//JONEONNw=;F[;I"$/font/fontawesome-webfont-woff/;TI"!UkzY9wJf9hoI3UqoI5llnG/OuZE=;F[;I"/font/FontAwesome/;TI"!2TDNZR90GB41fZJl/861yz7+zUw=;F[;I"/img/alberto/;TI"!f/rAMir2Cn0jWwA4N7bM3Ch0Cu4=;F[;I"/img/alex/;TI"!uMnVYXnPevqGsMI1bXkRjp8JRZc=;F[;I""/img/apache_usergrid_favicon/;TI"!6D0hrhKJOFr2laZTQPa3VG0DbmU=;F[;I"%/img/apache_usergrid_logo_white/;TI"!1rKENU0xV2EcaG2DVBHUc+rSBK8=;F[;I"+/img/apache_usergrid_logo_white_small/;TI"!LgynYDpEp5lWfyTcaNJApCfYdGQ=;F[;I" /img/check_flat/default/;TI"!YYYFmYUyyd018gSU3zFJsUlbVZY=;F[;I"/img/dave/;TI"!3enRKJioQIQTUb6FYSNg/lXhH7s=;F[;I"
/img/ed/;TI"!7zXZ+Fa1ut63qqO28kP8bkFqEjk=;F[;I"/img/egg-logo/;TI"!OYjxz813OEBBXBj3P3HKjjSJxPQ=;F[;I"/img/grey/;TI"!NHsS+0H5vr6CTDnafyOl7JZl9Cc=;F[;I"/img/nate/;TI"!qy1QmbrXgSpv/T4uNZr9Mqekd7A=;F[;I"/img/rod/;TI"!OaBz7qmw2qP0hSEXjHV6
O9zdmmY=;F[;I"/img/scott/;TI"!0BsMv8bOwFIgQlIXKAn7SDVGzts=;F[;I"/img/strong/;TI"!VygZ5vSNbUrKTYpb7nOzjVvG/+Y=;F[;I"/img/sungju/;TI"!jijCp/iKF5Ky4rax0VHpRDcLsIw=;F[;I"/img/tim/;TI"!41VdsrLj75gaZsX8ZhFebsg+zGM=;F[;I"/img/todd/;TI"!86WUnZ7BA9xsS80sDC6BTG/ThuE=;F[;I"/img/usergrid-logo/;TI"!Aqk5UXUo4dFeEOZMrVAXy+Y5Vi0=;F[;I"/img/usergrid/;TI"!nIzFeYoyyCN9BhPyOlxBE2dV5jQ=;F[;I"/img/usergrid_160/;TI"!m5B/B6Zt3k1dtKXbMKW6l116khA=;F[;I"/img/usergrid_200/;TI"!sq+SHCkGtdMhHr0nlFTHgE9LW5k=;F[;I"/img/usergrid_300/;TI"!eclrFaoU86QeT+el3Wi7oifcqto=;F[;I"#/img/usergrid_300_transparent/;TI"!0yKkSMN7UjGy2Sk9J+gixkgHYoE=;F[;I"/img/usergrid_400/;TI"!9Hfc5EpdxIhW6A1NOorfd1320Xk=;F[;I"/img/usergrid_800/;TI"!yv2P6q1tMzUs8l1FiDP7MOsKKBk=;F[;I"/img/usergrid_card/;TI"!Aa//Bl1mTmLn9RxJpVLED7AhTF8=;F[;I"/img/usergrid_logo/;TI"!5lU0pyh9sE/FI9ZeytBhAfEstes=;F[;I" /img/usergrid_logo_205_50/;TI"!iKXmKYPMnt
8M0Xb9MNn64Alj9DE=;F[;I" /img/usergrid_logo_260_50/;TI"!84dC19ZCsJUI9qcna9DZAYUjBAA=;F[;I" /img/usergrid_logo_720/;TI"!A/fYYz3vEQr78d9LagqKDu6+FfY=;F[;I" /img/usergrid_logo_720p/;TI"!qH4bcwVqFHPg0s6AtE3lBI4DFxc=;F[;I" /img/usergrid_logo_900_200/;TI"!YIO+XZ5ntZwXd1Ubkw8mt9pmBbs=;F[;I" /img/usergrid_logo_white/;TI"!PLm+YIRBBFcR53EJmCJjqRAZypY=;F[;I" /img/usergrid_profile_128/;TI"!yaIaxOsNEfRFGqrezSbQeXKHMtI=;F[;I" /img/usergrid_profile_256/;TI"!jk9olu2ghO0Xrdoty77MOADH7Es=;F[;I"%/img/usergrid_profile_256_white/;TI"!QFeYTA+ISQR8ZOHAsAKIngavBYk=;F[;I"'/img/usergrid_profile_512_margins/;TI"!C9+Z2eTYvkWN97UJoV7ZSxu9exg=;F[;I"$/img/usergrid_profile_64_white/;TI"!JVGTWCH8c0JF8aVxgr/RzLmOiks=;F[;I"&/img/usergrid_profile_background/;TI"!LGTaigehn//IH6jXpRGCDQSYGv4=;F[;I"!/img/usergrid_screencast_bg/;TI"!u17jat/cv6E1ICaf1zVcYjnP5yE=;F[;I" /img/usergrid_small_100/;TI"!1AGpfcZsXZo1penJylFd+HSKfLg=;F[;I"/img/usergr
id_wiki/;TI"!mAJ57NQ3R6B1gnaKIkuADywGPqE=;F[;I"/;TI"!7PQ/wBXYaAb0Jjk0usxCsta6peA=;F[;I"/js/bootstrap/;TI"!sTuwMhrenkri47tM28V7pMcWhDU=;F[;I"/js/head/;TI"!Ny4umkyjw1ZRcW1tiqyixMOZiuI=;F[;I"/js/html5shiv/;TI"!+m/AFFq64W1qh8ajwJCAl9O1sZE=;F[;I"/js/jquery-1/;TI"!pgSDvT6HU2A/bSzpYJA6ucR35uo=;F[;I"/js/jquery/;TI"!vpo5KedrGEcpbabnvT/UtbRFAhA=;F[;I"/js/respond/;TI"!IUzrEhCwtGm8E4sBXCV4Q9lsvVM=;F[;I"/js/usergrid-site/;TI"!OxCfMF/3TkAjDwdGxc20eW81oZA=;F[;I"/static/github-btn/;TI"!Dk5CHwQ0PjO53S2n9e3Yl82zLw0=;F[: layoutI"/community/;TI"!Vz6WtgEl8BB6t96FGbzN5hhVc4c=;F[;I"/default/;TI"!k9I6lOQ4z4+nHoc8WQw7P2MoKbY=;F[;I" /docs/;TI"!tmBld5ZHivR/56iHwp6I0LUoPlc=;F[;I"
/footer/;TI"!A2Bvp2oFTYnDJ/cc9h+T+Qf/8Y4=;F[;I"
/header/;TI"!9b0cDfoAq1nbSF/228dc8Z19H3o=;F[:code_snippetI"lib/default.rb;TI"!obtwYGHKsZcksb03nMTPrlOqd5U=;F[; I"lib/helpers_.rb;TI"!huKhcwQYeoQiIuYmRpgzAwKwrbc=;F: configI"!Sxv
usj+Tnw1yNJuSGRkZ7fv3R2Q=;F:
-rulesI"!nclWn6tIAjzNd8AV/It9HpNy9y0=;F[;I"/docs/contribute-code/;TI"!4qf8xPP00M97O2Mn7aYskiaZHbY=;F[;I"/docs/contributecode/;TI"Vf83fd7240a06d583d5e2b6f5b79d2d41b4f40e43,1d274687d36e5d4c2895acd54366d5b20424dd7b;F[;I"/docs/deploy-local/;TI"!I27C7JJfNAkb4Ex6xYv/m1OA/iA=;F[;I"/img/shawn/;TI"!DQV77mUr61bkTDWeSvcCVwX972E=;F[;I"/docs/old-forks/;TI"!3TvEGi1GeqC18Y/Dd6Uxm2vcKXM=;F[;I"/docs/presentations/;TI"!6RN7MD+JH6zEZ7rrLv/L1s6i2s4=;F[;I"/docs/videos/;TI"!U/emu6XGZOBxvjxIiDIWcXWGkAw=;F[;I"/img/github/;TI"!fZcV5HIenfH3MoHMIPWR2joRhHs=;F[;I"/img/stliu/;TI"!fE1siGDkDpby+K+al/avq4vnNtE=;F[;I"/releases/;TI"!i2Kckz8q17BkgQ0VdS2hagrFB/I=;F[;I"/img/intellij/;TI"!1YaBB2ghC9uWr3/NTIklbfZj764=;F[;I"/img/structure101/;TI"!L1bjOxaT6wK/j3YgN6gUntLMnl4=;F[;I"/img/yourkit/;TI"!vYnui0vvjZPWNy6e0di6uS6DgX8=;F[;I"/img/jeff/;TI"!wZ6dU7qfUw5BOJSe4KW8w+B/Qhk=;F: versioni
\ No newline at end of file
+{: data{�[: itemI"/bootstrap/bootstrap/:ETI"!xZuPqCOzvJhkmDlX3Dsw0hfozxQ=;F[;I"/community/;TI"!sef2YpC9Kx9NIriNycJ7UVIbnNY=;F[;I" /css/bootflat-extensions/;TI"!lUxZMTwDRyE0hXnoHg4VN+DQUvc=;F[;I"/css/bootflat-square/;TI"!qcmzh/o/J6NgJpZBJSbv4B2lH40=;F[;I"/css/bootflat/;TI"!r8FDz2VgCCzTX0fc9NSH21ierPM=;F[;I"/css/font-awesome/;TI"!tj4+gOqxUfZhyqPyMvahGwww3tg=;F[;I"/css/usergrid-site/;TI"!QDjpZpuVBWNdRrf74j8wUXInTF4=;F[;I"/docs/access-token/;TI"!sJ5bFNSo5YkKLDml2z68geJ8dAs=;F[;I"/docs/activity/;TI"!KiGgHHaVhxlsDBHK4wSHU4Kal44=;F[;I"/docs/admin-portal/;TI"!XMUamB9Zbv4UNaBwlUvb6lQpa+U=;F[;I"/docs/admin-user/;TI"!+hqD4loedhmClr+7mduSasvmvho=;F[;I"/docs/app-security/;TI"!qDvCJDxgowf84A/EhuDwO+djtvE=;F[;I"/docs/application/;TI"!vkBomFaAB128x+WbwlvliEfoclE=;F[;I"/docs/applications/;TI"!RBWNfDDIOrpnG4OJYwawdsT4gLY=;F[;I"/docs/assets/;TI"!Rs2i48JEuZfagYUx50eYPZvr3QQ=;F[;I"8/docs/authen
ticating-users-and-application-clients/;TI"!Wlb0rR0rzBdc1Wol3U+rmAKCFBY=;F[;I"4/docs/authentication-and-access-app-services-0/;TI"!E0jP0LC3vAlLC6Gk5rVeau15vDU=;F[;I" /docs/client-authorization/;TI"!E+099lPotfl3VTpr9Mo2p7GPjKE=;F[;I"/docs/collections/;TI"!7XvRP9SGsCEWTJC5FFg88irvDNg=;F[;I" /docs/creating-collections/;TI"!GgK4/uH7LgLxA5SXngBHt5yG/sg=;F[;I")/docs/creating-custom-data-entities/;TI"!cNJmM0RyZm9W2j/PHxe9HOi+XzA=;F[;I"2/docs/creating-new-application-admin-console/;TI"!RwLQY/flqMOY6cfnYjxnYWdycGw=;F[;I"/docs/data-model/;TI"!d3hy3KjyRuCoZiAUbSOV6ZjxvfI=;F[;I" /docs/data-query-overview/;TI"!lMFiYi0KjHuxAMoo5pPb9iZOmxo=;F[;I"!/docs/default-data-entities/;TI"!N8SRsqPk3NUsKz+xMpG/hCiaXpY=;F[;I" /docs/deleting-collections/;TI"!6k7X+Y5UMjagZXgJ83Y7C+qCEiQ=;F[;I""/docs/deleting-data-entities/;TI"!XhKPWMNLoz9yR/GTb8wEDLmhAng=;F[;I"/docs/device/;TI"!0fhnCWW0jAfyQuymmbHanhVdXIU=;F[;I";/docs/displaying-app
-services-api-calls-curl-commands/;TI"!hD4+YkGiJ7D1nDvN1Rc3D2tdppY=;F[;I"!/docs/events-and-counters 2/;TI"!0X4WXNhMX1yEgSayQVcaL9vJYfQ=;F[;I" /docs/events-and-counters/;TI"!zYZiuwam5Kgw0v5l/e5eLLGSPTc=;F[;I"/docs/facebook-sign/;TI"!cWucJI/rNBbFZ22w4Y1jgLmryco=;F[;I"/docs/features/;TI"!dt3/nmR9h32O/48gZBIpv4TA+6g=;F[;I"/docs/folder/;TI"!NCc8GlSq7oWSqBFFA2XYjKwNqE4=;F[;I"/docs/geolocation/;TI"!o0jvHi8IDiQMecZW52hXBHOWOLc=;F[;I"*/docs/getting-up-and-running-locally/;TI"!e6jt4UPmK5OzYNLuDQ44XlHagHI=;F[;I"/docs/group 2/;TI"!dbfHreBluYQZEi/qHaXLXNGFquA=;F[;I"/docs/group/;TI"!7qfz7VpryLhSO5r+JfufWn8nxHo=;F[;I"/docs/groups/;TI"!lTAadPa1T79P/H7UE27MuShBH9A=;F[;I"#/docs/html-5-example-messagee/;TI"!asQgmDRF10/zn4ZAbTPwr42Cuf4=;F[;I" /docs/;TI"!0Gc0eBNvMPBoqsifWOJkx9RJ3Jg=;F[;I"5/docs/managing-access-defining-permission-rules/;TI"!EVOxJAt7wHJFQnTVTDMaVzzdn30=;F[;I" /docs/messagee-example/;TI"!H9snglQUO
iqEnt4DAdpfaq1kWOM=;F[;I"/docs/nodejs-module/;TI"!tjCOmaE8Iqy+1xnnApnzwSMVQOI=;F[;I"/docs/organization/;TI"!Ro2MEXd9f/Ey005gwBqWommH12g=;F[;I""/docs/organizations-admins 2/;TI"!SyzmVE6JhswIYyfkZ8LM3k7GGGQ=;F[;I" /docs/organizations-admins/;TI"!LGMnDOIJyNiaA05u/YFYA4pFTFE=;F[;I"/docs/overview/;TI"!IM616gkwwWCLYA1cyuYcYV1SlJA=;F[;I"/docs/query-language/;TI"!FXh38MitlyTgvfavxf9oeVDYB04=;F[;I"&/docs/querying-data-admin-portal/;TI"!d1SmVP4424Upyd53X7VsKWg6WWs=;F[;I"+/docs/querying-your-app-services-data/;TI"!OjvFQQI/P+utnPIOWPTnKYsvbjM=;F[;I"/docs/relationships/;TI"!i6s/7OInIhyELY+jhpcJn6ze1XQ=;F[;I"/docs/rest-api/;TI"!zkSo5PrH4bNT9Fkg9IotmpUlF3w=;F[;I"/docs/rest-endpoints/;TI"!XsjMPez5lIGzwp21XS4fE27kRvc=;F[;I""/docs/retrieving-collections/;TI"!Rwoo5Ac7/GlSNzXOwNM1ODnhYqM=;F[;I"$/docs/retrieving-data-entities/;TI"!NCxcYpGq+lM5+G96/Alj8r0F5r4=;F[;I"/docs/role/;TI"!30Miopbr8+vTF3ofRrAc65ejkVY=;F[
;I"!/docs/roles-and-permissions/;TI"!x6yz2EHMvCwroiAex/fbdSpyS3Y=;F[;I"/docs/ruby-gem/;TI"!FWS8NAksszPnlzGPVRWmzHc6MfA=;F[;I" /docs/securing-your-app/;TI"!O/LZpfS6mHX83Ot5o846lJpjH1c=;F[;I"/docs/security-model/;TI"!zgeJsYPhkvGJ494pYzQdhkbtZqs=;F[;I" /docs/updating-collections/;TI"!MU5pYESVEfLJ9zNxmYrcCZxjyGE=;F[;I""/docs/updating-data-entities/;TI"!Un1y0x108XS1qLe4kKe92sg7vEs=;F[;I"/docs/upgrading/;TI"!/Gagi05VTncMU2dVig8Tm6DhX1U=;F[;I"&/docs/uploading-files-and-assets/;TI"!pslYeOoUmk6B9Y09vtzuXQ995zs=;F[;I"/docs/user/;TI"!GIff/8+sc4WsHVfbFjqiJl4PnPs=;F[;I"/docs/users-devices/;TI"!8FsDxWVeQhd/8WW/DCtrURhC8yo=;F[;I"/docs/using-api/;TI"!DWLCS7/PYLtZ2iDbnk5tJ05pkVg=;F[;I"%/docs/using-sandbox-application/;TI"!RWzmW0icE4mkU6h41PvCf85o1O8=;F[;I"/favicon/;TI"!/f9ctExN7ieI9Lu5a6Rn5zsJnkc=;F[;I"#/font/fontawesome-webfont-eot/;TI"!tt3rzCh6sxfGSQ2yExdMckIh/To=;F[;I"#/font/fontawesome-webfont-svg/;TI"
!rC1F3Ep/zlb/Fd/njMy0GIP1gQ8=;F[;I"#/font/fontawesome-webfont-ttf/;TI"!4UrYER+BOwRLCh1GT59etwJOCKk=;F[;I"$/font/fontawesome-webfont-woff/;TI"!gAq5Ho8kRgX3/CacBzEJiYDpbYc=;F[;I"/font/FontAwesome/;TI"!Omh5LlXurhXKG/Rw/594gJrl1V0=;F[;I"/img/alberto/;TI"!8iAqqgXbQobWfcXmxzJANumRWHg=;F[;I"/img/alex/;TI"!BRKSK9B7SJ6mH1/K/P2cXAtdAng=;F[;I""/img/apache_usergrid_favicon/;TI"!7TGTUTUNQ7EuwExvx8GQrI1oV5w=;F[;I"%/img/apache_usergrid_logo_white/;TI"!340L2vnakUJsDba5TNaRWjJNXIc=;F[;I"+/img/apache_usergrid_logo_white_small/;TI"!kfXT8JM20MpYlR+NZongAxspCcw=;F[;I" /img/check_flat/default/;TI"!FfH0U3kiEye/O/UoYfG7uKjPsgA=;F[;I"/img/dave/;TI"!a0xxsuxmTYptLVjUCzJek0Wh99U=;F[;I"
/img/ed/;TI"!XdGn7287/cX14U4hIBGm905GRng=;F[;I"/img/egg-logo/;TI"!0Xio91vONNRS9c69/thZWcjHiZI=;F[;I"/img/grey/;TI"!mZHUJxs4owF1c4CoR/VRDJvAvHY=;F[;I"/img/nate/;TI"!UEyFIKyy3nTy9RDaxBDsQEQlBus=;F[;I"/img/rod/;TI"!H2sDsiligE87eKkElGRd
JMZyrLs=;F[;I"/img/scott/;TI"!o9CkZL6fUnb7ZCnWAFuAvpNcYO0=;F[;I"/img/strong/;TI"!s5bnQuikYRBijOmsOxi41GWl4/Q=;F[;I"/img/sungju/;TI"!UsuZP6uEixtLmpO6Iwf1nGydml4=;F[;I"/img/tim/;TI"!+xTXChHWMels1Qdt/+sZTIrqw3c=;F[;I"/img/todd/;TI"!B8Cjvzce7KVYEFXDrhJK8HdiX+A=;F[;I"/img/usergrid-logo/;TI"!wa9tbduOoQ6i16UIA8YvD49TP6E=;F[;I"/img/usergrid/;TI"!rBy3+ezbZe8i4fQiPLzkHPeplvM=;F[;I"/img/usergrid_160/;TI"!AdQlAKicXLOkO1OOMGWwsZaxf8k=;F[;I"/img/usergrid_200/;TI"!xZjt/Lb171fw22/p2uG+zd9VxDc=;F[;I"/img/usergrid_300/;TI"!Po+FDTlWpFHxBcCXN+yxenIDjqw=;F[;I"#/img/usergrid_300_transparent/;TI"!y2DToQHwivhadGSu9Esulkezdes=;F[;I"/img/usergrid_400/;TI"!+BUj5I2YMBkos11XCvYmxW0K1EQ=;F[;I"/img/usergrid_800/;TI"!Ud1tCufzgKQHgjQRPcWD9SZaEp8=;F[;I"/img/usergrid_card/;TI"!37NmFKYC15dBT3xeQDGVggW6qms=;F[;I"/img/usergrid_logo/;TI"!UuZPSH9alNYxFwErra9OmrLwa/I=;F[;I" /img/usergrid_logo_205_50/;TI"!+CsP3frO4H
aCewot3NRz0GzTtn8=;F[;I" /img/usergrid_logo_260_50/;TI"!mUjw8hWsLryH95Vp4ldnmqoW7TQ=;F[;I" /img/usergrid_logo_720/;TI"!FN/beVD7LkVxQjQ39dcUN+hcOCw=;F[;I" /img/usergrid_logo_720p/;TI"!1J2RCRdaXGkfjD8GRGdg5G/INZ4=;F[;I" /img/usergrid_logo_900_200/;TI"!B2knnsCaj3ZuhAuQQfJCfU2j0EU=;F[;I" /img/usergrid_logo_white/;TI"!0kCkc551txJY3LhPkAW9cV7lqoY=;F[;I" /img/usergrid_profile_128/;TI"!xOOjxWKxQPyKcnbfIKx84lMXgc0=;F[;I" /img/usergrid_profile_256/;TI"!kziD/bBpK0XqQJrveb77iKzSio0=;F[;I"%/img/usergrid_profile_256_white/;TI"!oZrDOUO1IU89BUdi5ox9L8Q/46g=;F[;I"'/img/usergrid_profile_512_margins/;TI"!LNSq5gv6p2EWeZhKfex3ChCrg38=;F[;I"$/img/usergrid_profile_64_white/;TI"!nxfgKN5NxkSdar02vB1zupUVMZk=;F[;I"&/img/usergrid_profile_background/;TI"!OVHihWS6wRQgrHrahwK1Mz9XZhM=;F[;I"!/img/usergrid_screencast_bg/;TI"!jZlxy9v23h+Px3t91VxW46dv4tk=;F[;I" /img/usergrid_small_100/;TI"!23/QdrB/4ywAXP/w+bcy+lfadp8=;F[;I"/img/usergr
id_wiki/;TI"!6E3thSYSVMhPQ/+3rtPmX0K28xI=;F[;I"/;TI"!uPT04D//6i3pAZ16u4pUMqNgPzM=;F[;I"/js/bootstrap/;TI"!F9HtEnC8RVNT4pyEdvGKTk02b1U=;F[;I"/js/head/;TI"!dK99vpZVaIuUSIwCxbWtxhHvzMs=;F[;I"/js/html5shiv/;TI"!iQ/7sYTHAd0NEAc/UpHt+/bKn6A=;F[;I"/js/jquery-1/;TI"!qTO20YmlQqw6lVp7hRPI6r/tGLk=;F[;I"/js/jquery/;TI"!FMy0r4Vj9E1tw7OfXJhst8t5snM=;F[;I"/js/respond/;TI"!tD5Vs49MPSxYDOqwksrVnfIWcJc=;F[;I"/js/usergrid-site/;TI"!DjnbQZBa2S6g9pYqsN47ecWczS4=;F[;I"/static/github-btn/;TI"!cNmEcLcfkWNKqAmbbdUeeMR7juo=;F[: layoutI"/community/;TI"!Vz6WtgEl8BB6t96FGbzN5hhVc4c=;F[;I"/default/;TI"!k9I6lOQ4z4+nHoc8WQw7P2MoKbY=;F[;I" /docs/;TI"!tmBld5ZHivR/56iHwp6I0LUoPlc=;F[;I"
/footer/;TI"!iLzZaL9jsE9qH/1mj/yosIoCfH0=;F[;I"
/header/;TI"!Diks9ApifD4Ze6SOwHw1aW++SOA=;F[:code_snippetI"lib/default.rb;TI"!obtwYGHKsZcksb03nMTPrlOqd5U=;F[; I"lib/helpers_.rb;TI"!huKhcwQYeoQiIuYmRpgzAwKwrbc=;F: configI"!Sxv
usj+Tnw1yNJuSGRkZ7fv3R2Q=;F:
+rulesI"!nclWn6tIAjzNd8AV/It9HpNy9y0=;F[;I"/docs/contribute-code/;TI"!4qf8xPP00M97O2Mn7aYskiaZHbY=;F[;I"/docs/contributecode/;TI"Vf83fd7240a06d583d5e2b6f5b79d2d41b4f40e43,1d274687d36e5d4c2895acd54366d5b20424dd7b;F[;I"/docs/deploy-local/;TI"!I27C7JJfNAkb4Ex6xYv/m1OA/iA=;F[;I"/img/shawn/;TI"!nSqSj8BipnqMYNlQHOoJopobIq0=;F[;I"/docs/old-forks/;TI"!3TvEGi1GeqC18Y/Dd6Uxm2vcKXM=;F[;I"/docs/presentations/;TI"!6RN7MD+JH6zEZ7rrLv/L1s6i2s4=;F[;I"/docs/videos/;TI"!U/emu6XGZOBxvjxIiDIWcXWGkAw=;F[;I"/img/github/;TI"!0+s4l1YKWDnFAOBczisGg7jCsIo=;F[;I"/img/stliu/;TI"!HVPXHXlfxWPBZlN1QoxQYJsQeDA=;F[;I"/releases/;TI"!5ysDUMH6zJEMjLKGD1Wj/mqjdUo=;F[;I"/img/intellij/;TI"!3HKOUasE/aXQWQW4SMrz5r73Ntg=;F[;I"/img/structure101/;TI"!Zk4syBF3tW3pRnLtWB0uQR4GNno=;F[;I"/img/yourkit/;TI"!6ohfH3xWDDkSol3NqW/7fEYfegw=;F[;I"/img/jeff/;TI"!3yq5gpnU+Jr0CZvluKP580dtHAA=;F: versioni
\ No newline at end of file
[33/36] usergrid git commit: Ensure we persist entities with nested
arrays. The nested data will be serialized as binary and not specifically
typed.
Posted by sf...@apache.org.
Ensure we persist entities with nested arrays. The nested data will be serialized as binary and not specifically typed.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/2391bfd0
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/2391bfd0
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/2391bfd0
Branch: refs/heads/entity-size
Commit: 2391bfd09d69c2797e440beb638d8bfa3532df4f
Parents: 7318607
Author: Michael Russo <mi...@gmail.com>
Authored: Tue Aug 25 13:36:24 2015 -0700
Committer: Michael Russo <mi...@gmail.com>
Committed: Tue Aug 25 13:36:24 2015 -0700
----------------------------------------------------------------------
.../corepersistence/CpEntityMapUtilsTest.java | 79 ++++++++++++++++++++
.../model/entity/MapToEntityConverter.java | 10 ++-
2 files changed, 88 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/2391bfd0/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityMapUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityMapUtilsTest.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityMapUtilsTest.java
index 5d492a0..1656fa6 100644
--- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityMapUtilsTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityMapUtilsTest.java
@@ -69,6 +69,37 @@ public class CpEntityMapUtilsTest {
assertUserWithBlocks( cpEntity );
}
+ @Test
+ public void testNestedArrayToMap() {
+
+ /*** This tests example property input of
+
+ {
+ "nestedarray" : [ [ "fred" ] ]
+ }
+
+ ****/
+
+ Map<String, Object> properties = new LinkedHashMap<String, Object>() {{
+ put( "nestedarray",
+ new ArrayList<ArrayList<String>>() {{
+ add(0, new ArrayList<String>() {{
+ add(0, "fred");
+ }});
+ }}
+ );
+ put( "block", new ArrayList<Object>() {{
+ add( new LinkedHashMap<String, Object>() {{ put("name", "fred"); }});
+ add( new LinkedHashMap<String, Object>() {{ put("name", "gertrude"); }});
+ add( new LinkedHashMap<String, Object>() {{ put("name", "mina"); }});
+ }});
+ }};
+
+ Entity cpEntity = CpEntityMapUtils.fromMap( properties, "user", true );
+ assertUserWithBlocks( cpEntity );
+ }
+
+
@Test
public void testSerialization() throws JsonProcessingException, IOException {
@@ -112,6 +143,54 @@ public class CpEntityMapUtilsTest {
}
+ @Test
+ public void testNestedArraySerialization() throws JsonProcessingException, IOException {
+
+ /*** This tests example property input of
+
+ {
+ "nestedarray" : [ [ "fred" ] ]
+ }
+
+ ****/
+
+ Map<String, Object> properties = new LinkedHashMap<String, Object>() {{
+ put( "nestedarray",
+ new ArrayList<ArrayList<String>>() {{
+ add(0, new ArrayList<String>() {{
+ add(0, "fred");
+ }});
+ }}
+ );
+ put( "block", new ArrayList<Object>() {{
+ add( new LinkedHashMap<String, Object>() {{ put("name", "fred"); }});
+ add( new LinkedHashMap<String, Object>() {{ put("name", "gertrude"); }});
+ add( new LinkedHashMap<String, Object>() {{ put("name", "mina"); }});
+ }});
+ }};
+
+ org.apache.usergrid.persistence.model.entity.Entity entity =
+ new org.apache.usergrid.persistence.model.entity.Entity(
+ new SimpleId( "user" ) );
+ entity = CpEntityMapUtils.fromMap( entity, properties, null, true );
+
+ assertUserWithBlocks( entity );
+
+ ObjectMapper mapper = new ObjectMapper();
+ mapper.enable(SerializationFeature.INDENT_OUTPUT);
+ mapper.enableDefaultTypingAsProperty(ObjectMapper.DefaultTyping.JAVA_LANG_OBJECT, "@class");
+
+ String entityString = mapper.writeValueAsString( entity );
+ //log.debug("Serialized to JSON: " + entityString );
+
+ TypeReference<Entity> tr = new TypeReference<Entity>() {};
+ entity = mapper.readValue( entityString, tr );
+ //log.debug("Round-tripped entity: " + CpEntityMapUtils.toMap(entity) );
+
+ assertUserWithBlocks( entity );
+ }
+
+
private void assertUserWithBlocks( org.apache.usergrid.persistence.model.entity.Entity e ) {
assertTrue( e.getField("block") instanceof ListField );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/2391bfd0/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/MapToEntityConverter.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/MapToEntityConverter.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/MapToEntityConverter.java
index 79f8973..323d424 100644
--- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/MapToEntityConverter.java
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/MapToEntityConverter.java
@@ -145,7 +145,15 @@ public class MapToEntityConverter{
return newList;
} else if ( sample instanceof List ) {
- return processListForField( list ); // recursion
+ List<Object> newList = new ArrayList<Object>();
+ for (Object o : list) {
+ if (o instanceof List) {
+ newList.add(processListForField((List) o));
+ } else {
+ newList.add(o);
+ }
+ }
+ return newList;
} else {
return list;
[21/36] usergrid git commit: Update generated website content.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/introduction/overview.html
----------------------------------------------------------------------
diff --git a/content/docs/introduction/overview.html b/content/docs/introduction/overview.html
new file mode 100644
index 0000000..a58df23
--- /dev/null
+++ b/content/docs/introduction/overview.html
@@ -0,0 +1,333 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>Documentation Overview — Apache Usergrid 1.0 documentation</title>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+
+
+
+
+
+ <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+ <link rel="next" title="Usergrid Features" href="usergrid-features.html"/>
+ <link rel="prev" title="Apache Usergrid Documentation" href="../index.html"/>
+
+
+ <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+ <div class="wy-grid-for-nav">
+
+
+ <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+ <div class="wy-side-nav-search">
+
+
+
+ <a href="../index.html" class="icon icon-home"> Apache Usergrid
+
+
+
+ </a>
+
+
+
+
+ <div class="version">
+ 1.0
+ </div>
+
+
+
+
+<div role="search">
+ <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+ <input type="text" name="q" placeholder="Search docs" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+
+
+ </div>
+
+ <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+
+
+
+ <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters & clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators & data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security & Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management & Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management & social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets & Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters & Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters & events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating & incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations & Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations & Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code & Docs</a></li>
+</ul>
+
+
+
+ </div>
+
+ </nav>
+
+ <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+ <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+ <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+ <a href="../index.html">Apache Usergrid</a>
+ </nav>
+
+
+
+ <div class="wy-nav-content">
+ <div class="rst-content">
+ <div role="navigation" aria-label="breadcrumbs navigation">
+ <ul class="wy-breadcrumbs">
+ <li><a href="../index.html">Docs</a> »</li>
+
+ <li>Documentation Overview</li>
+ <li class="wy-breadcrumbs-aside">
+
+
+ <a href="../_sources/introduction/overview.txt" rel="nofollow"> View page source</a>
+
+
+ </li>
+ </ul>
+ <hr/>
+</div>
+ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+ <div itemprop="articleBody">
+
+ <div class="section" id="documentation-overview">
+<h1>Documentation Overview<a class="headerlink" href="#documentation-overview" title="Permalink to this headline">¶</a></h1>
+<p>The Usergrid documentation is written for a couple of distinctly
+different audiences:</p>
+<ul class="simple">
+<li><strong>Application Developer</strong>: this is you if you are a Javascript, iOS,
+Android, Java or other developer who wants to build an app that uses
+the Usergrid APIs for data storage, user management, authentication,
+etc. <strong>Most of our docs are written for application developers</strong> so
+browse the left side-bar and work your way down the topics list.</li>
+<li><strong>Deployment/Operations Engineer</strong>: this is for you if you are the
+person who will be installing Usergrid, setting up the required
+Cassandra database and other things that Usergrid needs. Currently,
+we have limited docs for installation, deployment and maintenance of
+Usergrid:<ul>
+<li><a class="reference external" href="../ug1-deploy-to-tomacat">Deploying to Tomcat</a>: How to build
+and deploy Usergrid to Tomcat and Cassandra.</li>
+<li><a class="reference external" href="../ug1-launcher-quick-start">Launcher Quick Start</a>: How to
+build and run Usergrid via the Usergrid Launcher.</li>
+</ul>
+</li>
+<li><strong>Open Source Contributor</strong>: How to “give back” and contribute to
+Usergrid. Usergrid welcomes code and documentation contributions,
+GitHub pull-requests, bug reports and suggestions for improvement.<ul>
+<li><a class="reference external" href="../reference/contribute-code">How to Contribute Code & Docs</a>:</li>
+</ul>
+</li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ <footer>
+
+ <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+
+ <a href="usergrid-features.html" class="btn btn-neutral float-right" title="Usergrid Features" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+
+
+ <a href="../index.html" class="btn btn-neutral" title="Apache Usergrid Documentation" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+
+ </div>
+
+
+ <hr/>
+
+ <div role="contentinfo">
+ <p>
+ © Copyright 2013-2015, Apache Usergrid.
+
+ </p>
+ </div>
+ Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+
+
+
+
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT:'../',
+ VERSION:'1.0',
+ COLLAPSE_INDEX:false,
+ FILE_SUFFIX:'.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+
+
+
+
+
+ <script type="text/javascript" src="../_static/js/theme.js"></script>
+
+
+
+
+ <script type="text/javascript">
+ jQuery(function () {
+ SphinxRtdTheme.StickyNav.enable();
+ });
+ </script>
+
+
+</body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/introduction/usergrid-features.html
----------------------------------------------------------------------
diff --git a/content/docs/introduction/usergrid-features.html b/content/docs/introduction/usergrid-features.html
index 496a33d..f39e211 100644
--- a/content/docs/introduction/usergrid-features.html
+++ b/content/docs/introduction/usergrid-features.html
@@ -32,7 +32,7 @@
<link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
<link rel="next" title="Usergrid Data model" href="data-model.html"/>
- <link rel="prev" title="Apache Usergrid Documentation" href="../index.html"/>
+ <link rel="prev" title="Documentation Overview" href="overview.html"/>
<script src="../_static/js/modernizr.min.js"></script>
@@ -82,6 +82,7 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="overview.html">Documentation Overview</a></li>
<li class="toctree-l1 current"><a class="current reference internal" href="">Usergrid Features</a><ul>
<li class="toctree-l2"><a class="reference internal" href="#data-storage-management">Data storage & management</a><ul>
<li class="toctree-l3"><a class="reference internal" href="#application-data">Application data</a></li>
@@ -102,7 +103,7 @@
</ul>
</li>
<li class="toctree-l2"><a class="reference internal" href="#geolocation">Geolocation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#push-notifications">Push notifications</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#push-notifications-coming-soon">Push notifications (Coming soon...)</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="data-model.html">Usergrid Data model</a></li>
@@ -110,8 +111,8 @@
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -135,10 +136,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -163,9 +177,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -180,11 +194,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -262,9 +278,10 @@ and immediately perform complex queries or full-text searches on any
field. You can also create custom entities with custom properties,
giving you the ability to store data and context in a way that makes
sense for your app.</p>
-<p>To learn more about entities and collections, see Usergrid Data model.</p>
-<p>For a complete list of the default data entities available, see Default
-Data Entity Types.</p>
+<p>To learn more about entities and collections, see <a class="reference external" href="data-model.html">Usergrid Data
+model</a>.</p>
+<p>For a complete list of the default data entities available, see
+<a class="reference external" href="../rest-endpoint/api-docs.html#models">Models</a>.</p>
</div>
<div class="section" id="files-assets">
<h3>Files & assets<a class="headerlink" href="#files-assets" title="Permalink to this headline">¶</a></h3>
@@ -274,8 +291,8 @@ data store as the rest of your application data, eliminating the need to
set up content delivery networks (CDNs) and easing implementation. We
handle all the back-end details that keep your content quickly
accessible.</p>
-<p>To learn more about files and asset storage, see Uploading files and
-assets .</p>
+<p>To learn more about files and asset storage, see <a class="reference external" href="../assets-and-files/uploading-assets.html">Uploading files and
+assets</a>.</p>
</div>
</div>
<div class="section" id="flexible-data-querying">
@@ -285,7 +302,8 @@ SQL-style queries and full-text searches on data entities, as well as
their properties. This lets you quickly retrieve specific data entities
based on multiple criteria, then utilize that data to power social
features, target push notifications, perform user analysis, and more.</p>
-<p>Learn more about querying app data, see Data query overview.</p>
+<p>Learn more about querying app data, see <a class="reference external" href="../data-queries/querying-your-data.html">Data query
+overview</a>.</p>
</div>
<div class="section" id="social">
<h2>Social<a class="headerlink" href="#social" title="Permalink to this headline">¶</a></h2>
@@ -296,7 +314,8 @@ features, improve user experience, and contextualize data. For example,
you might associate a user with their devices to capture valuable
geolocation data, create relationships between users to build social
graphs, or implement popular features such as activity streams.</p>
-<p>To learn more about entity relationships, see Entity connections.</p>
+<p>To learn more about entity relationships, see <a class="reference external" href="../entity-connections/connecting-entities.html">Entity
+connections</a>.</p>
</div>
<div class="section" id="activity-streams">
<h3>Activity streams<a class="headerlink" href="#activity-streams" title="Permalink to this headline">¶</a></h3>
@@ -306,7 +325,8 @@ activities, and tweets. Usergrid simplifies management and routing of
these data streams by providing an activity entity that is specifically
designed to automatically create a relationship between activities and
the user who created them.</p>
-<p>To learn more about activities and activity feeds, see Activity feeds.</p>
+<p>To learn more about activities and activity feeds, see <a class="reference external" href="../user-management/activity.html">Activity
+feeds</a>.</p>
</div>
</div>
<div class="section" id="user-management">
@@ -318,7 +338,8 @@ necessary to handle secure registration and log in, including OAuth
2.0-compliant client authentication. In addition, any number of default
or custom data entities and properties can be associated with a user
entity to create complete user profiles.</p>
-<p>To learn more about user management, see User.</p>
+<p>To learn more about user management, see <a class="reference external" href="../user-management/user-management.html">User
+Management</a>.</p>
<p>To learn more about authentication, see Authenticating users and
application clients.</p>
</div>
@@ -331,8 +352,8 @@ create roles that represent user types or access levels, such as
Administrator, then assign the necessary permissions to that role. With
a single API call, you can then associate your roles with any user or
group of users.</p>
-<p>To learn more about user roles and permissions, see Managing access by
-defining permission rules.</p>
+<p>To learn more about user roles and permissions, see <a class="reference external" href="../security-and-auth/securing-your-app.html">Using
+Permissions</a>.</p>
</div>
<div class="section" id="groups">
<h3>Groups<a class="headerlink" href="#groups" title="Permalink to this headline">¶</a></h3>
@@ -342,7 +363,8 @@ location to more effectively deliver relevant content, target offers, or
customize campaigns. You can also take advantage of the groups entity to
enable group-based social networking activities, such as allowing your
users to create private information feeds or circles of friends.</p>
-<p>To learn more about groups, see Working with group data.</p>
+<p>To learn more about groups, see <a class="reference external" href="../user-management/groups.html">Working with group
+data</a>.</p>
</div>
<div class="section" id="third-party-authentication">
<h3>Third-party authentication<a class="headerlink" href="#third-party-authentication" title="Permalink to this headline">¶</a></h3>
@@ -352,7 +374,8 @@ through such popular services as Facebook, Twitter and other
OAuth-enabled accounts. Providing third-party sign-in can improve user
experience, while increasing adoption, giving you access to valuable
information from social networks and services.</p>
-<p>To learn more about using third-party sign-in, see Facebook sign in.</p>
+<p>To learn more about using third-party sign-in, see <a class="reference external" href="../security-and-auth/facebook-sign.html">Facebook sign
+in</a>.</p>
</div>
</div>
<div class="section" id="geolocation">
@@ -361,20 +384,22 @@ information from social networks and services.</p>
users’ GPS-enabled devices to more effectively target campaigns, push
notifications, offers and more. Geolocation also gives you an important
data point for contextualizing and analyzing trends and user behavior.</p>
-<p>To learn more about geolocation, see Geolocation.</p>
+<p>To learn more about geolocation, see
+<a class="reference external" href="../geolocation/geolocation.html">Geolocation</a>.</p>
</div>
-<div class="section" id="push-notifications">
-<h2>Push notifications<a class="headerlink" href="#push-notifications" title="Permalink to this headline">¶</a></h2>
-<p>Push notifications are the most effective way to engage your users with
-relevant content, and thanks to Usergrid, implementing them can be done
-in minutes. Simply register your app and your user’s devices with a
-notification provider, such as Apple Push Notification Service or Google
-Cloud Messaging, then use the Usergrid notification entity to send
-millions of push notifications a month at no cost. When used in
-conjunction with queries of user and application data, push
-notifications become a powerful tool for leveraging user data, ensuring
-relevancy and driving engagement.</p>
-<p>To learn more about push notifications, see Push notifications overview.</p>
+<div class="section" id="push-notifications-coming-soon">
+<h2>Push notifications (Coming soon...)<a class="headerlink" href="#push-notifications-coming-soon" title="Permalink to this headline">¶</a></h2>
+<p><strong>(Coming Usergrid 2.0)</strong> Push notifications are the most effective way
+to engage your users with relevant content, and thanks to Usergrid,
+implementing them can be done in minutes. Simply register your app and
+your user’s devices with a notification provider, such as Apple Push
+Notification Service or Google Cloud Messaging, then use the Usergrid
+notification entity to send millions of push notifications a month at no
+cost. When used in conjunction with queries of user and application
+data, push notifications become a powerful tool for leveraging user
+data, ensuring relevancy and driving engagement.</p>
+<p>To learn more about push notifications, see <a class="reference external" href="../push-notifications/tbd.html">Push notifications
+overview</a>.</p>
</div>
</div>
@@ -388,7 +413,7 @@ relevancy and driving engagement.</p>
<a href="data-model.html" class="btn btn-neutral float-right" title="Usergrid Data model" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
- <a href="../index.html" class="btn btn-neutral" title="Apache Usergrid Documentation" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+ <a href="overview.html" class="btn btn-neutral" title="Documentation Overview" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
</div>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/objects.inv
----------------------------------------------------------------------
diff --git a/content/docs/objects.inv b/content/docs/objects.inv
index aeca549..7a9c3ca 100644
Binary files a/content/docs/objects.inv and b/content/docs/objects.inv differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/orgs-and-apps/admin-user.html
----------------------------------------------------------------------
diff --git a/content/docs/orgs-and-apps/admin-user.html b/content/docs/orgs-and-apps/admin-user.html
index 6696baa..234e34e 100644
--- a/content/docs/orgs-and-apps/admin-user.html
+++ b/content/docs/orgs-and-apps/admin-user.html
@@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>Admin user$ — Apache Usergrid 1.0 documentation</title>
+ <title>Admin user — Apache Usergrid 1.0 documentation</title>
@@ -30,7 +30,9 @@
- <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+ <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+ <link rel="next" title="Methods" href="../rest-endpoints/api-docs.html"/>
+ <link rel="prev" title="Application" href="application.html"/>
<script src="../_static/js/modernizr.min.js"></script>
@@ -80,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -111,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -139,9 +155,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -152,15 +168,76 @@
<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
</ul>
<p class="caption"><span class="caption-text">Organizations & Applications</span></p>
-<ul>
+<ul class="current">
<li class="toctree-l1"><a class="reference internal" href="managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="application.html">Application</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Admin user</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#creating-an-admin-user">Creating an admin user</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#request-uri">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-request">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-response">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#updating-an-admin-user">Updating an admin user</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id1">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id2">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id3">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#getting-an-admin-user">Getting an admin user</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id4">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id5">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id6">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#setting-an-admin-user-s-password">Setting an admin user’s password</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id7">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id8">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id9">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#resetting-an-admin-user-s-password">Resetting an admin user’s password</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#initiating-a-password-reset">Initiating a password reset</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id10">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id11">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id12">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#completing-a-password-reset">Completing a password reset</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id13">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id14">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id15">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#activating-an-admin-user">Activating an admin user</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id16">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id17">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id18">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#reactivating-an-admin-user">Reactivating an admin user</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id19">Request URI</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#id20">Example - Request</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id21">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#getting-an-admin-user-s-activity-feed">Getting an admin user’s activity feed</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id22">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id23">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id24">Example - Response</a></li>
+</ul>
+</li>
+</ul>
+</li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -200,7 +277,7 @@
<ul class="wy-breadcrumbs">
<li><a href="../index.html">Docs</a> »</li>
- <li>Admin user$</li>
+ <li>Admin user</li>
<li class="wy-breadcrumbs-aside">
@@ -215,7 +292,7 @@
<div itemprop="articleBody">
<div class="section" id="admin-user">
-<h1>Admin user$<a class="headerlink" href="#admin-user" title="Permalink to this headline">¶</a></h1>
+<h1>Admin user<a class="headerlink" href="#admin-user" title="Permalink to this headline">¶</a></h1>
<p>An admin user has full access to perform any operation on all
organization accounts of which the admin user is a member. Using the API
Services BaaS API, you can create, update, or retrieve an admin user.
@@ -723,6 +800,15 @@ email notification.</p>
</div>
<footer>
+ <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+
+ <a href="../rest-endpoints/api-docs.html" class="btn btn-neutral float-right" title="Methods" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+
+
+ <a href="application.html" class="btn btn-neutral" title="Application" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+
+ </div>
+
<hr/>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/orgs-and-apps/application.html
----------------------------------------------------------------------
diff --git a/content/docs/orgs-and-apps/application.html b/content/docs/orgs-and-apps/application.html
index 7213562..e897160 100644
--- a/content/docs/orgs-and-apps/application.html
+++ b/content/docs/orgs-and-apps/application.html
@@ -31,7 +31,7 @@
<link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
- <link rel="next" title="Methods" href="../rest-endpoints/api-docs.html"/>
+ <link rel="next" title="Admin user" href="admin-user.html"/>
<link rel="prev" title="Organization" href="organization.html"/>
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -141,9 +155,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -178,11 +192,13 @@
</li>
</ul>
</li>
+<li class="toctree-l1"><a class="reference internal" href="admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -240,11 +256,12 @@
<h1>Application<a class="headerlink" href="#application" title="Permalink to this headline">¶</a></h1>
<p>You can create a new application in an organization through the Admin
portal. The Admin portal creates the new application by issuing a post
-against the management endpoint (see the “Creating an organization
-application” section in Organization for details). If you need to create
-an application programmatically in your app, you can also use the API to
-do this. You can access application entities using your app name or
-UUID, prefixed with the organization name or UUID:</p>
+against the management endpoint (see the <a class="reference external" href="../orgs-and-apps/application.html#creating-an-application">Creating an
+Application</a>
+section in Organization for details). If you need to create an
+application programmatically in your app, you can also use the API to do
+this. You can access application entities using your app name or UUID,
+prefixed with the organization name or UUID:</p>
<div class="highlight-python"><div class="highlight"><pre>https://api.usergrid.com/{org_name|uuid}/{app_name|uuid}
</pre></div>
</div>
@@ -431,7 +448,7 @@ for details.</p>
<div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
- <a href="../rest-endpoints/api-docs.html" class="btn btn-neutral float-right" title="Methods" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+ <a href="admin-user.html" class="btn btn-neutral float-right" title="Admin user" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
<a href="organization.html" class="btn btn-neutral" title="Organization" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/orgs-and-apps/managing.html
----------------------------------------------------------------------
diff --git a/content/docs/orgs-and-apps/managing.html b/content/docs/orgs-and-apps/managing.html
index 817a6f2..9b1072e 100644
--- a/content/docs/orgs-and-apps/managing.html
+++ b/content/docs/orgs-and-apps/managing.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -141,9 +155,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -158,11 +172,13 @@
<li class="toctree-l1 current"><a class="current reference internal" href="">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/orgs-and-apps/organization.html
----------------------------------------------------------------------
diff --git a/content/docs/orgs-and-apps/organization.html b/content/docs/orgs-and-apps/organization.html
index 47f0c4f..40dad2e 100644
--- a/content/docs/orgs-and-apps/organization.html
+++ b/content/docs/orgs-and-apps/organization.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -141,9 +155,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -226,11 +240,13 @@
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
[27/36] usergrid git commit: Update generated website content.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/rest-endpoints/api-docs.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/rest-endpoints/api-docs.txt b/content/docs/_sources/rest-endpoints/api-docs.txt
index 93a6e32..3a1b748 100644
--- a/content/docs/_sources/rest-endpoints/api-docs.txt
+++ b/content/docs/_sources/rest-endpoints/api-docs.txt
@@ -1,375 +1,392 @@
+<h1>Usergrid API Reference</h1>
+
+Methods are organized by tag. Follow the methods are the [Model Definitions](#models).
+
+<h2>Table of Contents</h2>
+
+* [Access-Tokens](#Access-Tokens)
+* [Activities](#Activities)
+* [Admin-Users](#Admin-Users)
+* [App-Users](#App-Users)
+* [Entities-Collections](#Entities-Collections)
+* [Events](#Events)
+* [Groups](#Groups)
+* [Notifications](#Notifications)
+* [Organizations-Applications](#Organizations-Applications)
+* [Permissions-Roles](#Permissions-Roles)
+
+<br>
+<br>
+
+
## Methods
-### Action Methods
-<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/activate</h2>
-Activate an organization from a link provIded in an email notification.
+### Access-Tokens
+
+
+<h2 class="usergrid-POST-heading">POST /management/token</h2>
+
+Login with Admin-User or Organization credentials.
<h3>Parameters</h3>
-* __orgId__ (string)
-One of the organization's identification which includes name or uuid. (Specified in path).
-* __token__ ()
-Activation token. (Specified in query).
-* __confirm_email__ ()
-Send confirmation email or not. (Specified in query).
+* __login-credentials__ ([LoginCredentials](#logincredentials))
+Login credentials either username/password or id/secret. (Specified in body).
<h3>Responses</h3>
__200__
-* Description: An array of complete messages.
-* Schema: [Action](#action)
+* Description: Object containing access_token.
+* Schema: [AccessTokenResponse](#AccessTokenResponse)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/reactivate</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/token</h2>
-Reactivate an expired organization.
+Login with App-User or Application credentials.
<h3>Parameters</h3>
-* __orgId__ (string)
-One of the organization's identification which includes name or uuid. (Specified in path).
+* __login-credentials__ ([LoginCredentials](#logincredentials))
+Login credentials either username/password or id/secret. (Specified in body).
<h3>Responses</h3>
__200__
-* Description: An array of complete messages.
-* Schema: [Action](#action)
+* Description: Object containing access_token.
+* Schema: [AccessTokenResponse](#AccessTokenResponse)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-GET-heading">GET /management/users/resetpw</h2>
+### Activities
-Initiate the reset of an admin user's password.
+
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/groups/{groupId}/feed</h2>
+
+Get a group's feed through providing all the identifications.
<h3>Parameters</h3>
+* __orgId__ (string)
+One of the organization's identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application's identification which includes name or uuid. (Specified in path).
+* __groupId__ (string)
+One of the group's identification which includes name or uuid. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of complete messages.
-* Schema: [Action](#action)
+* Description: An array of group's activity.
+* Schema: [ActivityFeed](#ActivityFeed)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-POST-heading">POST /management/users/resetpw</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/users/{userId}/activities</h2>
-Complete the password reset through getting the newpassword and the old one for identification.
+Create an activity in the activities collection.
<h3>Parameters</h3>
-* __ResetPWMsg__ ([ResetPWMsg](#resetpwmsg))
-Parameters and value for the Captcha challenge, the admin user's response to the Captcha challenge, and the admin user's email address. (Specified in body).
+* __orgId__ (string)
+One of the organization's identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application's identification which includes name or uuid. (Specified in path).
+* __userId-3__ (string)
+One of the user's identification which includes username or UUID. (Specified in path).
+* __CreateActivity__ ([CreateActivity](#createactivity))
+One or more sets of activity properties. (Specified in body).
<h3>Responses</h3>
__200__
-* Description: An array of complete messages.
-* Schema: [Action](#action)
+* Description: An array of user's activity.
+* Schema: [ActivityFeed](#ActivityFeed)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-GET-heading">GET /management/users/{userId}/activate</h2>
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users/{userId}/feed</h2>
-Activate an admin user from a link provIded in an email notification.
+Retrieve a user's feed through providing all the identifications.
<h3>Parameters</h3>
-* __userId__ (string)
-One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
-* __token__ ()
-Activation token's query statement. (Specified in query).
-* __confirm_email__ ()
-Query statement of whether send confimation email or not. (Specified in query).
+* __orgId__ (string)
+One of the organization's identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application's identification which includes name or uuid. (Specified in path).
+* __userId-3__ (string)
+One of the user's identification which includes username or UUID. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of complete messages.
-* Schema: [Action](#action)
+* Description: An array of user's activity feed.
+* Schema: [ActivityFeed](#ActivityFeed)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-PUT-heading">PUT /management/users/{userId}/password</h2>
+### Admin-Users
-Update an admin user's password through getting the newpassword and the old one for identification.
+
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/users</h2>
+
+Retrieve details about the admin users in an organization.
<h3>Parameters</h3>
-* __userId__ (string)
-One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
-* __ResetPW__ ([ResetPW](#resetpw))
-The user's old and new password. (Specified in body).
+* __orgId__ (string)
+One of the organization's identification which includes name or uuid. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of complete messages.
-* Schema: [Action](#action)
+* Description: An array of retrieved Admin user's info.
+* Schema: [User](#User)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-GET-heading">GET /management/users/{userId}/reactivate</h2>
+<h2 class="usergrid-DELETE-heading">DELETE /management/orgs/{orgId}/users/{userId}</h2>
-Reactivate an expired admin user.
+Remove an admin user from an organization through providing both Id of application and organization.
<h3>Parameters</h3>
-* __userId__ (string)
-One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
+* __orgId__ (string)
+One of the organization's identification which includes name or uuid. (Specified in path).
+* __userId-2__ (string)
+One of the user's identification which includes username, email address or UUID. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of complete messages.
-* Schema: [Action](#action)
+* Description: An array of deleted Admin user's info.
+* Schema: [User](#User)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/users/{user}/password</h2>
+<h2 class="usergrid-POST-heading">POST /management/users</h2>
-Set a user's password or reset the user's existing password.
+Create a whole new admin user.
<h3>Parameters</h3>
-* __orgId__ (string)
-One of the organization's identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application's identification which includes name or uuid. (Specified in path).
-* __username__ (string)
-The username of the user. (Specified in path).
-* __ResetPW__ ([ResetPW](#resetpw))
-The user's old and new password. (Specified in body).
+* __CreateAdminUser__ ([CreateAdminUser](#createadminuser))
+User entity with fields required for User creation. (Specified in body).
<h3>Responses</h3>
__200__
-* Description: An array of complete messages.
-* Schema: [Action](#action)
+* Description: An API Response with a entities array containing the newly created Admin User.
+* Schema: [User](#User)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-### ActivityFeed Methods
-<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/feed</h2>
+<h2 class="usergrid-GET-heading">GET /management/users/resetpw</h2>
-Retrieve an organization's activity feed.
+Initiate the reset of an admin user's password.
<h3>Parameters</h3>
-* __orgId__ (string)
-One of the organization's identification which includes name or uuid. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of the organization's ActivityFeed.
-* Schema: [ActivityFeed](#activityfeed)
+* Description: An array of complete messages.
+* Schema: [Action](#Action)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-GET-heading">GET /management/users/{userId}/feed</h2>
+<h2 class="usergrid-POST-heading">POST /management/users/resetpw</h2>
-Retrieve an admin user's activity feed.
+Complete the password reset through getting the newpassword and the old one for identification.
<h3>Parameters</h3>
-* __userId__ (string)
-One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
+* __ResetPWMsg__ ([ResetPWMsg](#resetpwmsg))
+Parameters and value for the Captcha challenge, the admin user's response to the Captcha challenge, and the admin user's email address. (Specified in body).
<h3>Responses</h3>
__200__
-* Description: An array of user's activity
-* Schema: [ActivityFeed](#activityfeed)
+* Description: An array of complete messages.
+* Schema: [](#)
__default__
-* Description: Unexpected error.
-* Schema: [Error](#error)
+* Description:
+* Schema: [Error](#Error)
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/groups/{groupId}/activities</h2>
+<h2 class="usergrid-GET-heading">GET /management/users/{userId}</h2>
-Create an activity to a specific group. In this case the activity is created in the activities collection and is accessible at the /activities endpoint to users who have the permission to read that endpoint. In addition, a relationship is established between the activity and the group, and because of that, the activity will appear in the group’s feed. The group 'owns' the activity. Also, the activity will be published in the feed of all users that are members of the group.
+Retrieve details about an admin user.
<h3>Parameters</h3>
-* __orgId__ (string)
-One of the organization's identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application's identification which includes name or uuid. (Specified in path).
-* __groupId__ (string)
-One of the group's identification which includes name or uuid. (Specified in path).
-* __CreateActivity__ ([CreateActivity](#createactivity))
-One or more sets of activity properties. (Specified in body).
+* __userId__ (string)
+One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of user's activity.
-* Schema: [ActivityFeed](#activityfeed)
+* Description: An API Response with a entities array containing the Admin User.
+* Schema: [User](#User)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/groups/{groupId}/feed</h2>
+<h2 class="usergrid-PUT-heading">PUT /management/users/{userId}</h2>
-Get a group's feed through providing all the identifications.
+Update the info of an admin user.
<h3>Parameters</h3>
-* __orgId__ (string)
-One of the organization's identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application's identification which includes name or uuid. (Specified in path).
-* __groupId__ (string)
-One of the group's identification which includes name or uuid. (Specified in path).
+* __userId__ (string)
+One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of group's activity.
-* Schema: [ActivityFeed](#activityfeed)
+* Description: An API Response with a entities array containing the updated Admin User
+* Schema: [User](#User)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/users/{userId}/activities</h2>
+<h2 class="usergrid-GET-heading">GET /management/users/{userId}/activate</h2>
-Create an activity in the activities collection.
+Activate an admin user from a link provIded in an email notification.
<h3>Parameters</h3>
-* __orgId__ (string)
-One of the organization's identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application's identification which includes name or uuid. (Specified in path).
-* __userId-3__ (string)
-One of the user's identification which includes username or UUID. (Specified in path).
-* __CreateActivity__ ([CreateActivity](#createactivity))
-One or more sets of activity properties. (Specified in body).
+* __userId__ (string)
+One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
+* __token__ (string)
+Activation token's query statement. (Specified in query).
+* __confirm_email__ (boolean)
+Query statement of whether send confimation email or not. (Specified in query).
<h3>Responses</h3>
__200__
-* Description: An array of user's activity.
-* Schema: [ActivityFeed](#activityfeed)
+* Description: An array of complete messages.
+* Schema: [Action](#Action)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users/{userId}/feed</h2>
+<h2 class="usergrid-PUT-heading">PUT /management/users/{userId}/password</h2>
-Retrieve a user's feed through providing all the identifications.
+Update an admin user's password through getting the newpassword and the old one for identification.
<h3>Parameters</h3>
-* __orgId__ (string)
-One of the organization's identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application's identification which includes name or uuid. (Specified in path).
-* __userId-3__ (string)
-One of the user's identification which includes username or UUID. (Specified in path).
+* __userId__ (string)
+One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
+* __ResetPW__ ([ResetPW](#resetpw))
+The user's old and new password. (Specified in body).
<h3>Responses</h3>
__200__
-* Description: An array of user's activity feed.
-* Schema: [ActivityFeed](#activityfeed)
+* Description: An array of complete messages.
+* Schema: [Action](#Action)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-### AppData Methods
-<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/apps</h2>
+<h2 class="usergrid-GET-heading">GET /management/users/{userId}/reactivate</h2>
-Retrieve the applications in an organization through providing both Id of application and organization.
+Reactivate an expired admin user.
<h3>Parameters</h3>
-* __orgId__ (string)
-One of the organization's identification which includes name or uuid. (Specified in path).
+* __userId__ (string)
+One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of retrieved application data.
-* Schema: [AppData](#appdata)
+* Description: An array of complete messages.
+* Schema: [Action](#Action)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-DELETE-heading">DELETE /management/orgs/{orgId}/apps/{appId}</h2>
+### App-Users
-Remove an application from an organization through providing both Id of application and organization.
+
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users</h2>
+
+Retrieve users though query statement.
<h3>Parameters</h3>
@@ -377,24 +394,25 @@ Remove an application from an organization through providing both Id of applicat
One of the organization's identification which includes name or uuid. (Specified in path).
* __appId__ (string)
One of the application's identification which includes name or uuid. (Specified in path).
+* __queryStatement__ (string)
+The query statement of the User. (Specified in query).
<h3>Responses</h3>
__200__
-* Description: An array of deleted application info.
-* Schema: [AppData](#appdata)
+* Description: An array of retrieved user's info.
+* Schema: [User](#User)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-### Credential Methods
-<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/apps/{appId}/credentials</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/users</h2>
-Retrieve the client Id and client secret credentials for an application in an organization.
+Create a user in the users collection through providing all the identifications.
<h3>Parameters</h3>
@@ -402,23 +420,25 @@ Retrieve the client Id and client secret credentials for an application in an or
One of the organization's identification which includes name or uuid. (Specified in path).
* __appId__ (string)
One of the application's identification which includes name or uuid. (Specified in path).
+* __CreateUser__ ([CreateUser](#createuser))
+The properties of the user. (Specified in body).
<h3>Responses</h3>
__200__
-* Description: An array of retrieved credentials info.
-* Schema: [Credential](#credential)
+* Description: An array of created user's info.
+* Schema: [User](#User)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-POST-heading">POST /management/orgs/{orgId}/apps/{appId}/credentials</h2>
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users/{userId}</h2>
-Generate the client Id and client secret credentials for an application in an organization.
+Retrieve a user through providing all the identifications.
<h3>Parameters</h3>
@@ -426,68 +446,77 @@ Generate the client Id and client secret credentials for an application in an or
One of the organization's identification which includes name or uuid. (Specified in path).
* __appId__ (string)
One of the application's identification which includes name or uuid. (Specified in path).
+* __userId-2__ (string)
+One of the user's identification which includes username, email address or UUID. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of generated credentials info.
-* Schema: [Credential](#credential)
+* Description: An array of retrieved user's info.
+* Schema: [User](#User)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/credentials</h2>
+<h2 class="usergrid-PUT-heading">PUT /{orgId}/{appId}/users/{userId}</h2>
-Retrieve the credentials for an organization client.
+Update a user through providing all the identifications.
<h3>Parameters</h3>
* __orgId__ (string)
One of the organization's identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application's identification which includes name or uuid. (Specified in path).
+* __userId-3__ (string)
+One of the user's identification which includes username or UUID. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of Credential
-* Schema: [Credential](#credential)
+* Description: An array of updated user's info.
+* Schema: [User](#User)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-POST-heading">POST /management/orgs/{orgId}/credentials</h2>
+<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/users/{userId}</h2>
-Generate whole new credentials for an organization client.
+Remove a user through providing all the identifications.
<h3>Parameters</h3>
* __orgId__ (string)
One of the organization's identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application's identification which includes name or uuid. (Specified in path).
+* __userId-3__ (string)
+One of the user's identification which includes username or UUID. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of Credential
-* Schema: [Credential](#credential)
+* Description: An array of deleted user's info.
+* Schema: [User](#User)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-### Devices Methods
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/{notificationId}/*/queue</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/users/{user}/password</h2>
-Retrieve the list of devices associated with one or more notifications before the notifications are sent through providing all the identifications.
+Set a user's password or reset the user's existing password.
<h3>Parameters</h3>
@@ -495,22 +524,26 @@ Retrieve the list of devices associated with one or more notifications before th
One of the organization's identification which includes name or uuid. (Specified in path).
* __appId__ (string)
One of the application's identification which includes name or uuid. (Specified in path).
-* __notificationId__ (string)
-One of the notification's identification which includes name or uuid. (Specified in path).
+* __username__ (string)
+The username of the user. (Specified in path).
+* __ResetPW__ ([ResetPW](#resetpw))
+The user's old and new password. (Specified in body).
<h3>Responses</h3>
__200__
-* Description: An array of retrieved device's info.
-* Schema: [Device](#device)
+* Description: An array of complete messages.
+* Schema: [Action](#Action)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-### Entity Methods
+
+### Entities-Collections
+
<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users/{userId}/{relation}</h2>
@@ -526,7 +559,7 @@ One of the application's identification which includes name or uuid. (Specif
One of the user's identification which includes username or UUID. (Specified in path).
* __relation__ (string)
The relation between user and collections. (Specified in path).
-* __queryStatement__ ()
+* __queryStatement__ (string)
The query statement of the user. (Specified in query).
<h3>Responses</h3>
@@ -534,12 +567,12 @@ The query statement of the user. (Specified in query).
__200__
* Description: An array of user's collections info.
-* Schema: [Entity](#entity)
+* Schema: [Entity](#Entity)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/{collectionId}</h2>
@@ -554,7 +587,7 @@ One of the organization's identification which includes name or uuid. (Speci
One of the application's identification which includes name or uuid. (Specified in path).
* __collectionId__ (string)
One of the collection's identification which includes name or uuid. (Specified in path).
-* __queryStatement__ ()
+* __queryStatement__ (string)
Any values specified in the query statement should be enclosed in single-quotes. (Specified in query).
<h3>Responses</h3>
@@ -562,12 +595,12 @@ Any values specified in the query statement should be enclosed in single-quotes.
__200__
* Description: An array of retrieved collection's info.
-* Schema: [Entity](#entity)
+* Schema: [Entity](#Entity)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
<h2 class="usergrid-PUT-heading">PUT /{orgId}/{appId}/{collectionId}</h2>
@@ -582,7 +615,7 @@ One of the organization's identification which includes name or uuid. (Speci
One of the application's identification which includes name or uuid. (Specified in path).
* __collectionId__ (string)
One of the collection's identification which includes name or uuid. (Specified in path).
-* __queryStatement__ ()
+* __queryStatement__ (string)
Any values specified in the query statement should be enclosed in single-quotes. (Specified in query).
<h3>Responses</h3>
@@ -590,12 +623,12 @@ Any values specified in the query statement should be enclosed in single-quotes.
__200__
* Description: An array of updated collection's info.
-* Schema: [Entity](#entity)
+* Schema: [Entity](#Entity)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2}</h2>
@@ -622,12 +655,12 @@ The Id of the 2nd entity. (Specified in path).
__200__
* Description: An array of added entity's info.
-* Schema: [Entity](#entity)
+* Schema: [Entity](#Entity)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2}</h2>
@@ -654,12 +687,12 @@ The Id of the 2nd entity. (Specified in path).
__200__
* Description: An array of deleted entity's info.
-* Schema: [Entity](#entity)
+* Schema: [Entity](#Entity)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/{collectionId}/{entityId}</h2>
@@ -682,12 +715,12 @@ One of the entity's identification which includes name or uuid. (Specified i
__200__
* Description: An array of retrieved entity's info.
-* Schema: [Entity](#entity)
+* Schema: [Entity](#Entity)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
<h2 class="usergrid-PUT-heading">PUT /{orgId}/{appId}/{collectionId}/{entityId}</h2>
@@ -712,12 +745,12 @@ The properties of the entity. (Specified in body).
__200__
* Description: An array of updated entity's info.
-* Schema: [Entity](#entity)
+* Schema: [Entity](#Entity)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId}</h2>
@@ -740,17 +773,17 @@ One of the entity's identification which includes name or uuid. (Specified i
__200__
* Description: An array of deleted entity's info.
-* Schema: [Entity](#entity)
+* Schema: [Entity](#Entity)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/{entitytype}</h2>
-When a new entity is created, Usergrid will automatically create a corresponding collection if one does not already exist. The collection will automatically be named with the plural form of the entity type.
+When a new entity is created, Usergrid will automatically create a corresponding collection if one does not already exist. The collection will automatically be named with the plural form of the entity type.
<h3>Parameters</h3>
@@ -768,16 +801,18 @@ The properties of the entity. (Specified in body).
__200__
* Description: An array of created custom entity's info.
-* Schema: [Entity](#entity)
+* Schema: [Entity](#Entity)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-### Event Methods
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/events</h2>
+### Events
+
+
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/events</h2>
Create an event through providing both Id of organization and application.
@@ -795,14 +830,16 @@ The required property of the event. (Specified in body).
__200__
* Description: An array of created event's info.
-* Schema: [Event](#event)
+* Schema: [Event](#Event)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-### Group Methods
+
+### Groups
+
<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/groups</h2>
@@ -822,17 +859,17 @@ The property of the created group. (Specified in body).
__200__
* Description: An array of created group's info.
-* Schema: [Group](#group)
+* Schema: [Group](#Group)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-GET-heading">GET /{org_Id}/{app_Id}/groups/{groupId}</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/groups/{groupId}/activities</h2>
-Get a group through through providing all the identifications.
+Create an activity to a specific group. In this case the activity is created in the activities collection and is accessible at the /activities endpoint to users who have the permission to read that endpoint. In addition, a relationship is established between the activity and the group, and because of that, the activity will appear in the group’s feed. The group 'owns' the activity. Also, the activity will be published in the feed of all users that are members of the group.
<h3>Parameters</h3>
@@ -842,23 +879,25 @@ One of the organization's identification which includes name or uuid. (Speci
One of the application's identification which includes name or uuid. (Specified in path).
* __groupId__ (string)
One of the group's identification which includes name or uuid. (Specified in path).
+* __CreateActivity__ ([CreateActivity](#createactivity))
+One or more sets of activity properties. (Specified in body).
<h3>Responses</h3>
__200__
-* Description: An array of retrieved group's info.
-* Schema: [Group](#group)
+* Description:
+* Schema: [ActivityFeed](#ActivityFeed)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-PUT-heading">PUT /{org_Id}/{app_Id}/groups/{groupId}</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/groups/{groupId}/users/{userId}</h2>
-Update a group through providing all the identifications.
+Add a user to a group through providing all the identifications.
<h3>Parameters</h3>
@@ -868,48 +907,53 @@ One of the organization's identification which includes name or uuid. (Speci
One of the application's identification which includes name or uuid. (Specified in path).
* __groupId__ (string)
One of the group's identification which includes name or uuid. (Specified in path).
+* __userId-3__ (string)
+One of the user's identification which includes username or UUID. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of updated group's info.
-* Schema: [Group](#group)
+* Description: An array of added user's info.
+* Schema: [User](#User)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-### Notification Methods
-<h2 class="usergrid-PUT-heading">PUT /my-org/sandbox/notifications/{notificationId}</h2>
+<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/groups/{groupId}/users/{userId}</h2>
-Cancel sent notifications through providing the Id of the notification.
+Delete user from a group through providing all the identifications.
<h3>Parameters</h3>
-* __notificationId__ (string)
-One of the notification's identification which includes name or uuid. (Specified in path).
-* __cancelMsg__ ([CancelMSG](#cancelmsg))
-Indicete whether is canceled or not. (Specified in body).
+* __orgId__ (string)
+One of the organization's identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application's identification which includes name or uuid. (Specified in path).
+* __groupId__ (string)
+One of the group's identification which includes name or uuid. (Specified in path).
+* __userId-3__ (string)
+One of the user's identification which includes username or UUID. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of canceled notification's info.
-* Schema: [Notification](#notification)
+* Description: An array of deleted user's info.
+* Schema: [User](#User)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/devices</h2>
+<h2 class="usergrid-GET-heading">GET /{org_Id}/{app_Id}/groups/{groupId}</h2>
-Create notifications for user through targeting by location and providing all the identifications.
+Get a group through through providing all the identifications.
<h3>Parameters</h3>
@@ -917,31 +961,25 @@ Create notifications for user through targeting by location and providing all th
One of the organization's identification which includes name or uuid. (Specified in path).
* __appId__ (string)
One of the application's identification which includes name or uuid. (Specified in path).
-* __notification__ ([CreateNotifications](#createnotifications))
-These parameters are used when forming the notification portion of the request. (Specified in body).
-* __scheduleNotification__ ([ScheduleNotification](#schedulenotification))
-To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
-* __setExpiration__ ([SetExpiration](#setexpiration))
-If a push service can't deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
-* __queryStatement__ ()
-The query statement of the location of the user. (Specified in query).
+* __groupId__ (string)
+One of the group's identification which includes name or uuid. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of created notification's info.
-* Schema: [Notification](#notification)
+* Description: An array of retrieved group's info.
+* Schema: [Group](#Group)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/devices/*/notifications</h2>
+<h2 class="usergrid-PUT-heading">PUT /{org_Id}/{app_Id}/groups/{groupId}</h2>
-Create notifications for all devices. This request will target all device entities.
+Update a group through providing all the identifications.
<h3>Parameters</h3>
@@ -949,117 +987,110 @@ Create notifications for all devices. This request will target all device entiti
One of the organization's identification which includes name or uuid. (Specified in path).
* __appId__ (string)
One of the application's identification which includes name or uuid. (Specified in path).
-* __notification__ ([CreateNotifications](#createnotifications))
-These parameters are used when forming the notification portion of the request. (Specified in body).
-* __scheduleNotification__ ([ScheduleNotification](#schedulenotification))
-To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
-* __setExpiration__ ([SetExpiration](#setexpiration))
-If a push service can't deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
+* __groupId__ (string)
+One of the group's identification which includes name or uuid. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of created notification's info.
-* Schema: [Notification](#notification)
+* Description: An array of updated group's info.
+* Schema: [Group](#Group)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/devices/{deviceId}/notifications</h2>
+### Notifications
-Create notifications for a single device. This request will target a specific device entity.
+
+<h2 class="usergrid-POST-heading">POST /{orgId}/{applicationId}/devices</h2>
+
+Create notifications for user through targeting by location and providing all the identifications.
<h3>Parameters</h3>
* __orgId__ (string)
One of the organization's identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application's identification which includes name or uuid. (Specified in path).
-* __deviceId__ (string)
-One of the device's identification which includes name or uuid. (Specified in path).
+* __applicationId__ (string)
+One of the application's identification which includes name or uuid (same as appId). (Specified in path).
* __notification__ ([CreateNotifications](#createnotifications))
These parameters are used when forming the notification portion of the request. (Specified in body).
-* __scheduleNotification__ ([ScheduleNotification](#schedulenotification))
-To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
-* __setExpiration__ ([SetExpiration](#setexpiration))
-If a push service can't deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
+* __queryStatement__ (string)
+The query statement of the location of the user. (Specified in query).
<h3>Responses</h3>
__200__
* Description: An array of created notification's info.
-* Schema: [Notification](#notification)
+* Schema: [Notification](#Notification)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/groups/{path}/notifications</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{applicationId}/devices/*/notifications</h2>
-Create notifications for a group. This request will target all users associated with a specific group entity.
+Create notifications for all devices. This request will target all device entities.
<h3>Parameters</h3>
* __orgId__ (string)
One of the organization's identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application's identification which includes name or uuid. (Specified in path).
-* __path__ (string)
-The path of the group. (Specified in path).
+* __applicationId__ (string)
+One of the application's identification which includes name or uuid (same as appId). (Specified in path).
* __notification__ ([CreateNotifications](#createnotifications))
These parameters are used when forming the notification portion of the request. (Specified in body).
-* __scheduleNotification__ ([ScheduleNotification](#schedulenotification))
-To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
-* __setExpiration__ ([SetExpiration](#setexpiration))
-If a push service can't deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
<h3>Responses</h3>
__200__
* Description: An array of created notification's info.
-* Schema: [Notification](#notification)
+* Schema: [Notification](#Notification)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/notifications</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{applicationId}/devices/{deviceId}/notifications</h2>
-Retrieve one or more notifications through providing all the identifications.
+Create notifications for a single device. This request will target a specific device entity.
<h3>Parameters</h3>
* __orgId__ (string)
One of the organization's identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application's identification which includes name or uuid. (Specified in path).
+* __applicationId__ (string)
+One of the application's identification which includes name or uuid (same as appId). (Specified in path).
+* __deviceId__ (string)
+One of the device's identification which includes name or uuid. (Specified in path).
+* __notification__ ([CreateNotifications](#createnotifications))
+These parameters are used when forming the notification portion of the request. (Specified in body).
<h3>Responses</h3>
__200__
-* Description: An array of retrieved notification's info.
-* Schema: [Notification](#notification)
+* Description: An array of created notification's info.
+* Schema: [Notification](#Notification)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/notifications/{notificationId}</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{applicationId}/groups/{path}/notifications</h2>
-Remove unsent notifications through providing all the identifications.
+Create notifications for a group. This request will target all users associated with a specific group entity.
<h3>Parameters</h3>
@@ -1067,215 +1098,216 @@ Remove unsent notifications through providing all the identifications.
One of the organization's identification which includes name or uuid. (Specified in path).
* __appId__ (string)
One of the application's identification which includes name or uuid. (Specified in path).
-* __notificationId__ (string)
-One of the notification's identification which includes name or uuid. (Specified in path).
+* __path__ (string)
+The path of the group. (Specified in path).
+* __notification__ ([CreateNotifications](#createnotifications))
+These parameters are used when forming the notification portion of the request. (Specified in body).
<h3>Responses</h3>
__200__
-* Description: An array of deleted notification's info.
-* Schema: [Notification](#notification)
+* Description: An array of created notification's info.
+* Schema: [Notification](#Notification)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/users/{userId}/notifications</h2>
+<h2 class="usergrid-GET-heading">GET /{orgId}/{applicationId}/notifications</h2>
-Create notifications for a user. This request will target a specific user entity.
+Retrieve one or more notifications through providing all the identifications.
<h3>Parameters</h3>
* __orgId__ (string)
One of the organization's identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application's identification which includes name or uuid. (Specified in path).
-* __userId-3__ (string)
-One of the user's identification which includes username or UUID. (Specified in path).
-* __notification__ ([CreateNotifications](#createnotifications))
-These parameters are used when forming the notification portion of the request. (Specified in body).
-* __scheduleNotification__ ([ScheduleNotification](#schedulenotification))
-To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
-* __setExpiration__ ([SetExpiration](#setexpiration))
-If a push service can't deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
+* __applicationId__ (string)
+One of the application's identification which includes name or uuid (same as appId). (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of created notification's info.
-* Schema: [Notification](#notification)
+* Description: An array of retrieved notification's info.
+* Schema: [Notification](#Notification)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/{receiptId}/*/notifications</h2>
+<h2 class="usergrid-PUT-heading">PUT /{orgId}/{applicationId}/notifications/{notificationId}</h2>
-Retrieve notifications associated with one or more receipts through providing all the identifications.
+Update a Notification in order to cancel the notifcation or set a new expiration time.
<h3>Parameters</h3>
* __orgId__ (string)
One of the organization's identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application's identification which includes name or uuid. (Specified in path).
-* __receiptId__ (string)
-One of the receipt's identification which includes name or uuid. (Specified in path).
+* __applicationId__ (string)
+One of the application's identification which includes name or uuid (same as appId). (Specified in path).
+* __notificationId__ (string)
+One of the notification's identification which includes name or uuid. (Specified in path).
+* __notificationUpdate__ ([NotificationUpdate](#notificationupdate))
+Object with Notification fields to be updated. (Specified in body).
<h3>Responses</h3>
__200__
-* Description: An array of retrieved notification's info.
-* Schema: [Notification](#notification)
+* Description: An API Response object containing an entity of type Notification.
+* Schema: [Notification](#Notification)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-### Organization Methods
-<h2 class="usergrid-POST-heading">POST /management/orgs</h2>
+<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{applicationId}/notifications/{notificationId}</h2>
-Create an organization through a form post.
+Delete an unsent Notification from the system.
<h3>Parameters</h3>
-* __CreateOrg__ ([CreateOrg](#createorg))
-A set of organization properties supplied through a form. (Specified in body).
+* __orgId__ (string)
+One of the organization's identification which includes name or uuid. (Specified in path).
+* __applicationId__ (string)
+One of the application's identification which includes name or uuid (same as appId). (Specified in path).
+* __notificationId__ (string)
+One of the notification's identification which includes name or uuid. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of created Organization.
-* Schema: [Organization](#organization)
+* Description: API Response containing Notification entity that was deleted.
+* Schema: [Notification](#Notification)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}</h2>
+<h2 class="usergrid-GET-heading">GET /{orgId}/{applicationId}/receipts</h2>
-Retrieve an organization given a specified UUID or username.
+Retrieve one or more receipts through providing all the identifications.
<h3>Parameters</h3>
* __orgId__ (string)
One of the organization's identification which includes name or uuid. (Specified in path).
+* __applicationId__ (string)
+One of the application's identification which includes name or uuid (same as appId). (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of created Organization.
-* Schema: [Organization](#organization)
+* Description: An array of retrieved receipt's info.
+* Schema: [Receipt](#Receipt)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-### Permission Methods
-<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/roles/{roleId}/permissions</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{applicationId}/users/{userId}/notifications</h2>
-Remove permissions from a role.
+Create notifications for a user. This request will target a specific user entity.
<h3>Parameters</h3>
* __orgId__ (string)
One of the organization's identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application's identification which includes name or uuid. (Specified in path).
-* __roleId__ (string)
-One of the role's identification which includes name or uuid. (Specified in path).
-* __grant_url_pattern__ ()
-The query statement of the url pattern. (Specified in query).
+* __applicationId__ (string)
+One of the application's identification which includes name or uuid (same as appId). (Specified in path).
+* __userId-3__ (string)
+One of the user's identification which includes username or UUID. (Specified in path).
+* __notification__ ([CreateNotifications](#createnotifications))
+These parameters are used when forming the notification portion of the request. (Specified in body).
<h3>Responses</h3>
__200__
-* Description: An array of deleted permission's info.
-* Schema: [Permission](#permission)
+* Description: An array of created notification's info.
+* Schema: [Notification](#Notification)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-### Receipt Methods
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/receipts</h2>
+<h2 class="usergrid-GET-heading">GET /{orgId}/{applicationId}/{deviceId}/*/receipts</h2>
-Retrieve one or more receipts through providing all the identifications.
+Retrieve receipts associated with one or more devices through providing all the identifications.
<h3>Parameters</h3>
* __orgId__ (string)
One of the organization's identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application's identification which includes name or uuid. (Specified in path).
+* __applicationId__ (string)
+One of the application's identification which includes name or uuid (same as appId). (Specified in path).
+* __deviceId__ (string)
+One of the device's identification which includes name or uuid. (Specified in path).
<h3>Responses</h3>
__200__
* Description: An array of retrieved receipt's info.
-* Schema: [Receipt](#receipt)
+* Schema: [Receipt](#Receipt)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/{deviceId}/*/receipts</h2>
+<h2 class="usergrid-GET-heading">GET /{orgId}/{applicationId}/{notificationId}/*/queue</h2>
-Retrieve receipts associated with one or more devices through providing all the identifications.
+Retrieve the list of devices associated with one or more notifications before the notifications are sent through providing all the identifications.
<h3>Parameters</h3>
* __orgId__ (string)
One of the organization's identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application's identification which includes name or uuid. (Specified in path).
-* __deviceId__ (string)
-One of the device's identification which includes name or uuid. (Specified in path).
+* __applicationId__ (string)
+One of the application's identification which includes name or uuid (same as appId). (Specified in path).
+* __notificationId__ (string)
+One of the notification's identification which includes name or uuid. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of retrieved receipt's info.
-* Schema: [Receipt](#receipt)
+* Description: An array of retrieved device's info.
+* Schema: [Device](#Device)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/{notificationId}/*/receipts</h2>
+<h2 class="usergrid-GET-heading">GET /{orgId}/{applicationId}/{notificationId}/*/receipts</h2>
-Retrieve receipts for one or more notifications through providing all the identifications."
+Retrieve receipts for one or more notifications through providing all the identifications.
<h3>Parameters</h3>
* __orgId__ (string)
One of the organization's identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application's identification which includes name or uuid. (Specified in path).
+* __applicationId__ (string)
+One of the application's identification which includes name or uuid (same as appId). (Specified in path).
* __notificationId__ (string)
One of the notification's identification which includes name or uuid. (Specified in path).
@@ -1284,263 +1316,323 @@ One of the notification's identification which includes name or uuid. (Speci
__200__
* Description: An array of retrieved receipt's info.
-* Schema: [Receipt](#receipt)
+* Schema: [Receipt](#Receipt)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-### Role Methods
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/roles</h2>
+<h2 class="usergrid-GET-heading">GET /{orgId}/{applicationId}/{receiptId}/*/notifications</h2>
-Retrieve the roles in an application through providing all the identifications.
+Retrieve notifications associated with one or more receipts through providing all the identifications.
<h3>Parameters</h3>
* __orgId__ (string)
One of the organization's identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application's identification which includes name or uuid. (Specified in path).
+* __applicationId__ (string)
+One of the application's identification which includes name or uuid (same as appId). (Specified in path).
+* __receiptId__ (string)
+One of the receipt's identification which includes name or uuid. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of retrieved role's info.
-* Schema: [Role](#role)
+* Description: An array of retrieved notification's info.
+* Schema: [Notification](#Notification)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/roles</h2>
+### Organizations-Applications
-Create a new role through providing all the identifications.
+
+<h2 class="usergrid-POST-heading">POST /management/orgs</h2>
+
+Create an organization through a form post.
<h3>Parameters</h3>
-* __orgId__ (string)
-One of the organization's identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application's identification which includes name or uuid. (Specified in path).
-* __roleproperty__ ([AddRole](#addrole))
-The required properties of the role. (Specified in body).
+* __CreateOrg__ ([CreateOrg](#createorg))
+A set of organization properties supplied through a form. (Specified in body).
<h3>Responses</h3>
__200__
-* Description: An array of created role's info.
-* Schema: [Role](#role)
+* Description: An array of created Organization.
+* Schema: [Organization](#Organization)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/roles/{rolename}</h2>
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}</h2>
-Remove a role through providing all the identifications.
+Retrieve an organization given a specified UUID or username.
<h3>Parameters</h3>
* __orgId__ (string)
One of the organization's identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application's identification which includes name or uuid. (Specified in path).
-* __rolename__ (string)
-The name of the role. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of deleted role's info.
-* Schema: [Role](#role)
+* Description: An array of created Organization.
+* Schema: [Organization](#Organization)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-### User Methods
-<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/users</h2>
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/activate</h2>
-Retrieve details about the admin users in an organization.
+Activate an organization from a link provIded in an email notification.
<h3>Parameters</h3>
* __orgId__ (string)
One of the organization's identification which includes name or uuid. (Specified in path).
+* __token__ (string)
+Activation token. (Specified in query).
+* __confirm_email__ (boolean)
+Send confirmation email or not. (Specified in query).
<h3>Responses</h3>
__200__
-* Description: An array of retrieved Admin user's info.
-* Schema: [User](#user)
+* Description: An array of complete messages.
+* Schema: [Action](#Action)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-DELETE-heading">DELETE /management/orgs/{orgId}/users/{userId}</h2>
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/apps</h2>
-Remove an admin user from an organization through providing both Id of application and organization.
+Retrieve the applications in an organization through providing both Id of application and organization.
<h3>Parameters</h3>
* __orgId__ (string)
One of the organization's identification which includes name or uuid. (Specified in path).
-* __userId-2__ (string)
-One of the user's identification which includes username, email address or UUID. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of deleted Admin user's info.
-* Schema: [User](#user)
+* Description: An array of retrieved application data.
+* Schema: [AppData](#AppData)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-POST-heading">POST /management/users</h2>
+<h2 class="usergrid-DELETE-heading">DELETE /management/orgs/{orgId}/apps/{appId}</h2>
-Create a whole new admin user.
+Remove an application from an organization through providing both Id of application and organization.
<h3>Parameters</h3>
-* __adminuserproperty__ ([CreateAdminUser](#createadminuser))
-One or more sets of user properties of which username is mandatory and must be unique. (Specified in body).
+* __orgId__ (string)
+One of the organization's identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application's identification which includes name or uuid. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of new created Admin user's info.
-* Schema: [User](#user)
+* Description: An array of deleted application info.
+* Schema: [AppData](#AppData)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-GET-heading">GET /management/users/{userId}</h2>
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/apps/{appId}/credentials</h2>
-Retrieve details about an admin user.
+Retrieve the client Id and client secret credentials for an application in an organization.
<h3>Parameters</h3>
-* __userId__ (string)
-One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
+* __orgId__ (string)
+One of the organization's identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application's identification which includes name or uuid. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of user's details
-* Schema: [User](#user)
+* Description: An array of retrieved credentials info.
+* Schema: [Credential](#Credential)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-PUT-heading">PUT /management/users/{userId}</h2>
+<h2 class="usergrid-POST-heading">POST /management/orgs/{orgId}/apps/{appId}/credentials</h2>
-Update the info of an admin user.
+Generate the client Id and client secret credentials for an application in an organization.
<h3>Parameters</h3>
-* __userId__ (string)
-One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
+* __orgId__ (string)
+One of the organization's identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application's identification which includes name or uuid. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of user's details.
-* Schema: [User](#user)
+* Description: An array of generated credentials info.
+* Schema: [Credential](#Credential)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/groups/{groupId}/users/{userId}</h2>
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/credentials</h2>
-Add a user to a group through providing all the identifications.
+Retrieve the credentials for an organization client.
<h3>Parameters</h3>
* __orgId__ (string)
One of the organization's identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application's identification which includes name or uuid. (Specified in path).
-* __groupId__ (string)
-One of the group's identification which includes name or uuid. (Specified in path).
-* __userId-3__ (string)
-One of the user's identification which includes username or UUID. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of added user's info.
-* Schema: [User](#user)
+* Description: An array of Credential
+* Schema: [Credential](#Credential)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/groups/{groupId}/users/{userId}</h2>
+<h2 class="usergrid-POST-heading">POST /management/orgs/{orgId}/credentials</h2>
-Delete user from a group through providing all the identifications.
+Generate whole new credentials for an organization client.
<h3>Parameters</h3>
* __orgId__ (string)
One of the organization's identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application's identification which includes name or uuid. (Specified in path).
-* __groupId__ (string)
-One of the group's identification which includes name or uuid. (Specified in path).
-* __userId-3__ (string)
-One of the user's identification which includes username or UUID. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of deleted user's info.
-* Schema: [User](#user)
+* Description: An array of Credential
+* Schema: [Credential](#Credential)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/roles/{roleId}/users</h2>
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/feed</h2>
-Retrieve the users in a role through providing all the identifications.
+Retrieve an organization's activity feed.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization's identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of the organization's ActivityFeed.
+* Schema: [ActivityFeed](#ActivityFeed)
+
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#Error)
+
+
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/reactivate</h2>
+
+Reactivate an expired organization.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization's identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of complete messages.
+* Schema: [Action](#Action)
+
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#Error)
+
+
+<h2 class="usergrid-GET-heading">GET /management/users/{userId}/feed</h2>
+
+Retrieve an admin user's activity feed.
+
+<h3>Parameters</h3>
+
+* __userId__ (string)
+One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of user's activity
+* Schema: [ActivityFeed](#ActivityFeed)
+
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#Error)
+
+
+### Permissions-Roles
+
+
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/roles</h2>
+
+Retrieve the roles in an application through providing all the identifications.
<h3>Parameters</h3>
@@ -1548,25 +1640,49 @@ Retrieve the users in a role through providing all the identifications.
One of the organization's identification which includes name or uuid. (Specified in path).
* __appId__ (string)
One of the application's identification which includes name or uuid. (Specified in path).
-* __roleId__ (string)
-One of the role's identification which includes name or uuid. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of retrieved user's info.
-* Schema: [User](#user)
+* Description: An array of retrieved role's info.
+* Schema: [Role](#Role)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/roles/{roleId}/users/{userId}</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/roles</h2>
-Add a user to a role through providing all the identifications.
+Create a new role through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization's identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application's identification which includes name or uuid. (Specified in path).
+* __roleproperty__ ([AddRole](#addrole))
+The required properties of the role. (Specified in body).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of created role's info.
+* Schema: [Role](#Role)
+
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#Error)
+
+
+<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/roles/{roleId}/permissions</h2>
+
+Remove permissions from a role.
<h3>Parameters</h3>
@@ -1576,25 +1692,25 @@ One of the organization's identification which includes name or uuid. (Speci
One of the application's identification which includes name or uuid. (Specified in path).
* __roleId__ (string)
One of the role's identification which includes name or uuid. (Specified in path).
-* __userId-3__ (string)
-One of the user's identification which includes username or UUID. (Specified in path).
+* __Permissions__ ([Permissions](#permissions))
+The query statement of the url pattern. (Specified in body).
<h3>Responses</h3>
__200__
-* Description: An array of added user's info.
-* Schema: [User](#user)
+* Description: Permissions object with array of the deleated Usergrid Permission strings.
+* Schema: [Permissions](#Permissions)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/roles/{roleId}/users/{userId}</h2>
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/roles/{roleId}/users</h2>
-Remove a user from a role through providing all the identifications.
+Retrieve the users in a role through providing all the identifications.
<h3>Parameters</h3>
@@ -1604,25 +1720,23 @@ One of the organization's identification which includes name or uuid. (Speci
One of the application's identification which includes name or uuid. (Specified in path).
* __roleId__ (string)
One of the role's identification which includes name or uuid. (Specified in path).
-* __userId-3__ (string)
-One of the user's identification which includes username or UUID. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of deleted user's info.
-* Schema: [User](#user)
+* Description: An API Response with a entities array of Users.
+* Schema: [User](#User)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/roles/{roleId}/users/{userId}</h2>
-Retrieve users though query statement.
+Add a user to a role through providing all the identifications.
<h3>Parameters</h3>
@@ -1630,25 +1744,27 @@ Retrieve users though query statement.
One of the organization's identification which includes name or uuid. (Specified in path).
* __appId__ (string)
One of the application's identification which includes name or uuid. (Specified in path).
-* __queryStatement__ ()
-The query statement of the User. (Specified in query).
+* __roleId__ (string)
+One of the role's identification which includes name or uuid. (Specified in path).
+* __userId-3__ (string)
+One of the user's identification which includes username or UUID. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of retrieved user's info.
-* Schema: [User](#user)
+* Description: An array of added user's info.
+* Schema: [User](#User)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/users</h2>
+<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/roles/{roleId}/users/{userId}</h2>
-Create a user in the users collection through providing all the identifications.
+Remove a user from a role through providing all the identifications.
<h3>Parameters</h3>
@@ -1656,25 +1772,27 @@ Create a user in the users collection through providing all the identifications.
One of the organization's identification which includes name or uuid. (Specified in path).
* __appId__ (string)
One of the application's identification which includes name or uuid. (Specified in path).
-* __CreateUser__ ([CreateUser](#createuser))
-The properties of the user. (Specified in body).
+* __roleId__ (string)
+One of the role's identification which includes name or uuid. (Specified in path).
+* __userId-3__ (string)
+One of the user's identification which includes username or UUID. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of created user's info.
-* Schema: [User](#user)
+* Description: An array of deleted user's info.
+* Schema: [User](#User)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users/{userId}</h2>
+<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/roles/{rolename}</h2>
-Retrieve a user through providing all the identifications.
+Remove a role through providing all the identifications.
<h3>Parameters</h3>
@@ -1682,25 +1800,25 @@ Retrieve a user through providing all the identifications.
One of the organization's identification which includes name or uuid. (Specified in path).
* __appId__ (string)
One of the application's identification which includes name or uuid. (Specified in path).
-* __userId-2__ (string)
-One of the user's identification which includes username, email address or UUID. (Specified in path).
+* __rolename__ (string)
+The name of the role. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of retrieved user's info.
-* Schema: [User](#user)
+* Description: An array of deleted role's info.
+* Schema: [Role](#Role)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-PUT-heading">PUT /{orgId}/{appId}/users/{userId}</h2>
+<h2 class="usergrid-GET-heading">GET /{orgId}/{applicationId}/roles/{roleId}/permissions</h2>
-Update a user through providing all the identifications.
+Retrieve permissions for a Role.
<h3>Parameters</h3>
@@ -1708,25 +1826,25 @@ Update a user through providing all the identifications.
One of the organization's identification which includes name or uuid. (Specified in path).
* __appId__ (string)
One of the application's identification which includes name or uuid. (Specified in path).
-* __userId-3__ (string)
-One of the user's identification which includes username or UUID. (Specified in path).
+* __roleId__ (string)
+One of the role's identification which includes name or uuid. (Specified in path).
<h3>Responses</h3>
__200__
-* Description: An array of updated user's info.
-* Schema: [User](#user)
+* Description: Permissions object with array of Usergrid Permission strings.
+* Schema: [Permissions](#Permissions)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
-<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/users/{userId}</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{applicationId}/roles/{roleId}/permissions</h2>
-Remove a user through providing all the identifications.
+Add permissions to a role through providing all the identifications.
<h3>Parameters</h3>
@@ -1734,1586 +1852,2193 @@ Remove a user through providing all the identifications.
One of the organization's identification which includes name or uuid. (Specified in path).
* __appId__ (string)
One of the application's identification which includes name or uuid. (Specified in path).
-* __userId-3__ (string)
-One of the user's identification which includes username or UUID. (Specified in path).
+* __roleId__ (string)
+One of the role's identification which includes name or uuid. (Specified in path).
+* __Permissions__ ([Permissions](#permissions))
+Permissions object with array of Usergrid Permission strings to be added. (Specified in body).
<h3>Responses</h3>
__200__
-* Description: An array of deleted user's info.
-* Schema: [User](#user)
+* Description: Permissions object with array of Usergrid Permission strings.
+* Schema: [Permission](#Permission)
__default__
* Description: Unexpected error.
-* Schema: [Error](#error)
+* Schema: [Error](#Error)
## Models
-Properties for Usergrid default entities.
+This section lists the properties for the Usergrid Default Entities:
+
+### AccessTokenResponse
+
-### Action
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>action</td>
- <td>string</td>
- <td>The requested action.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>status</td>
- <td>string</td>
- <td>The status of the requested action.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>token</td>
- <td>string</td>
- <td>The token required for getting an AdminUser.</td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>access_token</td>
+ <td>
+ string
+ </td>
+ <td>Access-token that may be used on subsequent requests.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>expires_in</td>
+ <td>
+ number
+ </td>
+ <td>Time (in milliseconds) until access-token expires.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>user</td>
+ <td>
+ [User](#user)
+ </td>
+ <td>User object if login was done as a user.</td>
+ <td>false</td>
+ </tr>
</table>
-### ActivityFeed
+__Referring API Paths__
+
+* [/management/token](#op-MhD5hWgRwK)
+* [/{orgId}/{appId}/token](#op-9TDlDc0BL3)
+
-__Properties__
-<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>entityproperty</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>category</td>
- <td>string</td>
- <td>The category of the activity.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>metadataproperty</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>objectproperty</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>title</td>
- <td>string</td>
- <td>The title of the activity.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>verb</td>
- <td>string</td>
- <td>The verb of the activity.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>completeMsg</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
-</table>
+### Action
+
-### Actor
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>displayname</td>
- <td>string</td>
- <td>The display of the name of the actor.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>objecttype</td>
- <td>string</td>
- <td>The type of the actor.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>objectuuId</td>
- <td>string</td>
- <td>The UUID of the actor.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>entitytype</td>
- <td>string</td>
- <td>The entitytype of the actor.</td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>action</td>
+ <td>
+ string
+ </td>
+ <td>The requested action.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>status</td>
+ <td>
+ string
+ </td>
+ <td>The status of the requested action.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>timestamp</td>
+ <td>
+ number
+ </td>
+ <td>The timestamp of the requested action.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>duration</td>
+ <td>
+ number
+ </td>
+ <td>The duration of the requested action.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>token</td>
+ <td>
+ string
+ </td>
+ <td>The token required for getting an AdminUser.</td>
+ <td>false</td>
+ </tr>
</table>
-### AddPermission
+__Referring API Paths__
+
+* [/management/users/resetpw](#op-AiNhPeeyiq)
+* [/{orgId}/{appId}/users/{user}/password](#op-d0NWF6YZuK)
+* [/management/orgs/{orgId}/activate](#op-5138i0P1q8)
+* [/management/users/{userId}/activate](#op-c9LsV7Ulbr)
+* [/management/orgs/{orgId}/reactivate](#op-RIuF55JkgX)
+* [/management/users/{userId}/reactivate](#op-jk8tbzHamj)
+* [/management/users/{userId}/password](#op-yjg1hntm4R)
+
+
+__Referring Definitions__
+
+* [Receipt](#receipt)
+* [Device](#device)
+* [Notification](#notification)
+* [Role](#role)
+* [Event](#event)
+* [Group](#group)
+* [Credential](#credential)
+* [Organization](#organization)
+* [AppData](#appdata)
+* [User](#user)
+* [ActivityFeed](#activityfeed)
+
-__Properties__
+### ActivityFeed
-<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>operation</td>
- <td>string</td>
- <td>A comma-delimited set of HTTP methods (GET, PUT, POST, DELETE) that are allowed for the specified resource path.</td>
- <td>true</td>
- </tr>
- <tr>
- <td>resource_path</td>
- <td>string</td>
- <td>The path to the resources to be accessed.</td>
- <td>true</td>
- </tr>
-</table>
-### AddRole
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>title</td>
- <td>string</td>
- <td>The title of the role.</td>
- <td>true</td>
- </tr>
- <tr>
- <td>role name</td>
- <td>string</td>
- <td>The name of the role.</td>
- <td>true</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>entityproperty</td>
+ <td>
+ [Entity](#entity)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>category</td>
+ <td>
+ string
+ </td>
+ <td>The category of the activity.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>metadataproperty</td>
+ <td>
+ [Metadata](#metadata)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>objectproperty</td>
+ <td>
+ [Object](#object)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>title</td>
+ <td>
+ string
+ </td>
+ <td>The title of the activity.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>verb</td>
+ <td>
+ string
+ </td>
+ <td>The verb of the activity.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>published</td>
+ <td>
+ number
+ </td>
+ <td>UTC timestamp of the feed publish time.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>completeMsg</td>
+ <td>
+ [Action](#action)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
</table>
-### AdminUserUpdate
+__Referring API Paths__
+
+* [/{orgId}/{appId}/users/{userId}/activities](#op-SgbcdXdHSq)
+* [/{orgId}/{appId}/users/{userId}/feed](#op-JOpALhJR9x)
+* [/management/orgs/{orgId}/feed](#op-FsWAA6TQ6j)
+* [/{orgId}/{appId}/groups/{groupId}/feed](#op-vjWBovszxD)
+* [/management/users/{userId}/feed](#op-oyQqxIeMTj)
+* [/{orgId}/{appId}/groups/{groupId}/activities](#op-Y8sHuGSnUK)
+
-__Properties__
-<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>city</td>
- <td>string</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>state</td>
- <td>string</td>
- <td></td>
- <td>false</td>
- </tr>
-</table>
+### AddRole
+
-### AppData
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>tester/sandbox</td>
- <td>string</td>
- <td>The UUID of tester/sandbox.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>tester/app1</td>
- <td>string</td>
- <td>The UUID of tester/app1.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>tester/app2</td>
- <td>string</td>
- <td>The UUID of tester/app2.</td>
- <td>false</td>
- </tr>
- <tr>
- <td>completeMsg</td>
- <td>ref</td>
- <td></td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>title</td>
+ <td>
+ string
+ </td>
+ <td>The title of the role.</td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td>role name</td>
+ <td>
+ string
+ </td>
+ <td>The name of the role.</td>
+ <td>true</td>
+ </tr>
</table>
-### CancelMSG
+__Referring API Paths__
+
+* [/{orgId}/{appId}/roles](#op-77UvdX1AKS)
+
-__Properties__
-<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>canceled</td>
- <td>boolean</td>
- <td></td>
- <td>true</td>
- </tr>
-</table>
+### AppData
+
-### Collections
__Properties__
<table width="80%" class="usergrid-table">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>activities</td>
- <td>string</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>feed</td>
- <td>string</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>roles</td>
- <td>string</td>
- <td></td>
- <td>false</td>
- </tr>
- <tr>
- <td>users</td>
- <td>string</td>
- <td></td>
- <td>false</td>
- </tr>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ <th>Required</th>
+ </tr>
+ <tr>
+ <td>tester/sandbox</td>
+ <td>
+ string
+ </td>
+ <td>The UUID of tester/sandbox.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>tester/app1</td>
+ <td>
+ string
+ </td>
+ <td>The UUID of tester/app1.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>tester/app2</td>
+ <td>
+ string
+ </td>
+ <td>The UUID of tester/app2.</td>
+ <td>false</td>
+ </tr>
+ <tr>
+ <td>completeMsg</td>
+ <td>
+ [Action](#action)
+ </td>
+ <td></td>
+ <td>false</td>
+ </tr>
</table>
+__Referring API Paths__
+
+* [/management/orgs/{orgId}/apps](#op-FxESea37Iw)
+* [
<TRUNCATED>
[08/36] usergrid git commit: Cherry pick: Update website to remove
reference to incubator.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d0f10bcf/content/docs/searchindex.js
----------------------------------------------------------------------
diff --git a/content/docs/searchindex.js b/content/docs/searchindex.js
index 26604b3..2541ca4 100644
--- a/content/docs/searchindex.js
+++ b/content/docs/searchindex.js
@@ -1 +1 @@
-Search.setIndex({envversion:46,filenames:["README","asset-and-files/assets","asset-and-files/file-storage-configuration","asset-and-files/folders","asset-and-files/legacy-asset-support","asset-and-files/retrieving-assets","asset-and-files/uploading-assets","counters-and-events/creating-and-incrementing-counters","counters-and-events/events-and-counters","counters-and-events/retrieving-counters","data-queries/advanced-query-usage","data-queries/operators-and-types","data-queries/query-language","data-queries/query-parameters","data-queries/querying-your-data","data-storage/collections","data-storage/data-store-dbms","data-storage/entities","data-storage/optimizing-access","entity-connections/connecting-entities","entity-connections/disconnecting-entities","entity-connections/relationships","entity-connections/retrieving-entities","geolocation/geolocation","geolocation/tbd","getting-started/creating-a-new-application","getting-started/creating-account","getting-started/using-a-sandbox
-app","getting-started/using-the-api","index","installation/ug1-deploy-to-tomcat","installation/ug1-launcher-quick-start","installation/ug2-deploy-to-tomcat","introduction/async-vs-sync","introduction/data-model","introduction/usergrid-features","orgs-and-apps/admin-user","orgs-and-apps/application","orgs-and-apps/managing","orgs-and-apps/organization","push-notifications/tbd","push-notifications/users-devices","reference/contribute-code","reference/presos-and-videos","rest-endpoints/api-docs","sdks/ios","sdks/java","sdks/javascript","sdks/tbd","sdks/usage","security-and-auth/app-security","security-and-auth/authenticating-api-requests","security-and-auth/authenticating-users-and-application-clients","security-and-auth/changing-token-time-live-ttl","security-and-auth/facebook-sign","security-and-auth/revoking-tokens-logout","security-and-auth/securing-your-app","security-and-auth/user-authentication-types","security-and-auth/using-permissions","user-management/activity","user-manage
ment/group","user-management/groups","user-management/messagee-example","user-management/user-connections","user-management/user-management","user-management/working-user-data"],objects:{},objnames:{},objtypes:{},terms:{"005056c00008":65,"00767101f6b4f2cf5d02ed510dbcf0b4":60,"02e81ac5a17b":[3,11,12],"02e81adcf3d0":[6,7,9,15,17,20,22,28,58,59,60],"02e81ae236e9":60,"02e81ae61238":60,"02e81ae640dc":[3,59],"02e81ae66238":60,"02e81aeb2129":60,"02e81aeb26e9":60,"02e9sjwsf3d0":17,"03ae956a":23,"0455fc92de2636fc7a176cc5d298bb78":60,"0abe":15,"0d7cf92a":17,"0d7e":39,"0d7f":39,"0f1ff3650d20":[19,60,65],"10e":[11,12],"10e10":[11,12],"11e0":[9,65],"11e1":[3,28,34,36,39,59,60,65],"11e2":[3,6,7,9,11,12,14,15,17,20,22,28,39,58,59,60],"11e3":[6,15,17,19,20,22,23,28,53,60,65],"1231380a0284":59,"12313b01d5c1":[3,28,34,59],"12313b06ae01":59,"12313b06d112":59,"12313b111c56":39,"12313b122c56":[36,39],"12313d027361":39,"12313d027471":39,"12313d14bde7":60,"12313d1520f1":59,"12313d1c4491":[3,36,39,59],"123
13d1c44914":59,"12313d1c5591":39,"12313d288ee0":39,"12313d288ff0":39,"12313d331ae8":59,"12313f0204b":65,"12313f0204bb":[9,65],"12313f0204bb8":65,"12331b144c65":36,"12331d1c5591":[36,39],"12424d1c4491":36,"174785aa":19,"19a0":17,"1a62":15,"1a9356ba":[15,17],"1bd100b8059e":15,"1c8f60e4":65,"1f3567aa":59,"1px":43,"1st":44,"20adr":65,"20c57d4f41cf51f2db44165eb058b3b2":[12,14],"20employe":60,"20or":17,"20titl":60,"20uuid":17,"20where":[60,65],"22000a1c4e22":60,"22000a1c5a67":[60,65],"2440ca58":59,"2482a1c5":59,"249f":23,"2ac6":3,"2ac8":3,"2d00":59,"2d21":3,"2e1db7299b0a667ed80e674a0ef9d653":6,"2nd":44,"31847b9a":15,"3192ac6a":15,"327b527f":[36,39],"328b526e":36,"328fe64a":17,"335b527f":[36,39],"33dd0563":[36,39],"3400ba10":[3,39,59],"34e26bc9":59,"3500ba10":39,"37f3":59,"38dc":17,"3d1a9356ba":17,"410b213a":6,"411c466c4f2c":[12,14],"417f":[19,60,65],"4353136f":65,"438a1ca1":9,"477d":60,"48c92c73":39,"496ca1d42ce7":15,"49ff":59,"4a1edb70":17,"4d2664c8e0c3":60,"5005a0fa":60,"503f17da":28,"5
0gb":2,"5111c463":59,"5373d7165c2d":53,"53fe3700":15,"563f5d96":59,"58606d0a":[20,22],"58e8":[60,65],"5ae1fa7a":15,"5bb76bca":[15,17],"5bcc47ca":[20,22],"5c0c1789":[3,34],"5de0bb69":39,"5f4a65c16193":17,"5wugd":52,"61c9":59,"62de5d97":28,"62fd53c78ce7":58,"65c8":39,"6640a601":3,"6715d5ef47a6":17,"67cb":60,"698b":60,"699740088e05":7,"6a42":59,"6be0003c809b":15,"6c56ffda":19,"6fbc8157":60,"6ldstnesaaaaakhdvglhmmu86_eoyxsjjqqd1ipz":[36,65],"74d2d7da":60,"78c54a82":65,"7bf47435":3,"7fb8d891":60,"802f":60,"81581bbaf055":[15,17],"8272c9b0":[12,14],"83ceb9965c26":60,"83de":60,"83e9b7ea":17,"84a5":65,"84c0":59,"84df":17,"87b9":39,"884d":65,"89ab":15,"8a2a":17,"8a4c":58,"8ae8a6ea":65,"8bde":[20,22],"8cef":[12,14],"8d05e96f700d":15,"8d5c":28,"8dd1801e534c":19,"8e0cd3866ee20746c99e9a9825f38ad8":3,"8ea8":19,"903f":[15,17],"90f823ba15655b8cc8e3b4d63377576f":60,"917d":17,"924d":[11,12],"92c3":3,"92e2":[12,14],"9501cda1":3,"95c8":[36,39],"96f6":59,"98b9":39,"9953085ea376":6,"99a7":53,"99fd":19,"9c
1b":60,"9ce3":17,"9d3a":7,"9e75":19,"9e92":17,"9f80":23,"9ff6c621a7a4":[15,17],"9ffc":59,"____usergrid":30,"boolean":[11,12,39,41,44],"case":[10,12,18,21,30,33,41,44,59,61,63],"class":[2,32,36,52,55,65],"default":[2,11,12,13,14,15,16,17,23,28,29,30,32],"float":[11,12],"function":[7,33,35,54,57,59,60,61,62,64],"import":[27,28,33,34,35,50],"long":[1,11,12,34,41,61],"new":[7,10,12,15,17,18,21],"null":[7,54],"public":[36,65],"return":[11,12,13,14,15,18,22,23,28,31,33,36,39,41,44,52,53,54,55,58,59,60],"short":[26,59],"static":30,"super":29,"switch":21,"transient":32,"true":[11,12,14,20,22,28,30,31,32,36,39,44,54,60,65],"try":[26,27,31,36,50,54,58],"typeof":54,"var":[10,36,54],"while":[27,30,33,34,35,41,58],a065:59,a0dd:28,a0e5:6,a0f7:59,a166:[6,7,9,15,17,20,22,28,58,60],a24f:15,a407b1e7:[60,65],a51b:17,a554b7fbd57a:28,a668717b:60,a694:[20,22],a6e3:60,a71c:58,a72a:[15,17],a7e008061e10:[20,22],a7f7:[6,7,9,15,17,20,22,28,58,60],abbrevi:[12,14,18,28],abil:[21,23,26,35,63,64],abl:[18,28,30,56
,57,59,64,65],about:[0,11,12,18,26,27,28,29,30,35,36,38,39,44,52,56,57,59,60,61,64,65],abov:[6,7,22,30,31,32,59],ac46:[60,65],accept:[5,52,58],access:[3,15,16,17,18,22,25,26,27],access_token:[31,51,52,53,54],accessid:2,accesstokenttl:53,accomplish:55,accord:52,account:[14,17,18],achiev:63,acknowledg:12,acquaint:59,acquir:29,across:[9,18],act:[14,59,62],action:[3,6,7,8,9,12,14,15,16,17,18,19,20,22,28,29,30,35,36,37,39],activ:[6,11,12,14,20,22,23,26,28,29,30,32,34],activit:36,activityfe:29,actor:[29,36,39],actorproperti:44,actual:18,add:[2,10,12,16,17,18,25,26,27,29],addit:[9,18,26,35,36,44,51,52,57,59,60,63,65],addpermiss:29,address:[12,14,28,30,36,39,41,44,52,65],addrol:29,adjust:[12,13],admin:[25,26,27,29,30,31,32],admin_password:52,admin_usernam:52,admin_users_require_activ:[30,32],admin_users_require_confirm:[30,32],admingmail:36,administr:[30,31,34,35,37,39,41,52,56,57],adminus:[36,39,44],adminuserproperti:44,adminuserupd:29,adomain:65,adopt:[35,42],advantag:35,advertis:23,advis
:56,ae1f:19,aec3:59,afad:59,affect:53,after:[7,11,12,28,31,33,44,52,54,56,62],again:[30,36],against:[12,20,32,37,51,52,56,58],aggreg:9,air:16,alert:[23,33,60,61],alia:65,all:[0,7,9],allow:[8,14,23,28,30,32,34,35,39,41,44,54,57,58,59,60,61,63,64,65],almost:64,along:[12,13,18],alreadi:[17,18,26,30,41,44,54,56,62],also:[2,3,7,8,9,12,13,15,17,18,25,31,32,34,35,36,37,39,41,44,52,54,55,56,58,59,60,61,62,63,65],altern:[14,15,60,61],although:[15,17,36,59,60,65],alwai:34,amazon:2,amazonaw:30,amount:[12,13,57,59],amuramoto:[6,17,53],analysi:35,analyt:26,analyz:[35,51,52,56,57],android:[28,29,33,49,52,54,55],ani:[6,7,9,11,12,14,16,17,18,21,23,32,33,34,35,36,38,44,50,51,52,53,56,57,58,59,60,62,63,64,65],anonym:[41,59,65],anoth:[12,14,18,21,27,51,59,62,63,65],answer:65,ant:58,anuff:43,anyon:[57,59],anyth:30,anytim:59,anywher:13,apachecon:43,apidocgener:0,apige:[28,43,60],apigeemobileconfig:53,apikei:54,apn:44,app1:44,app2:44,app:[3,5,6,7,8,9,12,14,15,16,17,18,19,20,21,22],app_id:[17,44,59,60,65]
,app_nam:[12,37,53,55],app_uuid:[16,18],appdata:29,appear:[22,44,59,62,63],append:[9,10,15,18,23,51,54],appid:[44,54],appl:[35,44],appli:[12,28,32,53,56,58,63,64,65],applic:[3,5,6,7,8,9,12,14,15,16,17,18,19,20,22,23],application_client_secret:52,application_clientid:52,application_info:39,applicationdata:44,applicationid:[36,39,44],applicationnam:[3,6,7,9,12,14,15,16,17,18,19,20,22,28,44,53,58,59,60,65],appnam:[10,52,54],appropri:[34,41,54],approv:[30,32],arbitrari:[28,63],architectur:[16,30],area:[26,27,36,50,65],aren:[16,18],arg:[2,37,39,59,60],argument:2,arm:56,around:[0,18],arrai:[11,12,14,16,17,18,22,28,44],arrang:12,arthur:[19,20,22,63,64],articl:[14,15,17,51],asc:[12,13],ascend:[12,13],ask:[12,14,32],aspect:[8,35],asset1:3,assets_id:3,assign:[7,29,34,35,41,52,56],associ:[6,11,12,15,22,23,25,28,34,35,39,41,44,50,52,53,55,57,60,62,64,65],assum:[18,51],async:29,asynchron:29,atistophan:36,atom:17,attach:[5,6],attack:[50,56],attempt:[39,51],attribut:16,audio:[1,6,35],auth:[30,32,4
1,54],authent:[15,17,27],author:[12,31,38,51,53,54,59,64],author_uuid:18,authorid:[16,18],authorimag:18,authornam:18,authoruuid:18,authrespons:54,auto:[30,32],automat:[6,7,15,17,21,25,26,32,34,35,44,52,54,55,58,59,63],avail:[12,15,17,23,26,28,31,35,52,62,64],avatar:[12,14,28,59,60,65],avoid:[18,62],awai:18,awar:[11,12,23],awssdks3binarystor:2,b0c6:60,b11217fc:7,b1f7:15,b24e:7,b2bd:60,b2e4:17,b31d:53,b36a:[3,34],b379:6,b3u68vghi6fmeekn9wlogtzz0a:37,b3u6aaabmqz:52,b3u6zuz5_u8i:37,b4c6:3,b690:60,b6dd:59,b77ec8addc0d:60,b90c:60,b93d:65,baa:[36,39,50],back:[16,18,31,35,42,62],backend:[14,29,34],bad:[39,52,57],banner:8,bar1234b:65,bar:28,barnei:[21,60,63],base:[0,15,23],batch:[12,13],baz:28,bcc1:9,bcf7:[3,36,39,59],bcf8:[36,39],bd397ea1:58,be04:15,be08a5f9:39,be09a5f9:39,bean:2,bearer:[31,51],beca:39,becaus:[12,16,21,23,27,30,44,52,56,57,59,62],becom:[13,14,23,30,35,59,60,61],bedrock:12,been:[7,18,51,54,55,56,59],bef8:[36,39],befor:[0,2,26,27,32,33,44,54,56,65],begin:[9,12,13,38],behalf:5
2,behav:62,behavior:35,behind:[26,41,54],belong:[31,34,41,59,61],below:[12,15,16,17,18,30,32,36,54,59,60,62,65],beneath:62,benefici:33,benefit:[16,30],best:[13,14],better:[18,52,57],bewar:32,beyond:59,bike:11,bin:32,binari:[1,35,51,52,56,57],binarystor:2,bit:16,block:33,board:62,boat:[11,12],boavijt0oyrkjf:37,bodi:[7,18,36,37,39,44,53,59,60,65],book:[12,13,35],border:43,both:[7,12,16,19,32,33,34,42,44,57,64],bounc:18,bouncer:18,bounci:[16,18],box:[25,27,62,64],bracket:17,bread:[15,17],brief:[33,54],broad:[51,52,57],browser:[30,32,36,54],bucketnam:2,buildcurl:54,built:[12,18,28,30,59],busi:23,button:[8,25,27,36,62,65],button_click:[7,9],c2v7n61dy90mcdg78xixprxfdq:39,c2v7wedxiutzwekwdyslct_lydfvmmn:39,c5e707256e71:17,california:[36,60,61],call:9,callback:[33,54],campaign:35,can:[0,1,2,3,5,6,7,8,9,11,12,13,14,15,16,17,18,19,21,22,23,25,26,27,28,30,31,32,33,34,35,36,37,38,39,41,42,44,50,51,52,53,54,56,57,58,59,60,61,62,63,64,65],cancel:[44,54],cancelmsg:29,cannot:[15,17,28,33,34,57],cap
abl:56,captcha:[36,44,65],captur:[12,14,18,23,35],car:11,carefulli:57,carri:38,cassandra:[16,18,29],cast:43,castl:[16,18],cat:31,catalina:32,catalog:35,categori:[16,36,39,44],caus:[0,17],caution:53,cautiou:[51,52,57],ccc:43,cd0c:[3,36,39,59],cd0d:[36,39],cd789b00:60,cd796d0a:60,cdf1ce04c1c0:[12,14],cdn:35,cede5b7:39,cede5b8:39,cell:0,center:23,central:[0,2],certain:[12,17,18,34,44,55,64],cf3e981c:36,cf4d981c:[36,39],cf9b:9,cfed:[20,22],chain:7,challeng:[28,36,44,65],channel:54,channelurl:54,charact:[13,59,65],charset:[36,65],check:[27,30,31,54,57,58,59],checksum:[3,6],chicago:65,choos:18,circl:[35,59],circumst:55,cite:17,citi:[13,36,44,65],clara:43,classpath:2,claus:12,clean:[0,30,31,32,36],cli:30,click:[8,18,25,27,38,62],client:[10,12,13,15,16,17,18,28,29,30,33,35,36,37,38],client_credenti:[37,52],client_id:[37,39,44,51,52,54],client_secret:[37,39,44,51,52],climb:18,clone:[0,30,32],closer:18,cloud:[2,5,6,35],clue:30,cluster:30,cluster_nam:32,cn0wtdxxkxmqlgzvtmubcp20fulczq:52,code:[
2,12,13,18,28,29,30,31,33,35],coffe:16,colleagu:59,collect:[5,6,12,14],collection_nam:15,collectionid:44,column:[12,16,18],com:[3,5,6,7,9,12,14,15,16,17,18,19,20,21,22,23,28,30,31,32,34,36,37,39,41,52,53,54,55,58,59,60,62,63,64,65],combin:[18,56,65],comma:[12,14,44,54,58],comma_separated_list_of_permission_nam:54,command:[0,26,30,31,32,49,54,60],comment:[35,59],commit:0,committ:42,common:[12,14,56,59,65],commun:62,compani:[38,39,62],compar:[12,14],comparison:12,compil:[51,52,56,57],complet:[14,30,33,34,35],completemsg:44,complex:[17,18,29,35],compliant:35,complic:30,compon:[34,35],compromis:51,concept:[16,26],config:32,confim:44,confirm:[30,32,36,39,44,62],confirm_email:[36,39,44],conflict:62,conform:[11,12],conjunct:[35,64],connect:[0,3,6,12,14,18],connected_collect:[19,20],connected_ent:[19,20],connecting_collect:[19,20],connecting_ent:[19,20],consid:[52,56],consider:[51,52,57],consol:29,constrain:16,constructor:2,consult:26,consum:[35,59],contain:[11,12],containslook:13,containsw
il:13,content_typ:5,context:[2,35],contextu:35,continu:[12,13,33,62],contrast:[18,63],contribut:29,contributor:42,control:[35,53,56,65],conveni:[10,51,60,62],convent:34,convert:12,cooki:54,copi:[0,18,30,62],core:[31,32,35],cores:32,correct:[41,54,62],correspond:[12,14,15,17,28,34,44],cost:35,costli:18,could:[3,12,13,18,21,33,51,52,56,57,60,61,63,64],count:[8,9,12,14,15,16,17,59],counter_nam:[7,9],creat:[1,3,6],createact:29,createadminus:29,createapp:29,createent:[29,33],createev:29,creategroup:29,createnotif:29,createorg:29,createus:29,creation:[1,41,53,61],credenti:[29,30,32],credential:32,criteria:[12,35],cross:59,css:[36,65],cumul:7,curiou:26,curl:[5,6,7,9,10,12,13,14,15,17,19,20,22,23,31,32,36,37,39,52,53,54,55,58,59,60,65],current:[7,15,23,34,44,58,59,65],cursor:12,custom:[10,15],custom_id:10,d0d7d0ba:[12,14],d16344f5a0e1:23,d20976ff:60,d28c:28,d503:[3,34],d7a8:17,d86a:[12,14],d878de4r:53,d87edec7:59,d9693ec3:59,da448955:59,da4a50dc:17,da67:65,da71:65,da83:59,dai:[8,9,53],daili
:9,dashboard:54,data:[1,2],databas:[12,13,16,18,23,29],datacli:[10,52,55],date:[11,12,44],dave:43,david:43,db1e60a0:[19,60,65],dbf5228024a7:[20,22],dbm:[13,14,16,18],dc5d478e9c029853fbd025bed0dc51f8:28,decim:[11,12],decompil:56,dedic:7,defin:[8,12,16,17,27,32,34,35,50,51,52,53,57,58,59,60,64,65],definit:58,degre:53,delet:[12,13,14],delimit:[11,12,44,58,61],deliv:[35,44],deliveri:[35,44],denot:[21,60,63],depend:[28,60,61],deploi:29,deploy:29,desc:[12,13],descend:13,describ:[13,14,15,17,18,23,28,38,41,50,51,52,54,60,62],descript:[1,5,6,7,9,12,13,15,16,17,19,20,22,29,34,36,37,38,39,41,44,52,57,58,59],design:[16,18,23,30,35,59,60,61,62,64],destin:2,destroi:55,detail:[15,17,26,34,35,36,37,38,39,44,52,54,59,60,62,63,65],detect:[6,12,23],determin:[12,23,59,65],dev:[32,54],develop:[11,12,23,27,34,35,44,56,62,64],devic:[6,12,20,22,23,25,28,29,34,35],deviceid:44,dfr4d5m1mjmoeeogvpncm:53,dialog:[25,27,36],did:17,differenti:35,dimens:64,diner:[12,13],dino:[21,28,63],dir:0,direct:[0,18],directli
:[0,37,57],directori:[0,30,31,32,42,54,62],disabl:[27,30,36,39,41,44],discuss:62,displai:[9,12,13,23,41,44,54,59,61,62],displayemail:44,displayemailaddress:[36,39],displaynam:[36,39,44,59],distanc:[12,23],distance_in_met:23,distribut:[16,18,56],div:[36,65],dk88fh4r:22,doctyp:[36,65],doe:[0,1,17,21,28,34,41,44,51,52,53,54,59,60,65],doesn:[16,18,27],dog:[17,21,28,33,60,61,63],dogcreatecallback:33,doge:[60,61],domain:54,don:[30,56,59,65],done:[0,30,35,54,56,57,65],dot:[7,11,12],down:[11,12,25],download:29,drive:[2,35],drop:25,dropdown:25,dskiptest:[30,31,32],dtd:[36,65],due:[13,14,18,52],duplic:18,durat:[3,6,7,9,12,14,15,16,17,18,19,20,22,28,30,36,37,39,53,55,58,59,60,65],dure:56,e13743a7f1db7f4246badd6fd6ff54ff:65,e694:60,e7127751:60,e7d0:59,e8f5:17,e94123890c7a:17,e978:65,e97b:[12,14],each:[0,7,8,9,11,12,14,15,16,17,18,23,27,28,34,36,41,54,57,59,60,65],eas:35,easi:[0,12,35,64],easier:[10,12,13,14,18,27,28,56,60,63],easili:[7,23,34,35,56,64],east:30,easy_instal:0,eb20e5bce407:19,ebc6f
49d1fc4:17,ec39:28,edit:[0,2,29,30],edort1:36,ee912c4b:[11,12],ef0b:17,effb:17,effect:35,effici:[14,18],either:[2,15,19,51,54],elasticsearch:32,elev:56,elimin:[35,51,56],els:[33,54],email:[12,14,28,30,31,32,34,36,39,41,44,52,59,60,62,65],email_address:[28,65],embed:32,embed_cod:43,employe:60,empti:[15,62],emul:[59,60,61],enabl:[23,30,35,41,54,56,59],enclos:[12,14,44],encod:[10,12,13,14,17],end:[9,35],end_tim:9,endpoint:[0,7,20,37,41,44,51,52,54,55,59,65],engag:[23,35],enhanc:[12,23],enough:27,ensur:[11,18,28,35,50,52,56],enter:[25,27,36,54,62,65],entir:[13,44],entit:18,entiti:[0,1,3],entity_nam:17,entity_typ:17,entity_uuid:17,entityid1:44,entityid2:44,entityid:44,entityproperti:44,entitytyp:[36,39,44],entri:[13,54],environ:[26,44,56],equal:[11,12,14,53],equiv:[36,65],equival:12,err:[33,54],error:[7,29,33,39,41],errorcod:44,errormessag:44,essenti:64,establish:[21,44,59,64],etag:[3,6],etc:41,evalu:30,even:[9,12,13,18,30,34,51,52,56,57,63],event:7,everi:[9,10,28,34,51,56,57,60,61],ever
yth:[0,28],exact:[12,23,64],exactli:[12,13],examin:[9,56],exampl:[0,1,2],except:[12,17,51,56],execut:[10,12,13,14,33],exhaust:56,exist:[6,7,17,18,23,30,39,41,44,53,54,59,60],expect:[11,12,23,36,39,64],experi:[12,16,23,35,64],experiment:[27,50],expir:[29,44],expires_in:52,explain:[0,30],explan:33,explicitli:[51,55],expos:31,express:13,extend:[21,63],extens:62,extern:42,extract:[30,31,32,51,52,54,57],f18e8f6fb3bc:65,f315e5aa568a:17,f34f4222:[6,7,9,15,17,28,58,60],f399:59,f3a8061a:17,f3aa:59,f3be262a:17,f3teeg:37,f8zemolceecubwbqvsaaca:52,f_gubelxeecfrgbqvsaaca:52,facebook:[28,29,35],facebookaccesstoken:54,facebooktoken:54,factor:30,fail:44,failur:16,fals:[11,12,30,32,36,39,44],famili:[16,23],familiar:[12,18,26],faq:30,far:25,fast:16,favorit:65,fb_access_token:[41,54],fbasynchinit:54,fbasyncinit:54,fc4d:59,fdd3:39,fe80:36,fe90:[36,39],featur:[18,21,23,26,28,29],feed:[6,12,14,20,22,28,29,35],feel:32,few:[12,13,23,62,64],ffd79647:59,field:[2,12,13,17,35,36,44],fieldset:[36,65],file_loc:6
,filenam:6,files:2,filter:[14,59,60,65],find:[0,12,13,23,30,56,60],fine:[32,35],finish:[44,62],first:[12,13,14,15,18,21,26,28,32,33,36,41,56],first_nam:28,firstnam:[12,13,14,41],fish:31,fit:57,five_minut:9,flexibl:[16,18,29,34],flow:[54,65],fluffi:31,fobnszewobnioerabnoiawegbrn:6,focu:[28,35],folder:2,follow:[0,3,5,6,7,9,10,11,12,13,14,15,16,17,18,20,21,22,23,26,27,28,29,30,31,32,33,34,38,41,50,51,53,54,56,58],foo9876a:65,foo:28,force_refresh:32,ford:[20,22,63,64],forgot:65,fork:42,form:[17,21,34,36,39,44],format:[0,3],fortun:9,forward:[54,60],found:[12,37,51,52],four:[52,57],foursquar:59,fragment:54,framebord:43,framework:62,francisco:[23,36,60,61],fred:[12,13,21,60,63],free:[32,34],friend:[20,23,35,59],from:[0,5,10,12,13,14],full:[13,17,27,35,36,38,51,52,56,57,63],fulli:[28,32],further:[12,28,33,38,41,51,54,56],furthest:[13,23],futur:[17,56],g9qgaaaurv_lfq7uu6ayhjjjn7qcrgovnvu:53,gain:[51,56],game:8,gaufeolxeecfrgbqvsaaca:52,gcm:44,gem:49,gener:[0,7,8,28,29,31,32,34],geo:29,geocoo
rdin:23,geograph:13,geoloc:[12,13],get:[3,5,9,12,13,14,15,16,17],ggkaaqmaggkabge5ffm1aqcadqaq_9ewr_ozeeguwxixowauaqcadqaqablaovoaeeguwxixowauaqa:59,ggkaaqmaggkabge5mlfh7gcadqaqjikhxefqeegw9hixowbregcadqaqjnep6ufqeegw9hixowbrega:59,ggkaaqmaggkabge5xc3r1gcadqaqz02yhp6qeegvybixoxisvgcadqaqz3soh_6qeegvybixoxisvga:39,ggkaaqmaggkabge5xc3r1gcadqaqz02yhp6qeegvybixoxisvgcadqaqz4zbyf6qeegvybixoxisvga:36,ggkaaqmaggkabge7pehcgwcadqaqvj9dljfzeekg9wloguza3acadqaqvkvrctfzeekg9wloguza3aa:59,git:[0,42],github:[30,42],give:[7,12,18,27,28,35,53,58,64],given:[17,18,27,34,39,43,44,51,56],gladi:[12,14],gmail:[32,36,59,65],goal:13,goe:30,gold:31,good:[0,27,56],googl:[35,36,44,59,65],govern:[50,52,57,60],grain:35,grant:[28,51,52,54,56,57],grant_typ:[31,37,52,53],grant_url_pattern:44,granular:[7,9],graph:[29,35],graph_async:32,graph_us:32,gravatar:[12,14,28,59,60,65],great:[35,41,60,61],greater:[11,12,13,53],greatest:57,groovi:0,group:[6,12,14,16,17,20,22,28,29,34],groupid:44,groupnam:[59,60],grouppath:60,g
roupproperti:44,gte:[11,12],guarante:33,guest:[27,51,56,59,65],guid:[10,30,42,54],hacker:[51,52,56,57],half_hour:9,hand:18,handi:26,handl:[25,35,36,64],happen:23,happi:[0,59],happy_cloud:6,hard:[2,57],hava:0,have:[0,1,12,14,16,17,18,22,26,28,34,37,39,41,44,52,53,54,56,57,59,60,61,62,64,65],head:[36,65],header:[5,51],height:[43,59],hello:59,help:[8,12,13,16,34,35,50,52],hemingwai:12,her:[18,36],here:[3,12,14,18,21,23,28,30,31,34,42,54,59,60,62,65],hierarchi:[7,34,38,39,58,60],high:[16,18,50,53],higher:[31,57],highest:[38,39],highlight:18,hike:57,him:31,hold:6,home:23,homepag:7,host:[30,32,51,54],hotmail:39,hour:9,hous:18,howev:[1,9,12,13,14,15,17,32,33,34,41,54,56,59,62],href:[36,39,65],html4:[36,65],html5:[28,29],html:[0,36,44,52,54,62,65],htmldisplayemail:44,htmldisplayemailaddress:[36,39],http:[3,5,6,7,9,12,14,15,16,17,18,19,20,21,22,23],human:[36,65],hundr:[12,13],hurrai:54,hystrix:32,icon:[59,62],idea:56,ident:18,identif:44,identifi:[10,18,34,36,41,65],ifram:43,illustr:[16,50],i
mag:[1,3,5,6,16,35,44,59],imagemodel:29,imagin:[12,14,18,57],immedi:[35,65],immut:34,implement:[28,35,50,51,52,54,57,65],improv:[23,35],inbox:[41,59,61],includ:[7,12,13,14,16,17,18,25,26,27,28,34,35,36,44,51,52,53,54,56,60,65],incorpor:62,incorrect:[28,36],increas:[15,23,35],increment_valu:7,incub:[30,32,42],index:[0,11,12,13,17,32,34,62],index_prefix:32,indic:[12,44,53,59,60],indicet:44,individu:[17,34,53,57],ineffici:[13,14,18],inflat:18,info:[36,44],inform:[5,9,13,14,15,16,17,18],infrastructur:[34,35],ing:59,inher:56,init:54,initi:10,initil:32,inner:18,input:[32,36,65],insecur:56,insert:54,insid:28,instal:[0,10,26,28,29],instanc:[30,31,34,52,55,62],instead:[18,28,32,35,52,56,57],instruct:[0,30,54,62,65],integ:[12,13,44],integr:[23,28,35,54],intend:34,intention:18,interest:[9,35],interfac:[30,62],intern:29,interpret:[28,58],intersect:[11,12],intrins:28,introduct:29,invalid:[41,54],iphon:62,isn:[12,16,26,28,50],iso:[36,65],issu:[0,3],item:[11,12,14,15,17,28,59],items:15,itself:18,j
ane:65,jar:31,java:[0,30,31],javascript:[7,10,12,14,16,28,29,30,33,36],javscript:33,jdk:[30,31,32],jdoe57:34,jenni:18,jim:36,jin:43,jinm:36,john:[28,34,52,59,60,65],johnson:43,join:18,jpeg:[1,3,5,6],jpg:[3,6,16,18],json:[11,12,14,16,17,18,22,28,31,34,36,37,54,59,60,64],json_arrai:17,json_object:17,just:[16,18,19,21,23,27,28,30,59,64],k88dh4f:20,keep:[2,8,10,12,13,14,27,35,51,52,56,57],kei:[15,17,18,28,35,54],keyspac:[30,32],keyword:17,kid:18,kind:[12,13,14,18],know:9,krav:12,kravitz:[12,14],label:36,lack:27,lag:33,languag:11,larg:0,last:[6,12,13,34,39,41],lastnam:[12,13,14,41],latenc:33,later:[18,23,44],latest:[30,31],latitud:[12,13,23],latitude_coordin:23,launch:[9,56],launcher:29,layer:31,lceecubwbqvsaaca:52,learn:[26,27,35,56,62,64],least:30,leav:30,left:[25,59,62],length:[3,6],less:[11,12,16,53,59],let:[9,31,35],letter:65,level:[7,9,16,17,25,26,27,29,31,34,35,37,38,39,50,51],leverag:[35,62],lib:[30,32],librari:49,lightweight:64,like:[0,3,6,9,11,12,16,18,19,20,21,22,27,30,32,33,3
5,36,41,54,56,58,59,61,62,63,64,65],liked_bi:63,limit:[2,12],line:[0,18,30,31,49],linear:[16,30],live:[27,29,51],load:[31,54],localfilebinarystor:2,localhost:[30,31,32],locat:[6,12],log:[7,30,35,41,52,54,55,59,62,65],logic:12,login:29,loginfacebook:54,logout:29,longer:[12,13,56],longitud:[12,13,23],longitude_coordin:23,look:[3,9,11,12,13,18,54,57,59,65],loos:[36,65],love:18,lower:7,lte:[11,12],ltixndg0nduxndpnr2tbqvffqwditufdwfj2ylm1emjxbdbhqunbzffbuuqymvzneexfrwvlrlv3tg9hc1dozxddqwrrqvfiyvdjb0jwrevls1vcd0xvr3nwt0jrqq:12,ltixndg0nduxndpvdjb0jwrevls1vcd0xvr3nwt0jrqq:13,made:[12,22,28,58,63],magic:18,mai:[0,7,10,15,17,27,34,55,56,60],mail:[30,32,34,60],mailer:[30,32],mailto:[36,39],main:[0,2,54],maintain:[18,54],make:[0,10,12,13,14,16,18,21,26,27,28,32,33,34,35,38,41,51,52,54,55,56,59,62,63,64,65],makefil:0,maker:16,malici:[50,51,52,57],manag:[1,6],mandatori:[1,2,41,44,60,61,65],mani:[8,12,13,14,16,18,23,27,34,64],manual:[59,63],map:16,marginheight:43,marginwidth:43,mark:12,massoddb:5
9,match:[12,13,17,58,65],matter:35,mattress:16,maven:[0,30,31,32],max:32,maximum:[12,13,53],mayb:18,mean:[11,16,17,18,27,33,34,50,51,56,63,64],meant:59,meanwhil:33,measur:50,mechan:62,meet:30,member:[12,34,36,38,44,57,59,60,61],meme:[60,61],memori:23,menu:[25,37,62],messag:[7,12,30,32,35,36,44,53,60,62,64],message:[21,29],meta:[36,65],metadata:[3,5,6,7,11,12,14,15,16,17,18,19,20,22,23,28,29,36,39],metadataproperti:44,meter:[12,13,23],method:[7,9,12,13,17,21,22],mfdsadfdsaoabl:59,middl:41,middlenam:41,might:[8,9,10,12,13,14,16,17,18,26,30,34,35,37,56,60],mile:[12,23],milk:[15,17],million:35,millisecond:[34,44,53],mind:[2,10,12,13,14,18,23,27],minim:[18,30,32],minimum:[34,37,39],minu:18,minut:[9,35],mirror:21,mix:28,moab:59,mobil:[16,18,23,27,29,37],model:[1,16],modern:[34,59],modif:[1,41,61],modifi:[1,3,6,7,12,14,15,16,17,18,19,20,22,23,28,34,36,39,41,44,53,59,60,61,65],modul:[7,49],monitor:35,month:[9,35],more:[5,7,9,10,12,13,14,15,16,17,18,23,25,26,27,28,29,30,34,35,39,42,44,50,52,
53,55,56,57,58,59,60,62,63,64,65],morn:9,most:[9,12,13,18,21,26,32,33,34,35,37,56,59,63,64,65],mountain:57,much:[11,16,18,56,62],multi:17,multipl:0,must:[0,11,12,17,18,31,32,34,39,44,51,53,59,60,62,63,65],mustach:0,mvn:[30,31,32],my_app:[16,18,41,54],my_org:[16,18,41,54],myadmin:31,myapp:[12,14,31],myasset:3,mycollect:[11,12],myfirstorg:31,mygroup:[59,60],mynewapp:[60,65],mynewgroup:60,mynewpassword:36,myorg:[12,14,60],mypassword:31,myself:[18,30,32],myuser:31,name:[1,2,3,5,6,7,9,11,12,13,14,15,16,17,18,19,20,21,22,23,25,27,28,30,31,32,34,36,37,39,41,44,51,53,54,56,58,59,60,61,62,65],narrow:11,nativ:[0,16],natur:[13,14],navig:[30,31,32],nearbi:23,nearest:[13,23],nearli:18,necessari:[18,35],need:[0,2,3,9,10,12,13,14,15,16,17,18,25,26,28,30,32,34,35,36,37,38,39,41,44,51,52,54,55,56,57,59,60,62,63,64,65],neg:7,nest:[17,34],net:[28,43,49],network:35,never:[27,29,37,51,52,53],new_password:[36,65],new_review_uuid:18,newli:[58,59],newpassword:[36,44,65],next:[12,13,15,25],node:[28,30,32,52
,55,59],nodej:32,non:[16,18],normal:[5,17,18],nosql:[13,14,16],notat:[11,12,14,16],note__:65,notic:[6,18,22,54,59],notif:[23,26,29,30,32,34],notifi:[29,34],notificationid:44,notify_sysadmin_of_new_admin_us:[30,32],notify_sysadmin_of_new_organ:[30,32],notitf:44,now:[21,30,31,32,54,62],number:[7,8,12,13,14,15,16,34,35,44,56,59,65],oauth2:44,ob5ko:53,object:[1,6,10,11,12,14,16,17,28,29,34,35,36,37,39],objectproperti:44,objecttyp:[36,39,44],objectuuid:44,obtain:[41,51,53,54,56],occur:[8,23],occurr:[12,13],octal:[11,12],off:[30,54],offer:[23,27,28,35,56,63,64],offici:62,often:[9,11,12,18,34,35,59],old:[36,44,65],old_password:[36,65],oldpassword:[36,65],omit:[12,14],onc:[0,12,13,18,30,33,54,56,65],ongo:[35,59],onli:[6,10,12,13,14,18,21,25,27,28,30,33,34,37,50,51,52,53,56,57,58,59,60,63,65],onlin:59,oop:54,open:[16,18,27,29,32],optim:[13,14,16,18],option:[6,10,30,32,34,51,54],order:[3,12],orderl:13,org:[2,3,5,6,7,9,14,15,17,19,20,21,22,23,28,30,31,32,36,37,39,44,51,52,53,55,58,59,60,63,64,
65],org_client_secret:52,org_clientid:52,org_id:[17,44,59,60,65],org_nam:[12,37,39,53,55],org_uuid:[37,39],organ:[0,3,5,6,7,9,12,14,15,16,17,18,19,20,22,25,27,28,29,30,31,32],organizationnam:53,organizations_require_activ:[30,32],orgid:44,orgnam:[10,44,52,54],orguuid:44,origin:60,originali:61,oscar:31,our:[0,10,12,13,14,21,30,31,32,42,64],out:[12,13],outbox:59,outgo:32,outlin:6,output:54,over:[9,53],overrid:[32,53],overview:[13,14,29,34,35],overwritten:17,own:[8,27,35,44,54,58,59,60,61,65],owner:[1,3,39,44,59,60],packag:[30,54,62],page:[26,27,31,36,52,54],pair:[12,15,17],param:[3,6,7,9,12,14,15,16,17,18,19,20,22,28,53,58,59,60,65],paramet:[5,6,7,9,10,12],pars:54,part:[10,12,13,14,18,23,28],partial:[13,34],particular:[11,12,18,59],particularli:[16,18,58,59,63],partit:26,pass:[12,13,37],passiv:64,password:[28,29,30,31,32],path:[1,3,6,7,12,14,15,16,17,18,19,20,22,23,27,28,29,30,32,36,39,44,54],path_to_imag:18,pathnam:54,pattern:[44,58],payload:44,peak:9,peopl:[8,34,59,60,61,62],per:[15
,16,54],perceiv:33,perform:[5,6,15,16,18,20,33,35,36,38,41,51,52,57,58,59,61,65],period:[8,9,23],perl:49,permiss:[6,12,14,20,22,27,28,29],permissiondata:44,persist:[28,31,32],person:[18,23,36,39,62],perspect:34,pertin:38,pet:31,phone:[12,14,49],phone_numb:[12,14],photo:[23,64],php:49,physic:[12,23],pictur:[5,6,12,14,23,28,41,44,60,65],pinterest:59,pip:0,place:[16,17,18,30,34,52,65],plai:[8,26],plain:5,plan:18,platform:35,pleas:[11,36,51,53,63],plenti:0,plural:[15,17,34,44],png:18,point:[11,12,13,16,23,32,33,35,54,62],polici:[42,56],pop:62,popul:[21,60,62,64],popular:[35,62],port:[30,31,32],portal:[25,26,27,30],portion:44,pose:53,posit:[12,13,23],possibl:[18,56,63],post:[3,6,7,8,12,15,17,18,19,20,21,25,27,28,29,31,36,37,38,39,44,51,52,53,56,58],postal:[12,13],potenti:[12,13],power:[23,31,34,35,43,52,57,63],practic:[13,14],preced:[12,14,18],precis:59,predefin:34,prefer:[12,13,28,30],prefix:37,prepar:56,present:[18,29],preserv:60,prevent:[13,14],preview:0,previou:[59,62],previous:62,pr
ice:[11,12,15,17],primari:[18,41],primarili:1,prior:56,privaci:59,privat:35,privileg:39,probabl:[0,18,30,33],process:[31,34,36,64],product:[16,18,25,27,29,30,34,44,50],product_uuid:[16,18],productid:18,productimag:18,productnam:18,productuuid:18,profil:[23,35,41,54,64],program:33,programmat:[25,37,57],project:[0,31,38,39,42,62],prompt:[30,54],prone:59,proof:[36,65],properit:23,properli:[31,33],properti:[1,2,5,6,7,10,11],properties____:30,property_1:[15,17],property_2:[15,17],property_nam:[12,13],propti:36,protect:[50,52],protocol:[30,32,54,56],prototyp:54,provid:[7,9,12,13,15,16,17,23,25,28,32,34,35,36,37,39,41,44,51,52,54,56,57,59,60,62,65],provis:[41,54],proxim:[13,23],pure:28,purpos:[11,27,30,34,37,64],push:[0,23,26,29],put:[6,12,14,15,17],pw123:30,pwhere:32,python:0,qualifi:28,quantiti:11,query_stat:[12,14],query_str:[60,65],querystat:44,queue:44,quick:29,quicker:28,quickli:[13,14,18,34,35,64],quitwait:[30,32],quot:[14,44],quotat:12,radiu:12,rail:49,raleigh:43,rang:9,rate:18,rat
her:[6,18,19,20,35],raw:0,rdbm:[16,18],reach:[11,12],reactiv:29,read:[10,12,13,14,16,18,26,42,44,59],readabl:18,readi:[12,13,26,32,62],readm:[0,42],real:44,reason:60,recaptcha:[36,65],recaptcha_challeng:44,recaptcha_challenge_field:36,recaptcha_respons:44,recaptcha_response_field:36,recaptchaopt:36,receipt:[29,34],receiptid:44,receiv:[12,13,33,41,61,62,65],reciproc:63,recommend:[30,56],record:[34,35],recurs:58,redirect:[30,32,54],redirect_root:[30,32],redirect_uri:54,reduc:[14,18],redund:18,ref:44,regard:[7,34],regardless:17,regionnam:2,regist:[35,50,57,62,64,65],rel:[1,36,65],relat:[6,12,16],relationship:[18,19,20],relev:[23,35,44,54,56,64],reli:18,rememb:[11,12,54,62],remind:18,remot:[12,23],remov:[27,29,30,36],renam:34,repeat:62,replac:[2,18,21,54,62],replic:30,replication_factor:[30,32],repo:[30,32,42],report:8,reposloc:2,repres:[13,16,25,28,34,35,36,39,57,58,59,60,65],represent:[12,13,17,28,34],request:3,requir:[0,7,15,19,20,23,27,29],resembl:12,resend:44,reserv:34,resetpw:[29,
30,32,36],resetpwmsg:29,resolut:9,resourc:[0,2,28,38,41,44,51,54,57,58],resource_path:[44,58],respect:51,respons:3,response_typ:54,restaur:[12,13,23],restkit:62,restrict:56,restructuredtext:0,result:11,review_entity_json:18,review_uuid:18,reviewed_product_uuid:18,reviewedbi:18,reviewedin:18,revok:[29,51,53],revoketoken:55,rich:[35,64],right:[18,28,33,59,62,64],rigid:34,risk:53,rock:[11,12],rockadero:[12,23],rocki:57,role:[6,11,12,14,20,22,25,27,28,29,34],roleid:44,rolenam:[6,12,14,20,22,28,41,44,60,61,65],roleproperti:44,root:[0,30,31,32,56],rout:[35,59],row:16,rubi:[28,49],rule:[27,35,50,51,52,56,57,58,60,65],run:[0,8,29],safe:[52,57],sai:[9,51,52,59],said:12,sake:32,same:[6,7,13,18,20,22,23,32,34,35,57,59,60,61,62],sampl:[21,59,60,62,65],san:[23,36,60,61],sandbox:[6,17,26],santa:43,save:[6,17],scalabl:[16,18,30],scale:18,scatter:18,scene:[41,54],schedul:44,schedulenotif:29,schema:[16,34,44],scope:[18,31,52,54,57],screen:[25,43],script:[0,36,57,65],scroll:43,sdk:[7,10,16,17,26],sea
rch:[9,12,13,35],second:[7,33,36,53,62],secondari:18,secret:[29,37,44],secretkei:2,section:[28,37,51,52,60,62,65],see:[3,5,9,10,11,12,13,14,15,16,17,21,22,23,25,26,27,28,30,31,34,35,36,37,38,39,42,50,51,52,53,54,56,57,58,59,60,62,63,65],seen:59,segment:58,select:[11,12,13,14,18,25,27,28,60,62,65],self:54,send:[2,5,10,12,13,14,22,23,31,35,36,39,41,44,54,62,64],sens:[18,35],sensit:[27,50],sent:[10,12,14,28,36,37,39,44,51,52,58,62,65],separ:[7,12,14,18,34,54],seri:0,serv:[56,57],server:[12,13,27,30,33,35,37,51,52,54,55,56,57,60,62],servic:[2,12,14,23,27,28,31,35,36,38,39,41,44,50,52,54,59,60,62,65],session:[54,56],set:[0,5,6,7,9],setexpir:29,settoken:54,setup:29,sever:[2,28],share:[31,39,59,64],shell:26,shortcut:12,shorthand:[12,13],should:[0,3,12,13,14,17,18,19,20,26,27,30,32,42,44,50,51,52,53,56,57,62],show:[14,15,18,62],shown:[10,12,13,14,15,17,22,36,51,54,59,60,65],side:[35,37,51,52,54,56,57,62],sign:[29,30,32,34,35],similar:[18,21,59,62],simpl:[0,16,18,21,27,30,34,35,62,64],simple
strategi:[30,32],simpli:[15,22,28,35,59,62],simplifi:[18,35],sinc:[11,13,33,51,57],singl:[9,14,16,17,18,30,34,35,44,60],singular:34,six_dai:9,skim:17,sku:[16,17],slash:[60,61],slate:12,slideshar:43,slideshow:43,slightli:16,slower:11,small:30,smith:[12,13],smtp:[30,32],snippet:54,social:[23,29],softwar:32,sojre5ywlkq7jrdcka:52,solid:43,solut:34,solv:35,some:[0,2,8,10,13,18,28,31,33,34,56,59,60,62],somegroup:60,someon:9,somepassword:[30,53],somesubgroup:60,someth:[3,18,30],sometim:[0,16],someus:[28,30,53,55,60,65],sourc:[16,18,29],space:18,span:[9,18],sparingli:57,special:[0,23,58,63],specif:[8,11,12,13,16,17,18],specifi:[7,12,13,14,15,17,19,20,22,23,28,30,38,39,44,51,52,53,58,59,60,62,65],split:9,sql:[11,12,18,35],squar:17,src:[0,2,36,43,65],stack:[2,29,30,31],stage:32,standalon:31,standard:[23,28,56,57,65],start:[9,12,13,14,16,18,26,28,29],start_tim:9,startup:31,state:[28,36,44,54],statement:[12,14,33,44],statist:8,statu:[14,30,31,32,36,39,44,54,64],steventraut:[60,65],still:[26,56]
,stock:[15,17,30],stop:[12,13],store:[2,6,11,12,13,14],str:59,strateg:18,strategi:[30,32],stream:23,streamlin:[18,62],street:12,string:[1,10,11,12,13,14,15,17,18,34,36,37,39,41,44,51,54,59,60,61],stringifi:54,strong:36,stronger:23,structur:[12,18,21,28,31,38,63],struggl:59,style:[35,36,43,50,59,62,65],stylesheet:[36,65],sub_properti:17,subgroup:60,submit:[13,14,36,42,58,65],subscrib:[21,59,60,61],subscript:[60,61,63],subsequ:[41,51,52,54],subset:[15,18],substitut:59,subtract:[11,12],succe:[41,54,58],success:[30,33,56],sudo:0,suggest:[23,27],suit:[52,57],summit:43,sungju:43,superadmin:30,superus:[30,32],suppli:[36,39,44,52],support:[0,9,11],suppos:17,sure:[12,25,27,32,50,56,62],swagger:0,symbol:65,sync:29,synchron:29,sysadmin:[30,32],system:[0,1,16,30,32,34,41,42,53,59,60,62,65],tag:54,take:[7,12,13,18,32,33,35,50,52,56],taken:[12,23,54],tale:[11,13],talk:[43,56,62],tar:54,target:[0,30,31,32,35,44],team:[38,39,62],technic:54,techniqu:[13,18],temp:2,templat:0,temporari:2,tempt:18,tend
:[60,61],test12345:[36,39],test1234:65,test123:[36,39],test:[6,12,13,27,30,32,39,56,57,60,62],testadmin:52,testadminpw:52,testapp1:[37,39],testapp2:39,tester123:39,tester:44,testorg:[37,39],testpw:52,text:[5,11],text_field:36,than:[0,6,7,9,11,12,13,14,15,18,19,20,30,35,53,56],thank:35,thei:[0,12,13,14,17,18,21,23,34,39,50,51,52,56,57,59,60,61,65],them:[0,7,10,11,12,13,14,18,27,28,35,52,54,57,59],theme:[18,36],themselv:65,thereaft:50,thi:[0,2,3,7,9,10,11,12,13,14,15,16,17,18,21,23,25,26,28,30,31,32,33,34,35,36,37,41,42,44,50,51,52,53,54,55,56,57,59,60,61,62,63,64,65],thing:[8,11,12,26,27,43,50,60,61,65],think:59,those:[12,13,18,42,50,51,52,56,57,59,65],though:[12,13,18,44],thousand:16,threadpool:32,three:[7,12,13,30,57,62],through:[16,18,21,25,35,37,38,39,41,44,50,54,56,57,59,60,65],thu:12,thumb:27,tier:31,time:[7,8],timeout:32,timestamp:[1,3,6,7,9,11,12,14,15,16,17,18,19,20,22,28,30,34,36,37,39,41,44,53,55,58,59,60,61,65],titl:[11,13,18,36,39,44,60,61,65],tld:[30,32],tmp:2,toctre:0,
todai:[12,23],togeth:[0,57],token:[10,15,17,27,28,29,31,36,37,38,39,41,44],token_to_revok:55,tom:58,tomcat:29,too:0,tool:[10,12,13,14,35],top:[25,31,54,62],topic:[13,52,60,61,65],topolog:30,track:[7,8,41],trail:57,transfer:28,transform:0,transit:[36,65],transport:[30,32],treat:[17,29],trend:35,trial:28,truli:35,tsefia:36,ttl:29,ttl_in_millisecond:53,tupl:16,turn:54,tutori:26,tweet:[21,35,59],twitter:[21,35,59,62],two:[12,13,14,21,31,33,34,36,51,62,63,64],type:[1,3,5,6,7],typic:[11,12,28,34,65],udpat:0,uffff:[11,12],ugc:49,under:[27,30,52,55,56,62],underli:16,understand:34,unencod:[10,12,13,14],unexpect:44,unfamiliar:16,unfortun:0,unicod:[11,12],union:[11,12],uniqu:[1,12,17,34,41,44,54,60,61,62,65],univers:34,unix:[1,7,41,44,61],unless:[0,41,51,54,57,62],unlik:[12,16,17,34],unnecesari:56,unreleas:32,unsecur:56,unsent:44,until:33,untrust:56,untrustworthi:29,upcom:23,upon:28,upward:7,uri:[3,6,7,9,10,12,14,15,16,17,18,19,20,22,28],url:[10,12,13,14,15,17,18,22],usag:9,usegrid:[28,29],use
r:[6,8,11,12,13,14,15,17,18,19,20,21,22,23,25,26,27,28,29],user_uuid:18,user_uuid_or_usernam:55,usergrid_appl:32,usergriddatacli:[52,55],usergridsdk:54,userid:44,usernam:[12,13,14,17,19,20,22,28,30,31,32,34,36,39,41,44,50,52,53,56,57,58,59,60,62,63,65],username_or_email:65,usual:30,utc:[34,44],util:[31,34,35],uuid:[1,3,5,6,7,11,12,14,15,16,17,18,19,20,22,23,28,34,36,37,39,41,44,53,54,58,59,60,61,65],uuid_for_selected_review:18,val:54,valid:[2,15,17,34,36,37,39,41,51,53,54,56,58,59,60,61,65],valu:[2,7,9,11],valuabl:35,value_1:[15,17],value_2:[15,17],vari:9,variabl:58,varieti:[17,28,38,65],variou:56,verb:[18,21,36,39,44,59],veri:[0,12,13,14,26,34,51,59],verifi:50,version:[30,32,62],versu:59,via:[0,30,34,36,39,57,58,60,61,64],video:[1,6,29,35],view:[9,12,18,22,30,32,57,59],virtual:21,visit:30,visitor:57,w3c:[36,65],wai:[7,12,13,14,16],wait:[12,13,33],walk:21,wall:59,want:[0,2,6,7,12,13],war:29,warn:[27,51,52,57],watch:30,web:[12,14,16,18,30,31,32,37,41,52,54,56,57,64],webapp:[30,31],we
ek:9,welcom:[30,32],well:[23,28,30,35,55,56,59,62,63,64,65],went:30,were:[12,13,14,23,60,61],what:[18,23,26],whatev:27,whatsoev:50,when:[0,6,10,12,13,14,17,18,19,21,23,27,28,29,30,32,33,34,35,44,50,51,52],whenev:54,where:[0,3,11,12,13,14,18,21,23,26,27,28,32,34,41,54,56,59,65],whether:[12,41,44,51,64],which:[0,9,12,13,15,16,17,18,20,25,30,33,34,36,38,41,44,50,51,52,53,54,56,57,58,59,60,61,63,65],who:[18,21,35,42,44,50,52,56,59],whole:[12,17,44],whose:[12,13,14,22,28,65],why:30,wide:[57,65],width:[43,44,59],wildcard:[13,58],window:[26,49,54,62],wireless:[12,23],wish:[15,34,65],within:[7,12,13,17,23,30,34,39,53,57,59,62],without:[12,13,51,65],won:59,word:[12,13,15,16,17,18,21,59],work:[0,13,14,16,18,23,27,29,30,32,33,35,55,56],workflow:42,world:59,would:[5,9,10,12,13,18,22,23,30,36,51,53,54,56,57,58,59,60,61,63,65],wouldn:18,write:[12,16,18,50,62],written:[0,16,18,30,42],wrong:[21,30],wrote:18,www:[12,14,28,36,43,54,59,60,65],xfbml:54,xml:2,xxxx:12,xxxxxxxx:12,xxxxxxxxxxxx:12,yaml:0,y
ear:59,yet:[12,13,60],yhixpqk1cq:37,you:[0,2,3,5,6,7,8,9,10,11,12,13,14,15,16,17],your:[0,2,5,6,7,8,9,10,11,12,13],your_app_id:54,your_domain:54,your_redirect_url:54,your_response_typ:54,your_state_valu:54,yourapp:10,yourappnam:54,yourdomain:28,yourorg:10,yourorgnam:54,ywmt4nqe8q9geelyjhixpsio4aaaato5fqfcg0ced2h9nwmdmrorknnreeqydof:36,ywq6aaabmqz_xuyyeerokkjnzn7yqxxlpgml69fvaa:52,yxa65gylqja8ayysay8ox3vg5arzp48:37,yxa6aaabmq0d4mep_ugbza0:52,yxa7ygil:37,yxb7nad7em0meej989xixprxekq:52,yxb7nautv9krhhmr8ycw0qbozh2pxef:52,yxu6aaabmq0hdy4:52,zip:54},titles:["Apache Usergrid Documentation","Assets","File storage configuration","Folders","<no title>","Retrieving assets","Uploading assets","Creating & incrementing counters","Counters & events","Retrieving counters","Advanced query usage","Query operators & data types","Query Language","Query parameters & clauses","Querying your data","Collections","The Usergrid Data Store","Entities","Data Store Best Practices","Connect
ing entities","Disconnecting entities","Relationships","Retrieving connections","Geolocating your Entities","COMING SOON...","Creating a new application","Creating an Usergrid Account","Using a Sandbox Application","Using the API","Apache Usergrid Documentation","Usegrid 1: Deploying to Tomcat","Usegrid 1: Launcher Quick-start","Usergrid 2: Deploy to Tomcat","Async vs. sync calls","Usergrid Data model","Usergrid Features","Admin user$","Application","Organization & application management","Organization","COMING IN USERGRID 2","Users & Devices","How to Contribute Code & Docs","Presentations & Videos","Methods","iOS SDK","Java SDK","JavaScript/HTML5 SDK","COMING SOON...","SDKs & Tools","Security & token authentication","Authenticating API requests","Authenticating users & app clients","Changing token expiration (time-to-live)","Facebook sign in","Revoking tokens (logout)","Security best practices","Authentication levels","Using permissions","Activity","Work
ing with group data","Groups","App Example - Messagee","Social Graph Connections","User management & social graph","Working with User Data"],titleterms:{"default":[34,53,56],"new":[25,27],"return":65,"super":30,access:[28,51,56],account:[26,62],acquir:56,action:44,activ:[35,36,39,59,64],activityfe:44,actor:44,add:[30,54],addpermiss:44,addrol:44,admin:[36,39,52,55,57],adminuserupd:44,advanc:10,all:[10,21,22],android:62,apach:[0,29,43],api:[0,10,28,31,51],app:[23,43,52,54,56,62],appdata:44,applic:[25,27,34,35,37,38,39,52],asset:[1,3,5,6,35],assign:58,async:33,asynchron:33,attach:10,authent:[28,35,50,51,52,57],backend:43,base:28,basic:[12,14],batch:15,best:[18,56],between:[0,21],build:[0,30,31,32,43],call:[10,33],cancelmsg:44,cassandra:[30,43],chang:[0,53,65],claus:13,client:[39,51,52,56,62],code:42,collect:[15,28,34,44,61],come:[24,40,48],complet:36,complex:58,comput:18,configur:[2,30,57],connect:[19,21,22,63,64],consol:30,construct:28,contain:13,content:[0,12],contribut:[42,43],c
ounter:[7,8,9],creat:[7,15,17,21,25,26,27,36,37,39,53,54,59,60,62,63,65],createact:44,createadminus:44,createapp:44,createent:44,createev:44,creategroup:44,createnotif:44,createorg:44,createus:44,credenti:[37,39,44],cursor:13,custom:[17,30],data:[5,11,12,14,16,17,18,23,34,35,60,65],databas:30,deal:0,decrement:7,delet:[15,17,21,60,65],denorm:18,deploi:[30,32],deploy:32,descript:60,devic:[41,44],dialog:54,differ:0,disconnect:20,displai:65,doc:[0,42],document:[0,29,42],download2:31,download:[30,31],edit:56,enrich:23,entiti:[5,15,17,19,20,21,22,23,28,34,35,44],error:44,event:[8,44],exampl:[5,6,7,9,15,17,30,32,36,37,39,52,53,54,55,58,59,60,62,65],expir:53,facebook:[41,54],featur:35,feed:[36,39,59,64],file:[0,2,30,32,35],flexibl:35,folder:3,follow:[59,63],form:65,format:[12,28],from:[15,39,60],gener:[37,39,61],geoloc:[23,35],geoqueri:12,get:[18,21,30,31,36,37,39,65],graph:[63,64],group:[35,44,59,60,61,64],handl:65,hierarch:7,how:[0,42,43],html5:[47,62],http:[28,31,56],imagemodel:44,increm
ent:7,inform:21,initi:36,instal:30,intern:43,interv:9,invok:54,issu:28,itself:32,java:[32,46],javascript:[47,54,62],languag:12,larg:12,launcher:31,let:65,level:[52,57],limit:13,link:3,list:3,live:53,local:[2,32],locat:[13,23],login:[30,35,52,54],logout:55,manag:[12,35,38,64],markdown:0,message:62,metadata:44,method:[28,44],mobil:[43,56],model:[18,34,44],multipl:[12,14,17],never:56,next:26,note:0,notif:[35,44],notifi:44,oauth:[28,54],object:44,open:43,oper:[11,12],order:13,organ:[34,38,39,44,52],other:[0,21,63],out:18,overview:43,paramet:[13,60],parti:35,password:[36,65],path:58,permiss:[35,44,56,58],portal:32,post:59,practic:[18,56],pre:18,prerequisit:0,present:43,product:56,properti:[12,14,17,30,32,34,41,61],publish:0,push:35,put:18,queri:[10,11,12,13,14,18,23,28,35],quick:31,reactiv:[36,39],receipt:44,refer:0,registr:35,relat:18,relationship:[21,35,41],relationshop:41,remov:[39,58,60],request:[5,6,7,9,14,15,17,19,20,22,28,36,37,39,51,52,53,55,58,59,60,65],requir:[30,31,32],reset:[
7,36,65],resetpw:44,resetpwmsg:44,respons:[6,7,9,12,14,15,17,28,36,37,39,52,53,58,59,60,65],rest:[0,65],result:[12,18],retriev:[3,5,9,12,14,15,17,18,22,39,59,60,65],review:[18,56],revok:55,role:[35,44,56],rst:0,run:[30,31,32],sandbox:[27,56],save:23,schedulenotif:44,sdk:[28,32,45,46,47,49,52,54,62],secret:51,secur:[25,27,50,56],set:[12,15,36,41,44,61],setexpir:44,setup:[30,54],sign:[41,54],social:[35,63,64],soon:[24,48],sort:12,sourc:43,specif:21,sphinx:0,stack:32,start:[30,31],step:[26,54,62,65],storag:[2,35],store:[16,18],stream:35,sub:17,support:[12,28],sync:33,synchron:33,syntax:[5,6,7,9,12,14,15,17,19,20,22,52,53,55,58,60,65],tabl:0,text:12,third:35,time:[9,53],token:[50,51,53,55,56],tomcat:[30,32],tool:49,treat:56,ttl:53,type:[11,12,21,22],untrustworthi:56,updat:[0,6,15,17,36,65],upload:6,uri:[36,37,39,59,60,65],url:[28,39],usag:[10,14],usegrid:[30,31],user:[30,35,36,39,41,44,52,55,57,59,60,62,64,65],usergrid:[0,16,26,29,30,32,34,35,40,43,62,65],valu:[12,14],video:43,wai:[18,5
6],want:18,war:30,websit:[0,42],what:27,when:53,work:[60,65],you:18,your:[14,18,23,56]}})
\ No newline at end of file
+Search.setIndex({envversion:46,filenames:["README","assets-and-files/file-storage-configuration","assets-and-files/folders","assets-and-files/legacy-asset-support","assets-and-files/retrieving-assets","assets-and-files/uploading-assets","counters-and-events/creating-and-incrementing-counters","counters-and-events/events-and-counters","counters-and-events/retrieving-counters","data-queries/advanced-query-usage","data-queries/operators-and-types","data-queries/query-parameters","data-queries/querying-your-data","data-storage/collections","data-storage/data-store-dbms","data-storage/entities","data-storage/optimizing-access","entity-connections/connecting-entities","entity-connections/disconnecting-entities","entity-connections/retrieving-entities","geolocation/geolocation","getting-started/creating-a-new-application","getting-started/creating-account","getting-started/using-a-sandbox-app","getting-started/using-the-api","index","installation/ug1-deploy-to-tomcat","installation/ug1-lau
ncher-quick-start","installation/ug2-deploy-to-tomcat","introduction/async-vs-sync","introduction/data-model","introduction/overview","introduction/usergrid-features","orgs-and-apps/admin-user","orgs-and-apps/application","orgs-and-apps/managing","orgs-and-apps/organization","push-notifications/tbd","push-notifications/users-devices","reference/contribute-code","reference/presos-and-videos","rest-endpoints/api-docs","sdks/ios-new","sdks/sdk-outline","sdks/tbd","security-and-auth/app-security","security-and-auth/authenticating-api-requests","security-and-auth/authenticating-users-and-application-clients","security-and-auth/changing-token-time-live-ttl","security-and-auth/facebook-sign","security-and-auth/revoking-tokens-logout","security-and-auth/securing-your-app","security-and-auth/user-authentication-types","security-and-auth/using-permissions","security-and-auth/using-roles","user-management/activity","user-management/group","user-management/groups","user-management/messagee-exam
ple","user-management/user-connections","user-management/user-management","user-management/working-user-data"],objects:{},objnames:{},objtypes:{},terms:{"005056c00008":61,"00767101f6b4f2cf5d02ed510dbcf0b4":56,"02e81ac5a17b":[2,10],"02e81adcf3d0":[5,6,8,13,15,18,19,24,42,53,54,55,56],"02e81ae236e9":56,"02e81ae61238":56,"02e81ae640dc":[2,55],"02e81ae66238":56,"02e81aeb2129":56,"02e81aeb26e9":56,"02e9sjwsf3d0":[15,42],"03ae956a":20,"0455fc92de2636fc7a176cc5d298bb78":56,"08fe":42,"0abe":[13,42],"0d7cf92a":[15,42],"0d7e":36,"0d7f":36,"0f1ff3650d20":[17,56,61],"10e":10,"10e10":10,"11e0":[8,61],"11e1":[2,24,30,33,36,55,56,61],"11e2":[2,5,6,8,10,12,13,15,18,19,24,36,42,53,54,55,56],"11e3":[5,13,15,17,18,19,20,24,42,48,54,56,61],"1231380a0284":55,"12313b01d5c1":[2,24,30,55],"12313b06ae01":55,"12313b06d112":55,"12313b111c56":36,"12313b122c56":[33,36],"12313d027361":36,"12313d027471":36,"12313d14bde7":56,"12313d1520f1":55,"12313d1c4491":[2,33,36,55],"12313d1c44914":55,"12313d1c5591":36,"12313d
288ee0":36,"12313d288ff0":36,"12313d331ae8":55,"12313f0204b":61,"12313f0204bb":[8,61],"12313f0204bb8":61,"12331b144c65":33,"12331d1c5591":[33,36],"12424d1c4491":33,"174785aa":17,"19a0":[15,42],"1a62":[13,42],"1a9356ba":[13,15,42],"1bd100b8059e":[13,42],"1c8f60e4":61,"1f3567aa":55,"1px":40,"1st":41,"20adr":61,"20c57d4f41cf51f2db44165eb058b3b2":12,"20employe":56,"20or":15,"20titl":56,"20uuid":15,"20where":[56,61],"22000a1c4e22":56,"22000a1c5a67":[56,61],"2440ca58":55,"2482a1c5":55,"249f":20,"2ac6":2,"2ac8":2,"2d00":55,"2d21":2,"2e1db7299b0a667ed80e674a0ef9d653":5,"2nd":41,"31847b9a":[13,42],"3192ac6a":[13,42],"327b527f":[33,36],"328b526e":33,"328fe64a":[15,42],"335b527f":[33,36],"33dd0563":[33,36],"3400ba10":[2,36,55],"348388de":54,"34e26bc9":55,"3500ba10":36,"37f3":55,"382d0991":54,"38dc":15,"3c1e":54,"3d1a9356ba":15,"410b213a":[5,54],"411c466c4f2c":12,"417f":[17,56,61],"4353136f":61,"438a1ca1":8,"477d":56,"48c92c73":36,"496ca1d42ce7":[13,42],"49ff":55,"4a1edb70":[15,42],"4d2664c8e0c
3":56,"5005a0fa":56,"503f17da":24,"50gb":1,"5111c463":55,"5373d7165c2d":48,"53fe3700":[13,42],"563f5d96":55,"58606d0a":[18,19],"58e8":[56,61],"5ae1fa7a":[13,42],"5bb76bca":[13,15,42],"5bcc47ca":[18,19],"5bd5fa5f701f":42,"5c0c1789":[2,30],"5de0bb69":36,"5f4a65c16193":[15,42],"5wugd":47,"61c9":55,"62de5d97":24,"62fd53c78ce7":53,"65c8":36,"6640a601":2,"6715d5ef47a6":[15,42],"67cb":56,"698b":56,"699740088e05":6,"6a42":55,"6b07e44495ef":54,"6be0003c809b":[13,42],"6c56ffda":17,"6fbc8157":56,"6ldstnesaaaaakhdvglhmmu86_eoyxsjjqqd1ipz":[33,61],"74bb":54,"74d2d7da":56,"78c54a82":61,"7bf47435":2,"7fb8d891":56,"802f":56,"81581bbaf055":[13,15,42],"8272c9b0":12,"83ceb9965c26":56,"83de":56,"83e9b7ea":[15,42],"84a5":61,"84c0":55,"84df":[15,42],"87b9":36,"884d":61,"89ab":[13,42],"8a2a":[15,42],"8a4c":53,"8ae8a6ea":61,"8bde":[18,19],"8cef":12,"8d05e96f700d":[13,42],"8d5c":24,"8dd1801e534c":17,"8e0cd3866ee20746c99e9a9825f38ad8":2,"8ea8":17,"903f":[13,15,42],"90f823ba15655b8cc8e3b4d63377576f":56,"917d"
:[15,42],"924d":10,"92c3":2,"92e2":12,"9501cda1":2,"95c8":[33,36],"96f6":55,"98b9":36,"9953085ea376":[5,54],"999e12039f87":42,"99a7":48,"99fd":17,"9c1b":56,"9ce3":[15,42],"9d3a":6,"9de5":54,"9e75":17,"9e92":[15,42],"9efc8ad529d8":54,"9f80":20,"9ff6c621a7a4":[13,15,42],"9ffc":55,"____usergrid":26,"boolean":[10,36,38,41],"case":[9,16,26,29,38,41,42,55,57,59],"catch":42,"class":[1,28,33,47,50,61],"default":[1,10,11,12,13,14,15,20,24,25,26,28],"export":42,"float":10,"function":[6,29,32,49,52,55,56,57,58,60],"import":[23,24,29,30,32,45],"long":[10,30,38,57],"new":[6,9,13,15,16],"null":[6,49],"public":[33,61],"return":[10,11,12,13,16,19,20,24,27,29,33,36,38,41,47,48,49,50,53,55,56],"short":[22,55],"static":26,"super":25,"transient":28,"true":[10,12,18,19,24,26,27,28,33,36,41,49,54,56,61],"try":[22,23,27,33,42,45,49,53],"typeof":49,"var":[9,33,49],"while":[23,26,29,30,32,38,53,54],a065:55,a0dd:24,a0e5:[5,54],a0f7:55,a166:[5,6,8,13,15,18,19,24,42,53,54,56],a24f:[13,42],a407b1e7:[56,61],a51b
:[15,42],a554b7fbd57a:24,a5c5:54,a668717b:56,a694:[18,19],a6e3:56,a71c:53,a72a:[13,15,42],a7e008061e10:[18,19],a7f7:[5,6,8,13,15,18,19,24,42,53,54,56],a9c1:42,abbrevi:[12,16,24],abil:[20,22,32,59,60],abl:[16,24,26,51,52,55,60,61],about:[0,10,16,22,23,24,25,26,32,33,35,36,41,47,51,52,55,56,57,60,61],abov:[5,6,19,26,27,28,54,55],ac46:[56,61],accept:[4,47,53],access:[2,13,14,15,16,19,21,22,23],access_token:[27,41,46,47,48,49],accessid:1,accesstokenrepons:41,accesstokenrespons:25,accesstokenttl:48,accomplish:50,accord:47,account:[12,15,16],achiev:59,acquaint:55,acquir:25,across:[8,16],act:[12,55,58],action:[2,5,6,7,8,12,13,14,15,16,17,18,19,24,25,26,32,33,34,36],activ:[5,10,12,18,19,20,22,24,25,26,28,30],activit:33,activityfe:25,actor:[25,33,36],actorproperti:41,actual:16,add:[1,9,14,15,16,21,22,23,25],addit:[8,16,22,32,33,41,46,47,52,55,56,59,61],addobject:42,addpermiss:25,address:[12,24,26,33,36,38,41,47,61],addrol:25,adjust:[11,54],admin:[21,22,23,25,26,27,28],admin_password:47,admin
_usernam:47,admin_users_require_activ:[26,28],admin_users_require_confirm:[26,28],admingmail:33,administr:[26,27,30,32,34,36,38,47,51,52,54],adminus:[33,36,41],adminuserproperti:41,adminuserupd:25,adomain:61,adopt:[32,39],advantag:32,advertis:20,advis:51,ae1f:17,aec3:55,afad:55,affect:48,after:[6,10,24,27,29,47,49,51,54,58],again:[26,33],against:[18,28,34,46,47,51,53],aggreg:8,air:14,alert:[20,29,56,57],alia:[54,61],all:[0,6,8],alloc:42,allow:[7,12,20,24,26,28,30,32,36,38,41,49,52,53,54,55,56,57,59,60,61],almost:60,along:[11,16],alreadi:[15,16,22,26,38,41,42,49,51,58],also:[1,2,6,7,8,11,13,15,16,21,27,28,30,32,33,34,36,38,41,47,49,50,51,53,55,56,57,58,59,61],alter:54,altern:[12,13,56,57],although:[13,15,33,55,56,61],alwai:30,amazon:1,amazonaw:26,amount:[11,52,55],amuramoto:[5,15,42,48],analysi:32,analyt:22,analyz:[32,46,47,51,52],android:[24,25,29,31,42,43,47,49,50],ani:[5,6,8,10,12,14,15,16,20,28,29,30,32,33,35,41,45,46,47,48,51,52,53,54,55,56,58,59,60,61],anonym:[38,55,61],anoth:[
12,16,23,46,55,58,59,61],answer:61,ant:53,anuff:40,anyon:[52,55],anyth:26,anytim:55,anywher:11,apachecon:40,apidocgener:0,apige:[24,40,42,56],apigeecli:42,apigeeclientrespons:42,apigeecollect:42,apigeemobileconfig:48,apikei:49,apirequest:42,apn:41,app1:41,app2:41,app:[2,4,5,6,7,8,12,13,14,15,16,17,18,19],app_id:[15,41,55,56,61],app_nam:[34,48,50],app_uuid:[14,16],appdata:25,appdeleg:42,appear:[19,41,55,58,59],append:[8,9,13,16,20,46,49],appid:[41,49],appl:[32,41],appli:[24,28,48,51,53,54,59,60,61],applic:[2,4,5,6,7,8,12,13,14,15,16,17,18,19,20],application_client_secret:47,application_clientid:47,application_info:36,applicationdata:41,applicationid:[33,36,41],applicationnam:[2,5,6,8,12,13,14,15,16,17,18,19,24,41,42,48,53,54,55,56,61],appnam:[9,47,49],appropri:[30,38,49],approv:[26,28],arbitrari:[24,59],architectur:[14,26],area:[22,23,33,45,61],aren:[14,16],arg:[1,34,36,55,56],argument:1,arm:51,around:[0,16],arrai:[10,12,14,15,16,19,24,41,42],arthur:[17,18,19,59,60],articl:[12,13,15,
46,54],asc:11,ascend:11,ask:[12,28],aspect:[7,32],asset1:2,asset:1,assets_id:2,assign:[6,25,30,32,38],associ:[5,10,13,19,20,21,24,30,32,36,38,42,45,47,48,50,52,54,56,58,60,61],assum:[16,46],async:25,asynchron:25,atistophan:33,atom:15,attach:[4,5],attack:[45,51],attempt:[36,41,46],attribut:14,audienc:31,audio:[5,32],auth:[26,28,38,49],authent:[13,15,23],author:[27,35,46,48,49,55,60],author_uuid:16,authorid:[14,16],authorimag:16,authornam:16,authoruuid:16,authrespons:49,auto:[26,28],automat:[5,6,13,15,21,22,28,30,32,41,47,49,50,53,54,55,59],avail:[13,15,20,22,24,27,32,42,47,58,60],avatar:[12,24,55,56,61],avoid:[16,58],awai:16,awar:[10,20],awssdks3binarystor:1,b0c6:56,b11217fc:6,b1f7:[13,42],b24e:6,b2bd:56,b2e4:15,b31d:48,b36a:[2,30],b379:[5,54],b3aad0a4:42,b3u68vghi6fmeekn9wlogtzz0a:34,b3u6aaabmqz:47,b3u6zuz5_u8i:34,b4c6:2,b690:56,b6dd:55,b77ec8addc0d:56,b90c:56,b93d:61,baa:[33,36,45],back:[14,16,27,31,32,39,58],backend:[12,25,30],bad:[36,47,52],banner:7,bar1234b:61,bar:[24,31],barnei
:[56,59],base:[0,13,20],batch:11,baz:24,bcc1:8,bcf7:[2,33,36,55],bcf8:[33,36],bd397ea1:53,be04:[13,42],be08a5f9:36,be09a5f9:36,bean:1,bearer:[27,46],beca:36,becaus:[14,20,23,26,41,47,51,52,55,58],becom:[11,12,20,26,32,55,56,57],been:[6,16,46,49,50,51,55],bef8:[33,36],befor:[0,1,22,23,28,29,49,51,54,61],begin:[8,11,35],behalf:47,behav:58,behavior:32,behind:[22,38,49],belong:[27,30,38,55,57],below:[13,14,15,16,26,28,33,42,43,49,55,56,58,61],beneath:58,benefici:29,benefit:[14,26],besid:54,best:[11,12],better:[16,47,52],bewar:28,beyond:55,bike:10,bin:28,binari:[32,46,47,51,52],binarystor:1,bit:14,blank:54,block:29,blog:54,board:58,boat:10,boavijt0oyrkjf:34,bodi:[6,16,33,34,36,41,48,55,56,61],book:[11,32,42],border:40,both:[6,14,17,28,29,30,39,41,52,60],bounc:16,bouncer:16,bounci:[14,16],box:[21,23,54,58,60],bracket:15,bread:[13,15,42],brief:[29,49],broad:[46,47,52],brows:31,browser:[26,28,33,49],bucketnam:1,bug:31,buildcurl:49,built:[16,24,26,55],busi:20,button:[7,21,23,33,54,58,61],but
ton_click:[6,8],c2v7n61dy90mcdg78xixprxfdq:36,c2v7wedxiutzwekwdyslct_lydfvmmn:36,c5e707256e71:[15,42],california:[33,56,57],call:8,callback:[29,49],campaign:32,can:[0,1,2,4,5,6,7,8,10,11,12,13,14,15,16,17,19,20,21,22,23,24,26,27,28,29,30,32,33,34,35,36,38,39,41,45,46,47,48,49,51,52,53,54,55,56,57,58,59,60,61],cancel:[41,49],cancelmsg:25,cannot:[13,15,24,29,30,52],capabl:51,captcha:[33,41,61],captur:[12,16,20,32],car:10,carefulli:52,carri:35,cassandra:[14,16,25],cast:40,castl:[14,16],cat:27,catalina:28,catalog:32,categori:[14,33,36,41],caus:[0,15],caution:48,cautiou:[46,47,52],ccc:40,cd0c:[2,33,36,55],cd0d:[33,36],cd789b00:56,cd796d0a:56,cdf1ce04c1c0:12,cdn:32,cede5b7:36,cede5b8:36,cell:0,center:20,central:[0,1],certain:[15,16,30,50,60],cf3e981c:33,cf4d981c:[33,36],cf9b:8,cfed:[18,19],chain:6,challeng:[24,33,41,61],chang:[0,1,25,26,28,30,46],channel:49,channelurl:49,charact:[11,55,61],charset:[33,61],check:[23,26,27,49,52,53,54,55],checkbox:54,checksum:[2,5],chicago:61,choos:16,circl
:[32,55],circumst:50,cite:15,citi:[11,33,41,61],clara:40,classpath:1,clean:[0,26,27,28,33],cli:26,click:[7,16,21,23,35,54,58],client:[9,11,13,14,15,16,24,25,26,29,32,33,34,35],client_credenti:[34,41,47],client_id:[34,36,41,46,47,49],client_secret:[34,36,41,46,47],climb:16,clone:[0,26,28],closer:16,cloud:[1,4,5,32],clue:26,cluster:26,cluster_nam:28,cn0wtdxxkxmqlgzvtmubcp20fulczq:47,code:[1,11,16,24,25,26,27,29,31,32],coffe:14,colleagu:55,colleciton:42,collect:[4,5,12],collection_nam:13,collectionid:41,column:[14,16],com:[2,4,5,6,8,12,13,14,15,16,17,18,19,20,24,26,27,28,30,33,34,36,38,42,47,48,49,50,53,54,55,56,58,59,60,61],combin:[16,51,61],come:[23,25,26,28],comma:[12,41,42,49,53],comma_separated_list_of_permission_nam:49,command:[0,22,26,27,28,49,56],comment:[32,55],commit:0,committ:39,common:[12,51,55,61],commonli:54,commun:58,compani:[35,36,58],compar:12,comparison:54,compil:[46,47,51,52],complet:[12,25,26,29,30,32],completemsg:41,complex:[15,16,25,32],compliant:32,complic:26,com
pon:[30,32],compromis:46,concept:[14,22],config:28,confim:41,confirm:[26,28,33,36,41,58],confirm_email:[33,36,41],conflict:58,conform:10,conjunct:[32,60],connect:[0,2,5,12,16],connected_collect:[17,18],connected_ent:[17,18],connecting_collect:[17,18],connecting_ent:[17,18],consid:[47,51,54],consider:[46,47,52],consol:25,constrain:14,constructor:1,consult:22,consum:[32,55],contain:10,containslook:11,containswil:11,content_typ:4,context:[1,32],contextu:32,continu:[11,29,58],contrast:[16,59],contribut:[25,31],contributor:[31,39],control:[32,48,51,54,61],conveni:[9,46,56,58],convent:30,cooki:49,copi:[0,16,26,58],core:[27,28,32],cores:28,correct:[38,49,58],correspond:[12,13,15,24,30,41,42],cost:32,costli:16,could:[2,11,16,29,46,47,51,52,56,57,59,60],count:[7,8,12,13,14,15,42,55],counter_nam:[6,8],coupl:31,creat:[2,5],createact:25,createadminus:25,createapp:25,createcollect:42,createent:[25,29],createev:25,creategroup:25,createnotif:25,createorg:25,createus:25,creation:[38,48,57],credenti
:[25,26,28],credential:28,criteria:32,cross:55,css:[33,61],cumul:6,curiou:22,curl:[4,5,6,8,9,11,12,13,15,17,18,19,20,27,28,33,34,36,42,43,47,48,49,50,53,54,55,56,61],current:[6,13,20,30,31,41,53,55,61],custom:[9,13],custom_id:9,d0d7d0ba:12,d16344f5a0e1:20,d20976ff:56,d28c:24,d503:[2,30],d7a8:[15,42],d86a:12,d878de4r:48,d87edec7:55,d9693ec3:55,da448955:55,da4a50dc:15,da67:61,da71:61,da83:55,dai:[7,8,48],daili:8,dashboard:49,data:1,databas:[11,14,16,20,25],datacli:[9,42,47,50],date:10,dave:40,david:40,db1e60a0:[17,56,61],dbf5228024a7:[18,19],dbm:[11,12,14,16],dc5d478e9c029853fbd025bed0dc51f8:24,decim:10,decompil:51,dedic:6,defin:[7,14,15,23,28,30,42,45,47,48,53,54,55,56,60,61],definit:[41,53],degre:48,deleg:42,delet:[11,12],deletecollect:42,deleteent:42,delimit:[10,41,53,57],deliv:[32,41],deliveri:[32,41],denot:[56,59],depend:[24,56,57],deploi:25,deploy:25,desc:11,descend:11,describ:[11,12,13,15,16,20,24,35,38,45,46,47,49,54,56,58],descript:[4,5,6,8,11,13,14,15,17,18,19,25,30,33,34,35
,36,38,41,42,47,52,53,54,55],design:[14,16,20,26,32,55,56,57,58,60],destin:1,destroi:50,detail:[13,15,22,30,32,33,34,35,36,41,47,49,54,55,56,59,61],detect:[5,20],determin:[20,55,61],dev:[28,49],develop:[10,20,23,30,31,32,41,51,58,60],devic:[5,18,19,20,21,24,25,30,32],dfr4d5m1mjmoeeogvpncm:48,dialog:[21,23,33],did:15,differenti:32,dimens:60,diner:11,dino:[24,59],dir:0,direct:[0,16],directli:[0,34,52],directori:[0,26,27,28,39,49,58],disabl:[23,26,33,36,38,41],displai:[8,11,20,38,41,49,54,55,57,58],displayemail:41,displayemailaddress:[33,36],displaynam:[33,36,41,55],distanc:20,distance_in_met:20,distinctli:31,distribut:[14,16,51],div:[33,61],dk88fh4r:19,doctyp:[33,61],doe:[0,15,24,30,38,41,42,46,47,48,49,55,56,61],doesn:[14,16,23],dog:[15,24,29,56,57,59],dogcreatecallback:29,doge:[56,57],domain:49,don:[26,51,55,61],done:[0,26,32,41,49,51,52,61],dot:[6,10],down:[10,21,31,54],download:25,drive:[1,32],drop:[21,54],dropdown:21,dskiptest:[26,27,28],dtd:[33,61],due:[11,12,16,47],duplic:16,du
rat:[2,5,6,8,12,13,14,15,16,17,18,19,24,26,33,34,36,42,48,50,53,54,55,56,61],dure:[51,54],duti:54,e13743a7f1db7f4246badd6fd6ff54ff:61,e694:56,e7127751:56,e7d0:55,e8f5:[15,42],e94123890c7a:[15,42],e978:61,e97b:12,each:[0,6,7,8,10,12,13,14,15,16,20,23,24,30,33,38,42,43,49,52,54,55,56,61],eas:32,easi:[0,32,60],easier:[9,11,12,16,23,24,51,56,59],easiest:54,easili:[6,20,30,32,51,60],east:26,easy_instal:0,eb20e5bce407:17,ebc6f49d1fc4:[15,42],ec39:24,edit:[0,1,25,26],edort1:33,ee912c4b:10,ef0b:[15,42],effb:[15,42],effect:32,effici:[12,16],either:[1,13,17,41,46,49,54],elasticsearch:28,elev:51,elimin:[32,46,51],els:[29,49],email:[12,24,26,27,28,30,33,36,38,41,47,55,56,58,61],email_address:[24,61],embed:28,embed_cod:40,employe:56,empti:[13,42,58],emul:[55,56,57],enabl:[20,26,32,38,49,51,54,55],enclos:[12,41],encod:[9,11,12,15],end:[8,32,42],end_tim:8,endpoint:[0,6,18,34,38,41,42,46,47,49,50,55,61],engag:[20,32],engin:31,enhanc:20,enough:23,ensur:[10,16,24,32,45,47,51],enter:[21,23,33,49,54,58
,61],entir:[11,41],entit:16,entiti:[0,2],entity_nam:15,entity_typ:[15,42],entity_uuid:15,entityid1:41,entityid2:41,entityid:[41,42,54],entityproperti:41,entitytyp:[33,36,41,54],entri:[11,49],environ:[22,41,51],equal:[10,12,48],equiv:[33,61],err:[29,49],error:[6,25,29,36,38],errorcod:41,errormessag:41,escap:42,essenti:60,establish:[41,55,60],etag:[2,5],etc:[31,38],evalu:26,even:[8,11,16,26,30,46,47,51,52,59],event:6,everi:[8,9,24,30,46,51,52,54,56,57],everyth:[0,24],exact:[20,60],exactli:11,examin:[8,51],exampl:[0,1],except:[15,46,51],execut:[9,11,12,29],exhaust:51,exist:[5,6,15,16,20,26,36,38,41,42,48,49,55,56],expect:[10,20,33,36,42,60],experi:[14,20,32,60],experiment:[23,45],expir:[25,41],expires_in:[41,47],explain:[0,26],explan:29,explicitli:[46,50,54],expos:27,express:11,extend:59,extens:58,extern:39,extract:[26,27,28,46,47,49,52],f18e8f6fb3bc:61,f315e5aa568a:[15,42],f322:42,f34f4222:[5,6,8,13,15,24,42,53,54,56],f399:55,f3a8061a:[15,42],f3aa:55,f3be262a:[15,42],f3teeg:34,f42752a
a:42,f8zemolceecubwbqvsaaca:47,f_gubelxeecfrgbqvsaaca:47,facebook:[24,25,32],facebookaccesstoken:49,facebooktoken:49,factor:26,fail:[41,42],failur:14,fals:[10,26,28,33,36,41],famili:[14,20],familiar:[16,22],faq:26,far:21,fast:14,favorit:61,fb_access_token:[38,49],fbasynchinit:49,fbasyncinit:49,fc4d:55,fdd3:36,fe80:33,fe90:[33,36],featur:[16,20,22,24,25],feed:[5,12,18,19,24,25,32],feel:28,few:[11,20,58,60],ffd79647:55,field:[1,11,15,32,33,41,54],fieldset:[33,61],file_loc:5,filenam:5,files:1,filter:[12,55,56,61],find:[0,11,20,26,51,56],fine:[28,32],finish:[41,58],first:[0,11,12,13,16,22,24,28,29,33,38,42,51,54],first_nam:24,firstnam:[11,12,38],fish:27,fit:52,five_minut:8,flexibl:[14,16,25,30],flow:[49,61],fluffi:27,fobnszewobnioerabnoiawegbrn:[5,54],focu:[24,32],folder:1,follow:[0,2,4,5,6,8,9,10,11,12,13,14,15,16,18,19,20,22,23,24,25,26,27,28,29,30,35,38,41],foo9876a:61,foo:24,force_refresh:28,ford:[18,19,59,60],forgot:61,fork:39,forkei:42,form:[15,30,33,36,41,42],format:[0,2,12,13,14
,15,20],fortun:8,forward:[49,56],found:[34,46,47],four:[47,52],foursquar:55,fragment:49,framebord:40,framework:58,francisco:[20,33,56,57],fred:[11,56,59],free:[28,30],friend:[18,20,32,54,55],from:[0,4,9,11,12],full:[11,15,23,32,33,35,46,47,51,52,54,59],fulli:[24,28,42],further:[24,29,35,38,46,49,51],furthest:[11,20],futur:[15,51],g9qgaaaurv_lfq7uu6ayhjjjn7qcrgovnvu:48,gain:[46,51],game:7,gaufeolxeecfrgbqvsaaca:47,gcm:41,gener:[0,6,7,24,25,27,28,30],geo:25,geocoordin:20,geograph:11,geoloc:11,get:[2,4,8,11,12,13,14,15],getcollect:42,getent:42,ggkaaqmaggkabge5ffm1aqcadqaq_9ewr_ozeeguwxixowauaqcadqaqablaovoaeeguwxixowauaqa:55,ggkaaqmaggkabge5mlfh7gcadqaqjikhxefqeegw9hixowbregcadqaqjnep6ufqeegw9hixowbrega:55,ggkaaqmaggkabge5xc3r1gcadqaqz02yhp6qeegvybixoxisvgcadqaqz3soh_6qeegvybixoxisvga:36,ggkaaqmaggkabge5xc3r1gcadqaqz02yhp6qeegvybixoxisvgcadqaqz4zbyf6qeegvybixoxisvga:33,ggkaaqmaggkabge7pehcgwcadqaqvj9dljfzeekg9wloguza3acadqaqvkvrctfzeekg9wloguza3aa:55,git:[0,39],github:[26,31,39],give:[
6,16,23,24,31,32,48,53,54,60],given:[15,16,23,30,36,40,41,46,51],gladi:12,gmail:[28,33,55,61],goal:11,goe:26,gold:27,good:[0,23,51],googl:[32,33,41,55,61],govern:[45,47,52,56],grain:32,grant:[24,41,46,47,49,51,52,54],grant_typ:[27,34,41,47,48],grant_url_pattern:41,granular:[6,8],graph:[25,32],graph_async:28,graph_us:28,gravatar:[12,24,55,56,61],great:[32,38,54,56,57],greater:[10,11,48],greatest:52,groovi:0,group:[5,12,14,15,18,19,24,25,30],groupid:41,groupnam:[55,56],grouppath:56,groupproperti:41,gte:10,guarante:29,guest:[23,46,51,54,55,61],guid:[9,26,39,42,49],hacker:[46,47,51,52],half_hour:8,hand:16,handi:22,handl:[21,32,33,60],happen:20,happi:[0,55],happy_cloud:5,hard:[1,52],hava:0,have:[0,12,14,15,16,19,22,24,30,31,34,36,38,41,47,48,49,51,52,54,55,56,57,58,60,61],head:[33,61],header:[4,46],height:[40,55],hello:55,help:[7,11,14,30,32,45,47],her:[16,33],here:[2,12,16,20,24,26,27,30,39,49,55,56,58,61],hierarchi:[6,30,35,36,53,56],high:[14,16,45,48],higher:[27,52],highest:[35,36],hi
ghlight:16,hike:52,him:27,hold:[5,42],home:20,homepag:6,host:[26,28,46,49],hotmail:36,hour:8,hous:16,howev:[8,11,12,13,15,28,29,30,38,49,51,54,55,58],href:[33,36,61],html4:[33,61],html5:[24,25],html:[0,33,41,49,58,61],htmldisplayemail:41,htmldisplayemailaddress:[33,36],http:[2,4,5,6,8,12,13,14,15,16,17,18,19,20],human:[33,61],hundr:11,hurrai:49,hystrix:28,icon:[55,58],idea:51,ident:16,identif:41,identifi:[9,16,30,33,38,42,61],ifram:40,illustr:[14,45],imag:[2,4,5,14,32,41,55],imagemodel:25,imagin:[12,16,52],immedi:[32,54,61],immut:30,implement:[24,32,45,46,47,49,52,61],implicit:54,improv:[20,31,32],inact:54,inbox:[38,55,57],includ:[6,11,12,14,15,16,21,22,23,24,30,32,33,41,42,46,47,48,49,51,54,56,61],incorpor:58,incorrect:[24,33],increas:[13,20,32],increment_valu:6,index:[0,10,11,15,28,30,58],index_prefix:28,indic:[41,48,55,56],individu:[15,30,48,52],ineffici:[11,12,16],inflat:16,info:[33,41],inform:[4,8,11,12,13,14,15,16,20,22,24,26,30,32,33,35,38,39,42,45,46,49,51,55,56,58,59,61],in
frastructur:[30,32],ing:55,inher:51,init:[42,49],initi:9,initil:28,initwithobject:42,inner:16,input:[28,33,61],insecur:51,insert:49,insid:24,instal:[0,9,22,24,25],instanc:[26,27,30,42,47,50,58],instead:[16,24,28,32,47,51,52],instruct:[0,26,49,58,61],integ:[11,41],integr:[20,24,32,49],intend:30,intention:16,interest:[8,32],interfac:[26,58],intern:25,interpret:[24,53],intersect:10,intrins:24,introduct:25,invalid:[38,49],iphon:58,isn:[14,22,24,45],iso:[33,61],issu:[0,2],item:[10,12,13,15,24,42,55],items:13,itself:16,jane:61,jar:27,java:[0,26,27],javascript:[6,9,12,14,24,25,26,29,31,33,42,43,47],javscript:29,jdk:[26,27,28],jdoe57:30,jenni:16,jim:33,jin:40,jinm:33,job:54,john:[24,30,47,55,56,61],johnson:40,join:16,jpeg:[2,4,5],jpg:[2,5,14,16],json:[10,12,14,15,16,19,24,27,30,33,34,42,49,55,56,60],json_arrai:15,json_object:15,just:[14,16,17,20,23,24,26,55,60],k88dh4f:18,keep:[1,7,9,11,12,23,32,46,47,51,52],kei:[13,15,16,24,32,42,49],keyspac:[26,28],keyword:15,kid:16,kind:[11,12,16],know:8
,kravitz:12,label:33,lack:23,lag:29,languag:[10,14,15,24],larg:[0,11,55],last:[5,11,30,36,38],lastnam:[11,12,38],latenc:29,later:[16,20],latest:[26,27],latitud:[11,20],latitude_coordin:20,launch:[8,51],launcher:25,layer:27,lceecubwbqvsaaca:47,learn:[22,23,32,51,58,60],least:26,leav:[26,54],left:[21,31,54,55,58],length:[2,5],less:[10,14,48,55],let:[8,27,32,54],letter:61,level:[6,8,14,15,21,22,23,25,27,30,32,34,35,36,45,46],leverag:[32,58],lib:[26,28],lightweight:60,like:[0,2,5,8,10,14,16,17,18,19,23,26,28,29,32,33,38,49,51,53,54,55,57,58,59,60,61],liked_bi:59,limit:1,line:[0,16,26,27],linear:[14,26],live:[23,25,46],load:[27,49],localfilebinarystor:1,localhost:[26,27,28],locat:5,log:[6,26,32,38,47,49,50,54,55,58,61],login:25,logincredenti:25,loginfacebook:49,logout:25,longer:[11,51],longitud:[11,20],longitude_coordin:20,look:[2,8,10,11,16,49,52,55,61],loos:[33,61],love:16,lower:6,lte:10,ltixndg0nduxndpvdjb0jwrevls1vcd0xvr3nwt0jrqq:11,made:[19,24,53,59],magic:16,mai:[0,6,9,13,15,23,30,
41,50,51,54,56],mail:[26,28,30,56],mailer:[26,28],mailto:[33,36],main:[0,1,49],maintain:[16,49],mainten:31,make:[0,9,11,12,14,16,22,23,24,28,29,30,32,35,38,46,47,49,50,51,55,58,59,60,61],makefil:0,maker:14,malici:[45,46,47,52],manag:[5,11,12,22,23,25,26,27,28,30,31],mandatori:[1,38,41,56,57,61],mani:[7,11,12,14,16,20,23,30,54,60],manual:[55,59],map:14,marginheight:40,marginwidth:40,massoddb:55,match:[11,15,42,53,61],matter:32,mattress:14,maven:[0,26,27,28],max:28,maximum:[11,48],mayb:16,mean:[10,14,15,16,23,29,30,45,46,51,59,60],meant:55,meanwhil:29,measur:45,mechan:58,meet:26,member:[30,33,35,41,52,55,56,57],meme:[56,57],memori:20,menu:[21,34,54,58],messag:[6,26,28,32,33,41,48,56,58,60],message:25,meta:[33,61],metadata:[2,4,5,6,10,12,13,14,15,16,17,18,19,20,24,25,33,36],metadataproperti:41,meter:[11,20],method:[6,8,11,15,19],mfdsadfdsaoabl:55,middl:38,middlenam:38,might:[7,8,9,11,12,14,15,16,22,26,30,32,34,51,54,56],mile:20,milk:[13,15,42],million:32,millisecond:[30,41,48],mind:[1,
9,11,12,16,20,23],minim:[16,26,28],minimum:[30,34,36],minu:16,minut:[8,32],mix:24,moab:55,mobil:[14,16,20,23,25,34],model:14,modern:[30,55],modif:[38,57],modifi:[2,5,6,12,13,14,15,16,17,18,19,20,24,30,33,36,38,41,42,48,54,55,56,57,61],modul:6,monitor:32,month:[8,32],more:[4,6,8,9,11,12,13,14,15,16,20,21,22,23,24,25,26,30,32,36,39,41,42,45,47,48,50,51,52,53,54,55,56,58,59,60,61],morn:8,most:[8,11,16,22,28,29,30,31,32,34,51,55,59,60,61],mountain:52,much:[10,14,16,51,58],multi:[15,42],multipl:[0,11],must:[0,10,15,16,27,28,30,36,41,42,46,48,54,55,56,58,59,61],mustach:0,mvn:[26,27,28],my_app:[14,16,38,49],my_org:[14,16,38,49],myadmin:27,myapp:[12,27],myasset:2,mycollect:10,myfirstorg:27,mygroup:[55,56],mynewapp:[56,61],mynewgroup:56,mynewpassword:33,myorg:[12,56],mypassword:27,myself:[16,26,28],myuser:27,name:[1,2,4,5,6,8,10,11,12,13,14,15,16,17,18,19,20,21,23,24,26,27,28,30,33,34,36,38,41,42,46,48,49,51,53,54,55,56,57,58,61],narrow:[10,54],nativ:[0,14],natur:[11,12],navig:[26,27,28],nea
rbi:20,nearest:[11,20],nearli:16,necessari:[16,32,54],need:[0,1,2,8,9,11,12,13,14,15,16,21,22,24,26,28,30,31,32,33,34,35,36,38,46,47,49,50,51,52,54,55,56,58,59,60,61],neg:6,nest:[15,30,42],net:[24,40],network:32,never:[23,25,34,46,47,48],new_password:[33,61],new_review_uuid:16,newent:42,newli:[53,55],newpassword:[33,41,61],next:[11,13,21],nil:42,node:[24,26,28,42,43,47,50],nodej:28,non:[14,16],none:54,normal:[4,15,16],nosql:[11,12,14],notat:[10,12,14],note__:61,notic:[5,16,19,49,55],notif:[20,22,25,26,28,30],notifi:[25,30],notify_sysadmin_of_new_admin_us:[26,28],notify_sysadmin_of_new_organ:[26,28],notitf:41,now:[26,27,28,49,58],nsarrai:42,nsdictionari:42,nsexcept:42,nsmutablearrai:42,nsmutabledictionari:42,nsstring:42,number:[6,7,11,12,13,14,30,32,41,51,54,55,61],oauth2:41,ob5ko:48,object:[5,9,10,12,14,15,24,25,30,32,33,34,36],objectproperti:41,objecttyp:[33,36,41],objectuuid:41,obtain:[38,46,48,49,51],occur:[7,20],occurr:11,octal:10,off:[26,49],offer:[20,23,24,32,51,59,60],offici:
58,often:[8,10,16,30,32,55],old:[33,41,61],old_password:[33,61],oldpassword:[33,61],omit:12,onc:[0,11,16,26,29,49,51,54,61],ongo:[32,55],onli:[5,9,11,12,16,21,23,24,26,29,30,34,41,45,46,47,48,51,52,53,55,56,59,61],onlin:55,oop:49,opdata:42,open:[14,16,23,25,28,31],optim:[11,12,14,16],option:[5,9,26,28,30,42,46,49],order:2,orderl:11,org:[1,2,4,5,6,8,12,13,15,17,18,19,20,24,26,27,28,33,34,36,41],org_client_secret:47,org_clientid:47,org_id:[15,41,55,56,61],org_nam:[34,36,48,50],org_uuid:[34,36],organ:[0,2,4,5,6,8,12,13,14,15,16,17,18,19,21,23,24,25,26,27,28],organizationnam:48,organizations_require_activ:[26,28],orgid:41,orgnam:[9,41,47,49],orguuid:41,origin:56,originali:57,oscar:27,our:[0,9,11,12,26,27,28,31,39,42,60],out:11,outbox:55,outgo:28,outlin:5,output:49,over:[8,48],overrid:[28,48],overview:[11,12,25,30],overwritten:15,own:[7,23,32,41,49,53,55,56,57,61],owner:[2,36,41,55,56],packag:[26,49,58],page:[22,23,27,33,47,49],pair:[13,15,42],pane:54,param:[2,5,6,8,12,13,14,15,16,17,18,
19,24,42,48,53,54,55,56,61],paramet:[4,5,6,8,9],pars:49,part:[9,11,12,16,20,24],partial:[11,30],particular:[10,16,55],particularli:[14,16,53,55,59],partit:22,pass:[11,34],passiv:60,password:[24,25,26,27,28],path:[2,5,6,12,13,14,15,16,17,18,19,20,23,24,25,26,28,33,36,41,42,49],path_to_imag:16,pathnam:49,pattern:[41,53],payload:41,peak:8,peopl:[7,30,55,56,57,58],per:[13,14,49,54],perceiv:29,perform:[4,5,13,14,16,18,29,32,33,35,38,46,47,52,53,55,57,61],period:[7,8,20,54],permiss:[5,12,18,19,23,24,25],permissiondata:41,persist:[24,27,28],person:[16,20,31,33,36,58],perspect:30,pertin:35,pet:27,phone:12,phone_numb:12,photo:[20,60],physic:20,pictur:[4,5,12,20,24,38,41,56,61],pinterest:55,pip:0,place:[14,15,16,26,30,42,47,61],plai:[7,22],plain:4,plan:16,platform:32,pleas:[10,33,46,48,54,59],plenti:0,plural:[13,15,30,41],png:16,point:[10,11,14,20,28,29,32,49,58],polici:[39,51],pop:58,popul:[56,58,60],popular:[32,58],popup:54,port:[26,27,28],portal:[21,22,23,26],portion:41,pose:48,posit:[11,2
0],possibl:[16,51,59],post:[2,5,6,7,13,15,16,17,18,21,23,24,25,27,33,34,35,36,41],postal:11,potenti:11,power:[20,27,30,32,40,47,52,59],practic:[11,12],preced:[12,16],precis:55,predefin:30,prefer:[11,24,26],prefix:34,prepar:51,present:[16,25],preserv:56,prevent:[11,12],preview:0,previou:[55,58],previous:58,price:[10,13,15,42],primari:[16,38],prior:51,privaci:55,privat:32,privileg:36,probabl:[0,16,26,29],process:[27,30,33,60],product:[14,16,21,23,25,26,30,41,45],product_uuid:[14,16],productid:16,productimag:16,productnam:16,productuuid:16,profil:[20,32,38,49,60],program:29,programat:21,programmat:[34,52],project:[0,27,35,36,39,58],prompt:[26,49],prone:55,proof:[33,61],prop:42,properit:20,properli:[27,29],properti:[1,4,5,6,9,10,11],properties____:26,property_1:[13,15],property_2:[13,15],property_nam:11,props1:42,props2:42,propti:33,protect:[45,47],protocol:[26,28,49,51],prototyp:49,provid:[6,8,11,13,14,15,20,21,24,28,30,32,33,34,36,38,41,42,43,46,47,49,51,52,54,55,56,58,61],provis:[38,
49],proxim:[11,20],pull:31,pure:24,purpos:[10,23,26,30,34,54,60],push:[0,20,22,25],put:[5,12,13,15],pw123:26,pwhere:28,python:0,qualifi:24,quantiti:10,query_stat:12,query_str:[56,61],querystat:41,querystr:42,quick:25,quicker:24,quickli:[11,12,16,30,32,60],quitwait:[26,28],quot:[12,41,42],raleigh:40,rang:8,rate:16,rather:[5,16,17,18,32],raw:0,rdbm:[14,16],reach:10,reactiv:25,read:[9,11,12,14,16,22,39,41,55],readabl:16,readi:[11,22,28,58],readm:[0,39],real:41,reason:56,recaptcha:[33,61],recaptcha_challeng:41,recaptcha_challenge_field:33,recaptcha_respons:41,recaptcha_response_field:33,recaptchaopt:33,receipt:[25,30],receiv:[11,29,38,57,58,61],reciproc:59,recommend:[26,42,51],record:[30,32],recurs:53,redefin:54,redirect:[26,28,49],redirect_root:[26,28],redirect_uri:49,reduc:[12,16],redund:16,ref:41,regard:[6,30],regardless:15,regionnam:1,regist:[32,45,52,54,58,60,61],rel:[33,61],relat:[5,14],relationship:[16,17,18,19],relev:[20,32,41,49,51,60],reli:16,rememb:[10,49,58],remind:16,remot:
20,remov:[23,25,26,33],removeent:42,renam:30,repeat:58,replac:[1,16,49,58],replic:26,replication_factor:[26,28],repo:[26,28,39],report:[7,31],reposloc:1,repres:[11,14,21,24,30,32,33,36,52,53,55,56,61],represent:[11,15,24,30],request:2,requir:[0,6,13,17,18,20,23,25],reserv:30,resetpw:[25,26,28,33],resetpwmsg:25,resolut:8,resourc:[0,1,24,35,38,41,46,49,52,53,54],resource_path:[41,53],respect:46,respons:2,response_typ:49,restaur:[11,20],restkit:58,restrict:[51,54],restructuredtext:0,result:[10,11,13],review_entity_json:16,review_uuid:16,reviewed_product_uuid:16,reviewedbi:16,reviewedin:16,revok:25,revoketoken:50,rich:[32,60],right:[16,24,29,54,55,58,60],rigid:30,risk:48,rock:10,rockadero:20,rocki:52,role:[5,10,12,18,19,21,23,24,25,30],roleid:41,rolenam:[5,12,18,19,24,38,41,54,56,57,61],roleproperti:41,root:[0,26,27,28,51],rout:[32,55],row:14,rubi:[24,42,43],rule:[23,45,47,51,52,53,54,56,61],run:[0,7,25],safe:52,sai:[8,46,47,55],sake:28,same:[5,6,11,16,18,19,20,28,30,32,52,54,55,56,57,5
8],sampl:[55,56,58,61],san:[20,33,56,57],sandbox:[5,15,22],santa:40,save:[5,15],scalabl:[14,16,26],scale:16,scatter:16,scene:[38,49],schedul:41,schedulenotif:25,schema:[14,30,41,54],scope:[16,27,47,49,52],screen:[21,40],script:[0,33,52,61],scroll:40,sdk:[6,9,14,15,22],search:[8,11,32],second:[6,29,33,48,54,58],secondari:16,secret:[25,34,41],secretkei:1,section:[24,34,46,47,56,58,61],see:[2,4,8,9,10,11,12,13,14,15,19,20,21,22,23,24,26,27,30,32,33,34,35,36,39,42,45,46,47,48,49,51,52,53,54,55,56,58,59,61],seen:55,segment:53,select:[10,11,12,16,21,23,24,54,56,58,61],self:49,send:[1,4,9,11,12,19,20,27,32,33,36,38,41,49,54,58,60],sens:[16,32],sensit:[23,45],sent:[9,12,24,33,34,36,41,42,46,47,53,58,61],separ:[6,12,16,30,42,49,54],seri:0,serv:[51,52,54],server:[11,23,26,29,32,34,46,47,49,50,51,52,56,58],servic:[1,12,20,23,24,27,32,33,35,36,38,41,42,45,47,49,55,56,58,61],session:[49,51],set:[0,4,5,6,8,11,12],setexpir:25,setobject:42,settoken:49,setup:25,sever:[1,24],share:[27,36,55,60],share
dappl:42,shell:22,shorthand:11,should:[0,2,11,12,15,16,17,18,22,23,26,28,39,41,42,45,46,47,48,51,52,54,58],show:[12,13,16,42,54,58],shown:[9,11,12,13,15,19,33,46,49,55,56,61],side:[31,32,34,46,47,49,51,52,58],sidebar:54,sign:[25,26,28,30,32],similar:[16,55,58],simpl:[0,14,16,23,26,30,32,58,60],simplestrategi:[26,28],simpli:[13,19,24,32,54,55,58],simplifi:[16,32],sinc:[10,11,29,46,52],singl:[8,12,14,15,16,26,30,32,41,56],singular:30,six_dai:8,skim:[15,42],sku:[14,15,42],slash:[56,57],slate:54,slideshar:40,slideshow:40,slightli:14,slower:10,small:26,smith:11,smtp:[26,28],snippet:49,social:[20,25],softwar:28,sojre5ywlkq7jrdcka:47,solid:40,solut:30,solv:32,some:[0,1,7,9,11,16,24,27,29,30,51,54,55,56,58],somegroup:56,someon:[8,54],somepassword:[26,48],somesubgroup:56,someth:[2,16,26],sometim:[0,14],someus:[24,26,48,50,54,56,61],soon:25,sort:[11,20,24],sourc:[0,14,16,25,31],space:16,span:[8,16],sparingli:52,special:[0,20,53,54,59],specif:[7,10,11,14,15,16,19,24,30,32,41,42,46,50,52,53,54,
55,56,61],specifi:[6,11,12,13,15,17,18,19,20,24,26,35,36,41,42,46,47,48,53,55,56,58,61],split:8,sql:[10,16,32],squar:15,src:[0,1,33,40,61],stack:[1,25,26,27],stage:28,standalon:27,standard:[20,24,51,52,61],start:[8,11,12,14,16,22,24,25],start_tim:8,startup:27,state:[24,33,41,49],statement:[12,29,41],statist:7,statu:[12,26,27,28,33,36,41,49,60],steventraut:[56,61],still:[22,51],stock:[13,15,26,42],stop:11,store:[1,5,10,11,12],str:55,strateg:16,strategi:[26,28],stream:20,streamlin:[16,58],string:[9,10,11,12,13,15,16,30,33,34,36,38,41,42,46,49,55,56,57],stringifi:49,strong:33,stronger:20,structur:[16,24,27,35,59],struggl:55,style:[32,33,40,45,55,58,61],stylesheet:[33,61],sub_properti:15,subgroup:56,submit:[11,12,33,39,53,61],subproperti:42,subproperty1:42,subproperty2:42,subscrib:[55,56,57],subscript:[56,57,59],subsequ:[38,41,46,47,49],subset:[13,16],substitut:55,subtract:10,succe:[38,49,53],success:[26,29,42,51],sudo:0,suggest:[20,23,31],suit:[47,52,54],summit:40,sungju:40,superadmin:
26,superus:[26,28],suppli:[33,36,41,47],support:[0,8,10,14,16,20,22],suppos:15,sure:[21,23,28,45,51,58],swagger:0,symbol:61,sync:25,synchron:25,sysadmin:[26,28],system:[0,14,26,28,30,38,39,48,55,56,58,61],tab:54,tag:[41,49],take:[6,11,16,28,29,32,45,47,51],taken:[20,49],tale:[10,11],talk:[40,51,58],tar:49,target:[0,26,27,28,32],task:54,team:[35,36,58],technic:49,techniqu:[11,16],temp:1,templat:0,temporari:1,tempt:16,tend:[56,57],test12345:[33,36],test1234:61,test123:[33,36],test:[5,11,23,26,28,36,51,52,56,58],testadmin:47,testadminpw:47,testapp1:[34,36],testapp2:36,tester123:36,tester:41,testorg:[34,36],testpw:47,text:[4,10,11,32,33,55,58,61],text_field:33,than:[0,5,6,8,10,11,12,13,16,17,18,26,32,48,51],thank:32,thei:[0,11,12,15,16,20,30,36,45,46,47,51,52,54,55,56,57,61],them:[0,6,9,10,11,12,16,23,24,32,47,49,52,54,55],theme:[16,33],themselv:61,thereaft:45,thi:[0,1,2,6,8,9,10,11,12,13,14,15,16,20,21,22,24,26,27,28,29,30,31,32,33,34,38,39,41,42,45,46,47,48,49,50,51,52,54,55,56,57,58,
59,60,61],thing:[7,10,22,23,31,40,45,56,57,61],think:55,those:[11,16,39,45,46,47,51,52,55,61],though:[11,16,41],thousand:14,threadpool:28,three:[6,11,26,52,54,58],through:[14,16,21,32,34,35,36,38,41,45,49,51,52,55,56,61],thumb:23,tier:27,time:[6,7],timeout:28,timestamp:[2,5,6,8,10,12,13,14,15,16,17,18,19,24,26,30,33,34,36,38,41,42,48,50,53,54,55,56,57,61],titl:[10,11,16,33,36,41,54,56,57,61],tld:[26,28],tmp:1,toctre:0,todai:20,togeth:[0,52],token:[9,13,15,23,24,25,27,33,34,35,36,38],token_to_revok:50,tom:53,tomcat:25,too:0,tool:[9,11,12,32,60],top:[21,27,49,58],topic:[11,31,42,43,47,56,57,61],topolog:26,track:[6,7,38],trail:52,transfer:24,transform:0,transit:[33,61],transport:[26,28],treat:[15,25],trend:32,trial:24,truli:32,tsefia:33,ttl:25,ttl_in_millisecond:48,tupl:14,turn:49,tutori:22,tweet:[32,55],twitter:[32,55,58],two:[11,12,27,29,30,33,42,46,58,59,60],type:[2,4,5,6],typic:[10,24,30,61],udpat:0,uffff:10,uiapplic:42,unauthent:54,under:[23,26,47,50,51,54,58],underli:14,understan
d:30,unencod:[9,11,12],unexpect:41,unfamiliar:14,unfortun:0,unicod:10,union:10,uniqu:[15,30,38,41,49,56,57,58,61],univers:30,unix:[6,38,57],unless:[0,38,46,49,52,58],unlik:[14,15,30],unnecesari:51,unregist:54,unreleas:28,unsecur:51,until:[29,41,54],untrust:51,untrustworthi:25,unus:54,upcom:20,updatecollect:42,updatedent:42,updateent:42,upon:24,upward:6,uri:[2,5,6,8,9,12,13,14,15,16,17,18,19,24],url:[9,11,12,13,15,16,19],usag:8,usegrid:[24,25],user:[5,7,10,11,12,13,15,16,17,18,19,20,21,22,23,24,25],user_uuid:16,user_uuid_or_usernam:50,usergrid_appl:28,usergriddatacli:[47,50],usergridsdk:49,userid:41,usernam:[11,12,15,17,18,19,24,26,27,28,30,33,36,38,41,45,47,48,51,52,53,54,55,56,58,59,61],username_or_email:61,usual:26,utc:[30,41],util:[27,30,32],uuid:[2,4,5,6,10,12,13,14,15,16,17,18,19,20,24,30,33,34,36,38,41,42,48,49,53,54,55,56,57,61],uuid_for_selected_review:16,val:49,valid:[1,13,15,30,33,34,36,38,46,48,49,51,53,54,55,56,57,61],valu:[1,6,8,10,11],valuabl:32,value_1:[13,15],value_2
:[13,15],vari:8,variabl:53,varieti:[15,24,35,42,61],variety_1:42,variety_2:42,variety_3:42,variety_list:42,variou:51,verb:[16,33,36,41,55],veri:[0,11,12,22,30,46,55],verifi:45,version:[26,28,58],versu:55,via:[0,26,30,31,33,36,52,53,56,57,60],video:[5,25,32],view:[8,16,26,28,52],visit:26,visitor:52,w3c:[33,61],wai:[6,11,12,14],wait:[11,29],wall:55,want:[0,1,5,6,11],war:25,warn:[23,46,47,52,54],watch:26,web:[12,14,16,26,27,28,34,38,47,49,51,52,60],webapp:[26,27],week:8,welcom:[26,28,31],well:[20,24,26,32,50,51,55,58,59,60,61],went:26,were:[11,12,20,56,57],what:[16,20,22],whatev:23,whatsoev:45,when:[0,5,9,11,12,15,16,17,20,23,24,25,26,28,29,30,32,41,45,46,47],whenev:49,where:[0,2,10,11,12,16,20,22,23,24,28,30,38,49,51,55,61],whether:[38,41,46,60],which:[0,8,11,13,14,15,16,18,21,26,29,30,33,35,38,41,45,46,47,48,49,51,52,53,55,56,57,59,61],who:[16,31,32,39,41,45,47,51,54,55],whole:[15,41,42],whose:[11,12,19,24,54,61],why:26,wide:[52,61],width:[40,41,55],wildcard:[11,53],window:[22,49,58]
,wireless:20,wish:[13,30,61],within:[6,11,15,20,26,30,36,48,52,55,58],without:[11,46,54,61],won:55,word:[11,13,14,15,16,55],work:[0,11,12,14,16,20,23,25,26,28,29,31,32],workflow:39,world:55,would:[4,8,9,11,16,19,20,26,33,46,48,49,51,52,53,55,56,57,59,61],wouldn:16,write:[14,16,45,58],written:[0,14,16,26,31,39],wrong:26,wrote:16,www:[12,24,33,40,49,55,56,61],xfbml:49,xml:1,yaml:0,year:55,yet:[11,56],yhixpqk1cq:34,you:[0,1,2,4,5,6,7,8,9,10,11,12,13,14,15],your:[0,1,4,5,6,7,8,9,10,11],your_app_id:49,your_domain:49,your_redirect_url:49,your_response_typ:49,your_state_valu:49,yourapp:9,yourappnam:49,yourdomain:24,yourorg:9,yourorgnam:49,ywmt4nqe8q9geelyjhixpsio4aaaato5fqfcg0ced2h9nwmdmrorknnreeqydof:33,ywq6aaabmqz_xuyyeerokkjnzn7yqxxlpgml69fvaa:47,yxa65gylqja8ayysay8ox3vg5arzp48:34,yxa6aaabmq0d4mep_ugbza0:47,yxa7ygil:34,yxb7nad7em0meej989xixprxekq:47,yxb7nautv9krhhmr8ycw0qbozh2pxef:47,yxu6aaabmq0hdy4:47,zip:49},titles:["Apache Usergrid Documentation","File storage configuration","Folders
","<no title>","Retrieving assets","Uploading assets","Creating & incrementing counters","Counters & events","Retrieving counters","Advanced query usage","Query operators & data types","Query parameters & clauses","Querying your data","Collections","The Usergrid Data Store","Entities","Data Store Best Practices","Connecting entities","Disconnecting entities","Retrieving connections","Geolocating your Entities","Creating a new application","Creating an Usergrid Account","Using a Sandbox Application","Using the API","Apache Usergrid Documentation","Usegrid 1: Deploying to Tomcat","Usegrid 1: Launcher Quick-start","Usergrid 2: Deploy to Tomcat","Async vs. sync calls","Usergrid Data model","Documentation Overview","Usergrid Features","Admin user","Application","Organization & application management","Organization","COMING IN USERGRID 2","Users & Devices","How to Contribute Code & Docs","Presentations & Videos","Methods","Usergrid iOS SDK","Usergrid
SDK Documentation outline","COMING SOON...","Security & token authentication","Authenticating API requests","Authenticating users & app clients","Changing token expiration (time-to-live)","Facebook sign in","Revoking tokens (logout)","Security best practices","Authentication levels","Using permissions","Using roles","Activity","Working with group data","Groups","App Example - Messagee","Social Graph Connections","User management & social graph","Working with User Data"],titleterms:{"default":[30,48,51,54],"new":[21,23],"return":61,"super":26,access:[24,41,46,51],accesstokenrespons:41,account:[22,58],acquir:51,action:41,activ:[32,33,36,41,42,43,55,60],activityfe:41,actor:41,add:[26,49],addpermiss:41,addrol:41,admin:[33,36,41,42,43,47,50,52,54],adminuserupd:41,advanc:9,all:[9,19],android:58,apach:[0,25,40],api:[0,9,24,27,46],app:[20,40,41,42,43,47,49,51,58],appdata:41,applic:[21,23,30,32,34,35,36,41,42,43,47],asset:[2,4,5,32],assign:[42,43,53,54],async:29,asynchron:29,atta
ch:9,authent:[24,32,42,43,45,46,47,52],backend:40,base:24,basic:12,batch:13,best:[16,51],between:0,build:[0,26,27,28,40,42,43],call:[9,29],cancelmsg:41,cassandra:[26,40],chang:[48,61],claus:11,client:[36,42,43,46,47,51,58],code:39,collect:[13,24,30,41,42,43,57],come:[32,37,44],complet:33,complex:53,comput:16,configur:[1,26,52],connect:[17,19,42,43,59,60],consol:26,construct:24,contain:11,content:0,contribut:[39,40],counter:[6,7,8,42,43],creat:[6,13,15,21,22,23,33,34,36,42,43,48,49,54,55,56,58,59,61],createact:41,createadminus:41,createapp:41,createent:41,createev:41,creategroup:41,createnotif:41,createorg:41,createus:41,credenti:[34,36,41,42,43],cursor:11,custom:[15,26,42,43],data:[4,10,12,14,15,16,20,30,32,42,43,56,61],databas:26,deal:0,decrement:6,delet:[13,15,42,43,56,61],denorm:16,deploi:[26,28],deploy:28,descript:56,devic:[38,41],dialog:49,differ:0,disconnect:[18,42,43],displai:61,doc:[0,39],document:[0,25,31,39,43],download2:27,download:[26,27],edit:51,enrich:20,entiti:[4,13,1
5,17,18,19,20,24,30,32,41,42,43],error:41,event:[7,41,42,43],exampl:[4,5,6,8,13,15,26,28,33,34,36,42,43,47,48,49,50,53,54,55,56,58,61],expir:48,facebook:[38,49],featur:32,feed:[33,36,42,43,55,60],file:[0,1,26,28,32],flexibl:32,folder:2,follow:[42,43,55,59],form:61,format:24,from:[13,36,42,43,56],gener:[34,36,42,43,57],geoloc:[20,32],get:[16,26,27,33,34,36,42,43,61],graph:[59,60],group:[32,41,42,43,55,56,57,60],handl:61,hierarch:6,how:[0,39,40],html5:58,http:[24,27,51],imagemodel:41,increment:[6,42,43],initi:33,instal:[26,42,43],intern:40,interv:[8,42,43],invok:49,issu:24,itself:28,java:28,javascript:[49,58],launcher:27,let:61,level:[47,52],limit:11,link:2,list:2,live:48,local:[1,28],locat:[11,20],login:[26,32,42,43,47,49],logincredenti:41,logout:[42,43,50],manag:[32,35,42,43,60],markdown:0,message:58,metadata:41,method:[24,41],mobil:[40,51],model:[16,30,41],multipl:[12,15,42,43],never:51,next:22,note:0,notif:[32,41],notifi:41,oauth:[24,49],object:41,open:40,oper:10,order:11,org:[42,
43],organ:[30,35,36,41,42,43,47],other:[0,42,43,59],out:16,outlin:43,overview:[31,40],paramet:[11,56],parti:32,password:[33,42,43,61],path:53,permiss:[32,41,42,43,51,53],portal:[28,54],post:[42,43,55],practic:[16,51],pre:16,prerequisit:0,present:40,product:51,properti:[12,15,26,28,30,38,42,43
<TRUNCATED>
[04/36] usergrid git commit: Cherry pick: Remove references to
incubator from docs, README files and POMs.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/website/tmp/compiled_content
----------------------------------------------------------------------
diff --git a/website/tmp/compiled_content b/website/tmp/compiled_content
index bec3969..9e61f74 100644
--- a/website/tmp/compiled_content
+++ b/website/tmp/compiled_content
@@ -8,12 +8,12 @@
* Designed and built with all the love in the world by @mdo and @fat.
*//*! normalize.css v2.1.0 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{margin:.67em 0;font-size:2em}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{height:0;-moz-box-sizing:content-box;box-sizing:content-box}mark{color:#000;background:#ff0}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{padding:.35em .625em .75em;margin:0
2px;border:1px solid #c0c0c0}legend{padding:0;border:0}button,input,select,textarea{margin:0;font-family:inherit;font-size:100%}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{padding:0;box-sizing:border-box}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decorati
on:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}@page{margin:2cm .5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.table td,.table th{background-color:#fff!important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table-bordered th,.table-bordered td{border:1px solid #ddd!important}}*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.428571429;color:#333;background-color:#fff}input,button,select
,textarea{font-family:inherit;font-size:inherit;line-height:inherit}button,input,select[multiple],textarea{background-image:none}a{color:#428bca;text-decoration:none}a:hover,a:focus{color:#2a6496;text-decoration:underline}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}img{vertical-align:middle}.img-responsive{display:block;height:auto;max-width:100%}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;height:auto;max-width:100%;padding:4px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0 0 0 0);border:0}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16.099999999999998px;font-weight:200;line-height:1.4}@media(min-w
idth:768px){.lead{font-size:21px}}small{font-size:85%}cite{font-style:normal}.text-muted{color:#999}.text-primary{color:#428bca}.text-warning{color:#c09853}.text-danger{color:#b94a48}.text-success{color:#468847}.text-info{color:#3a87ad}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:500;line-height:1.1}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{margin-top:20px;margin-bottom:10px}h1 small,h2 small,h3 small{font-size:65%}h4,h5,h6{margin-top:10px;margin-bottom:10px}h4 small,h5 small,h6 small{font-size:75%}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,o
l{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-bottom:20px}dt,dd{line-height:1.428571429}dt{font-weight:bold}dd{margin-left:0}@media(min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{font-size:17.5px;font-weight:300;line-height
:1.25}blockquote p:last-child{margin-bottom:0}blockquote small{display:block;line-height:1.428571429;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}blockquote.pull-right small:before{content:''}blockquote.pull-right small:after{content:'\00A0 \2014'}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:20px;font-style:normal;line-height:1.428571429}code,pre{font-family:Monaco,Menlo,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;white-space:nowrap;background-color:#f9f2f4;border-radius:4px}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.428571429;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre.prettyprint{margin-bottom:20px}pre co
de{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}.row{margin-right:-15px;margin-left:-15px}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11,.col-xs-12,.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12,.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12,.col-lg-1,.col-lg-2,.col-lg-
3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11{float:left}.col-xs-1{width:8.333333333333332%}.col-xs-2{width:16.666666666666664%}.col-xs-3{width:25%}.col-xs-4{width:33.33333333333333%}.col-xs-5{width:41.66666666666667%}.col-xs-6{width:50%}.col-xs-7{width:58.333333333333336%}.col-xs-8{width:66.66666666666666%}.col-xs-9{width:75%}.col-xs-10{width:83.33333333333334%}.col-xs-11{width:91.66666666666666%}.col-xs-12{width:100%}@media(min-width:768px){.container{max-width:750px}.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11{float:left}.col-sm-1{width:8.333333333333332%}.col-sm-2{width:16.666666666666664%}.col-sm-3{width:25%}.col-sm-4{width:33.33333333333333%}.col-sm-5{width:41.66666666666667%}.col-sm-
6{width:50%}.col-sm-7{width:58.333333333333336%}.col-sm-8{width:66.66666666666666%}.col-sm-9{width:75%}.col-sm-10{width:83.33333333333334%}.col-sm-11{width:91.66666666666666%}.col-sm-12{width:100%}.col-sm-push-1{left:8.333333333333332%}.col-sm-push-2{left:16.666666666666664%}.col-sm-push-3{left:25%}.col-sm-push-4{left:33.33333333333333%}.col-sm-push-5{left:41.66666666666667%}.col-sm-push-6{left:50%}.col-sm-push-7{left:58.333333333333336%}.col-sm-push-8{left:66.66666666666666%}.col-sm-push-9{left:75%}.col-sm-push-10{left:83.33333333333334%}.col-sm-push-11{left:91.66666666666666%}.col-sm-pull-1{right:8.333333333333332%}.col-sm-pull-2{right:16.666666666666664%}.col-sm-pull-3{right:25%}.col-sm-pull-4{right:33.33333333333333%}.col-sm-pull-5{right:41.66666666666667%}.col-sm-pull-6{right:50%}.col-sm-pull-7{right:58.333333333333336%}.col-sm-pull-8{right:66.66666666666666%}.col-sm-pull-9{right:75%}.col-sm-pull-10{right:83.33333333333334%}.col-sm-pull-11{right:91.66666666666666%}.col-sm-offse
t-1{margin-left:8.333333333333332%}.col-sm-offset-2{margin-left:16.666666666666664%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-4{margin-left:33.33333333333333%}.col-sm-offset-5{margin-left:41.66666666666667%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-7{margin-left:58.333333333333336%}.col-sm-offset-8{margin-left:66.66666666666666%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-10{margin-left:83.33333333333334%}.col-sm-offset-11{margin-left:91.66666666666666%}}@media(min-width:992px){.container{max-width:970px}.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11{float:left}.col-md-1{width:8.333333333333332%}.col-md-2{width:16.666666666666664%}.col-md-3{width:25%}.col-md-4{width:33.33333333333333%}.col-md-5{width:41.66666666666667%}.col-md-6{width:50%}.col-md-7{width:58.333333333333336%}.col-md-8{width:66.66666666666666%}.col-md-9{width:75%}.col-md-10{width:83.33333333333334%}.col-md-11{width:91.66666666666666%}.col
-md-12{width:100%}.col-md-push-0{left:auto}.col-md-push-1{left:8.333333333333332%}.col-md-push-2{left:16.666666666666664%}.col-md-push-3{left:25%}.col-md-push-4{left:33.33333333333333%}.col-md-push-5{left:41.66666666666667%}.col-md-push-6{left:50%}.col-md-push-7{left:58.333333333333336%}.col-md-push-8{left:66.66666666666666%}.col-md-push-9{left:75%}.col-md-push-10{left:83.33333333333334%}.col-md-push-11{left:91.66666666666666%}.col-md-pull-0{right:auto}.col-md-pull-1{right:8.333333333333332%}.col-md-pull-2{right:16.666666666666664%}.col-md-pull-3{right:25%}.col-md-pull-4{right:33.33333333333333%}.col-md-pull-5{right:41.66666666666667%}.col-md-pull-6{right:50%}.col-md-pull-7{right:58.333333333333336%}.col-md-pull-8{right:66.66666666666666%}.col-md-pull-9{right:75%}.col-md-pull-10{right:83.33333333333334%}.col-md-pull-11{right:91.66666666666666%}.col-md-offset-0{margin-left:0}.col-md-offset-1{margin-left:8.333333333333332%}.col-md-offset-2{margin-left:16.666666666666664%}.col-md-offse
t-3{margin-left:25%}.col-md-offset-4{margin-left:33.33333333333333%}.col-md-offset-5{margin-left:41.66666666666667%}.col-md-offset-6{margin-left:50%}.col-md-offset-7{margin-left:58.333333333333336%}.col-md-offset-8{margin-left:66.66666666666666%}.col-md-offset-9{margin-left:75%}.col-md-offset-10{margin-left:83.33333333333334%}.col-md-offset-11{margin-left:91.66666666666666%}}@media(min-width:1200px){.container{max-width:1170px}.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11{float:left}.col-lg-1{width:8.333333333333332%}.col-lg-2{width:16.666666666666664%}.col-lg-3{width:25%}.col-lg-4{width:33.33333333333333%}.col-lg-5{width:41.66666666666667%}.col-lg-6{width:50%}.col-lg-7{width:58.333333333333336%}.col-lg-8{width:66.66666666666666%}.col-lg-9{width:75%}.col-lg-10{width:83.33333333333334%}.col-lg-11{width:91.66666666666666%}.col-lg-12{width:100%}.col-lg-push-0{left:auto}.col-lg-push-1{left:8.333333333333332%}.col-lg-push-
2{left:16.666666666666664%}.col-lg-push-3{left:25%}.col-lg-push-4{left:33.33333333333333%}.col-lg-push-5{left:41.66666666666667%}.col-lg-push-6{left:50%}.col-lg-push-7{left:58.333333333333336%}.col-lg-push-8{left:66.66666666666666%}.col-lg-push-9{left:75%}.col-lg-push-10{left:83.33333333333334%}.col-lg-push-11{left:91.66666666666666%}.col-lg-pull-0{right:auto}.col-lg-pull-1{right:8.333333333333332%}.col-lg-pull-2{right:16.666666666666664%}.col-lg-pull-3{right:25%}.col-lg-pull-4{right:33.33333333333333%}.col-lg-pull-5{right:41.66666666666667%}.col-lg-pull-6{right:50%}.col-lg-pull-7{right:58.333333333333336%}.col-lg-pull-8{right:66.66666666666666%}.col-lg-pull-9{right:75%}.col-lg-pull-10{right:83.33333333333334%}.col-lg-pull-11{right:91.66666666666666%}.col-lg-offset-0{margin-left:0}.col-lg-offset-1{margin-left:8.333333333333332%}.col-lg-offset-2{margin-left:16.666666666666664%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-4{margin-left:33.33333333333333%}.col-lg-offset-5{margin-lef
t:41.66666666666667%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-7{margin-left:58.333333333333336%}.col-lg-offset-8{margin-left:66.66666666666666%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-10{margin-left:83.33333333333334%}.col-lg-offset-11{margin-left:91.66666666666666%}}table{max-width:100%;background-color:transparent}th{text-align:left}.table{width:100%;margin-bottom:20px}.table thead>tr>th,.table tbody>tr>th,.table tfoot>tr>th,.table thead>tr>td,.table tbody>tr>td,.table tfoot>tr>td{padding:8px;line-height:1.428571429;vertical-align:top;border-top:1px solid #ddd}.table thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table caption+thead tr:first-child th,.table colgroup+thead tr:first-child th,.table thead:first-child tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child td{border-top:0}.table tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.tabl
e-condensed thead>tr>th,.table-condensed tbody>tr>th,.table-condensed tfoot>tr>th,.table-condensed thead>tr>td,.table-condensed tbody>tr>td,.table-condensed tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f5f5f5}table col[class*="col-"]{display:table-column;float:none}table td[class*="col-"],table th[class*="col-"]{display:table-cell;float:none}.table>thead>tr>td.active,.table>tbody>tr>td.active,.table>tfoot>tr>td.active,.table>thead>tr>th.active,.table>tbody>tr>th.active,.table>tfoot>tr>th.active,.table>thead>tr.activ
e>td,.table>tbody>tr.active>td,.table>tfoot>tr.active>td,.table>thead>tr.active>th,.table>tbody>tr.active>th,.table>tfoot>tr.active>th{background-color:#f5f5f5}.table>thead>tr>td.success,.table>tbody>tr>td.success,.table>tfoot>tr>td.success,.table>thead>tr>th.success,.table>tbody>tr>th.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>tbody>tr.success>td,.table>tfoot>tr.success>td,.table>thead>tr.success>th,.table>tbody>tr.success>th,.table>tfoot>tr.success>th{background-color:#dff0d8;border-color:#d6e9c6}.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover,.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th{background-color:#d0e9c6;border-color:#c9e2b3}.table>thead>tr>td.danger,.table>tbody>tr>td.danger,.table>tfoot>tr>td.danger,.table>thead>tr>th.danger,.table>tbody>tr>th.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>tbody>tr.danger>td,.table>tfoot>tr.danger>td,.table>thead>tr.danger>th,.tabl
e>tbody>tr.danger>th,.table>tfoot>tr.danger>th{background-color:#f2dede;border-color:#eed3d7}.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover,.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th{background-color:#ebcccc;border-color:#e6c1c7}.table>thead>tr>td.warning,.table>tbody>tr>td.warning,.table>tfoot>tr>td.warning,.table>thead>tr>th.warning,.table>tbody>tr>th.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>tbody>tr.warning>td,.table>tfoot>tr.warning>td,.table>thead>tr.warning>th,.table>tbody>tr.warning>th,.table>tfoot>tr.warning>th{background-color:#fcf8e3;border-color:#fbeed5}.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover,.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th{background-color:#faf2cc;border-color:#f8e5be}@media(max-width:768px){.table-responsive{width:100%;margin-bottom:15px;overflow-x:scroll;overflow-y:hidden;border:1px solid #ddd;-ms-
overflow-style:-ms-autohiding-scrollbar;-webkit-overflow-scrolling:touch}.table-responsive>.table{margin-bottom:0;background-color:#fff}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>t
d:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.table-responsive>.table-bordered>thead>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>thead>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;margin-bottom:5px;font-weight:bold}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type="file"]{display:block}select[multiple],sele
ct[size]{height:auto}select optgroup{font-family:inherit;font-size:inherit;font-style:inherit}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}input[type="number"]::-webkit-outer-spin-button,input[type="number"]::-webkit-inner-spin-button{height:auto}output{display:block;padding-top:7px;font-size:14px;line-height:1.428571429;color:#555;vertical-align:middle}.form-control:-moz-placeholder{color:#999}.form-control::-moz-placeholder{color:#999}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.428571429;color:#555;vertical-align:middle;background-color:#fff;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border-color eas
e-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6)}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee}textarea.form-control{height:auto}.form-group{margin-bottom:15px}.radio,.checkbox{display:block;min-height:20px;padding-left:20px;margin-top:10px;margin-bottom:10px;vertical-align:middle}.radio label,.checkbox label{display:inline;margin-bottom:0;font-weight:normal;cursor:pointer}.radio input[type="radio"],.radio-inline input[type="radio"],.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]{float:left;margin-left:-20px}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{display:inline-block;padding-l
eft:20px;margin-bottom:0;font-weight:normal;vertical-align:middle;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}input[type="radio"][disabled],input[type="checkbox"][disabled],.radio[disabled],.radio-inline[disabled],.checkbox[disabled],.checkbox-inline[disabled],fieldset[disabled] input[type="radio"],fieldset[disabled] input[type="checkbox"],fieldset[disabled] .radio,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}textarea.input-sm{height:auto}.input-lg{height:45px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-lg{height:45px;line-height:45px}textarea.input-lg{height:auto}.has-warning .help-block,.has-warning .control-label{color:#c09853}.has-warning .form-control{border-color:#c09853;-webki
t-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-warning .form-control:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e}.has-warning .input-group-addon{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.has-error .help-block,.has-error .control-label{color:#b94a48}.has-error .form-control{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-error .form-control:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392}.has-error .input-group-addon{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.has-success .help-block,.has-success .control-label{color:#468847}.has-success .form-control{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px
rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-success .form-control:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b}.has-success .input-group-addon{color:#468847;background-color:#dff0d8;border-color:#468847}.form-control-static{padding-top:7px;margin-bottom:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media(min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block}.form-inline .radio,.form-inline .checkbox{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:none;margin-left:0}}.form-horizontal .control-label,.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{padding
-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}@media(min-width:768px){.form-horizontal .control-label{text-align:right}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:normal;line-height:1.428571429;text-align:center;white-space:nowrap;vertical-align:middle;cursor:pointer;border:1px solid transparent;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus{color:#333;text-decoration:none}.btn:active,.btn.active{background-ima
ge:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#333;background-color:#ebebeb;border-color:#adadad}.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.dis
abled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#fff;border-color:#ccc}.btn-primary{color:#fff;background-color:#428bca;border-color:#357ebd}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#3276b1;border-color:#285e8e}.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca;border-color:#357ebd}.btn-warning{color:#fff;backg
round-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ed9c28;border-color:#d58512}.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#eea236}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{col
or:#fff;background-color:#d2322d;border-color:#ac2925}.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d43f3a}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#fff;background-color:#47a447;border-color:#398439}.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none}.btn-success.disab
led,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#5cb85c;border-color:#4cae4c}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:#fff;background-color:#39b3d7;border-color:#269abc}.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disable
d]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da}.btn-link{font-weight:normal;color:#428bca;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#2a6496;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#999;text-decoration:none}.btn-lg{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-sm,.btn-xs{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs{paddi
ng:1px 5px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';-
webkit-font-smoothing:antialiased;font-style:normal;font-weight:normal;line-height:1}.glyphicon:empty{width:1em}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e0
16"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e04
1"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-print:before{content:"\e045"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-mo
ve:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:
"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder
-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-
link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:
"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{
content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-briefcase:before{content:"\1f4bc"}.glyphicon-calendar:before{content:"\1f4c5"}.glyphicon-pushpin:before{content:"\1f4cc"}.glyphicon-paperclip:before{content:"\1f4ce"}.glyphicon-camera:before{content:"\1f4f7"}.glyphicon-lock:before{content:"\1f512"}.glyphicon-bell:before{content:"\1f514"}.glyphicon-bookmark:before{content:"\1f516"}.glyphicon-fire:before{content:"\1f525"}.glyphicon-wrench:before{content:"\1f527"}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid #000;border-right:4px solid transparent;border-bottom:0 dotted;border-l
eft:4px solid transparent;content:""}.dropdown{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.428571429;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{color:#fff;text-decoration:none;background-color:#428bca}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#428bca;outl
ine:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.428571429;color:#999}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0 dotted;border-bottom:4px solid #000;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media(min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}}.btn-default .caret{border-top-color:#333}.btn-primary .caret,.btn-success .caret,.btn-warning .care
t,.btn-danger .caret,.btn-info .caret{border-top-color:#fff}.dropup .btn-default .caret{border-bottom-color:#333}.dropup .btn-primary .caret,.dropup .btn-success .caret,.dropup .btn-warning .caret,.dropup .btn-danger .caret,.dropup .btn-info .caret{border-bottom-color:#fff}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:focus,.btn-group-vertical>.btn:focus,.btn-group>.btn:active,.btn-group-vertical>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn.active{z-index:2}.btn-group>.btn:focus,.btn-group-vertical>.btn:focus{outline:0}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar:before,.btn-toolbar:after{display:table;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar:before,.btn-toolbar:after{display:table
;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar .btn-group{float:left}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group,.btn-toolbar>.btn-group+.btn-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child>.btn:last-child,.btn-group>.btn-group:first-child>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown
-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group-xs>.btn{padding:5px 10px;padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after{display:table;content:" "}.btn-group-vertical>.btn-group:after{clear:both}.btn-g
roup-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after{display:table;content:" "}.btn-group-vertical>.btn-group:after{clear:both}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-right-radius:0;border-bottom-left-radius:4px;border-top-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child>.btn:last-child,.btn-group-vertical>.btn-group:first-child>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>
.btn-group:last-child>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;border-collapse:separate;table-layout:fixed}.btn-group-justified .btn{display:table-cell;float:none;width:1%}[data-toggle="buttons"]>.btn>input[type="radio"],[data-toggle="buttons"]>.btn>input[type="checkbox"]{display:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group.col{float:none;padding-right:0;padding-left:0}.input-group .form-control{width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:45px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:45px;line-height:45px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>
.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:normal;line-height:1;text-align:center;background-color:#eee;border:1px solid #ccc;border-radiu
s:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type="radio"],.input-group-addon input[type="checkbox"]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{m
argin-left:-4px}.input-group-btn>.btn:hover,.input-group-btn>.btn:active{z-index:2}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#999}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#999;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#428bca}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.428571429;border:1px solid transparent;border-radiu
s:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}@media(min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd}@media(min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav
-pills>li>a{border-radius:5px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#428bca}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}@media(min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border:1px solid #ddd}@media(min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border-bottom-color:#fff}}.tabbable:before,.tabbable:after{display:table;content:" "}.tabbable:after
{clear:both}.tabbable:before,.tabbable:after{display:table;content:" "}.tabbable:after{clear:both}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.nav .caret{border-top-color:#428bca;border-bottom-color:#428bca}.nav a:hover .caret{border-top-color:#2a6496;border-bottom-color:#2a6496}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;z-index:1000;min-height:50px;margin-bottom:20px;border:1px solid transparent}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}@media(min-width:768px){.navbar{border-radius:4px}}.navbar-header:before,.navbar-header:after{display:table;content:" "}.navbar-header:after{clear:both}.navbar-header:before,.navbar-header:after{display:table;content:" "}.navbar-header:after{clear:both}@media(min-width:768px){.navbar-hea
der{float:left}}.navbar-collapse{max-height:340px;padding-right:15px;padding-left:15px;overflow-x:visible;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,0.1);-webkit-overflow-scrolling:touch}.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.navbar-collapse:after{clear:both}.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.navbar-collapse:after{clear:both}.navbar-collapse.in{overflow-y:auto}@media(min-width:768px){.navbar-collapse{width:auto;border-top:0;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-collapse .navbar-nav.navbar-left:first-child{margin-left:-15px}.navbar-collapse .navbar-nav.navbar-right:last-child{margin-right:-15px}.navbar-collapse .navbar-text:last-child{margin-right:0}}.container>.navbar-header,.container>.navbar-collapse{margin-right:-15px;margin-left:-15px}@
media(min-width:768px){.container>.navbar-header,.container>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{border-width:0 0 1px}@media(min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;border-width:0 0 1px}@media(min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;z-index:1030}.navbar-fixed-bottom{bottom:0;margin-bottom:0}.navbar-brand{float:left;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}@media(min-width:768px){.navbar>.container .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;border:1px solid transparent;border-radius:4px}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media(
min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media(max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none}.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:hover,.navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media(min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}@media(min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webk
it-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}@media(min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.navbar-form .radio input[type="radio"],.navbar-form .checkbox input[type="checkbox"]{float:none;margin-left:0}}@media(max-width:767px){.navbar-form .form-group{margin-bottom:5px}}@media(min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-nav.pull-right>li>.dropdown-
menu,.navbar-nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-text{float:left;margin-top:15px;margin-bottom:15px}@media(min-width:768px){.navbar-text{margin-right:15px;margin-left:15px}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:hover,.navbar-default .navbar-brand:focus{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:hover,.navbar-default .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.n
avbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:hover,.navbar-default .navbar-toggle:focus{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#ccc}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e6e6e6}.navbar-default .navbar-nav>.dropdown>a:hover .caret,.navbar-default .navbar-nav>.dropdown>a:focus .caret{border-top-color:#333;border-bottom-color:#333}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>.open>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.open>a .caret,.navbar-default .navbar-nav>.open>a:hover .caret,.navbar-default .navbar-nav>.open>a:focus .caret{border-top-color:#555;border-bottom-color:#555}.navbar-default .navbar-nav>.dropdown>a .caret{border-top-color:#777;border-bottom-color:#777}@media(max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav
.open .dropdown-menu>li>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#999}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .navbar-nav>li>a{color:#999}.navbar-inverse .navba
r-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.dropdown>a:hover .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .nav
bar-nav>.dropdown>a .caret{border-top-color:#999;border-bottom-color:#999}.navbar-inverse .navbar-nav>.open>a .caret,.navbar-inverse .navbar-nav>.open>a:hover .caret,.navbar-inverse .navbar-nav>.open>a:focus .caret{border-top-color:#fff;border-bottom-color:#fff}@media(max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#999}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-inverse .navbar-nav .open .dropdown-me
nu>.disabled>a:focus{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#999}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.428571429;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:hover,.pagination>li>span:hover,.paginatio
n>li>a:focus,.pagination>li>span:focus{background-color:#eee}.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;cursor:default;background-color:#428bca;border-color:#428bca}.pagination>.disabled>span,.pagination>.disabled>span:hover,.pagination>.disabled>span:focus,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination
-sm>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:bold;line-height:1;color:
#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}.label[href]:hover,.label[href]:focus{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.label-default{background-color:#999}.label-default[href]:hover,.label-default[href]:focus{background-color:#808080}.label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9}.label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:bold;line-heigh
t:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;background-color:#999;border-radius:10px}.badge:empty{display:none}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}.btn .badge{position:relative;top:-1px}a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#428bca;background-color:#fff}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px;margin-bottom:30px;font-size:21px;font-weight:200;line-height:2.1428571435;color:inherit;background-color:#eee}.jumbotron h1{line-height:1;color:inherit}.jumbotron p{line-height:1.4}.container .jumbotron{border-radius:6px}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron{padding-right:60px;padding-left:60px}.jumbotron h1{font-size:63px}}.thumbnail{display:inline-block;display:block;height:auto;max-width:100%;padding:4px;margin-bottom:20px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:
4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.thumbnail>img{display:block;height:auto;max-width:100%}a.thumbnail:hover,a.thumbnail:focus{border-color:#428bca}.thumbnail>img{margin-right:auto;margin-left:auto}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:bold}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable{padding-right:35px}.alert-dismissable .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#356635}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#2d6987}.alert-warning{color:#c09853;background-color:#fcf8e3;border-color:#fbe
ed5}.alert-warning hr{border-top-color:#f8e5be}.alert-warning .alert-link{color:#a47e3c}.alert-danger{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-danger hr{border-top-color:#e6c1c7}.alert-danger .alert-link{color:#953b39}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;color:#fff;text-align:center;background-color:#428bca;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow
:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-transition:width .6s ease;transition:width .6s ease}.progress-striped .progress-bar{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-size:40px 40px}.progress.act
ive .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%
,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,2
55,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(
255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.media,.media-body{overflow:
hidden;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:#f5f5f5}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{z-index:2;color:#fff;background
-color:#428bca;border-color:#428bca}.list-group-item.active .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:hover .list-group-item-text,.list-group-item.active:focus .list-group-item-text{color:#e1edf7}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.panel-body{padding:15px}.panel-body:before,.panel-body:after{display:table;content:" "}.panel-body:after{clear:both}.panel-body:before,.panel-body:after{display:table;content:" "}.panel-body:after{clear:both}.panel>.list-group{margin-bottom:0}.panel>.list-group .list-group-item{border-width:1px 0}.panel>.list-group .list-group-item:
first-child{border-top-right-radius:0;border-top-left-radius:0}.panel>.list-group .list-group-item:last-child{border-bottom:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.panel>.table{margin-bottom:0}.panel>.panel-body+.table{border-top:1px solid #ddd}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.panel-title{margin-top:0;margin-bottom:0;font-size:16px}.panel-title>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-group .panel{margin-bottom:0;overflow:hidden;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse .panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #dd
d}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse .panel-body{border-top-color:#ddd}.panel-default>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#428bca}.panel-primary>.panel-heading{color:#fff;background-color:#428bca;border-color:#428bca}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#428bca}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#428bca}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse .panel-body{border-top-color:#d6e9c6}.panel-success>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#d6e9c6}.panel-warning{border-color:#fbeed5}.panel-warning>.panel-heading{color:#c09853;background-color:#fcf8e3;border-color:#fbeed5}.pane
l-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:#fbeed5}.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#fbeed5}.panel-danger{border-color:#eed3d7}.panel-danger>.panel-heading{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:#eed3d7}.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#eed3d7}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse .panel-body{border-top-color:#bce8f1}.panel-info>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#bce8f1}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-co
lor:rgba(0,0,0,0.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:bold;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}body.modal-open,.modal-open .navbar-fixed-top,.modal-open .navbar-fixed-bottom{margin-right:15px}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;display:none;overflow:auto;overflow-y:scroll}.modal.fade .modal-dialog{-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);transform:translate(0,-25%);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out}.modal.in .modal-dialog{-webkit-
transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0)}.modal-dialog{z-index:1050;width:auto;padding:10px;margin-right:auto;margin-left:auto}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,0.5);box-shadow:0 3px 9px rgba(0,0,0,0.5);background-clip:padding-box}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1030;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{min-height:16.428571429px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.428571429}.modal-body{position:relative;padding:20px}.modal-footer{padding:19px 20px 20px;margin-top:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer:before,.modal-footer:after{display:table;content:" "}.
modal-footer:after{clear:both}.modal-footer:before,.modal-footer:after{display:table;content:" "}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}@media screen and (min-width:768px){.modal-dialog{right:auto;left:50%;width:600px;padding-top:30px;padding-bottom:30px}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,0.5);box-shadow:0 5px 15px rgba(0,0,0,0.5)}}.tooltip{position:absolute;z-index:1030;display:block;font-size:12px;line-height:1.4;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.9;filter:alpha(opacity=90)}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-ra
dius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.top-left .tooltip-arrow{bottom:0;left:5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.top-right .tooltip-arrow{right:5px;bottom:0;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.tooltip.bottom-left .tooltip-arrow{top:0;left:5px;border-bottom-color:#000;border-width:0 5px 5px}.tooltip.bottom-right .tooltip-arrow{top:0;right:5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;displ
ay:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);background-clip:padding-box}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}.popover.top .arrow:after{bott
om:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0;content:" "}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0;content:" "}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);border-top-width:0}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#fff;border-top-width:0;content:" "}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-left-color:#999;border-left-color:rgba(0,0,0,0.25);border-right-width:0}.popover.left .arrow:after{right:1px;bottom:-10px;border-left-color:#fff;border-right-width:0;content:" "}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out
left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;height:auto;max-width:100%;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,0.6);opacity:.5;filter:alpha(opacity=50)}.carousel-control.left{background-image:-webkit-gradient(linear,0 top,100% top,from(rgba(0,0,0,0.5)),to(rgba(0,0,0,0.0001)));background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.5) 0),color-stop(rgba(0,0,0,0.0001) 100%));background-image:-moz-linear
-gradient(left,rgba(0,0,0,0.5) 0,rgba(0,0,0,0.0001) 100%);background-image:linear-gradient(to right,rgba(0,0,0,0.5) 0,rgba(0,0,0,0.0001) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000',endColorstr='#00000000',GradientType=1)}.carousel-control.right{right:0;left:auto;background-image:-webkit-gradient(linear,0 top,100% top,from(rgba(0,0,0,0.0001)),to(rgba(0,0,0,0.5)));background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.0001) 0),color-stop(rgba(0,0,0,0.5) 100%));background-image:-moz-linear-gradient(left,rgba(0,0,0,0.0001) 0,rgba(0,0,0,0.5) 100%);background-image:linear-gradient(to right,rgba(0,0,0,0.0001) 0,rgba(0,0,0,0.5) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000',endColorstr='#80000000',GradientType=1)}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-control .icon-
prev,.carousel-control .icon-next,.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right{position:absolute;top:50%;left:50%;z-index:5;display:inline-block}.carousel-control .icon-prev,.carousel-control .icon-next{width:20px;height:20px;margin-top:-10px;margin-left:-10px;font-family:serif}.carousel-
<TRUNCATED>
[19/36] usergrid git commit: Update generated website content.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/push-notifications/creating-notifiers.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/creating-notifiers.html b/content/docs/push-notifications/creating-notifiers.html
new file mode 100644
index 0000000..308a648
--- /dev/null
+++ b/content/docs/push-notifications/creating-notifiers.html
@@ -0,0 +1,425 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>Creating notifiers — Apache Usergrid 1.0 documentation</title>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+
+
+
+
+
+ <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+ <link rel="next" title="Managing users and devices" href="managing-users-and-devices.html"/>
+ <link rel="prev" title="Registering with a notification service" href="registering.html"/>
+
+
+ <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+ <div class="wy-grid-for-nav">
+
+
+ <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+ <div class="wy-side-nav-search">
+
+
+
+ <a href="../index.html" class="icon icon-home"> Apache Usergrid
+
+
+
+ </a>
+
+
+
+
+ <div class="version">
+ 1.0
+ </div>
+
+
+
+
+<div role="search">
+ <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+ <input type="text" name="q" placeholder="Search docs" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+
+
+ </div>
+
+ <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+
+
+
+ <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters & clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators & data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Creating notifiers</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#requirements">Requirements</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#creating-notifiers-with-the-admin-portal">Creating notifiers with the admin portal</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#creating-notifiers-programmatically">Creating notifiers programmatically</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#for-apple">For Apple</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#for-google">For Google</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#notifier-endpoints">Notifier endpoints</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security & Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management & Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management & social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets & Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters & Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters & events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating & incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations & Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations & Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code & Docs</a></li>
+</ul>
+
+
+
+ </div>
+
+ </nav>
+
+ <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+ <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+ <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+ <a href="../index.html">Apache Usergrid</a>
+ </nav>
+
+
+
+ <div class="wy-nav-content">
+ <div class="rst-content">
+ <div role="navigation" aria-label="breadcrumbs navigation">
+ <ul class="wy-breadcrumbs">
+ <li><a href="../index.html">Docs</a> »</li>
+
+ <li>Creating notifiers</li>
+ <li class="wy-breadcrumbs-aside">
+
+
+ <a href="../_sources/push-notifications/creating-notifiers.txt" rel="nofollow"> View page source</a>
+
+
+ </li>
+ </ul>
+ <hr/>
+</div>
+ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+ <div itemprop="articleBody">
+
+ <div class="section" id="creating-notifiers">
+<h1>Creating notifiers<a class="headerlink" href="#creating-notifiers" title="Permalink to this headline">¶</a></h1>
+<p>When you request that a push notification be sent to your app on
+devices, an Usergrid notifier carries the request to the notification
+service (Google GCM or Apple APNs).</p>
+<p>A notifier is represented by an entity in your Usergrid application (see
+the <a class="reference external" href="../rest-endpoints/api-docs.html">API Docs</a> for reference
+information). It carries the credentials that authorize your request.
+Once a notification service has verified that your notifier contains
+valid credentials, it will forward your push notification to your app on
+devices.</p>
+<p>You can create a notifier in two ways: using the admin portal and
+programmatically.</p>
+<div class="admonition note"> <p class="first admonition-title"><p>Note</p>
+ </p> <p class="last">
+
+
+For an overview of how to set up push notifications, including<p>troubleshooting tips, see <a class="reference external" href="adding-push-support.html">Adding push notifications
+support</a>.</p>
+</p></div><div class="section" id="requirements">
+<h2>Requirements<a class="headerlink" href="#requirements" title="Permalink to this headline">¶</a></h2>
+<p>To create a notifier, you must first register your app with the
+appropriate notification service, as described in <a class="reference external" href="registration.html">Registering with a
+notification service</a>.</p>
+</div>
+<div class="section" id="creating-notifiers-with-the-admin-portal">
+<h2>Creating notifiers with the admin portal<a class="headerlink" href="#creating-notifiers-with-the-admin-portal" title="Permalink to this headline">¶</a></h2>
+<p>To create a notifier with the admin portal, do the following:</p>
+<ol class="arabic simple">
+<li>Log in to the admin portal.</li>
+<li>In the left nav, select <strong>Push > Configuration</strong>.</li>
+<li>Click the <strong>Apple</strong> or <strong>Android</strong> tab.</li>
+<li>If you have not already done so, retrieve your .p12 certificate (iOS
+apps) or API key (Android apps) by following the steps in the
+<a class="reference external" href="registration.html">Registering with a notification service</a>.</li>
+<li>In the admin portal’s Configuration page, enter values for the
+platform on which your mobile app will be installed.</li>
+</ol>
+<p>The fields are different depending on whether you are on the Apple or
+Android tab:</p>
+<p><strong>Fields for Apple</strong></p>
+<table class="usergrid-table">
+<tr><td><p>Name this notifier</p>
+</td> <td><p>Enter a unique name that can be used to identify this notifiers.</p>
+</td></tr>
+<tr><td><p>Certificate</p>
+</td> <td><p>Click <strong>Choose File</strong> to select the .p12 certificate you generated and
+saved to your desktop earlier in this tutorial.</p>
+</td></tr>
+<tr><td><p>Environment</p>
+</td> <td><p>Select the environment appropriate to your app. You may select
+development or production. Note that for the environment you select, you
+should have a separate .p12 certificate – different certificates for
+development and production.</p>
+</td></tr>
+<tr><td><p>Certificate Password</p>
+</td>
+<td><p>Enter a certificate password if one was specified when you created your
+.p12 certificate.</p>
+</td></tr>
+</table><p><strong>Fields for Android</strong></p>
+<table class="usergrid-table">
+<tr><td><p>Name this notifier</p>
+</td> <td><p>Enter a unique name that can be used to identify this notifiers.</p>
+</td></tr>
+<tr><td><p>API Key</p>
+</td>
+<td><p>Enter the API key that was generated when you registered your app with
+GCM. To retrieve your API key, go to the <a class="reference external" href="https://code.google.com/apis/console/">Google API developer web
+site</a>, then select <strong>APIs &
+Auth > Credentials</strong>.</p>
+</td></tr>
+</table><ol class="arabic simple" start="6">
+<li>Click <strong>Create Notifier</strong>. The Usergrid will create a notifier entity
+in the /notifiers collection. The notifier will also appear in the
+list of notifiers in the notifications console.</li>
+</ol>
+</div>
+<div class="section" id="creating-notifiers-programmatically">
+<h2>Creating notifiers programmatically<a class="headerlink" href="#creating-notifiers-programmatically" title="Permalink to this headline">¶</a></h2>
+<p>You can create an App BaaS notifier programmatically by sending requests
+to the Usergrid API.</p>
+<div class="section" id="for-apple">
+<h3>For Apple<a class="headerlink" href="#for-apple" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST -i -H "Accept: application/json" -H "Accept-Encoding: gzip, deflate" -H "Authorization: Bearer YWMtFeeWEMyNEeKtbNX3o4PU0QAAAT8vzK3xz3utVZat0CosiYm75C2qpiGT79c" -F "name=applenotifier" -F "provider=apple" -F "environment=development" -F "p12Certificate=@/Users/me/dev/pushtest_dev.p12" 'https://api.usergrid.com/my-org/my-app/notifiers'
+</pre></div>
+</div>
+</div>
+<div class="section" id="for-google">
+<h3>For Google<a class="headerlink" href="#for-google" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST "https://api.usergrid.com/my-org/my-app/notifiers" -d '{"name":"androiddev", "provider":"google", "apiKey":"AIzaSyCkXOtBQ7A9GoJsSLqZlod_YjEfxxxxxxx"}'
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="notifier-endpoints">
+<h2>Notifier endpoints<a class="headerlink" href="#notifier-endpoints" title="Permalink to this headline">¶</a></h2>
+<p>The following are the available notifier endpoints. For details on
+notifier properties, see the <a class="reference external" href="../rest-endpoints/api-docs.html">API
+Docs</a>.</p>
+<p>Base URL: <code class="docutils literal"><span class="pre">https://api.usergrid.com/my-org/my-app/</span></code></p>
+<p>Working with one or more notifiers:</p>
+<div class="highlight-python"><div class="highlight"><pre>/notifiers
+</pre></div>
+</div>
+<p>Working with notifiers associated with specific devices:</p>
+<div class="highlight-python"><div class="highlight"><pre>/devices/{device-id}/notifier
+</pre></div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ <footer>
+
+ <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+
+ <a href="managing-users-and-devices.html" class="btn btn-neutral float-right" title="Managing users and devices" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+
+
+ <a href="registering.html" class="btn btn-neutral" title="Registering with a notification service" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+
+ </div>
+
+
+ <hr/>
+
+ <div role="contentinfo">
+ <p>
+ © Copyright 2013-2015, Apache Usergrid.
+
+ </p>
+ </div>
+ Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+
+
+
+
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT:'../',
+ VERSION:'1.0',
+ COLLAPSE_INDEX:false,
+ FILE_SUFFIX:'.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+
+
+
+
+
+ <script type="text/javascript" src="../_static/js/theme.js"></script>
+
+
+
+
+ <script type="text/javascript">
+ jQuery(function () {
+ SphinxRtdTheme.StickyNav.enable();
+ });
+ </script>
+
+
+</body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/push-notifications/getting-started.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/getting-started.html b/content/docs/push-notifications/getting-started.html
new file mode 100644
index 0000000..bad6ba9
--- /dev/null
+++ b/content/docs/push-notifications/getting-started.html
@@ -0,0 +1,497 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>Getting started with push notifications — Apache Usergrid 1.0 documentation</title>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+
+
+
+
+
+ <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+ <link rel="next" title="Tutorial: Push notifications sample app" href="tutorial.html"/>
+ <link rel="prev" title="Adding push notifications support" href="adding-push-support.html"/>
+
+
+ <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+ <div class="wy-grid-for-nav">
+
+
+ <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+ <div class="wy-side-nav-search">
+
+
+
+ <a href="../index.html" class="icon icon-home"> Apache Usergrid
+
+
+
+ </a>
+
+
+
+
+ <div class="version">
+ 1.0
+ </div>
+
+
+
+
+<div role="search">
+ <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+ <input type="text" name="q" placeholder="Search docs" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+
+
+ </div>
+
+ <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+
+
+
+ <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters & clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators & data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Getting started with push notifications</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#what-are-push-notifications">What are push notifications?</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#prerequisites">Prerequisites</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#ios-prerequisites">iOS Prerequisites</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#android-prerequisites">Android Prerequisites</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#phonegap-prerequisites">PhoneGap Prerequisites</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#setup-overview">Setup overview</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#how-it-works">How it works</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#apple-apns">Apple APNs</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#google-gcm">Google GCM</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security & Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management & Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management & social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets & Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters & Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters & events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating & incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations & Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations & Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code & Docs</a></li>
+</ul>
+
+
+
+ </div>
+
+ </nav>
+
+ <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+ <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+ <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+ <a href="../index.html">Apache Usergrid</a>
+ </nav>
+
+
+
+ <div class="wy-nav-content">
+ <div class="rst-content">
+ <div role="navigation" aria-label="breadcrumbs navigation">
+ <ul class="wy-breadcrumbs">
+ <li><a href="../index.html">Docs</a> »</li>
+
+ <li>Getting started with push notifications</li>
+ <li class="wy-breadcrumbs-aside">
+
+
+ <a href="../_sources/push-notifications/getting-started.txt" rel="nofollow"> View page source</a>
+
+
+ </li>
+ </ul>
+ <hr/>
+</div>
+ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+ <div itemprop="articleBody">
+
+ <div class="section" id="getting-started-with-push-notifications">
+<h1>Getting started with push notifications<a class="headerlink" href="#getting-started-with-push-notifications" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="what-are-push-notifications">
+<h2>What are push notifications?<a class="headerlink" href="#what-are-push-notifications" title="Permalink to this headline">¶</a></h2>
+<p>Usergrid provides a RESTful framework for sending push notifications to
+your apps, giving you full control over which app users you target, as
+well as when you send notifications. You can send messages to devices,
+users, or groups that have specific characteristics and locations. (To
+receive push notifications, users must be using devices that can connect
+to the Usergrid). Here are just a couple reasons for enabling push
+notification support in your app with Usergrid:</p>
+<ul class="simple">
+<li><strong>Reach your app’s users</strong> with messages they care about. This could
+be a flash sale happening near them right now (use
+<a class="reference external" href="../geolocation/geolocation.html">geolocation</a>!) or a lunch
+special at a favorite restaurant. You could even let a user know it’s
+her turn in a game she’s playing with a friend.</li>
+<li><strong>Keep your app footprint low</strong> while communicating in a high-value
+way with your app’s users. Compare pushing data with CPU- and
+memory-heavy pull processes. In those, an app actively listens on an
+endpoint, regularly pulling data (such as news feeds, new emails, or
+stock market updates) to the device.</li>
+</ul>
+<center>
+<iframe allowfullscreen="" frameborder="0" height="315" src="http://www.youtube.com/embed/W560tZ5fSIc" width="560"></iframe>
+</center>
+
+<p></p></div>
+<div class="section" id="prerequisites">
+<h2>Prerequisites<a class="headerlink" href="#prerequisites" title="Permalink to this headline">¶</a></h2>
+<p>You will need to test with a mobile device running the platform you’re
+developer for. In the case of Android, you might be able to use an
+emulator. It is not possible to test push notifications from a web
+browser.</p>
+<div class="section" id="ios-prerequisites">
+<h3>iOS Prerequisites<a class="headerlink" href="#ios-prerequisites" title="Permalink to this headline">¶</a></h3>
+<p>To develop push notifications for an iOS app, you’ll need:</p>
+<ul class="simple">
+<li>A Mac to generate the necessary SSL certificate.</li>
+<li>An iOS developer account. You’ll need this to register for an App ID
+and get a provisioning profile. To get an account, visit the <a class="reference external" href="https://developer.apple.com/ios/download/">iOS Dev
+Center</a>.</li>
+<li>An actual iOS device to test push notifications. It’s not yet
+possible to develop push notifications with an emulator.</li>
+<li>An iOS provisioning profile For iOS app testing, you need a
+provisioning profile that’s associated with an Apple ID. You set up
+the provisioning profile in the Apple developer portal, download the
+profile, and import it into Xcode.</li>
+</ul>
+<p>To set up a provisioning profile, you need to create an “iOS App
+Development” certificate in the Apple developer portal. For example, in
+the Apple APNs setup earlier in this tutorial, you created a certificate
+in the Apple developer portal to be used for push notifications.
+However, you won’t be able to create a provisioning portal with just
+that certificate. You also need to create an “iOS App Development”
+certificate (the configuration settings don’t matter), as shown in the
+following image.</p>
+<img alt="../_images/ios-cert.png" src="../_images/ios-cert.png" />
+<p>After you create an iOS App Development certificate, you can create a
+provisioning profile that includes your App ID/certificate for push
+notifications.</p>
+</div>
+<div class="section" id="android-prerequisites">
+<h3>Android Prerequisites<a class="headerlink" href="#android-prerequisites" title="Permalink to this headline">¶</a></h3>
+<p>It’s generally a best practice to develop Android apps by testing and
+debugging with an Android device. It’s also possible to use an emulator.</p>
+<p>Before testing and debugging with an Android device, you’ll need to set
+up your device for development. Be sure to see the Android documentation
+on <a class="reference external" href="http://developer.android.com/tools/device.html">using hardware
+devices</a>.</p>
+<p>To test with an emulator, you will need to follow these steps:</p>
+<ol class="arabic simple">
+<li>Ensure that you have Google API 8 (or above) and Android 2.2 (or
+above).</li>
+<li>Using the Android SDK Manager, install Google Cloud Messaging for
+Android Library.</li>
+<li>Using the Android Virtual Device Manager, create an emulator whose
+target is Google APIs.</li>
+<li>Ensure that the emulator you’re using includes a Google account.</li>
+</ol>
+<p>Next:</p>
+<ul class="simple">
+<li>Launch the emulator.</li>
+<li>In the emulator, click the Menu button, then go to Settings >
+Accounts & Sync.</li>
+<li>Add a Google account.</li>
+<li>Once you’ve finished these steps, you should have an emulator that
+can receive push notification messages.</li>
+</ul>
+</div>
+<div class="section" id="phonegap-prerequisites">
+<h3>PhoneGap Prerequisites<a class="headerlink" href="#phonegap-prerequisites" title="Permalink to this headline">¶</a></h3>
+<p>You’ll need to test with a device or emulator. It is not possible to
+test push notifications with a browser alone.</p>
+</div>
+</div>
+<div class="section" id="setup-overview">
+<h2>Setup overview<a class="headerlink" href="#setup-overview" title="Permalink to this headline">¶</a></h2>
+<p>The following steps get you set up so that your app can receive push
+notifications. Keep in mind that these steps build on one another. In
+other words, you’ll need values generated in step 1 in order to complete
+step 2, and so on.</p>
+<p>For a walkthrough of these steps using a push sample app, see Tutorial:
+Push notifications sample app.</p>
+<ol class="arabic simple">
+<li><strong>Register</strong> your app with push notification services. Your
+notification messages will be forwarded to devices by Apple and/or
+Google. So you’ll need to register with Apple APNs and/or Google’s
+GCM. For more information, see Registering with a notification
+service.</li>
+<li><strong>Create a notifier</strong> to send notification messages from the Usergrid
+to notification services. The Usergrid will use your notifier to send
+your messages to a notification service. For details, see Creating
+notifiers. To create a notifier, you’ll need information generated by
+registering with a push notification service. You’ll need a separate
+notifier for each app/platform combination.</li>
+<li><strong>Register devices at run time</strong>. At run time, your code will
+register to receive notifications. To do this, your code uses
+information from the notification service and your notifier. For
+more, see Managing users and devices.</li>
+<li><strong>Send and manage push notifications</strong>. You use Usergrid API
+notification endpoints to target devices, users, or groups with your
+messages. To learn more, see Creating and managing notifications.</li>
+</ol>
+</div>
+<div class="section" id="how-it-works">
+<h2>How it works<a class="headerlink" href="#how-it-works" title="Permalink to this headline">¶</a></h2>
+<p>Click a tab below to view more information about how the pieces connect
+once you’ve got it set up.</p>
+<div class="section" id="apple-apns">
+<h3>Apple APNs<a class="headerlink" href="#apple-apns" title="Permalink to this headline">¶</a></h3>
+<p>The diagram below illustrates what things should look like once you’ve
+gotten set up to send notifications that are received by your app.</p>
+<p><strong>A.</strong> At configuration time, you <a class="reference external" href="registering.html">create an App
+ID</a>, then <a class="reference external" href="creating-notifiers.html">create a
+notifier</a> with a .p12 certificate you
+generate on your Mac. The .p12 certificate correlates the notifier
+(which you will use to send notification messages) with the App ID (so
+that APNs will forward your notifications to devices).</p>
+<p><strong>B.</strong> A run time, your app’s code <a class="reference external" href="managing-users-and-devices.html">registers with Apple for
+notifications</a> by invoking the
+<code class="docutils literal"><span class="pre">registerForRemoteNotificationTypes</span></code> method to receive a token it can
+send to Usergrid.</p>
+<p><strong>C.</strong> At run time, your app’s code <a class="reference external" href="managing-users-and-devices.html">registers with the Usergrid for
+notifications</a> by sending the name
+of the notifier you created. This ensure’s that there’s a device entity
+in your Usergrid application. That way, you can address the device with
+notification messages.</p>
+<img alt="../_images/pushmiddleios0.png" src="../_images/pushmiddleios0.png" />
+<p><strong>Note</strong>: For information on troubleshooting push notifications on iOS
+devices, see <a class="reference external" href="troubleshooting.html">Troubleshooting Push
+Notifications</a></p>
+</div>
+<div class="section" id="google-gcm">
+<h3>Google GCM<a class="headerlink" href="#google-gcm" title="Permalink to this headline">¶</a></h3>
+<p>The diagram below illustrates what things should look like once you’ve
+gotten set up to send notifications that are received by your app.</p>
+<p><strong>A.</strong> At configuration time, you <a class="reference external" href="registering.html">create a Google API
+project</a>), then <a class="reference external" href="creating-notifiers.html">create an Usergrid
+notifier</a> with an API key from the project.
+The API key correlates the notifier (which you will use to send
+notification messages from the Usergrid) with the API project (which
+will forward your notifications to devices).</p>
+<p><strong>B.</strong> At run time, your app’s code <a class="reference external" href="managing-users-and-devices.html">registers with the
+Usergrid</a>) for notifications by
+sending the name of the notifier you created. This ensure’s that there’s
+a device entity in your Usergrid application. That way, you can address
+the device with notification messages.</p>
+<p><strong>C.</strong> A run time, your app’s code <a class="reference external" href="managing-users-and-devices.html">registers with Google for
+notifications</a>) by sending the
+number of your API project as a “sender ID”. The project is the actual
+notification “sender” that will forward notifications to your app. In
+other words, the app is telling Google that it wants to receive
+notifications from that sender.</p>
+<img alt="../_images/pushmiddleandroid0.png" src="../_images/pushmiddleandroid0.png" />
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ <footer>
+
+ <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+
+ <a href="tutorial.html" class="btn btn-neutral float-right" title="Tutorial: Push notifications sample app" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+
+
+ <a href="adding-push-support.html" class="btn btn-neutral" title="Adding push notifications support" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+
+ </div>
+
+
+ <hr/>
+
+ <div role="contentinfo">
+ <p>
+ © Copyright 2013-2015, Apache Usergrid.
+
+ </p>
+ </div>
+ Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+
+
+
+
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT:'../',
+ VERSION:'1.0',
+ COLLAPSE_INDEX:false,
+ FILE_SUFFIX:'.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+
+
+
+
+
+ <script type="text/javascript" src="../_static/js/theme.js"></script>
+
+
+
+
+ <script type="text/javascript">
+ jQuery(function () {
+ SphinxRtdTheme.StickyNav.enable();
+ });
+ </script>
+
+
+</body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/push-notifications/managing-users-and-devices.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/managing-users-and-devices.html b/content/docs/push-notifications/managing-users-and-devices.html
new file mode 100644
index 0000000..d7afe4f
--- /dev/null
+++ b/content/docs/push-notifications/managing-users-and-devices.html
@@ -0,0 +1,688 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>Managing users and devices — Apache Usergrid 1.0 documentation</title>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+
+
+
+
+
+ <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+ <link rel="next" title="Creating and managing notifications" href="creating-and-managing-notifications.html"/>
+ <link rel="prev" title="Creating notifiers" href="creating-notifiers.html"/>
+
+
+ <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+ <div class="wy-grid-for-nav">
+
+
+ <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+ <div class="wy-side-nav-search">
+
+
+
+ <a href="../index.html" class="icon icon-home"> Apache Usergrid
+
+
+
+ </a>
+
+
+
+
+ <div class="version">
+ 1.0
+ </div>
+
+
+
+
+<div role="search">
+ <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+ <input type="text" name="q" placeholder="Search docs" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+
+
+ </div>
+
+ <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+
+
+
+ <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters & clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators & data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Managing users and devices</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#registering-devices">Registering devices</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#registering-for-ios">Registering for iOS</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#registering-for-android">Registering for Android</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#registering-for-html5-phonegap">Registering for HTML5/PhoneGap</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#connecting-devices-to-users">Connecting devices to users</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#connecting-with-curl">Connecting with curl</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#connecting-with-ios">Connecting with iOS</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#connecting-with-android">Connecting with Android</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#connecting-with-html5-javascript">Connecting with HTML5/JavaScript</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security & Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management & Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management & social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets & Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters & Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters & events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating & incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations & Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations & Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code & Docs</a></li>
+</ul>
+
+
+
+ </div>
+
+ </nav>
+
+ <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+ <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+ <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+ <a href="../index.html">Apache Usergrid</a>
+ </nav>
+
+
+
+ <div class="wy-nav-content">
+ <div class="rst-content">
+ <div role="navigation" aria-label="breadcrumbs navigation">
+ <ul class="wy-breadcrumbs">
+ <li><a href="../index.html">Docs</a> »</li>
+
+ <li>Managing users and devices</li>
+ <li class="wy-breadcrumbs-aside">
+
+
+ <a href="../_sources/push-notifications/managing-users-and-devices.txt" rel="nofollow"> View page source</a>
+
+
+ </li>
+ </ul>
+ <hr/>
+</div>
+ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+ <div itemprop="articleBody">
+
+ <div class="section" id="managing-users-and-devices">
+<h1>Managing users and devices<a class="headerlink" href="#managing-users-and-devices" title="Permalink to this headline">¶</a></h1>
+<p>Before your app can receive notifications on a user’s device, the app’s
+code will need to register the device with both the Usergrid and the
+appropriate push notification service (Apple APNs or Google GCM).</p>
+<p>By registering with the Usergrid, your app adds the device on which it
+is installed to your data store. The device is represented as a Device
+entity. This makes it possible for you to target that device when
+sending notifications. (For more on the Device entity, see the <a class="reference external" href="../rest-endpoints/api-docs.html">API
+Docs</a>.) Any devices, users, and
+groups that have been registered in this way may be targeted with push
+notifications.</p>
+<p>By registering with the notification service, you make the device known
+to the service. This way, the service can forward your notifications to
+the device.</p>
+<div class="admonition note"> <p class="first admonition-title"><p>Note</p>
+ </p> <p class="last">
+
+
+For an overview of how to set up push notifications, including<p>troubleshooting tips, see <a class="reference external" href="adding-push-support.html">Adding push notifications
+support</a>.</p>
+</p></div><div class="section" id="registering-devices">
+<h2>Registering devices<a class="headerlink" href="#registering-devices" title="Permalink to this headline">¶</a></h2>
+<p>The following samples illustrate how to register a device with a
+notification service and with the Usergrid. At a high level, your code
+will send a registration request to the notification service, then use
+information in the service’s response to send a separate request to the
+Usergrid. The two requests correlate the notification service, Usergrid,
+and your mobile app.</p>
+<p>You can also create device entities separately by using the /devices
+endpoint. For more information on using the <code class="docutils literal"><span class="pre">/devices</span></code> endpoint in the
+Usergrid, see the <a class="reference external" href="../rest-endpoints/api-docs.html">API Docs</a>.</p>
+<p>Registering a device with a notification service is a standard coding
+activity for implementing push notifications. This is not specific to
+the Usergrid.</p>
+<div class="section" id="registering-for-ios">
+<h3>Registering for iOS<a class="headerlink" href="#registering-for-ios" title="Permalink to this headline">¶</a></h3>
+<p>The following code illustrates how you can use the iOS SDK to register a
+device with both the Usergrid server and with the APNs, the Apple push
+notification service. This example assumes that your code has already
+property initialized the SDK. For more information, see <a class="reference external" href="../sdks/tbd.html">Installing the
+Apigee SDK for iOS</a>.</p>
+<div class="highlight-python"><div class="highlight"><pre>// Register with Apple to receive notifications.
+
+// Invoked when the application moves from an inactive to active state. Use this
+// method to register with Apple for notifications.
+- (void)applicationDidBecomeActive:(UIApplication *)application
+{
+ // Find out what notification types the user has enabled.
+ UIRemoteNotificationType enabledTypes =
+ [application enabledRemoteNotificationTypes];
+
+ // If the user has enabled alert or sound notifications, then
+ // register for those notification types from Apple.
+ if (enabledTypes & (UIRemoteNotificationTypeAlert|UIRemoteNotificationTypeSound)) {
+
+ // Register for push notifications with Apple
+ NSLog(@"registering for remote notifications");
+ [application registerForRemoteNotificationTypes:UIRemoteNotificationTypeAlert |
+ UIRemoteNotificationTypeSound];
+ }
+}
+
+// Invoked as a callback from calling registerForRemoteNotificationTypes.
+// newDeviceToken is a token received from registering with Apple APNs.
+// Use this method to register with Apigee.
+- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)newDeviceToken
+{
+ // Register device token with the Usergrid (will create the Device entity if it doesn't exist)
+ // Sends the name of the notifier you created with Apigee, along with the token your code
+ // received from Apple.
+ ApigeeClientResponse *response = [dataClient setDevicePushToken: newDeviceToken
+ forNotifier: notifier];
+
+ if ( ! [response completedSuccessfully]) {
+ [self alert: response.rawResponse title: @"Error"];
+ }
+}
+
+// Invoked as a callback from calling registerForRemoteNotificationTypes if registration
+// failed.
+- (void)application:(UIApplication*)application didFailToRegisterForRemoteNotificationsWithError:(NSError*)error
+{
+ [self alert: error.localizedDescription title: @"Error"];
+}
+</pre></div>
+</div>
+<p>Initialize the Apigee client and check for notifications that might have
+been sent while the app was off.</p>
+<div class="highlight-python"><div class="highlight"><pre>// Invoked as a callback after the application launches.
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+ // Connect and login
+ ApigeeClient *apigeeClient =
+ [[ApigeeClient alloc] initWithOrganizationId:orgName
+ applicationId:appName
+ baseURL:baseURL];
+ dataClient = [apigeeClient dataClient];
+ [dataClient setLogging:true]; //comment out to remove debug output from the console window
+
+ // Find out if there's a notification waiting to be handled after the
+ // app launches.
+ if (launchOptions != nil) {
+ NSDictionary* userInfo =
+ [launchOptions objectForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
+
+ // If there's notification data waiting, send it to be processed.
+ if (userInfo) {
+ [self handlePushNotification:userInfo
+ forApplication:application];
+ }
+ }
+
+ // It's not necessary to explicitly login if the Guest role allows access.
+ // But this is how you can do it.
+// [apigeeClient logInUser: userName password: password];
+
+ NSLog(@"done launching");
+ return YES;
+}
+</pre></div>
+</div>
+</div>
+<div class="section" id="registering-for-android">
+<h3>Registering for Android<a class="headerlink" href="#registering-for-android" title="Permalink to this headline">¶</a></h3>
+<p>The following code illustrates how to register a client device with GCM,
+register the device with Apigee, and associate the device with the user.
+Methods used in this code are defined in the Apigee Android SDK. For
+more information on downloading and installing the SDK, see Installing
+the Apigee SDK for Android.</p>
+<div class="highlight-python"><div class="highlight"><pre>import android.content.Context;
+import com.google.android.gcm.GCMRegistrar;
+import com.apigee.sdk.ApigeeClient;
+import com.apigee.sdk.data.client.entities.Device;
+
+/**
+ * Registers this device with GCM, Google's messaging
+ * service.
+ *
+ * @param context An Android context with information specific to this
+ * application's context on the device.
+ */
+static void registerPush(Context context) {
+
+ //Get an instance of the Apigee DataClient class from the ApigeeClient object
+ dataClient = getClient().getDataClient();
+
+ // Get the registration ID (GCM API key) for this application.
+ final String regId = GCMRegistrar.getRegistrationId(context);
+
+ // If this device isn't already registered with GCM, register it
+ // using the the application context and an ID for the Google account
+ // authorized to send messages to this application. This is the
+ // Google Client ID from Google API Console.
+ if ("".equals(regId)) {
+ GCMRegistrar.register(context, gcmSenderId);
+ } else {
+ if (GCMRegistrar.isRegisteredOnServer(context)) {
+ Log.i(TAG, "Already registered with GCM");
+ } else {
+
+ // Use an instance of the Client class (SDK for Android)
+ // to register this device with the Usergrid. Pass as arguments
+ // the device unique identifier, the unique name of the notifier you
+ // created in the Usergrid, the GCM API key, and a callback that will
+ // receive an instance of a Device class representing the registered
+ // device on the system.
+ dataClient.registerDeviceForPushAsync(dataClient.getUniqueDeviceID(), notifierName, regId, null,
+ new DeviceRegistrationCallback() {
+ @Override
+ public void onResponse(Device device) {
+ AppServices.device = device;
+
+ // Associate the logged in user with this device.
+ if (dataClient.getLoggedInUser() != null) {
+ dataClient.connectEntitiesAsync("users",
+ dataClient.getLoggedInUser().getUuid().toString(),
+ "devices", device.getUuid().toString(),
+ new ApiResponseCallback() {
+ @Override
+ public void onResponse(ApiResponse apiResponse) {
+ Log.i(TAG, "connect response: " + apiResponse);
+ }
+
+ @Override
+ public void onException(Exception e) {
+ displayMessage(context, "Connect Exception: " + e);
+ Log.i(TAG, "connect exception: " + e);
+ }
+ });
+ }
+ }
+
+ });
+ }
+ }
+}
+
+/**
+ * Create an instance of the SDK ApigeeClient class, setting
+ * values from your Apigee registration.
+ */
+static synchronized ApigeeClient getClient() {
+ if (client == null) {
+ client = new ApigeeClient();
+ client.setApiUrl("https://api.usergrid.com");
+ client.setOrganizationId("your-org");
+ client.setApplicationId("your-app");
+ }
+ return client;
+}
+</pre></div>
+</div>
+</div>
+<div class="section" id="registering-for-html5-phonegap">
+<h3>Registering for HTML5/PhoneGap<a class="headerlink" href="#registering-for-html5-phonegap" title="Permalink to this headline">¶</a></h3>
+<p>The following code illustrates how you can use the JavaScript functions
+included with the PhoneGap plugin to register a device with both the
+Apigee server and with the APNs, the Apple push notification service.</p>
+<div class="highlight-python"><div class="highlight"><pre>// Declare a variable for calling push notification APIs.
+var pushNotification = window.plugins.pushNotification;
+// Collect configuration options to specify that this device accepts
+// an alert message, an application badge, and a sound.
+var appleOptions = {
+ alert:true, badge:true, sound:true
+};
+// Register the device with the Usergrid, passing options for configuration
+// along with a callback from which you can retrieve the device token
+// sent by Apigee.
+pushNotification.registerDevice(appleOptions, function(status) {
+ console.log(status);
+ // If a token was received, bundle options to pass when registering the device
+ // with the push notification service. The provider value must be "apigee" to
+ // support push notification through Apigee. orgName and appName should be
+ // values corresponding to those used in your Apigee account.
+ // notifier is the unique name you associated with the Apigee notifier you created.
+ // token is the device token this code received from Apigee after registering the
+ // device.
+ if(status.deviceToken) {
+ var options = {
+ "provider":"apigee",
+ "orgName":"YOUR APIGEE.COM USERNAME",
+ "appName":"sandbox",
+ "notifier":"YOUR NOTIFIER",
+ "token":status.deviceToken
+ };
+
+ // Use the device token and other options to register this device with the
+ // push notification provider.
+ pushNotification.registerWithPushProvider(options, function(status){
+ console.log(status);
+ });
+ }
+});
+</pre></div>
+</div>
+<p>The functions used in this code are defined in the PhoneGap plugin.
+JavaScript functions invoke underlying Objective-C or Java code
+(depending on platform). You’ll find that code in these files, included
+in the Apigee PhoneGap push notification plug-in.</p>
+<p>Information about installing the plugin is available in its Readme file.
+For more complete examples, see <a class="reference external" href="tutorial.html">Tutorial: Push notifications sample
+app</a>.</p>
+</div>
+</div>
+<div class="section" id="connecting-devices-to-users">
+<h2>Connecting devices to users<a class="headerlink" href="#connecting-devices-to-users" title="Permalink to this headline">¶</a></h2>
+<p>You can associate user entities with device entities in the Usergrid.
+Doing so allows you to target your push notifications at users with
+specific characteristics. The following describes how to connect a user
+to a specific device in the Usergrid.</p>
+<p>For more information on creating a device in your Usergrid data store,
+see “Registering Devices” above.</p>
+<p>For more information on creating a user in your Usergrid data store, see
+<a class="reference external" href="../rest-endpoints/api-docs.html#user">User</a>.</p>
+<p>The following code examples all use the same basic endpoint pattern for
+connecting devices with users:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">POST</span> <span class="o">/</span><span class="n">users</span><span class="o">/</span><span class="p">{</span><span class="n">userUUID</span> <span class="ow">or</span> <span class="n">name</span><span class="p">}</span><span class="o">/</span><span class="n">devices</span><span class="o">/</span><span class="p">{</span><span class="n">deviceUUID</span><span class="p">}</span>
+</pre></div>
+</div>
+<div class="section" id="connecting-with-curl">
+<h3>Connecting with curl<a class="headerlink" href="#connecting-with-curl" title="Permalink to this headline">¶</a></h3>
+<p>The following call connects user “joex” with device
+7a0a1cba-9a18-3bee-8ae3-4f511f12a386 (the device UUID). After this
+connection, you can send a push notification to joex rather than the
+device. Further, if joex has specific properties set–such as
+{“favoritecolor”: “blue”}–you can send a push notification to all users
+whose favorite color is blue (assuming they’re connected to devices in
+the Usergrid).</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST "https://api.usergrid.com/my-org/sandbox/users/joex/devices/7a0a1cba-9a18-3bee-8ae3-4f511f12a386"
+</pre></div>
+</div>
+</div>
+<div class="section" id="connecting-with-ios">
+<h3>Connecting with iOS<a class="headerlink" href="#connecting-with-ios" title="Permalink to this headline">¶</a></h3>
+<p>The following sample code, taken from AppDelegate.m in the native iOS
+push sample, uses the connectEntities method from the iOS SDK to connect
+a device to a user.</p>
+<div class="highlight-python"><div class="highlight"><pre>ApigeeClientResponse *response = [dataClient setDevicePushToken: newDeviceToken forNotifier: notifier];
+
+// You could use this if you log in as an Usergrid user to associate the Device to your User
+if (response.transactionState == kUGClientResponseSuccess) {
+ response = [self connectEntities: @"users" connectorID: @"me" type: @"devices" connecteeID: deviceId];
+}
+</pre></div>
+</div>
+</div>
+<div class="section" id="connecting-with-android">
+<h3>Connecting with Android<a class="headerlink" href="#connecting-with-android" title="Permalink to this headline">¶</a></h3>
+<p>The following sample code, taken from
+<a class="reference external" href="https://github.com/apigee/appservices-android-push-example/blob/master/src/com/ganyo/pushtest/AppServices.java">AppServices.java</a>
+in the native Android push sample, uses the connectEntitiesAsync method
+from the Android SDK to connect a device to an authenticated user.</p>
+<div class="highlight-python"><div class="highlight"><pre>// connect Device to current User - if there is one
+if (dataClient.getLoggedInUser() != null) {
+ dataClient.connectEntitiesAsync("users", dataClient.getLoggedInUser().getUuid().toString(),
+ "devices", device.getUuid().toString(),
+ new ApiResponseCallback() {...
+</pre></div>
+</div>
+</div>
+<div class="section" id="connecting-with-html5-javascript">
+<h3>Connecting with HTML5/JavaScript<a class="headerlink" href="#connecting-with-html5-javascript" title="Permalink to this headline">¶</a></h3>
+<p>The following code illlustrates how to associate the currently logged in
+user with their device.</p>
+<div class="highlight-python"><div class="highlight"><pre>// You'll need a client from the JavaScript SDK.
+var client = new Apigee.Client({
+ // Initialize client.
+});
+
+// Get information about the current user so you can use
+// it to connect them with their device.
+client.getLoggedInUser(function(err, data, user) {
+ if(err) {
+ // Could not get the logged in user.
+ } else {
+ if (client.isLoggedIn()) {
+ // Using a PushNotification function to get the device ID as
+ // it is known to the Apigee system.
+ pushNotification.getApigeeDeviceId(function(results) {
+ if (results.deviceId) {
+ // Use the JavaScript SDK connect function to register
+ // a connection between the current user and their device.
+ user.connect('devices', results.deviceId, function (err, data) {
+ if (err) {
+ // Could not make the connection.
+ } else {
+ // Call succeeded, so pull the connections back down.
+ user.getConnections('devices', function (err, data) {
+ if (err) {
+ // Couldn't get the connections.
+ } else {
+ // Connection exists.
+ });
+ }
+ }
+ }
+ }
+ }
+ }
+}
+</pre></div>
+</div>
+<p>You can also connect users with groups so that you can send push
+notifications to groups of users (and their associated devices), see
+<a class="reference external" href="../user-management/group.html">Working with group data</a>.</p>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ <footer>
+
+ <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+
+ <a href="creating-and-managing-notifications.html" class="btn btn-neutral float-right" title="Creating and managing notifications" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+
+
+ <a href="creating-notifiers.html" class="btn btn-neutral" title="Creating notifiers" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+
+ </div>
+
+
+ <hr/>
+
+ <div role="contentinfo">
+ <p>
+ © Copyright 2013-2015, Apache Usergrid.
+
+ </p>
+ </div>
+ Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+
+
+
+
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT:'../',
+ VERSION:'1.0',
+ COLLAPSE_INDEX:false,
+ FILE_SUFFIX:'.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+
+
+
+
+
+ <script type="text/javascript" src="../_static/js/theme.js"></script>
+
+
+
+
+ <script type="text/javascript">
+ jQuery(function () {
+ SphinxRtdTheme.StickyNav.enable();
+ });
+ </script>
+
+
+</body>
+</html>
\ No newline at end of file
[18/36] usergrid git commit: Update generated website content.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/push-notifications/overview.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/overview.html b/content/docs/push-notifications/overview.html
new file mode 100644
index 0000000..89f9142
--- /dev/null
+++ b/content/docs/push-notifications/overview.html
@@ -0,0 +1,393 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>Push notifications overview — Apache Usergrid 1.0 documentation</title>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+
+
+
+
+
+ <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+ <link rel="next" title="Adding push notifications support" href="adding-push-support.html"/>
+ <link rel="prev" title="Disconnecting entities" href="../entity-connections/disconnecting-entities.html"/>
+
+
+ <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+ <div class="wy-grid-for-nav">
+
+
+ <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+ <div class="wy-side-nav-search">
+
+
+
+ <a href="../index.html" class="icon icon-home"> Apache Usergrid
+
+
+
+ </a>
+
+
+
+
+ <div class="version">
+ 1.0
+ </div>
+
+
+
+
+<div role="search">
+ <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+ <input type="text" name="q" placeholder="Search docs" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+
+
+ </div>
+
+ <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+
+
+
+ <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters & clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators & data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">Push notifications overview</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#reach-your-users-with-push">Reach your users with push</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#get-started">Get started</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#get-started-with-a-tutorial">Get started with a tutorial</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#find-what-you-can-do-with-it">Find what you can do with it</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#see-the-prerequisites">See the prerequisites</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#build-push-support">Build push support</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#setting-up-push-notifications-support">Setting up push notifications support</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#register-your-app">Register your app</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#create-a-notifier">Create a notifier</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#register-client-devices">Register client devices</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#send-and-manage-notifications">Send and manage notifications</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#learn-more">Learn more</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#troubleshoot-your-push-support">Troubleshoot your push support</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security & Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management & Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management & social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets & Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters & Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters & events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating & incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations & Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations & Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code & Docs</a></li>
+</ul>
+
+
+
+ </div>
+
+ </nav>
+
+ <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+ <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+ <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+ <a href="../index.html">Apache Usergrid</a>
+ </nav>
+
+
+
+ <div class="wy-nav-content">
+ <div class="rst-content">
+ <div role="navigation" aria-label="breadcrumbs navigation">
+ <ul class="wy-breadcrumbs">
+ <li><a href="../index.html">Docs</a> »</li>
+
+ <li>Push notifications overview</li>
+ <li class="wy-breadcrumbs-aside">
+
+
+ <a href="../_sources/push-notifications/overview.txt" rel="nofollow"> View page source</a>
+
+
+ </li>
+ </ul>
+ <hr/>
+</div>
+ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+ <div itemprop="articleBody">
+
+ <div class="section" id="push-notifications-overview">
+<h1>Push notifications overview<a class="headerlink" href="#push-notifications-overview" title="Permalink to this headline">¶</a></h1>
+<table style="border: solid 1px grey">
+<tr>
+<td width="40%" style="padding:1em"><img alt="../_images/iphonemessage.png" src="../_images/iphonemessage.png" />
+</td>
+<td><div class="section" id="reach-your-users-with-push">
+<h2>Reach your users with push<a class="headerlink" href="#reach-your-users-with-push" title="Permalink to this headline">¶</a></h2>
+<p>With the new push notifications feature in the Usergrid, you can send
+announcements to your app’s users.</p>
+<ul class="simple">
+<li><strong>Reach your app’s users</strong> with messages they care about.</li>
+<li><strong>Keep your app footprint low</strong> while communicating in a high-value
+way with your app’s users.</li>
+</ul>
+<p><a class="reference external" href="getting-started.html">Read more</a></p>
+</td>
+</tr>
+</table>
+
+<p></p></div>
+<div class="section" id="get-started">
+<h2>Get started<a class="headerlink" href="#get-started" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="get-started-with-a-tutorial">
+<h3><a class="reference external" href="tutorial.html">Get started with a tutorial</a><a class="headerlink" href="#get-started-with-a-tutorial" title="Permalink to this headline">¶</a></h3>
+<p>Build your first push-enabled app using an Apigee sample.</p>
+</div>
+<div class="section" id="find-what-you-can-do-with-it">
+<h3><a class="reference external" href="getting-started.html">Find what you can do with it</a><a class="headerlink" href="#find-what-you-can-do-with-it" title="Permalink to this headline">¶</a></h3>
+<p>A video and introduction.</p>
+</div>
+<div class="section" id="see-the-prerequisites">
+<h3><a class="reference external" href="getting-started.html#prerequisites">See the prerequisites</a><a class="headerlink" href="#see-the-prerequisites" title="Permalink to this headline">¶</a></h3>
+<p>Depending on your supported app platforms, you’ll need just a few
+things.</p>
+</div>
+</div>
+<div class="section" id="build-push-support">
+<h2>Build push support<a class="headerlink" href="#build-push-support" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="setting-up-push-notifications-support">
+<h3><a class="reference external" href="getting-started.html">Setting up push notifications support</a><a class="headerlink" href="#setting-up-push-notifications-support" title="Permalink to this headline">¶</a></h3>
+<p>Connect Apple or Google with Usergrid and your app.</p>
+</div>
+<div class="section" id="register-your-app">
+<h3><a class="reference external" href="registering.html">Register your app</a><a class="headerlink" href="#register-your-app" title="Permalink to this headline">¶</a></h3>
+<p>Register with Apple or Google.</p>
+</div>
+<div class="section" id="create-a-notifier">
+<h3><a class="reference external" href="creating-notifiers.html">Create a notifier</a><a class="headerlink" href="#create-a-notifier" title="Permalink to this headline">¶</a></h3>
+<p>Your application uses this to send messages.</p>
+</div>
+<div class="section" id="register-client-devices">
+<h3><a class="reference external" href="managing-users-and-devices.html">Register client devices</a><a class="headerlink" href="#register-client-devices" title="Permalink to this headline">¶</a></h3>
+<p>Your app code registers to receive notifications.</p>
+</div>
+<div class="section" id="send-and-manage-notifications">
+<h3><a class="reference external" href="creating-and-managing-notifications.html">Send and manage notifications</a><a class="headerlink" href="#send-and-manage-notifications" title="Permalink to this headline">¶</a></h3>
+<p>You can do this from app code or the admin portal.</p>
+</div>
+</div>
+<div class="section" id="learn-more">
+<h2>Learn more<a class="headerlink" href="#learn-more" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="troubleshoot-your-push-support">
+<h3><a class="reference external" href="troubleshooting.html">Troubleshoot your push support</a><a class="headerlink" href="#troubleshoot-your-push-support" title="Permalink to this headline">¶</a></h3>
+<p>Things don’t work as you expect?</p>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ <footer>
+
+ <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+
+ <a href="adding-push-support.html" class="btn btn-neutral float-right" title="Adding push notifications support" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+
+
+ <a href="../entity-connections/disconnecting-entities.html" class="btn btn-neutral" title="Disconnecting entities" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+
+ </div>
+
+
+ <hr/>
+
+ <div role="contentinfo">
+ <p>
+ © Copyright 2013-2015, Apache Usergrid.
+
+ </p>
+ </div>
+ Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+
+
+
+
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT:'../',
+ VERSION:'1.0',
+ COLLAPSE_INDEX:false,
+ FILE_SUFFIX:'.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+
+
+
+
+
+ <script type="text/javascript" src="../_static/js/theme.js"></script>
+
+
+
+
+ <script type="text/javascript">
+ jQuery(function () {
+ SphinxRtdTheme.StickyNav.enable();
+ });
+ </script>
+
+
+</body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/push-notifications/registering.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/registering.html b/content/docs/push-notifications/registering.html
new file mode 100644
index 0000000..fd262d8
--- /dev/null
+++ b/content/docs/push-notifications/registering.html
@@ -0,0 +1,484 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>Registering with a notification service — Apache Usergrid 1.0 documentation</title>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+
+
+
+
+
+ <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+ <link rel="next" title="Creating notifiers" href="creating-notifiers.html"/>
+ <link rel="prev" title="Tutorial: Push notifications sample app" href="tutorial.html"/>
+
+
+ <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+ <div class="wy-grid-for-nav">
+
+
+ <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+ <div class="wy-side-nav-search">
+
+
+
+ <a href="../index.html" class="icon icon-home"> Apache Usergrid
+
+
+
+ </a>
+
+
+
+
+ <div class="version">
+ 1.0
+ </div>
+
+
+
+
+<div role="search">
+ <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+ <input type="text" name="q" placeholder="Search docs" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+
+
+ </div>
+
+ <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+
+
+
+ <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters & clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators & data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Registering with a notification service</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#registering-with-apple-apns">Registering with Apple APNs</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#generating-an-ssl-signing-certificate">Generating an SSL signing certificate</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#creating-an-app-id">Creating an App ID</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#generating-a-p12-certificate">Generating a .p12 certificate</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#registering-with-google-gcm">Registering with Google GCM</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security & Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management & Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management & social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets & Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters & Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters & events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating & incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations & Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations & Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code & Docs</a></li>
+</ul>
+
+
+
+ </div>
+
+ </nav>
+
+ <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+ <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+ <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+ <a href="../index.html">Apache Usergrid</a>
+ </nav>
+
+
+
+ <div class="wy-nav-content">
+ <div class="rst-content">
+ <div role="navigation" aria-label="breadcrumbs navigation">
+ <ul class="wy-breadcrumbs">
+ <li><a href="../index.html">Docs</a> »</li>
+
+ <li>Registering with a notification service</li>
+ <li class="wy-breadcrumbs-aside">
+
+
+ <a href="../_sources/push-notifications/registering.txt" rel="nofollow"> View page source</a>
+
+
+ </li>
+ </ul>
+ <hr/>
+</div>
+ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+ <div itemprop="articleBody">
+
+ <div class="section" id="registering-with-a-notification-service">
+<h1>Registering with a notification service<a class="headerlink" href="#registering-with-a-notification-service" title="Permalink to this headline">¶</a></h1>
+<p>To send push notifications, you will need to first register your app
+with the push notification service (Apple APNs or Google GCM) that
+corresponds to your app’s platform. Once you’ve registered, the service
+will provide you with a certificate or key that you will need when you
+create an Usergrid notifier. (See <a class="reference external" href="creating-notifiers.html">Creating
+notifiers</a> for more information.)</p>
+<p>Push notification services are gateways controlled by platform services
+(such as Apple and Google). These gateways ensure that push
+notifications are delivered securely and originate from trusted apps.</p>
+<p>To send push notifications to your app on iOS devices, you’ll register
+the the Apple Push Notification service (APNs). For app on Android,
+you’ll register with Google Cloud Messaging for Android (GCM).</p>
+<div class="admonition note"> <p class="first admonition-title"><p>Note</p>
+ </p> <p class="last">
+
+
+For an overview of how to set up push notifications, see `Setting up<p>push notification support <adding-push-support.html>`__.</p>
+</p></div><div class="section" id="registering-with-apple-apns">
+<h2>Registering with Apple APNs<a class="headerlink" href="#registering-with-apple-apns" title="Permalink to this headline">¶</a></h2>
+<p>Before you can send push notifications to your app on iOS devices,
+you’ll need to get set up so that Apple knows you’ll be sending
+notifications. To do that, you’ll need to do the following:</p>
+<ul class="simple">
+<li>Generate an SSL signing certificate you can use to generate a .p12
+certificate.</li>
+<li>Create an Apple App ID through which you can associate push
+notifications support with your app.</li>
+<li>Generate a .p12 certificate you can use to create an Usergrid
+notifier. The certificate will be sent to APNs with push notification
+requests.</li>
+</ul>
+<p>For more information see “How the pieces connect” in <a class="reference external" href="getting-started.html">Setting up push
+notification support</a>.</p>
+<div class="admonition note"> <p class="first admonition-title"><p>Note</p>
+ </p> <p class="last">
+
+
+You'll need a Mac to generate a .p12 certificate and work with APNs.</p></div><div class="section" id="generating-an-ssl-signing-certificate">
+<h3>Generating an SSL signing certificate<a class="headerlink" href="#generating-an-ssl-signing-certificate" title="Permalink to this headline">¶</a></h3>
+<p>First, you’ll create an SSL signing certificate that you can use to
+generate a .p12 certificate. To generate an SSL signing certificate, do
+the following:</p>
+<ol class="arabic simple">
+<li>On your development machine, launch the Keychain Access application.</li>
+<li>From the Keychain Access menu, select <strong>Certificate Assistant >
+Request a Certificate From a Certificate Authority</strong>.</li>
+<li>Enter a contact email address and a name you will use to sign your
+apps.</li>
+<li>Select <strong>Saved to disk</strong>, then click <strong>Continue</strong>.</li>
+<li>Select <strong>Desktop</strong> from the Where drop-down, then click <strong>Save</strong> to
+download the .certSigningRequest file.</li>
+<li>Click <strong>Done</strong> once the download has completed.</li>
+</ol>
+</div>
+<div class="section" id="creating-an-app-id">
+<h3>Creating an App ID<a class="headerlink" href="#creating-an-app-id" title="Permalink to this headline">¶</a></h3>
+<p>Next, you must create an App ID for your app. The App ID uniquely
+identifies your app and provides a way for you to configure the app for
+push notification support. (For more on App IDs, see <a class="reference external" href="https://developer.apple.com/library/ios/documentation/IDEs/Conceptual/AppDistributionGuide/MaintainingProfiles/MaintainingProfiles.html">Creating and
+Configuring App
+IDs</a>.)</p>
+<div class="admonition note"> <p class="first admonition-title"><p>Note</p>
+ </p> <p class="last">
+
+
+An iOS developer account is required to complete these steps. To<p>register for an iOS developer account, visit the <a class="reference external" href="https://developer.apple.com/">Apple Developer
+site</a>.</p>
+</p></div><ol class="arabic simple">
+<li>Log in to <a class="reference external" href="https://developer.apple.com/ios/manage/overview/index.action">Apple’s iOS developer
+portal</a>.</li>
+<li>In the iOS Apps section, click <strong>Identifiers</strong>, then select <strong>App
+IDs</strong>.</li>
+<li>Click the + icon to create a new App ID, and enter the following:</li>
+</ol>
+<ul class="simple">
+<li><strong>App ID Description - Name</strong>: A unique name that identifies your
+app.</li>
+<li><strong>App BaaS</strong>: Select Push Notifications.</li>
+<li><strong>App ID Suffix</strong>: Select Explicit App ID, and enter your desired App
+ID in reverse-domain format. For example, com.apigee.pushapp.</li>
+</ul>
+<ol class="arabic simple" start="4">
+<li>Click <strong>Submit</strong> to create the App ID, then click <strong>Done</strong>. You will
+be returned to the App IDs page.</li>
+</ol>
+</div>
+<div class="section" id="generating-a-p12-certificate">
+<h3>Generating a .p12 certificate<a class="headerlink" href="#generating-a-p12-certificate" title="Permalink to this headline">¶</a></h3>
+<p>Finally, you will generate the .p12 certificate using the App ID and
+signing certificate you created in the previous steps. The .p12
+certificate will be sent by Apigee to Apple APNs with all push
+notification requests. A unique .p12 certificate is required for each
+app. In addition, you should create separate .p12 certificates for
+development and production versions of your app.</p>
+<ol class="arabic simple">
+<li>On the App IDs page, click your new App ID, then click Edit.</li>
+<li>In the Push Notifications section, under Development SSL Certificate,
+click Create Certificate.</li>
+</ol>
+<img alt="../_images/pushsslcertificate.png" src="../_images/pushsslcertificate.png" />
+<ol class="arabic simple" start="3">
+<li>Click <strong>Choose File</strong>, select the .certSigningRequest file you saved
+to your Desktop in the previous section, then click <strong>Generate</strong>.</li>
+<li>Click <strong>Done</strong>. You will be returned to the App ID settings window.</li>
+<li>In the Push Notifications section, click <strong>Download</strong> to save the
+certificate (aps_development.cer file) to your Desktop.</li>
+<li>Double-click the .cer file to install it in your keychain. The newly
+installed certificate will appear in your Keychain Access
+application under My Certificates with a name similar to “Apple
+Development iOS Push Services: ”.</li>
+<li>Control-click the certificate and select <strong>Export</strong>.</li>
+<li>Save the certificate to your Desktop as a ‘Personal Information
+Exchange (.p12)’ file. (You’ll need this file when you create a
+notifier. For more information, see <a class="reference external" href="creating-notifiers.html">Creating
+notifiers</a>.</li>
+<li>In the password dialog, leave the password field blank, then click
+<strong>OK</strong>.</li>
+<li>In the next dialog, enter your system password, then click
+<strong>Allow</strong>.</li>
+</ol>
+</div>
+</div>
+<div class="section" id="registering-with-google-gcm">
+<h2>Registering with Google GCM<a class="headerlink" href="#registering-with-google-gcm" title="Permalink to this headline">¶</a></h2>
+<p>To create a notifier for sending notifications, you’ll need a Google API
+project and register your app as part of that project. The project’s
+identifier (project number) will become the sender ID your client code
+will send when registering. Registering your app will give you an API
+key you’ll use to create a notifier. (For more information see “How the
+pieces connect” in <a class="reference external" href="adding-push-support.html">Adding push notifications
+support</a>.)</p>
+<p>The following is an abbreviated version of the steps described in the
+Google documentation on <a class="reference external" href="http://developer.android.com/google/gcm/gs.html">getting started with Google Cloud
+Messaging</a>.</p>
+<p>To generate a project number and API key, do the following:</p>
+<ol class="arabic simple">
+<li>Go to the <a class="reference external" href="https://code.google.com/apis/console/">Google API developer web
+site</a> and log in with your
+Google ID.</li>
+<li>Click <strong>Create Project</strong>, enter a project name and ID, then follow
+the steps required to verify.</li>
+<li>In the left nav, click <strong>Overview</strong> to view the project number. Note
+this number for later use in client code.</li>
+</ol>
+<img alt="../_images/googleproj0.png" src="../_images/googleproj0.png" />
+<ol class="arabic simple" start="4">
+<li>Click <strong>APIs</strong> in the left nav area, then click the button to enable
+<strong>Google Cloud Messaging for Android</strong>.</li>
+</ol>
+<img alt="../_images/gcmsetting.png" src="../_images/gcmsetting.png" />
+<ol class="arabic simple" start="5">
+<li>In the left nav, under <strong>APIs and auth</strong>, click <strong>Credentials</strong>.</li>
+<li>Under <strong>Public API access</strong>, click <strong>Create New Key</strong>.</li>
+<li>In the <strong>Create a new key</strong> dialog, click <strong>Server key</strong>. Take care
+not to choose “Android key,” though you might be tempted to.
+Remember that your push notification requests will be received by
+Google from Apigee’s server (via the notifier your code sends to
+Apigee), rather than directly from the device your app is installed
+on.</li>
+<li>On the <strong>Create a server key...</strong> dialog, enter the IP address of
+the server that will be sending the notification request to Google.</li>
+<li>Click <strong>Create</strong>.</li>
+<li>On the Credentials page, under <strong>Key for server applications</strong>, copy
+the <strong>API key</strong> value for use when creating a notifier to request
+push notifications from GCM. (For more information, see <a class="reference external" href="creating-notifiers.html">Creating
+notifiers</a>.)</li>
+</ol>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ <footer>
+
+ <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+
+ <a href="creating-notifiers.html" class="btn btn-neutral float-right" title="Creating notifiers" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+
+
+ <a href="tutorial.html" class="btn btn-neutral" title="Tutorial: Push notifications sample app" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+
+ </div>
+
+
+ <hr/>
+
+ <div role="contentinfo">
+ <p>
+ © Copyright 2013-2015, Apache Usergrid.
+
+ </p>
+ </div>
+ Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+
+
+
+
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT:'../',
+ VERSION:'1.0',
+ COLLAPSE_INDEX:false,
+ FILE_SUFFIX:'.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+
+
+
+
+
+ <script type="text/javascript" src="../_static/js/theme.js"></script>
+
+
+
+
+ <script type="text/javascript">
+ jQuery(function () {
+ SphinxRtdTheme.StickyNav.enable();
+ });
+ </script>
+
+
+</body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/push-notifications/tbd.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/tbd.html b/content/docs/push-notifications/tbd.html
index a5e2846..b0619fa 100644
--- a/content/docs/push-notifications/tbd.html
+++ b/content/docs/push-notifications/tbd.html
@@ -80,14 +80,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -111,10 +112,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -139,9 +153,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -156,11 +170,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/push-notifications/troubleshooting.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/troubleshooting.html b/content/docs/push-notifications/troubleshooting.html
new file mode 100644
index 0000000..a41b33e
--- /dev/null
+++ b/content/docs/push-notifications/troubleshooting.html
@@ -0,0 +1,466 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>Troubleshooting — Apache Usergrid 1.0 documentation</title>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+
+
+
+
+
+ <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+ <link rel="next" title="Security & token authentication" href="../security-and-auth/app-security.html"/>
+ <link rel="prev" title="Creating and managing notifications" href="creating-and-managing-notifications.html"/>
+
+
+ <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+ <div class="wy-grid-for-nav">
+
+
+ <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+ <div class="wy-side-nav-search">
+
+
+
+ <a href="../index.html" class="icon icon-home"> Apache Usergrid
+
+
+
+ </a>
+
+
+
+
+ <div class="version">
+ 1.0
+ </div>
+
+
+
+
+<div role="search">
+ <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+ <input type="text" name="q" placeholder="Search docs" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+
+
+ </div>
+
+ <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+
+
+
+ <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters & clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators & data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Troubleshooting</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#working-with-android">Working with Android</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#app-fails-to-install-on-the-emulator">App fails to install on the emulator</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#push-errors">Push errors</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#mismatchsenderid-error-message-from-the-server-when-it-tries-to-send-a-message-to-your-app">MismatchSenderId error message from the server when it tries to send a message to your app.</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#invalid-sender-error-message">INVALID_SENDER error message</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#working-with-phonegap-android">Working with PhoneGap Android</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id1">App fails to install on the emulator</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id2">Push errors</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id3">MismatchSenderId error message from the server when it tries to send a message to your app.</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id4">INVALID_SENDER error message</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<p class="caption"><span class="caption-text">Security & Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management & Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management & social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets & Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters & Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters & events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating & incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations & Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations & Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code & Docs</a></li>
+</ul>
+
+
+
+ </div>
+
+ </nav>
+
+ <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+ <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+ <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+ <a href="../index.html">Apache Usergrid</a>
+ </nav>
+
+
+
+ <div class="wy-nav-content">
+ <div class="rst-content">
+ <div role="navigation" aria-label="breadcrumbs navigation">
+ <ul class="wy-breadcrumbs">
+ <li><a href="../index.html">Docs</a> »</li>
+
+ <li>Troubleshooting</li>
+ <li class="wy-breadcrumbs-aside">
+
+
+ <a href="../_sources/push-notifications/troubleshooting.txt" rel="nofollow"> View page source</a>
+
+
+ </li>
+ </ul>
+ <hr/>
+</div>
+ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+ <div itemprop="articleBody">
+
+ <div class="section" id="troubleshooting">
+<h1>Troubleshooting<a class="headerlink" href="#troubleshooting" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="working-with-android">
+<h2>Working with Android<a class="headerlink" href="#working-with-android" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="app-fails-to-install-on-the-emulator">
+<h3>App fails to install on the emulator<a class="headerlink" href="#app-fails-to-install-on-the-emulator" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>When using the emulator, be sure to note the setup steps in <a class="reference external" href="getting-started.html#prerequisites">Push
+notifications prerequisites</a>.</li>
+<li>Sometimes installation fails while the emulator is still being
+launched. Wait until the emulator is up and running (so that you can
+unlock and interact with the UI), then run the project again.</li>
+<li>Make sure that the order of your Java Build Path matches the order
+shown in <a class="reference external" href="tutorial.html">Tutorial: Push notifications sample app</a>.</li>
+</ul>
+</div>
+<div class="section" id="push-errors">
+<h3>Push errors<a class="headerlink" href="#push-errors" title="Permalink to this headline">¶</a></h3>
+<p>If pressing the button to send yourself a push throws an exception or
+doesn’t respond:</p>
+<ul class="simple">
+<li>Make sure the emulator’s target matches the Google API version used
+in the project.</li>
+<li>In the IDE log, wait until you see that the device has been
+registered before sending yourself a push. Sometimes waiting for the
+code to run and trying another click gets the push message to you.</li>
+<li>If you successfully send yourself a push message once but fail to
+again, try one of the following:</li>
+</ul>
+<p>Go to the apps list on the device and launch the app from there.</p>
+<p>OR</p>
+<p>Uninstall the app from the device, delete the device in the admin
+portal, and run the project again.</p>
+</div>
+<div class="section" id="mismatchsenderid-error-message-from-the-server-when-it-tries-to-send-a-message-to-your-app">
+<h3>MismatchSenderId error message from the server when it tries to send a message to your app.<a class="headerlink" href="#mismatchsenderid-error-message-from-the-server-when-it-tries-to-send-a-message-to-your-app" title="Permalink to this headline">¶</a></h3>
+<p>The sender ID is a number you send to GCM from app code when registering
+with GCM for notifications. The error might be occurring because the
+sender ID with which your app is registering at GCM for notifications
+does not correlate to the API project whose API key was used to create
+your notifier. First, confirm the following:</p>
+<ul class="simple">
+<li>The sender ID in your app code (used when registering with GCM) is
+the same as your Goole API project number.</li>
+<li>The API key used to create your notifier is the same as the API key
+in your Google API project.</li>
+<li>The notifier name used in your app code is the same as for the
+notifier you created in the Usergrid.</li>
+</ul>
+<p>It can be possible to make a fix (such as by correcting the sender ID in
+your app code) and still see this error. If you’re still seeing the
+error, consider create a new API project and notifier, then use their
+new values in your code:</p>
+<ol class="arabic simple">
+<li>Recreate (or create anew) the Google API project. This will generate
+a new API key and project number. See Registering with a notification
+service.</li>
+<li>Create a new notifier for GCM using the API key you generated with
+the new API project. See Creating notifiers.</li>
+<li>Use the new notifier name in your code, along with a new sender ID
+that is that same value as the Google API project number.</li>
+</ol>
+</div>
+<div class="section" id="invalid-sender-error-message">
+<h3>INVALID_SENDER error message<a class="headerlink" href="#invalid-sender-error-message" title="Permalink to this headline">¶</a></h3>
+<p>The sender ID is a number you send to GCM from app code when registering
+with GCM for notifications. The “sender” in this case is the Google API
+project you created to send notification messages. Confirm that the
+sender ID you’re using in code is the same value as the API project
+number generated when you created your Google API project. See
+Registering with a notification service.</p>
+</div>
+</div>
+<div class="section" id="working-with-phonegap-android">
+<h2>Working with PhoneGap Android<a class="headerlink" href="#working-with-phonegap-android" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="id1">
+<h3>App fails to install on the emulator<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>When using the emulator, be sure to note the setup steps in
+<a class="reference external" href="tutorial.html">Tutorial: Push notifications sample app</a>.</li>
+<li>Sometimes installation fails while the emulator is still being
+launched. Wait until the emulator is up and running (so that you can
+unlock and interact with the UI), then run the project again.</li>
+<li>Make sure that the order of your Java Build Path matches the order
+shown in <a class="reference external" href="tutorial.html">Tutorial: Push notifications sample app</a>.</li>
+</ul>
+</div>
+<div class="section" id="id2">
+<h3>Push errors<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h3>
+<p>If pressing the button to send yourself a push throws an exception or
+doesn’t respond:</p>
+<ul class="simple">
+<li>Make sure the emulator’s target matches the Google API version used
+in the project.</li>
+<li>In the IDE log, wait until you see that the device has been
+registered before sending yourself a push. Sometimes waiting for the
+code to run and trying another click gets the push message to you.</li>
+<li>If you successfully send yourself a push message once but fail to
+again, try one of the following:</li>
+</ul>
+<p>Go to the apps list on the device and launch the app from there.</p>
+<p>OR</p>
+<p>Uninstall the app from the device, delete the device using the admin
+portal, then run the project again.</p>
+</div>
+<div class="section" id="id3">
+<h3>MismatchSenderId error message from the server when it tries to send a message to your app.<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
+<p>The sender ID is a number you send to GCM from app code when registering
+with GCM for notifications. The error might be occurring because the
+sender ID with which your app is registering at GCM for notifications
+does not correlate to the API project whose API key was used to create
+your notifier. First, confirm the following:</p>
+<ul class="simple">
+<li>The sender ID in your app code (used when registering with GCM) is
+the same as your Google API project number.</li>
+<li>The API key used to create your notifier is the same as the API key
+in your Google API project.</li>
+<li>The notifier name used in your app code is the same as for the
+notifier you created in the Usergrid.</li>
+</ul>
+<p>It can be possible to make a fix (such as by correcting the sender ID in
+your app code) and still see this error. If you’re still seeing the
+error, consider create a new API project and notifier, then use their
+new values in your code:</p>
+<ol class="arabic simple">
+<li>Recreate (or create anew) the Google API project. This will generate
+a new API key and project number. See <a class="reference external" href="registration.html">Registering with a
+notification service</a>.</li>
+<li>Create a new notifier for GCM using the API key you generated with
+the new API project. See <a class="reference external" href="creating-notifiers.html">Creating
+notifiers</a>.</li>
+<li>Use the new notifier name in your code, along with a new sender ID
+that is that same value as the Google API project number.</li>
+</ol>
+</div>
+<div class="section" id="id4">
+<h3>INVALID_SENDER error message<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h3>
+<p>The sender ID is a number you send to GCM from app code when registering
+with GCM for notifications. The “sender” in this case is the Google API
+project you created to send notification messages. Confirm that the
+sender ID you’re using in code is the same value as the API project
+number generated when you created your Google API project. See
+<a class="reference external" href="registration.html">Registering with a notification service</a>.</p>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ <footer>
+
+ <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+
+ <a href="../security-and-auth/app-security.html" class="btn btn-neutral float-right" title="Security & token authentication" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+
+
+ <a href="creating-and-managing-notifications.html" class="btn btn-neutral" title="Creating and managing notifications" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+
+ </div>
+
+
+ <hr/>
+
+ <div role="contentinfo">
+ <p>
+ © Copyright 2013-2015, Apache Usergrid.
+
+ </p>
+ </div>
+ Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+
+
+
+
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT:'../',
+ VERSION:'1.0',
+ COLLAPSE_INDEX:false,
+ FILE_SUFFIX:'.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+
+
+
+
+
+ <script type="text/javascript" src="../_static/js/theme.js"></script>
+
+
+
+
+ <script type="text/javascript">
+ jQuery(function () {
+ SphinxRtdTheme.StickyNav.enable();
+ });
+ </script>
+
+
+</body>
+</html>
\ No newline at end of file
[20/36] usergrid git commit: Update generated website content.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/push-notifications/adding-push-support.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/adding-push-support.html b/content/docs/push-notifications/adding-push-support.html
new file mode 100644
index 0000000..9722be8
--- /dev/null
+++ b/content/docs/push-notifications/adding-push-support.html
@@ -0,0 +1,581 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>Adding push notifications support — Apache Usergrid 1.0 documentation</title>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+
+
+
+
+
+ <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+ <link rel="next" title="Getting started with push notifications" href="getting-started.html"/>
+ <link rel="prev" title="Push notifications overview" href="overview.html"/>
+
+
+ <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+ <div class="wy-grid-for-nav">
+
+
+ <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+ <div class="wy-side-nav-search">
+
+
+
+ <a href="../index.html" class="icon icon-home"> Apache Usergrid
+
+
+
+ </a>
+
+
+
+
+ <div class="version">
+ 1.0
+ </div>
+
+
+
+
+<div role="search">
+ <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+ <input type="text" name="q" placeholder="Search docs" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+
+
+ </div>
+
+ <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+
+
+
+ <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters & clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators & data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="overview.html">Push notifications overview</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Adding push notifications support</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#setting-up-push-notification-support">Setting up push notification support</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#how-the-pieces-connect">How the pieces connect</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#apple-apns">Apple APNs</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#google-gcm">Google GCM</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#requirements">Requirements</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#ios">iOS</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#android">Android</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#phonegap">PhoneGap</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#tutorials">Tutorials</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id1">iOS</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id2">Android</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#sample-apps">Sample Apps</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#troubleshooting">Troubleshooting</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#android-phonegap">Android / PhoneGap</a><ul>
+<li class="toctree-l4"><a class="reference internal" href="#push-errors">Push errors</a></li>
+<li class="toctree-l4"><a class="reference internal" href="#mismatchsenderid-error-message-from-the-server-when-it-tries-to-send-a-message-to-your-app">MismatchSenderId error message from the server when it tries to send a message to your app.</a></li>
+<li class="toctree-l4"><a class="reference internal" href="#invalid-sender-error-message">INVALID_SENDER error message</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security & Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management & Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management & social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets & Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters & Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters & events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating & incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations & Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations & Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code & Docs</a></li>
+</ul>
+
+
+
+ </div>
+
+ </nav>
+
+ <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+ <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+ <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+ <a href="../index.html">Apache Usergrid</a>
+ </nav>
+
+
+
+ <div class="wy-nav-content">
+ <div class="rst-content">
+ <div role="navigation" aria-label="breadcrumbs navigation">
+ <ul class="wy-breadcrumbs">
+ <li><a href="../index.html">Docs</a> »</li>
+
+ <li>Adding push notifications support</li>
+ <li class="wy-breadcrumbs-aside">
+
+
+ <a href="../_sources/push-notifications/adding-push-support.txt" rel="nofollow"> View page source</a>
+
+
+ </li>
+ </ul>
+ <hr/>
+</div>
+ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+ <div itemprop="articleBody">
+
+ <div class="section" id="adding-push-notifications-support">
+<h1>Adding push notifications support<a class="headerlink" href="#adding-push-notifications-support" title="Permalink to this headline">¶</a></h1>
+<p>You add push notification support by configuring services, then adding
+app code to receive messages. You’ll set up an account with a
+notification service (such as Apple’s APNs or Google’s GCM). Then you’ll
+configure your App Services application to send notifications to the
+service. Then you’ll add code to receive messages.</p>
+<div class="section" id="setting-up-push-notification-support">
+<h2>Setting up push notification support<a class="headerlink" href="#setting-up-push-notification-support" title="Permalink to this headline">¶</a></h2>
+<p>The following steps get you set up so that your app can receive push
+notifications. Keep in mind that these steps build on one another. In
+other words, you’ll need values generated in step 1 in order to complete
+step 2, and so on.</p>
+<p>For a walkthrough of these steps using a push sample app, see [Tutorial:
+Push notifications sample app].</p>
+<ol class="arabic simple">
+<li><strong>Register your app</strong> with push notification services. Your
+notification messages will be forwarded to devices by Apple and/or
+Google. So you’ll need to register with Apple APNs and/or Google’s
+GCM. For more information, see Registering with a notification
+service.</li>
+<li><strong>Create a notifier</strong> to send notification messages from App Services
+to notification services. App Services will use your notifier to send
+your messages to a notification service. For details, see Creating
+notifiers. To create a notifier, you’ll need information generated by
+registering with a push notification service. You’ll need a separate
+notifier for each app/platform combination.</li>
+<li><strong>Register devices</strong> at run time. At run time, your code will
+register to receive notifications. To do this, your code uses
+information from the notification service and App Services notifier.
+For more, see Managing users and devices.</li>
+<li><strong>Send and manage push notifications</strong> You use App Service API
+notification endpoints to target devices, users, or groups with your
+messages. To learn more, see Creating and managing notifications.</li>
+</ol>
+<div class="section" id="how-the-pieces-connect">
+<h3>How the pieces connect<a class="headerlink" href="#how-the-pieces-connect" title="Permalink to this headline">¶</a></h3>
+<p>Click a tab below to view more information about how the pieces connect
+once you’ve got it set up.</p>
+</div>
+<div class="section" id="apple-apns">
+<h3>Apple APNs<a class="headerlink" href="#apple-apns" title="Permalink to this headline">¶</a></h3>
+<p>The diagram below illustrates what things should look like once you’ve
+gotten set up to send notifications that are received by your app.</p>
+<p>A. At configuration time, you create an App ID, then create an App
+Services notifier with a .p12 certificate you generate on your Mac. The
+.p12 certificate correlates the notifier (which you will use to send
+notification messages from App Services) with the App ID (so that APNs
+will forward your notifications to devices).</p>
+<p>B. A run time, your app’s code registers with Apple for notifications by
+invoking the registerForRemoteNotificationTypes method to receive a
+token it can send to App Services.</p>
+<p>C. At run time, your app’s code registers with App Services for
+notifications by sending the name of the App Services notifier you
+created. This ensure’s that there’s a device entity in your App Service
+application. That way, you can address the device with notification
+messages.</p>
+<p>For information on troubleshooting push notifications on iOS devices,
+see Troubleshooting Push Notifications</p>
+</div>
+<div class="section" id="google-gcm">
+<h3>Google GCM<a class="headerlink" href="#google-gcm" title="Permalink to this headline">¶</a></h3>
+<p>Google GCM The diagram below illustrates what things should look like
+once you’ve gotten set up to send notifications that are received by
+your app.</p>
+<p>A. At configuration time, you create a Google API project, then create
+an App Services notifier with an API key from the project. The API key
+correlates the notifier (which you will use to send notification
+messages from App Services) with the API project (which will forward
+your notifications to devices).</p>
+<p>B. At run time, your app’s code registers with App Services for
+notifications by sending the name of the App Services notifier you
+created. This ensure’s that there’s a device entity in your App Service
+application. That way, you can address the device with notification
+messages.</p>
+<p>C. A run time, your app’s code registers with Google for notifications
+by sending the number of your API project as a “sender ID”. The project
+is the actual notification “sender” that will forward notifications to
+your app. In other words, the app is telling Google that it wants to
+receive notifications from that sender.</p>
+</div>
+</div>
+<div class="section" id="requirements">
+<h2>Requirements<a class="headerlink" href="#requirements" title="Permalink to this headline">¶</a></h2>
+<p>Before you start adding support for push notifications, be sure you’ve
+got the following:</p>
+<p>An Apigee account (it’s free). If you don’t yet have an Apigee account,
+you can create one. An App Services organization. Organizations are
+top-level containers for your APIs and other resources. By default, your
+Apigee account will include one organization that has the same name as
+your username. You can view your current organizations or create a new
+one by visiting your account dashboard. An App Services application. An
+App Services application is where you store you App Services data and
+where you schedule notifications. Data in the application represents
+devices, notifiers, notifications, users, and groups. For information on
+creating an app, see Registering apps. You will need to test with a
+mobile device running the platform you’re developer for. In the case of
+Android, you might be able to use an emulator. It is not possible to
+test push notifications from a web browser.</p>
+<div class="section" id="ios">
+<h3>iOS<a class="headerlink" href="#ios" title="Permalink to this headline">¶</a></h3>
+<p>To develop push notifications for an iOS app, you’ll need:</p>
+<p>A Mac to generate the necessary SSL certificate. An iOS developer
+account. You’ll need this to register for an App ID and get a
+provisioning profile. To get an account, visit the iOS Dev Center. An
+actual iOS device to test push notifications. It’s not yet possible to
+develop push notifications with an emulator. An iOS provisioning profile
+For iOS app testing, you need a provisioning profile that’s associated
+with an Apple ID. You set up the provisioning profile in the Apple
+developer portal, download the profile, and import it into Xcode.</p>
+<p>To set up a provisioning profile, you need to create an “iOS App
+Development” certificate in the Apple developer portal. For example, in
+the Apple APNs setup earlier in this tutorial, you created a certificate
+in the Apple developer portal to be used for push notifications.
+However, you won’t be able to create a provisioning portal with just
+that certificate. You also need to create an “iOS App Development”
+certificate (the configuration settings don’t matter), as shown in the
+following image.</p>
+<p>ios dev certificate</p>
+<p>After you create an iOS App Development certificate, you can create a
+provisioning profile that includes your App ID/certificate for push
+notifications.</p>
+</div>
+<div class="section" id="android">
+<h3>Android<a class="headerlink" href="#android" title="Permalink to this headline">¶</a></h3>
+<p>It’s generally a best practice to develop Android apps by testing and
+debugging with an Android device. It’s also possible to use an emulator.</p>
+<p>Before testing and debugging with an Android device, you’ll need to set
+up your device for development. Be sure to see the Android documentation
+on using hardware devices.</p>
+<p>To test with an emulator, you will need to follow these steps:</p>
+<p>Ensure that you have Google API 8 (or above) and Android 2.2 (or above).
+Using the Android SDK Manager, install Google Cloud Messaging for
+Android Library. Using the Android Virtual Device Manager, create an
+emulator whose target is Google APIs. Ensure that the emulator you’re
+using includes a Google account. Launch the emulator. In the emulator,
+click the Menu button, then go to Settings > Accounts & Sync. Add a
+Google account. Once you’ve finished these steps, you should have an
+emulator that can receive push notification messages.</p>
+</div>
+<div class="section" id="phonegap">
+<h3>PhoneGap<a class="headerlink" href="#phonegap" title="Permalink to this headline">¶</a></h3>
+<p>You’ll need to test with a device or emulator. It is not possible to
+test push notifications with a browser alone. PhoneGap Push plug-in.
+Developers using PhoneGap to develop their apps with HTML5 and
+Javascript will need to install the Apigee push notification PhoneGap
+plug-in to enable push notifications. Installation instructions are
+available in the plug-in Readme.md file, as well as in Tutorial: Push
+notifications sample app. The plug-in is already included in the above
+PhoneGap sample apps.</p>
+</div>
+</div>
+<div class="section" id="tutorials">
+<h2>Tutorials<a class="headerlink" href="#tutorials" title="Permalink to this headline">¶</a></h2>
+<p>Written tutorial For a full step-by-step tutorial using iOS, Android, or
+JavaScript, see Tutorial: Push notifications sample app.</p>
+<p>Video tutorial Click the tab for your preferred development platform to
+watch a full walkthrough video about how to integrate the App Services
+push notifications feature into your app.</p>
+<div class="section" id="id1">
+<h3>iOS<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="id2">
+<h3>Android<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h3>
+</div>
+</div>
+<div class="section" id="sample-apps">
+<h2>Sample Apps<a class="headerlink" href="#sample-apps" title="Permalink to this headline">¶</a></h2>
+<p>You’ll find samples in SDKs that are specific to three mobile platforms:
+iOS, Android, and JavaScript. These show a simple implementation of push
+notifications in action. After you perform a few setup steps, running
+the sample app on your connected device or emulator, you will be able to
+send a push notification to it by clicking a button in the app’s UI. You
+will also be able to send more pushes to it from the App Services
+console.</p>
+<p>To download the sample app and view the tutorial, see Tutorial: Push
+notifications sample app.</p>
+<p>When you create notifiers to run the samples, creating them in the
+default “sandbox” app in your Usergrid organization will make it easier
+to try out the feature. The sandbox app doesn’t require authentication.</p>
+</div>
+<div class="section" id="troubleshooting">
+<h2>Troubleshooting<a class="headerlink" href="#troubleshooting" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="android-phonegap">
+<h3>Android / PhoneGap<a class="headerlink" href="#android-phonegap" title="Permalink to this headline">¶</a></h3>
+<p>App fails to install on the emulator When using the emulator, be sure to
+note the setup steps in the requirements section.</p>
+<p>Sometimes installation fails while the emulator is still being launched.
+Wait until the emulator is up and running (so that you can unlock and
+interact with the UI), then run the project again.</p>
+<p>Make sure that the order of your Java Build Path matches the order shown
+in Tutorial: Push notifications sample app.</p>
+<div class="section" id="push-errors">
+<h4>Push errors<a class="headerlink" href="#push-errors" title="Permalink to this headline">¶</a></h4>
+<p>If pressing the button to send yourself a push throws an exception or
+doesn’t respond:</p>
+<p>Make sure the emulator’s target matches the Google API version used in
+the project.</p>
+<p>In the IDE log, wait until you see that the device has been registered
+before sending yourself a push. Sometimes waiting for the code to run
+and trying another click gets the push message to you.</p>
+<p>If you successfully send yourself a push message once but fail to again,
+try one of the following:</p>
+<p>Go to the apps list on the device and launch the app from there.</p>
+<p>Uninstall the app from the device, delete the device in the App Services
+console, and run the project again.</p>
+</div>
+<div class="section" id="mismatchsenderid-error-message-from-the-server-when-it-tries-to-send-a-message-to-your-app">
+<h4>MismatchSenderId error message from the server when it tries to send a message to your app.<a class="headerlink" href="#mismatchsenderid-error-message-from-the-server-when-it-tries-to-send-a-message-to-your-app" title="Permalink to this headline">¶</a></h4>
+<p>The sender ID is a number you send to GCM from app code when registering
+with GCM for notifications. The error might be occurring because the
+sender ID with which your app is registering at GCM for notifications
+does not correlate to the API project whose API key was used to create
+your App Services notifier. First, confirm the following:</p>
+<ul class="simple">
+<li>The sender ID in your app code (used when registering with GCM) is
+the same as your Goole API project number.</li>
+<li>The API key used to create your App Services notifier is the same as
+the API key in your Google API project.</li>
+<li>The notifier name used in your app code is the same as for the
+notifier you created in App Services.</li>
+</ul>
+<p>It can be possible to make a fix (such as by correcting the sender ID in
+your app code) and still see this error. If you’re still seeing the
+error, consider create a new API project and App Services notifier, then
+use their new values in your code:</p>
+<ol class="arabic simple">
+<li>Recreate (or create anew) the Google API project. This will generate
+a new API key and project number. See Registering with a notification
+service.</li>
+<li>Create a new App Services notifier for GCM using the API key you
+generated with the new API project. See Creating notifiers.</li>
+<li>Use the new notifier name in your code, along with a new sender ID
+that is that same value as the Google API project number.</li>
+</ol>
+</div>
+<div class="section" id="invalid-sender-error-message">
+<h4>INVALID_SENDER error message<a class="headerlink" href="#invalid-sender-error-message" title="Permalink to this headline">¶</a></h4>
+<p>The sender ID is a number you send to GCM from app code when registering
+with GCM for notifications. The “sender” in this case is the Google API
+project you created to send notification messages. Confirm that the
+sender ID you’re using in code is the same value as the API project
+number generated when you created your Google API project. See
+Registering with a notification service.</p>
+</div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ <footer>
+
+ <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+
+ <a href="getting-started.html" class="btn btn-neutral float-right" title="Getting started with push notifications" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+
+
+ <a href="overview.html" class="btn btn-neutral" title="Push notifications overview" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+
+ </div>
+
+
+ <hr/>
+
+ <div role="contentinfo">
+ <p>
+ © Copyright 2013-2015, Apache Usergrid.
+
+ </p>
+ </div>
+ Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+
+
+
+
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT:'../',
+ VERSION:'1.0',
+ COLLAPSE_INDEX:false,
+ FILE_SUFFIX:'.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+
+
+
+
+
+ <script type="text/javascript" src="../_static/js/theme.js"></script>
+
+
+
+
+ <script type="text/javascript">
+ jQuery(function () {
+ SphinxRtdTheme.StickyNav.enable();
+ });
+ </script>
+
+
+</body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/push-notifications/creating-and-managing-notifications.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/creating-and-managing-notifications.html b/content/docs/push-notifications/creating-and-managing-notifications.html
new file mode 100644
index 0000000..76890e9
--- /dev/null
+++ b/content/docs/push-notifications/creating-and-managing-notifications.html
@@ -0,0 +1,742 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>Creating and managing notifications — Apache Usergrid 1.0 documentation</title>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+
+
+
+
+
+ <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+ <link rel="next" title="Troubleshooting" href="troubleshooting.html"/>
+ <link rel="prev" title="Managing users and devices" href="managing-users-and-devices.html"/>
+
+
+ <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+ <div class="wy-grid-for-nav">
+
+
+ <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+ <div class="wy-side-nav-search">
+
+
+
+ <a href="../index.html" class="icon icon-home"> Apache Usergrid
+
+
+
+ </a>
+
+
+
+
+ <div class="version">
+ 1.0
+ </div>
+
+
+
+
+<div role="search">
+ <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+ <input type="text" name="q" placeholder="Search docs" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+
+
+ </div>
+
+ <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+
+
+
+ <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters & clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators & data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Creating and managing notifications</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#creating-notifications">Creating notifications</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#creating-notificastions-with-curl">Creating notificastions with cURL</a><ul>
+<li class="toctree-l4"><a class="reference internal" href="#targeting-a-single-device">Targeting a single device</a></li>
+<li class="toctree-l4"><a class="reference internal" href="#targeting-all-devices">Targeting all devices</a></li>
+<li class="toctree-l4"><a class="reference internal" href="#targeting-a-single-user">Targeting a single user</a></li>
+<li class="toctree-l4"><a class="reference internal" href="#targeting-a-group">Targeting a group</a></li>
+<li class="toctree-l4"><a class="reference internal" href="#targeting-users-by-location">Targeting users by location</a></li>
+<li class="toctree-l4"><a class="reference internal" href="#request-parameters">Request Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l3"><a class="reference internal" href="#creating-notificastions-with-admin-portal">Creating notificastions with Admin portal</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#creating-notificastions-with-ios">Creating notificastions with iOS</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#scheduling-notifications">Scheduling notifications</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#curl">cURL</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#targeting-multiple-notifiers-or-messages">Targeting multiple notifiers or messages</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#setting-a-notification-expiration">Setting a notification expiration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#getting-notifications">Getting notifications</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id1">cURL</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#canceling-sent-notifications">Canceling sent notifications</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#admin-portal">Admin portal</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#deleting-unsent-notifications">Deleting unsent notifications</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#deleting-unsent-notifications-with-curl">Deleting unsent notifications with cURL</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#deleting-unsent-notifications-with-admin-portal">Deleting unsent notifications with Admin Portal</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#getting-receipts">Getting receipts</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#notification-endpoints">Notification endpoints</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security & Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management & Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management & social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets & Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters & Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters & events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating & incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations & Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations & Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code & Docs</a></li>
+</ul>
+
+
+
+ </div>
+
+ </nav>
+
+ <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+ <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+ <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+ <a href="../index.html">Apache Usergrid</a>
+ </nav>
+
+
+
+ <div class="wy-nav-content">
+ <div class="rst-content">
+ <div role="navigation" aria-label="breadcrumbs navigation">
+ <ul class="wy-breadcrumbs">
+ <li><a href="../index.html">Docs</a> »</li>
+
+ <li>Creating and managing notifications</li>
+ <li class="wy-breadcrumbs-aside">
+
+
+ <a href="../_sources/push-notifications/creating-and-managing-notifications.txt" rel="nofollow"> View page source</a>
+
+
+ </li>
+ </ul>
+ <hr/>
+</div>
+ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+ <div itemprop="articleBody">
+
+ <div class="section" id="creating-and-managing-notifications">
+<h1>Creating and managing notifications<a class="headerlink" href="#creating-and-managing-notifications" title="Permalink to this headline">¶</a></h1>
+<p>This topic provides information on setting up and sending push
+notifications with the Usergrid API backend as a service (BaaS). For
+high-level information, prerequisites, and tutorials, see <a class="reference external" href="overview.html">Push
+notifications overview</a>.</p>
+<div class="admonition note"> <p class="first admonition-title"><p>Note</p>
+ </p> <p class="last">
+
+
+Although not shown in many of the API examples below, you need to<p>provide a valid access token with each API call. See <a class="reference external" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating
+users and application
+clients</a>
+for details.</p>
+</p></div>
+
+<div class="admonition note"> <p class="first admonition-title"><p>Note</p>
+ </p> <p class="last">
+
+
+For an overview of how to set up push notifications, including<p>troubleshooting tips, see <a class="reference external" href="adding-push-support.html">Adding push notifications
+support</a>.</p>
+</p></div><div class="section" id="creating-notifications">
+<h2>Creating notifications<a class="headerlink" href="#creating-notifications" title="Permalink to this headline">¶</a></h2>
+<p>When you create a notification, it is scheduled to be delivered to all
+applicable devices immediately unless the deliver property has been set.
+A notification may contain multiple messages (payloads), and each
+payload must be associated with a notifier in order to deliver that
+message to the associated app. This allows a single notification to be
+delivered to multiple apps across various services, and is useful if you
+want to send messages to multiple notifiers, such as development and
+production versions of both Apple and Google simultaneously.</p>
+<p>Notification can be created via POST request to the BaaS API, or in the
+admin portal:</p>
+<div class="section" id="creating-notificastions-with-curl">
+<h3>Creating notificastions with cURL<a class="headerlink" href="#creating-notificastions-with-curl" title="Permalink to this headline">¶</a></h3>
+<div class="section" id="targeting-a-single-device">
+<h4>Targeting a single device<a class="headerlink" href="#targeting-a-single-device" title="Permalink to this headline">¶</a></h4>
+<p>This request will target a specific device entity.</p>
+<p>Request Syntax</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST https://api.usergrid.com/<org>/<app>/devices/<device_ID>/notifications -d '{"payloads":{<notifier>:<message>}}'
+</pre></div>
+</div>
+</div>
+<div class="section" id="targeting-all-devices">
+<h4>Targeting all devices<a class="headerlink" href="#targeting-all-devices" title="Permalink to this headline">¶</a></h4>
+<p>This request will target all device entities.</p>
+<p>Request Syntax</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST https://api.usergrid.com/<org>/<app>/devices/*/notifications -d '{"payloads":{<notifier>:<message>}}'
+</pre></div>
+</div>
+</div>
+<div class="section" id="targeting-a-single-user">
+<h4>Targeting a single user<a class="headerlink" href="#targeting-a-single-user" title="Permalink to this headline">¶</a></h4>
+<p>This request will target a specific user entity.</p>
+<p>Request Syntax</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST https://api.usergrid.com/<org>/<app>/users/<username>/notifications -d '{"payloads":{<notifier>:<message>}}'
+</pre></div>
+</div>
+</div>
+<div class="section" id="targeting-a-group">
+<h4>Targeting a group<a class="headerlink" href="#targeting-a-group" title="Permalink to this headline">¶</a></h4>
+<p>This request will target all users associated with a specific group
+entity.</p>
+<p>Request Syntax</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST https://api.usergrid.com/<org>/<app>/groups/<group_path>/notifications -d '{"payloads":{<notifier>:<message>}}'
+</pre></div>
+</div>
+</div>
+<div class="section" id="targeting-users-by-location">
+<h4>Targeting users by location<a class="headerlink" href="#targeting-users-by-location" title="Permalink to this headline">¶</a></h4>
+<p>This request will target all device entities that are within a set
+radius of a latitude/longitude coordinate.</p>
+<p>Request Syntax</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST https://api.usergrid.com/<org>/<app>/devices;ql=location within <radius> of <lat>,<long>/notifications -d '{"payloads":{<notifier>:<message>}}'
+</pre></div>
+</div>
+</div>
+<div class="section" id="request-parameters">
+<h4>Request Parameters<a class="headerlink" href="#request-parameters" title="Permalink to this headline">¶</a></h4>
+<p>The following parameters can be specified when targeting push
+notifications.</p>
+<p>Base URL</p>
+<p>These parameters are used in forming the base URL of the request:</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="24%" />
+<col width="76%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app</td>
+<td>Application UUID or application name</td>
+</tr>
+</tbody>
+</table>
+<p>Notification</p>
+<p>These parameters are used when forming the notification portion of the
+request:</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="7%" />
+<col width="93%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>notifier</td>
+<td>The <code class="docutils literal"><span class="pre">notifier</span></code> entity you wish to associate with the notification (see <a class="reference external" href="creating-notifiers.html">Creating notifiers</a> for information on creating notifiers)</td>
+</tr>
+<tr class="row-odd"><td>message</td>
+<td>The push notification message that will be delivered to the user</td>
+</tr>
+</tbody>
+</table>
+<p><strong>Note</strong>: If your message contains double-quotes (“”) you must escape
+them with a backslash</p>
+<p>Targets</p>
+<p>These parameters are used when specifying the notification target in the
+request.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="21%" />
+<col width="79%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>device</td>
+<td>UUID of a device entity.</td>
+</tr>
+<tr class="row-odd"><td>user</td>
+<td>UUID or username of a user entity.</td>
+</tr>
+<tr class="row-even"><td>phone_type</td>
+<td>Specified in a appended query string. The type property of a device entity.</td>
+</tr>
+<tr class="row-odd"><td>group</td>
+<td>UUID or name of the group entity.</td>
+</tr>
+<tr class="row-even"><td>latitude, longitude, radius</td>
+<td>Specified in a appended query string. The radius in meters of a user device from a latitude/longitude coordinate.</td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+<div class="section" id="creating-notificastions-with-admin-portal">
+<h3>Creating notificastions with Admin portal<a class="headerlink" href="#creating-notificastions-with-admin-portal" title="Permalink to this headline">¶</a></h3>
+<p>To create the new notification with the admin portal, do the following:</p>
+<ol class="arabic simple">
+<li>Log in to the admin portal.</li>
+<li>In the left nav, click <strong>Push > Send Notification</strong>.</li>
+<li>From the <strong>Notifier</strong> drop-down, select the appropriate notifier.</li>
+<li>Under the notifier name, select one of the following to specify where
+your notification message should go:</li>
+</ol>
+<ul class="simple">
+<li><strong>All Devices</strong> to have the message sent to all devices.</li>
+<li><strong>Devices</strong> to have the message sent to a particular subset of
+devices. Enter a comma-separated list of device UUIDs in the box
+provided.</li>
+<li><strong>Users</strong> to have the message sent to a particular subset of users.
+Enter a comma-separated list of username values in the box provided.</li>
+<li><strong>Groups</strong> to have the message sent to a particular subset of user
+groups. Enter a comma-separated list of group paths in the box
+provided.</li>
+</ul>
+<ol class="arabic simple" start="5">
+<li>In the <strong>Notifier Message</strong> field, enter the message (payload) you
+want delivered.</li>
+<li>If double-quotes are included in your message, you must escape them
+with a backslash. 7, Under <strong>Delivery</strong>, select one of the following
+to specify when the notification should be delivered:</li>
+</ol>
+<ul class="simple">
+<li><strong>Now</strong> to have the message delivered immediately.</li>
+<li>Schedule for later to choose a date and time at which the message
+should be delivered.</li>
+</ul>
+<ol class="arabic simple" start="7">
+<li>Click <strong>Submit</strong>.</li>
+</ol>
+<p>To create a notification to send multiple messages or target multiple
+platforms, see the cURL syntax for creating notifications.</p>
+</div>
+<div class="section" id="creating-notificastions-with-ios">
+<h3>Creating notificastions with iOS<a class="headerlink" href="#creating-notificastions-with-ios" title="Permalink to this headline">¶</a></h3>
+<p>To send notifications from iOS app code, you use the
+11ApigeeAPSDestination11 and <code class="docutils literal"><span class="pre">ApigeeAPSPayload</span></code> classes.</p>
+<p>With <code class="docutils literal"><span class="pre">ApigeeAPSDestination</span></code>, you specify where the notification should
+go (a particular user or device or user group, for example). With
+<code class="docutils literal"><span class="pre">ApigeeAPSPayload</span></code>, you specify the contents of the message, including
+any alert text, sound, or badge (items specified by Apple as allowable
+notification content types). You then use <code class="docutils literal"><span class="pre">ApigeeDataClient</span></code> to send
+the message via Apigee and Apple APNs.</p>
+<p>The following code illustrates how to send a notification to a single
+user. Though this is the device on which the app itself is installed,
+you can imagine how you might send a notification to another device,
+such as one belonging to someone “following” this user. For more, see
+the iOS push sample application included with the <a class="reference external" href="../sdks/tbd.html">Apigee iOS
+SDK</a>.</p>
+<div class="highlight-python"><div class="highlight"><pre>- (void)sendMyselfAPushNotification:(NSString *)message
+completionHandler:(ApigeeDataClientCompletionHandler)completionHandler
+{
+ // send to a single device -- our own device
+ NSString *deviceId = [ApigeeDataClient getUniqueDeviceID];
+ ApigeeAPSDestination* destination =
+ [ApigeeAPSDestination destinationSingleDevice:deviceId];
+
+ // set our APS payload
+ ApigeeAPSPayload* apsPayload = [[ApigeeAPSPayload alloc] init];
+ apsPayload.sound = kBundledSoundNameWithExt;
+ apsPayload.alertText = message;
+
+ // Example of what a custom payload might look like -- remember that
+ // APNS payloads are limited to a maximum of 256 bytes (for the entire
+ // payload -- including the 'aps' part)
+ NSMutableDictionary* customPayload = [[NSMutableDictionary alloc] init];
+ [customPayload setValue:@"72" forKey:@"degrees"];
+ [customPayload setValue:@"3" forKey:@"newOrders"];
+
+ __weak AppDelegate* weakSelf = self;
+
+ // send the push notification
+ [dataClient pushAlert:apsPayload
+ customPayload:customPayload
+ destination:destination
+ usingNotifier:notifier
+ completionHandler:^(ApigeeClientResponse *response) {
+ if ( ! [response completedSuccessfully]) {
+ [weakSelf alert:response.rawResponse
+ title: @"Error"];
+ }
+
+ if (completionHandler) {
+ completionHandler(response);
+ }
+ }];
+}
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="scheduling-notifications">
+<h2>Scheduling notifications<a class="headerlink" href="#scheduling-notifications" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="curl">
+<h3>cURL<a class="headerlink" href="#curl" title="Permalink to this headline">¶</a></h3>
+<p>To schedule a notification for a later time, add the deliver parameter
+with a UNIX timestamp to the body of your request.</p>
+<p>Request body syntax</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="s">'{"deliver":<unix_timestamp>,"payloads":{<notifier>:<message>}}'</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="targeting-multiple-notifiers-or-messages">
+<h2>Targeting multiple notifiers or messages<a class="headerlink" href="#targeting-multiple-notifiers-or-messages" title="Permalink to this headline">¶</a></h2>
+<p>To send multiple messages or target multiple platforms with a single
+notification entity, include multiple notifier-message pairs as a
+comma-separated list in the payloads object of the request body:</p>
+<p>Request body syntax</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="s">'{"payloads":{<notifier>:<message>, <notifier>:<message>, ...}}'</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="setting-a-notification-expiration">
+<h2>Setting a notification expiration<a class="headerlink" href="#setting-a-notification-expiration" title="Permalink to this headline">¶</a></h2>
+<p>If a push service can’t deliver a message to a device and needs to
+resend it (for example, if the device is turned off), you can set a
+notification to expire after a certain date/time.</p>
+<p>To do this, adding the expire parameter with a UNIX timestamp to your
+request body. This specifies when the service should stop trying to send
+the notification.</p>
+<div class="admonition warning"> <p class="first admonition-title"><p>Warning</p>
+ </p> <p class="last">
+
+
+Please note that if the expire property is not set and Apple APNS or<p>Google GCM are not able to immediately deliver your push notification,
+delivery will not be retried. This means your notification will not be
+delivered. As a best practice, you should always set an expire timestamp
+to ensure your notification is delivered in the event the delivery
+initially fails.</p>
+</p></div><p>Request body syntax</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="s">'{"expire":<unix_timestamp>,"payloads":{"<notifier_name>":"<message>"}}'</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="getting-notifications">
+<h2>Getting notifications<a class="headerlink" href="#getting-notifications" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="id1">
+<h3>cURL<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
+<p>The following are endpoints can be used to get notifications. For
+details on the notification properties you can get, see Notifier,
+Receipt, and Notification.</p>
+<p>Getting one or more notifications:</p>
+<div class="highlight-python"><div class="highlight"><pre>/notifications
+</pre></div>
+</div>
+<p>Getting notifications associated with one or more receipts:</p>
+<div class="highlight-python"><div class="highlight"><pre>/receipts/*/notification
+</pre></div>
+</div>
+<p>Getting the list of devices associated with one or more notifications
+before the notifications are sent:</p>
+<div class="highlight-python"><div class="highlight"><pre>/notifications/*/queue
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="canceling-sent-notifications">
+<h2>Canceling sent notifications<a class="headerlink" href="#canceling-sent-notifications" title="Permalink to this headline">¶</a></h2>
+<p>You can cancel a notification that’s already in progress by doing the
+following:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X PUT "https://api.usergrid.com/my-org/sandbox/notifications/<notification-uuid>" -d '{"canceled": true}'
+</pre></div>
+</div>
+<div class="section" id="admin-portal">
+<h3>Admin portal<a class="headerlink" href="#admin-portal" title="Permalink to this headline">¶</a></h3>
+<p>You can view JSON for notifications by viewing their entity entries in
+the Data section of your application.</p>
+<p>In the admin portal, click Data, then click the <strong>/notifications</strong>
+collection. You can also view notification data in the message history.</p>
+<p>In the admin portal, click Push, then click Message History. Locate the
+notification for which you want to view data, then click its view
+details link.</p>
+</div>
+</div>
+<div class="section" id="deleting-unsent-notifications">
+<h2>Deleting unsent notifications<a class="headerlink" href="#deleting-unsent-notifications" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="deleting-unsent-notifications-with-curl">
+<h3>Deleting unsent notifications with cURL<a class="headerlink" href="#deleting-unsent-notifications-with-curl" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X DELETE "https://api.usergrid.com/<you-org>/<app>/notifications/<notification-uuid>"
+</pre></div>
+</div>
+</div>
+<div class="section" id="deleting-unsent-notifications-with-admin-portal">
+<h3>Deleting unsent notifications with Admin Portal<a class="headerlink" href="#deleting-unsent-notifications-with-admin-portal" title="Permalink to this headline">¶</a></h3>
+<ol class="arabic simple">
+<li>In the admin portal, click Push, then Message History.</li>
+<li>On the Message History page, click Scheduled.</li>
+<li>In the list of scheduled messages, locate the message you want to
+delete.</li>
+<li>In the top area of the message item, click the delete link.</li>
+</ol>
+</div>
+</div>
+<div class="section" id="getting-receipts">
+<h2>Getting receipts<a class="headerlink" href="#getting-receipts" title="Permalink to this headline">¶</a></h2>
+<p>After sending a notification, the BaaS generates a receipt entity that
+contains details about the notification. Receipts show details such as
+timestamps, payloads sent, and the receipt endpoints.</p>
+<p>For information about what’s contained in a receipt, see
+<a class="reference external" href="..//rest-endpoints/api-docs.html#notifier">Notifier</a>,
+<a class="reference external" href="..//rest-endpoints/api-docs.html#receipt">Receipt</a>, and
+<a class="reference external" href="..//rest-endpoints/api-docs.html#notification">Notification</a>. Use
+the following endpoints to get receipts.</p>
+<p>To get one or more receipts:</p>
+<div class="highlight-python"><div class="highlight"><pre>/receipts
+</pre></div>
+</div>
+<p>To get receipts associated with one or more devices:</p>
+<div class="highlight-python"><div class="highlight"><pre>/devices/*/receipts
+</pre></div>
+</div>
+<p>To get receipts for one or more notifications. For example, get receipts
+for notifications that had errors.</p>
+<div class="highlight-python"><div class="highlight"><pre>/notifications/*/receipts
+</pre></div>
+</div>
+</div>
+<div class="section" id="notification-endpoints">
+<h2>Notification endpoints<a class="headerlink" href="#notification-endpoints" title="Permalink to this headline">¶</a></h2>
+<p>The <code class="docutils literal"><span class="pre">/notifications</span></code> endpoints let you create, schedule, cancel, and
+delete notifications. You can also use the following endpoints to
+accomplish the same actions for specific groups, users, devices, or any
+combination thereof.</p>
+<p>Base URL: <code class="docutils literal"><span class="pre">https://api.usergrid.com/my-org/my-app</span></code></p>
+<div class="highlight-python"><div class="highlight"><pre>/groups/*/notifications
+/groups/*/users/*/notifications
+/groups/*/users/*/devices/*/notifications
+/users/*/notifications
+/users/*/devices/*/notifications
+/devices/*/notifications
+</pre></div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ <footer>
+
+ <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+
+ <a href="troubleshooting.html" class="btn btn-neutral float-right" title="Troubleshooting" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+
+
+ <a href="managing-users-and-devices.html" class="btn btn-neutral" title="Managing users and devices" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+
+ </div>
+
+
+ <hr/>
+
+ <div role="contentinfo">
+ <p>
+ © Copyright 2013-2015, Apache Usergrid.
+
+ </p>
+ </div>
+ Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+
+
+
+
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT:'../',
+ VERSION:'1.0',
+ COLLAPSE_INDEX:false,
+ FILE_SUFFIX:'.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+
+
+
+
+
+ <script type="text/javascript" src="../_static/js/theme.js"></script>
+
+
+
+
+ <script type="text/javascript">
+ jQuery(function () {
+ SphinxRtdTheme.StickyNav.enable();
+ });
+ </script>
+
+
+</body>
+</html>
\ No newline at end of file
[17/36] usergrid git commit: Update generated website content.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/push-notifications/tutorial.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/tutorial.html b/content/docs/push-notifications/tutorial.html
new file mode 100644
index 0000000..76a2483
--- /dev/null
+++ b/content/docs/push-notifications/tutorial.html
@@ -0,0 +1,666 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>Tutorial: Push notifications sample app — Apache Usergrid 1.0 documentation</title>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+
+
+
+
+
+ <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+ <link rel="next" title="Registering with a notification service" href="registering.html"/>
+ <link rel="prev" title="Getting started with push notifications" href="getting-started.html"/>
+
+
+ <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+ <div class="wy-grid-for-nav">
+
+
+ <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+ <div class="wy-side-nav-search">
+
+
+
+ <a href="../index.html" class="icon icon-home"> Apache Usergrid
+
+
+
+ </a>
+
+
+
+
+ <div class="version">
+ 1.0
+ </div>
+
+
+
+
+<div role="search">
+ <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+ <input type="text" name="q" placeholder="Search docs" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+
+
+ </div>
+
+ <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+
+
+
+ <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters & clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators & data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Tutorial: Push notifications sample app</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#before-you-begin">Before you begin</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#step-1-download-a-sample-app">Step 1: Download a sample app</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#step-2-register-with-a-notification-service-and-generate-a-certificate-key">Step 2: Register with a notification service and generate a certificate/key</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#step-3-create-a-notifier">Step 3: Create a notifier</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#step-4-configure-and-run-the-sample-app">Step 4: Configure and run the sample app</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#ios-dev-setup">iOS Dev Setup</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#phonegap-ios-dev-setup">PhoneGap iOS Dev Setup</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#about-ios-provisioning-profiles">About iOS provisioning profiles</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#android-dev-setup">Android Dev Setup</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#phonegap-android-dev-setup">PhoneGap Android Dev Setup</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#more-about-phonegap">More about PhoneGap</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#step-5-review-the-data-entities-created-by-the-sample-app">Step 5: Review the data entities created by the sample app</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#step-6-send-additional-push-notifications-using-other-usergrid-tools">Step 6: Send additional push notifications using other Usergrid tools</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#send-a-push-notification-directly-via-the-push-notifications-api">Send a push notification directly via the push notifications API</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security & Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management & Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management & social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets & Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters & Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters & events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating & incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations & Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations & Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code & Docs</a></li>
+</ul>
+
+
+
+ </div>
+
+ </nav>
+
+ <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+ <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+ <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+ <a href="../index.html">Apache Usergrid</a>
+ </nav>
+
+
+
+ <div class="wy-nav-content">
+ <div class="rst-content">
+ <div role="navigation" aria-label="breadcrumbs navigation">
+ <ul class="wy-breadcrumbs">
+ <li><a href="../index.html">Docs</a> »</li>
+
+ <li>Tutorial: Push notifications sample app</li>
+ <li class="wy-breadcrumbs-aside">
+
+
+ <a href="../_sources/push-notifications/tutorial.txt" rel="nofollow"> View page source</a>
+
+
+ </li>
+ </ul>
+ <hr/>
+</div>
+ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+ <div itemprop="articleBody">
+
+ <div class="section" id="tutorial-push-notifications-sample-app">
+<h1>Tutorial: Push notifications sample app<a class="headerlink" href="#tutorial-push-notifications-sample-app" title="Permalink to this headline">¶</a></h1>
+<p>In this tutorial, you’ll use a sample app (iOS, Android, or PhoneGap) to
+send yourself a push notification with the Usergrid push notification
+API. You’ll register with a push notification services (Apple APNs or
+Google GCM) to create the required security certificate or key, create
+the required Usergrid notifier to send a message, then modify, compile
+and run the sample app to see push notifications in action.</p>
+<div class="admonition note"> <p class="first admonition-title"><p>Note</p>
+ </p> <p class="last">
+
+
+For an overview of how to set up push notifications, including<p>troubleshooting tips, see <a class="reference external" href="adding-push-support.html">Adding push notifications
+support</a>.</p>
+</p></div><div class="section" id="before-you-begin">
+<h2>Before you begin<a class="headerlink" href="#before-you-begin" title="Permalink to this headline">¶</a></h2>
+<p>Before you can add support for push notifications, be sure that you’re
+set up for the requirements described in Adding push notifications
+support.</p>
+</div>
+<div class="section" id="step-1-download-a-sample-app">
+<h2>Step 1: Download a sample app<a class="headerlink" href="#step-1-download-a-sample-app" title="Permalink to this headline">¶</a></h2>
+<p>Sample push notification apps are included in the /samples directory of
+the following platform SDKs and plugins:</p>
+<ul class="simple">
+<li>Native iOS <a class="reference external" href="http://www.apigee.com/docs/content/ios-sdk-redirect">Download the
+SDK</a></li>
+<li>Native Android <a class="reference external" href="http://www.apigee.com/docs/content/android-sdk-redirect">Download the
+SDK</a></li>
+<li>PhoneGap iOS & Android (HTML5) [Download the
+SDK](<a class="reference external" href="http://www.apigee.com/docs/content/javascript-sdk-redirect">http://www.apigee.com/docs/content/javascript-sdk-redirect</a></li>
+</ul>
+<p>To begin this tutorial, download the sample app for the platform of your
+choice.</p>
+<p><strong>A note to PhoneGap developers</strong>: PhoneGap requires a plugin to enable
+push notifications. The plugin is included in the sample apps in the
+JavaScript SDK. For new PhoneGap applications, <a class="reference external" href="https://github.com/phonegap-build/PushPlugin">download the PhoneGap
+push plugin</a>.</p>
+</div>
+<div class="section" id="step-2-register-with-a-notification-service-and-generate-a-certificate-key">
+<h2>Step 2: Register with a notification service and generate a certificate/key<a class="headerlink" href="#step-2-register-with-a-notification-service-and-generate-a-certificate-key" title="Permalink to this headline">¶</a></h2>
+<p>To send push notifications you must register your app with the push
+notification service that corresponds to your app’s platform. Once
+registered, the service will provide you with a certificate or key that
+you will provide when creating an Usergrid notifier.</p>
+<p>For a full walkthrough of how to register an app with a notification
+service and generate the necessary certificate/key, see <a class="reference external" href="registration.html">Registering
+with a notification service</a>.</p>
+</div>
+<div class="section" id="step-3-create-a-notifier">
+<h2>Step 3: Create a notifier<a class="headerlink" href="#step-3-create-a-notifier" title="Permalink to this headline">¶</a></h2>
+<p>Notifiers are entities that carry your push notifications to a
+notification service. Once a notification service has verified that your
+notifier contains valid credentials, it will deliver your push
+notification to the devices of your app’s users.</p>
+<p>For information on how to use the admin portal to create a notifier, see
+<a class="reference external" href="creating-notifiers.html">Creating notifiers</a>.</p>
+</div>
+<div class="section" id="step-4-configure-and-run-the-sample-app">
+<h2>Step 4: Configure and run the sample app<a class="headerlink" href="#step-4-configure-and-run-the-sample-app" title="Permalink to this headline">¶</a></h2>
+<p>In this step, you’ll open your sample app of choice in your IDE and
+configure it. The Android sample app can be run with an emulator,
+included in the Android Developer Tools. The iOS sample app must be run
+on an actual iOS device.</p>
+<p>The following sections provide platform-specific guidance for setting up
+and running the samples. However, this content assumes that you
+understand your development environment well enough to configure and
+work with projects.</p>
+<div class="section" id="ios-dev-setup">
+<h3>iOS Dev Setup<a class="headerlink" href="#ios-dev-setup" title="Permalink to this headline">¶</a></h3>
+<p>To configure and run the Native iOS push notification sample app, do the
+following:</p>
+<ol class="arabic simple">
+<li>Open the iOS sample app with XCode by opening its .xcodeproj file.</li>
+<li>Make the following changes to <strong>/Push Test/AppDelegate.m</strong>:</li>
+</ol>
+<ul class="simple">
+<li><strong>orgName</strong>: Your Apigee organization.</li>
+<li><strong>appName</strong>: The app in your organization where you created the
+notifier. (For the sample, make sure it’s “sandbox”.)</li>
+<li><strong>notifier</strong>: Name of the notifier you created. (For the sample, make
+sure it’s “appledev”.).</li>
+</ul>
+<ol class="arabic simple" start="3">
+<li>Plug your iOS device into your development machine.</li>
+<li>In Xcode, select <strong>Window > Organizer</strong> to open the Xcode Organizer.</li>
+<li>Under <strong>Devices</strong>, select the device you plugged in, then click
+<strong>Add to Member Center</strong>. You may be prompted to log in with the
+Apple ID associated with your Apple Developer account.</li>
+<li>If prompted, select a Development Team to use for provisioning. This
+will be a team you’ve registered at the Apple developer portal.</li>
+<li>Log in to the <a class="reference external" href="https://developer.apple.com/">Apple Developer
+portal</a> and create a provisioning
+profile that includes the App ID you chose when you registered the
+sample app with Apple APNs. For more information on how to create a
+provisioning profile, see “About provisioning profiles” below.</li>
+<li>Download the profile and add it into Xcode Organizer, in the
+Provisioning Profiles group under your plugged-in device.</li>
+<li>Close the Organizer.</li>
+<li>In Xcode, select the Project Navigator, then select the project root
+folder.</li>
+<li>In the <strong>General</strong> tab, in the <strong>Bundle Identifer</strong> box, enter the
+App ID associated with your provisioning profile.</li>
+<li>In the <strong>Build Settings</strong> tab, under <strong>Deployment</strong>, for the <strong>iOS
+Deployment Target</strong> select the iOS version on your connected device.
+The version is displayed in the Xcode Organizer.</li>
+<li>In the <strong>Build Settings</strong> tab, under <strong>Code Signing</strong>, under <strong>Code
+Signing Identity > Debug</strong>, select the Apple signing certificate
+corresponding to your developer identity.</li>
+</ol>
+<img alt="../_images/iospushsettings.png" src="../_images/iospushsettings.png" />
+<ol class="arabic simple" start="14">
+<li>Click <strong>Run</strong> to launch the sample on your iOS device.</li>
+<li>When the “codesign wants to sign using key in your keychain.” dialog
+is displayed, click <strong>Allow</strong>.</li>
+<li>The project is now built, and the app is installed on your device.
+The first time you run the push sample app, your device will ask
+permission to allow push notifications. Tap <strong>OK</strong>.</li>
+</ol>
+<img alt="../_images/iospushauth.png" src="../_images/iospushauth.png" />
+<ol class="arabic simple" start="17">
+<li>In the app, tap the <strong>push to this device</strong> button to send yourself
+a push notification. If you have configured your notification to go
+to multiple devices, tap the <strong>push to all devices</strong> button to send
+the push notification to all devices.</li>
+</ol>
+<img alt="../_images/iospushfinal.png" src="../_images/iospushfinal.png" />
+</div>
+<div class="section" id="phonegap-ios-dev-setup">
+<h3>PhoneGap iOS Dev Setup<a class="headerlink" href="#phonegap-ios-dev-setup" title="Permalink to this headline">¶</a></h3>
+<p>To configure and run the PhoneGap iOS push notification sample app, do
+the following:</p>
+<ol class="arabic simple">
+<li>Open the iOS PhoneGap sample app with Xcode by opening its .xcodeproj
+file.</li>
+<li>Make the following changes in <strong>/www/js/index.js</strong>:</li>
+</ol>
+<ul class="simple">
+<li><strong>orgName</strong>: Your Apigee organization.</li>
+<li><strong>appName</strong>: The app in your organization where you created the
+notifier. (For the sample, make sure it’s “sandbox”.)</li>
+<li><strong>notifier</strong>: Name of the notifier you created.</li>
+</ul>
+<ol class="arabic simple" start="3">
+<li>Plug your iOS device into your development machine.</li>
+<li>In Xcode, select <strong>Window > Organizer</strong> to open the Xcode Organizer.</li>
+<li>Under <strong>Devices</strong>, select the device you plugged in, then click
+<strong>Add to Member Center</strong>. You may be prompted to log in with the
+Apple ID associated with your Apple Developer account.</li>
+<li>If prompted, select a Development Team to use for provisioning. This
+will be a team you’ve registered at the Apple developer portal.</li>
+<li>Log in to the <a class="reference external" href="https://developer.apple.com/">Apple Developer
+portal</a> and create a provisioning
+profile that includes the App ID you chose when you registered the
+sample app with Apple APNs. For more information on how to create a
+provisioning profile, see “About provisioning profiles” below.</li>
+<li>Download the profile and add it into Xcode Organizer, in the
+Provisioning Profiles group under your plugged-in device.</li>
+<li>Close the Organizer.</li>
+<li>In Xcode, select the Project Navigator, then select the project root
+folder.</li>
+<li>In the <strong>General</strong> tab, in the <strong>Bundle Identifer</strong> box, enter the
+App ID associated with your provisioning profile.</li>
+<li>In the <strong>Build Settings</strong> tab, under <strong>Deployment</strong>, for the <strong>iOS
+Deployment Target</strong> select the iOS version on your connected device.
+The version is displayed in the Xcode Organizer.</li>
+<li>In the <strong>Build Settings</strong> tab, under <strong>Code Signing</strong>, under <strong>Code
+Signing Identity > Debug</strong>, select the Apple signing certificate
+corresponding to your developer identity.</li>
+</ol>
+<img alt="../_images/iospgsettings.png" src="../_images/iospgsettings.png" />
+<ol class="arabic simple" start="14">
+<li>At the top of the IDE, ensure that the name for your plugged in
+device is displayed next to the target name, then click the Run
+button to launch the sample on your iOS device.</li>
+<li>If the “codesign wants to sign using key in your keychain” dialog is
+displayed, click <strong>Allow</strong>.</li>
+<li>The project is now built, and the app is installed on your device.
+The first time you run the push sample app, your device will ask
+permission to allow push notifications. Tap OK.</li>
+<li>In the app, tap the <strong>Send a push with Phonegap!</strong> button to send
+yourself a push notification.</li>
+</ol>
+<img alt="../_images/iospgapp.png" src="../_images/iospgapp.png" />
+</div>
+<div class="section" id="about-ios-provisioning-profiles">
+<h3>About iOS provisioning profiles<a class="headerlink" href="#about-ios-provisioning-profiles" title="Permalink to this headline">¶</a></h3>
+<p>For iOS app testing, you need a provisioning profile that’s associated
+with an Apple ID. You set up the provisioning profile in the Apple
+developer portal, download the profile, and import it into Xcode.</p>
+<p>To set up a provisioning profile, you need to create an “iOS App
+Development” certificate in the Apple developer portal. For example, in
+the Apple APNs setup earlier in this tutorial, you created a certificate
+in the Apple developer portal to be used for push notifications.
+However, you won’t be able to create a provisioning portal with just
+that certificate. You also need to create an “iOS App Development”
+certificate (the configuration settings don’t matter), as shown in the
+following image.</p>
+<img alt="../_images/iospgcert.png" src="../_images/iospgcert.png" />
+<p>After you create an iOS App Development certificate, you can create a
+provisioning profile that includes your App ID/certificate for push
+notifications.</p>
+</div>
+<div class="section" id="android-dev-setup">
+<h3>Android Dev Setup<a class="headerlink" href="#android-dev-setup" title="Permalink to this headline">¶</a></h3>
+<p>To configure and run the native Android push notification sample app, do
+the following:</p>
+<ol class="arabic simple">
+<li>Make sure you have the latest Android SDK installed in your IDE, and
+that Android APIs have been installed via the Android SDK Manager.</li>
+<li>Import the native Android sample app project into your IDE</li>
+<li>Modify the following in <strong>/src/com.ganyo.pushtest/Settings.java</strong>:</li>
+</ol>
+<ul class="simple">
+<li><strong>GCM_SENDER_ID</strong>: Your Google Cloud Messaging (GCM) project
+number, as described in the Tutorial: Push notifications sample app.</li>
+<li><strong>NOTIFIER</strong>: Name of your notifier. (For the sample, make sure it’s
+the name of the notifier you created.)</li>
+<li><strong>ORG</strong>: Your Apigee organization.</li>
+<li><strong>APP</strong>: The app in your organization where you created the notifier.
+(For the sample, make sure it’s “sandbox”.)</li>
+<li><strong>USER</strong> and <strong>PASSWORD</strong>: Optional. If you created your notifier in
+an app other than “sandbox” (which doesn’t require authentication),
+enter the username and password of one of your Usergrid admin users.</li>
+</ul>
+<ol class="arabic simple" start="4">
+<li>In AndroidManifest.xml, be sure the proper Android permissions are
+included, such as READ_PHONE_STATE and VIBRATE.</li>
+<li>In your project properties, go to <strong>Java Build Path > Libraries</strong> and
+add all the JAR files from the project’s /libs directory.</li>
+<li>In the <strong>Order and Export</strong> tab, move the JARs to the top of the list
+and select all the check boxes. Make sure the order and selections
+match the following image:</li>
+</ol>
+<img alt="../_images/assettings.png" src="../_images/assettings.png" />
+<ol class="arabic simple" start="7">
+<li>If you’re using an emulator, configure the emulator to use the Google
+APIs Level 16 target.</li>
+</ol>
+<img alt="../_images/asemu.png" src="../_images/asemu.png" />
+<ol class="arabic simple" start="8">
+<li>Run the project as an Android Application. The IDE should compile the
+project and install the app on your device.</li>
+<li>Press the button on the app to send yourself a push notification.</li>
+</ol>
+<img alt="../_images/asapp.png" src="../_images/asapp.png" />
+</div>
+<div class="section" id="phonegap-android-dev-setup">
+<h3>PhoneGap Android Dev Setup<a class="headerlink" href="#phonegap-android-dev-setup" title="Permalink to this headline">¶</a></h3>
+<p>To configure and run the PhoneGap Android push notification sample app,
+do the following:</p>
+<ol class="arabic simple">
+<li>Make sure you have the latest Android SDK installed in your IDE, and
+that Android APIs have been installed via the Android SDK Manager.</li>
+<li>Import the PhoneGap Android sample app project into your IDE.</li>
+<li>Modify the following in <strong>/assets/www/js/index.js</strong>:</li>
+</ol>
+<ul class="simple">
+<li><strong>orgName</strong>: Your apigee organization.</li>
+<li><strong>appName</strong>: The app in your organization where you created the
+notifier. (For the sample, make sure it’s “sandbox”.)</li>
+<li><strong>notifier</strong>: Name of your notifier.</li>
+<li><strong>senderID</strong>: Your API project number (the project must support
+Google Cloud Messaging for Android (GCM)), as described in the
+<a class="reference external" href="registration.html">Registering with a notification service</a>.</li>
+</ul>
+<ol class="arabic simple" start="4">
+<li>In <strong>AndroidManifest.xml</strong>, be sure the proper Android permissions
+are included. This includes READ_PHONE_STATE and VIBRATE.</li>
+<li>In your project properties, go to <strong>Java Build Path > Libraries</strong> and
+add all the JAR files from the project’s /libs directory.</li>
+<li>In the <strong>Order and Export</strong> tab, move the JARs to the top of the list
+and select all the check boxes. Make sure the order and selections
+match the following image:</li>
+</ol>
+<img alt="../_images/pgasettings.png" src="../_images/pgasettings.png" />
+<ol class="arabic simple" start="7">
+<li>If you’re using an emulator, configure the emulator to use the Google
+APIs Level 16 target or above. Also, be sure to see the Android
+requirements in <a class="reference external" href="adding-push-supprt.html">Adding push notifications
+support</a> for steps on setting up the
+emulator to support push notifications.</li>
+</ol>
+<img alt="../_images/pgaspath.png" src="../_images/pgaspath.png" />
+<ol class="arabic simple" start="8">
+<li>Run the project as an Android Application. The IDE should compile the
+project and install the app on your device.</li>
+<li>Press the button on the app to send yourself a push notification.</li>
+</ol>
+<img alt="../_images/pgaapp.png" src="../_images/pgaapp.png" />
+<div class="admonition note"> <p class="first admonition-title"><p>Note</p>
+ </p> <p class="last">
+
+
+For troubleshooting tips, see [Adding push notifications<p>support](adding-push-supprt.html.</p>
+</p></div></div>
+<div class="section" id="more-about-phonegap">
+<h3>More about PhoneGap<a class="headerlink" href="#more-about-phonegap" title="Permalink to this headline">¶</a></h3>
+<p>The <a class="reference external" href="http://phonegap.com/">PhoneGap</a> iOS push notification sample was
+created using standard web technologies such as HTML5, JavaScript, and
+CSS. You build the app with those technologies, and PhoneGap provides
+project templates for iOS, Android, and other platforms. For example,
+atop platform-specific PhoneGap code, core app code between the iOS and
+Android samples is essentially the same.</p>
+<p>When using PhoneGap to develop push notification apps, you use a
+PhoneGap plugin designed to support push notifications. That plugin is
+included in the Apigee samples. For more about the plugin, see the
+<a class="reference external" href="https://github.com/phonegap-build/PushPlugin/blob/master/README.md">plugin’s GitHub
+project</a>.</p>
+</div>
+</div>
+<div class="section" id="step-5-review-the-data-entities-created-by-the-sample-app">
+<h2>Step 5: Review the data entities created by the sample app<a class="headerlink" href="#step-5-review-the-data-entities-created-by-the-sample-app" title="Permalink to this headline">¶</a></h2>
+<ol class="arabic simple">
+<li>Log in to the admin portal, and select Data in the left navigation
+pane.</li>
+<li>Select any of the following collections to view the entities that
+were created in them by the push notification sample app:</li>
+</ol>
+<ul class="simple">
+<li><code class="docutils literal"><span class="pre">/devices</span></code> - To see the device that was added.</li>
+<li><code class="docutils literal"><span class="pre">/notifications</span></code> - To see the notification that was sent.</li>
+<li><code class="docutils literal"><span class="pre">/receipts</span></code> - To see the receipt generated from the successful
+push.</li>
+</ul>
+</div>
+<div class="section" id="step-6-send-additional-push-notifications-using-other-usergrid-tools">
+<h2>Step 6: Send additional push notifications using other Usergrid tools<a class="headerlink" href="#step-6-send-additional-push-notifications-using-other-usergrid-tools" title="Permalink to this headline">¶</a></h2>
+<p>Send a push notification from the Usergrid Notifications console On the
+Send Notification screen. Select your notifier, select All Devices,
+enter a message, select Now, and click to send it.</p>
+<img alt="../_images/sendnotification.png" src="../_images/sendnotification.png" />
+<div class="section" id="send-a-push-notification-directly-via-the-push-notifications-api">
+<h3>Send a push notification directly via the push notifications API<a class="headerlink" href="#send-a-push-notification-directly-via-the-push-notifications-api" title="Permalink to this headline">¶</a></h3>
+<p>Use the following curl command in a terminal window, replacing your-org,
+your-app and notifier-name.</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST "https://api.usergrid.com/your-org/your-app/devices/*/notifications" -d '{"payloads":{"notifier-name":"I just sent another notification! Yea, me!"}}'
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ <footer>
+
+ <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+
+ <a href="registering.html" class="btn btn-neutral float-right" title="Registering with a notification service" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+
+
+ <a href="getting-started.html" class="btn btn-neutral" title="Getting started with push notifications" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+
+ </div>
+
+
+ <hr/>
+
+ <div role="contentinfo">
+ <p>
+ © Copyright 2013-2015, Apache Usergrid.
+
+ </p>
+ </div>
+ Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+
+
+
+
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT:'../',
+ VERSION:'1.0',
+ COLLAPSE_INDEX:false,
+ FILE_SUFFIX:'.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+
+
+
+
+
+ <script type="text/javascript" src="../_static/js/theme.js"></script>
+
+
+
+
+ <script type="text/javascript">
+ jQuery(function () {
+ SphinxRtdTheme.StickyNav.enable();
+ });
+ </script>
+
+
+</body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/push-notifications/users-devices.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/users-devices.html b/content/docs/push-notifications/users-devices.html
index 618e5f3..04ec406 100644
--- a/content/docs/push-notifications/users-devices.html
+++ b/content/docs/push-notifications/users-devices.html
@@ -80,14 +80,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -111,10 +112,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -139,9 +153,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -156,11 +170,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/reference/contribute-code.html
----------------------------------------------------------------------
diff --git a/content/docs/reference/contribute-code.html b/content/docs/reference/contribute-code.html
index d86a3cc..1bfe2a9 100644
--- a/content/docs/reference/contribute-code.html
+++ b/content/docs/reference/contribute-code.html
@@ -81,14 +81,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -112,10 +113,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -140,9 +154,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -157,11 +171,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/reference/presos-and-videos.html
----------------------------------------------------------------------
diff --git a/content/docs/reference/presos-and-videos.html b/content/docs/reference/presos-and-videos.html
index 6df605c..4ae95e4 100644
--- a/content/docs/reference/presos-and-videos.html
+++ b/content/docs/reference/presos-and-videos.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -141,9 +155,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -158,11 +172,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
[03/36] usergrid git commit: Adding operation and model
cross-references to Markdown representation
Posted by sf...@apache.org.
Adding operation and model cross-references to Markdown representation
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/f9a354b2
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/f9a354b2
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/f9a354b2
Branch: refs/heads/entity-size
Commit: f9a354b27e6f18565acba569595593f3f2b5f0aa
Parents: 72016ea
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Aug 18 10:12:55 2015 -0700
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Aug 18 10:12:55 2015 -0700
----------------------------------------------------------------------
docs/rest-endpoints/api-docs.html | 972 +++---
docs/rest-endpoints/api-docs.md | 3199 +++++++++++-------
.../main/groovy/usergrid/ApiDocGenerator.groovy | 17 +-
docs/src/main/resources/html/model.mustache | 6 +-
docs/src/main/resources/markdown/model.mustache | 50 +-
5 files changed, 2486 insertions(+), 1758 deletions(-)
----------------------------------------------------------------------
[10/36] usergrid git commit: Update generated website content.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/user-management/user-connections.html
----------------------------------------------------------------------
diff --git a/content/docs/user-management/user-connections.html b/content/docs/user-management/user-connections.html
index a743066..284a569 100644
--- a/content/docs/user-management/user-connections.html
+++ b/content/docs/user-management/user-connections.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -145,9 +159,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -162,11 +176,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/user-management/user-management.html
----------------------------------------------------------------------
diff --git a/content/docs/user-management/user-management.html b/content/docs/user-management/user-management.html
index e74d5dc..1453f2a 100644
--- a/content/docs/user-management/user-management.html
+++ b/content/docs/user-management/user-management.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -147,9 +161,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -164,11 +178,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/user-management/working-user-data.html
----------------------------------------------------------------------
diff --git a/content/docs/user-management/working-user-data.html b/content/docs/user-management/working-user-data.html
index 58e40bc..cc2f262 100644
--- a/content/docs/user-management/working-user-data.html
+++ b/content/docs/user-management/working-user-data.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -168,9 +182,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -185,11 +199,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -249,8 +265,9 @@
your application, you can add support for a wide variety of features
common to mobile apps. For example, you can:</p>
<ul class="simple">
-<li>Control access to data by defining permission rules. (See Security &
-token authentication for more.)</li>
+<li>Control access to data by defining permission rules. (See <a class="reference external" href="../security-and-auth/app-security.html">Security &
+token authentication</a> for
+more.)</li>
<li>Present content specific to each user, such as their list of
favorites.</li>
<li>Support social features, such as letting users “follow” one another,
@@ -263,10 +280,10 @@ things done with user data.</p>
<div class="section" id="creating-users">
<h2>Creating users<a class="headerlink" href="#creating-users" title="Permalink to this headline">¶</a></h2>
<p>A user entity represents an application user. Using API Services you can
-create, retrieve, update, delete, and query user entities. See User
-entity properties for a list of the system-defined properties for user
-entities. In addition, you can create user properties specific to your
-application.</p>
+create, retrieve, update, delete, and query user entities. See <a class="reference external" href="../rest-endpoints/api-doc.html#user">User
+entity properties</a> for a list of
+the system-defined properties for user entities. In addition, you can
+create user properties specific to your application.</p>
<div class="section" id="request-syntax">
<h3>Request Syntax<a class="headerlink" href="#request-syntax" title="Permalink to this headline">¶</a></h3>
<div class="highlight-python"><div class="highlight"><pre>curl -X POST "https://api.usergrid.com/your-org/your-app/users" -d '{ "username": "john.doe", "email": "john.doe@gmail.com", "name": "John Doe", "password": "test1234" }'
@@ -314,15 +331,18 @@ application.</p>
<p>Although the password parameter is not mandatory, if you don’t specify
it, the user will not be able to log in using username and password
credentials. If a password is not specified for the user, and you’re an
-Admin, you can set a password for the user (see Setting a password).</p>
+Admin, you can set a password for the user (see <a class="reference external" href="#changing-a-user-password">Changing a User
+Password</a>).</p>
<p>__ Note__: The username can contain any combination of characters,
including those that represent letters, numbers, and symbols.</p>
</div>
<div class="section" id="example">
<h3>Example<a class="headerlink" href="#example" title="Permalink to this headline">¶</a></h3>
<p><strong>Note</strong>: Although not shown in the API examples below, you need to
-provide a valid access token with each API call. See Authenticating
-users and application clients for details.</p>
+provide a valid access token with each API call. See <a class="reference external" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating
+users and application
+clients</a>
+for details.</p>
</div>
<div class="section" id="request">
<h3>Request<a class="headerlink" href="#request" title="Permalink to this headline">¶</a></h3>
@@ -379,9 +399,9 @@ users and application clients for details.</p>
<p>You can retrieve data about users through cURL or one of the SDKs. Each
provides a way to filter the list of users by data associated with the
user, such as username or UUID, or other properties in the user entity.</p>
-<p>See User entity properties for a list of the system-defined properties
-for user entities. In addition, you can create user properties specific
-to your application.</p>
+<p>See <a class="reference external" href="../rest-endpoints/api-doc.html#user">User entity properties</a> for
+a list of the system-defined properties for user entities. In addition,
+you can create user properties specific to your application.</p>
<div class="section" id="id1">
<h3>Request Syntax<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
<div class="highlight-python"><div class="highlight"><pre>curl -X GET "https://api.usergrid.com/your-org/your-app/users"
@@ -420,9 +440,10 @@ to your application.</p>
<p>The alias <code class="docutils literal"><span class="pre">/users/me</span></code> can be used in place of the current user’s uuid,
username, or email address. Note: The <code class="docutils literal"><span class="pre">/users/me</span></code> endpoint is
accessible only if you provide an access token with the request (see
-Authenticating users and application clients). If you make an anonymous
-(“guest”) call, the system will not be able to determine which user to
-return as /users/me.</p>
+<a class="reference external" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users and application
+clients</a>).
+If you make an anonymous (“guest”) call, the system will not be able to
+determine which user to return as <code class="docutils literal"><span class="pre">/users/me</span></code>.</p>
<p><strong>Note</strong>: The username can contain any combination of characters,
including those that represent letters, numbers, and symbols.</p>
</div>
[23/36] usergrid git commit: Update generated website content.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/data-storage/data-store-dbms.html
----------------------------------------------------------------------
diff --git a/content/docs/data-storage/data-store-dbms.html b/content/docs/data-storage/data-store-dbms.html
index f30c742..97ba7a3 100644
--- a/content/docs/data-storage/data-store-dbms.html
+++ b/content/docs/data-storage/data-store-dbms.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -141,9 +155,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -158,11 +172,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -226,14 +242,14 @@ databases.</p>
<div class="admonition note"> <p class="first admonition-title"><p>Note</p>
</p> <p class="last"><p>Usergrid is not a relational database. Optimizing for performance on a
non-relational database like Cassandra differs a bit from relational
-databases. For more information, see Optimizing access to your Usergrid
-data store.</p>
+databases. For more information, see <a class="reference external" href="../data-storage/optimizing-access.html">Optimizing access to your Usergrid
+data store</a>.</p>
</p> </div><p>Cassandra is specifically designed to support applications that need
flexibility and high scalability, particularly web and mobile
applications. Usergrid client applications write and read data formatted
as JavaScript Object Notation (JSON). (Usergrid provides SDKs through
which client apps can do much of this work in their native language. For
-more information, see Usergrid SDKs.)</p>
+more information, see <a class="reference external" href="../sdks/tbd.html">Usergrid SDKs</a>.)</p>
<p>With Cassandra as the underlying DBMS, apps benefit from:</p>
<p>Fast writes to the data store. * A distributed architecture that means
no single point of failure. * Flexibility in data model design. You
@@ -244,13 +260,13 @@ the high-level concepts of an RDBMS’s data model both to Cassandra’s and
to the Usergrid, which is backed by Cassandra.</p>
<table class="usergrid-table">
<tr>
- <td></td>
- <td><p>RDBMS</p>
-</td>
- <td><p>Cassandra</p>
-</td>
- <td><p>Usergrid</p>
-</td>
+ <th></th>
+ <th><p>RDBMS</p>
+</th>
+ <th><p>Cassandra</p>
+</th>
+ <th><p>Usergrid</p>
+</th>
</tr>
<tr>
<td><p>Each tuple is modeled as</p>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/data-storage/entities.html
----------------------------------------------------------------------
diff --git a/content/docs/data-storage/entities.html b/content/docs/data-storage/entities.html
index be4531f..40c0439 100644
--- a/content/docs/data-storage/entities.html
+++ b/content/docs/data-storage/entities.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -152,10 +153,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -180,9 +194,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -197,11 +211,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -270,8 +286,10 @@ multiple words are keyword-indexed.</p>
entities. If you are using one of the Usergrid SDKs, use one of the
entity type-specific SDK methods to create default data entities.</p>
<p><strong>Note</strong>: Although not shown in the API examples below, you need to
-provide a valid access token with each API call. See Authenticating
-users and application clients for details.</p>
+provide a valid access token with each API call. See <a class="reference external" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating
+users and application
+clients</a>
+for details.</p>
<div class="section" id="creating-a-custom-entity">
<h3>Creating a custom entity<a class="headerlink" href="#creating-a-custom-entity" title="Permalink to this headline">¶</a></h3>
<p>When a new entity is created, Usergrid will automatically create a
@@ -464,7 +482,8 @@ might store the different varieties of milk as sub-properties of a
<p>An array of sub-properties is treated as a single object. This means
that sub-properties cannot be updated atomically. All sub-properties of
a given property must be updated as a set. For more on updating an
-existing sub-property, see Updating Data Entities.</p>
+existing sub-property, see <a class="reference external" href="../data-storage/entities.html#updating-data-entities">Updating Data
+Entities</a>.</p>
<p>Example Request/Response</p>
<div class="highlight-python"><div class="highlight"><pre>Request:
//Note the use of square brackets for specifying multiple nested objects
@@ -514,8 +533,10 @@ Response:
<h2>Retrieving Data Entities<a class="headerlink" href="#retrieving-data-entities" title="Permalink to this headline">¶</a></h2>
<p>This article describes how to retrieve entities from your account.</p>
<p><strong>Note</strong>: Although not shown in the API examples below, you need to
-provide a valid access token with each API call. See Authenticating
-users and application clients for details.</p>
+provide a valid access token with each API call. See <a class="reference external" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating
+users and application
+clients</a>
+for details.</p>
<p>With the exception of the user entity, all data entities can be
retrieved by using their UUID or a ‘name’ property. The user entity can
be retrieved by UUID or the ‘username’ property. The value for the
@@ -694,8 +715,10 @@ requests</p>
<h2>Updating Data Entities<a class="headerlink" href="#updating-data-entities" title="Permalink to this headline">¶</a></h2>
<p>This article describes how to update entities in your account.</p>
<p><strong>Note</strong>: Although not shown in the API examples below, you need to
-provide a valid access token with each API call. See Authenticating
-users and application clients for details.</p>
+provide a valid access token with each API call. See <a class="reference external" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating
+users and application
+clients</a>
+for details.</p>
<div class="section" id="updating-an-entity">
<h3>Updating an entity<a class="headerlink" href="#updating-an-entity" title="Permalink to this headline">¶</a></h3>
<p>One or more properties can be updated with a single PUT request. For
@@ -865,8 +888,10 @@ sub-properties within it to be overwritten.</p>
<h2>Deleting Data Entities<a class="headerlink" href="#deleting-data-entities" title="Permalink to this headline">¶</a></h2>
<p>This article describes how to delete data entities.</p>
<p><strong>Note</strong>:Although not shown in the API examples below, you need to
-provide a valid access token with each API call. See Authenticating
-users and application clients for details.</p>
+provide a valid access token with each API call. See <a class="reference external" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating
+users and application
+clients</a>
+for details.</p>
<div class="section" id="deleting-an-entity">
<h3>Deleting an entity<a class="headerlink" href="#deleting-an-entity" title="Permalink to this headline">¶</a></h3>
</div>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/data-storage/optimizing-access.html
----------------------------------------------------------------------
diff --git a/content/docs/data-storage/optimizing-access.html b/content/docs/data-storage/optimizing-access.html
index 43e215b..9f8c7b2 100644
--- a/content/docs/data-storage/optimizing-access.html
+++ b/content/docs/data-storage/optimizing-access.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -121,10 +122,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -149,9 +163,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -166,11 +180,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/entity-connections/connecting-entities.html
----------------------------------------------------------------------
diff --git a/content/docs/entity-connections/connecting-entities.html b/content/docs/entity-connections/connecting-entities.html
index d1bcda8..7f2ed4b 100644
--- a/content/docs/entity-connections/connecting-entities.html
+++ b/content/docs/entity-connections/connecting-entities.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -116,10 +117,23 @@
<li class="toctree-l1"><a class="reference internal" href="retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -144,9 +158,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -161,11 +175,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/entity-connections/disconnecting-entities.html
----------------------------------------------------------------------
diff --git a/content/docs/entity-connections/disconnecting-entities.html b/content/docs/entity-connections/disconnecting-entities.html
index cae444b..ce246ba 100644
--- a/content/docs/entity-connections/disconnecting-entities.html
+++ b/content/docs/entity-connections/disconnecting-entities.html
@@ -31,7 +31,7 @@
<link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
- <link rel="next" title="Security & token authentication" href="../security-and-auth/app-security.html"/>
+ <link rel="next" title="Push notifications overview" href="../push-notifications/overview.html"/>
<link rel="prev" title="Retrieving connections" href="retrieving-entities.html"/>
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -116,10 +117,23 @@
</ul>
</li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -144,9 +158,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -161,11 +175,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -331,7 +347,7 @@ is specified by its UUID.Parameter</p>
<div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
- <a href="../security-and-auth/app-security.html" class="btn btn-neutral float-right" title="Security & token authentication" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+ <a href="../push-notifications/overview.html" class="btn btn-neutral float-right" title="Push notifications overview" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
<a href="retrieving-entities.html" class="btn btn-neutral" title="Retrieving connections" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/entity-connections/retrieving-entities.html
----------------------------------------------------------------------
diff --git a/content/docs/entity-connections/retrieving-entities.html b/content/docs/entity-connections/retrieving-entities.html
index bafe45f..8788f8b 100644
--- a/content/docs/entity-connections/retrieving-entities.html
+++ b/content/docs/entity-connections/retrieving-entities.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -119,10 +120,23 @@
</li>
<li class="toctree-l1"><a class="reference internal" href="disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -147,9 +161,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -164,11 +178,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -224,15 +240,15 @@
<div class="section" id="retrieving-connections">
<h1>Retrieving connections<a class="headerlink" href="#retrieving-connections" title="Permalink to this headline">¶</a></h1>
-<p>Viewing all of an entities connections To see all of the connection
-types associated with an entity, simply retrieve the entity.</p>
+<p>To see all of the connection types associated with an entity, simply
+retrieve the entity.</p>
<p>All of the connection types the entity has made to other entities will
-appear in the metadata.connections property.</p>
+appear in the <code class="docutils literal"><span class="pre">metadata.connections</span></code> property.</p>
<p>All of the connection types that other entities have made to the entity
-will appear in the metadata.connecting property.</p>
+will appear in the <code class="docutils literal"><span class="pre">metadata.connecting</span></code> property.</p>
<p>For user entities, following/followers connections can be accessed by
-sending a GET request to the URL in the collections.following and
-collections.followers properties.</p>
+sending a <code class="docutils literal"><span class="pre">GET</span></code> request to the URL in the <code class="docutils literal"><span class="pre">collections.following</span></code>
+and <code class="docutils literal"><span class="pre">collections.follower</span></code>s properties.</p>
<p>Retrieve connected entities by connection type To get a list of entities
a specified entity has connected to with a specific connection type, do
the following:</p>
@@ -334,7 +350,7 @@ response.</p>
<p>To get a list of all the entities that have created a connection of a
specific type to a specified entity, use the same method as shown above
in Retrieve connected entities by connection type, and set the
-relationship to connecting/.</p>
+relationship to <code class="docutils literal"><span class="pre">connecting/<relationship></span></code>.</p>
<p>All of the entities that have made a connection to the specified entity
will be returned in the entities property of the response.</p>
</div>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/genindex.html
----------------------------------------------------------------------
diff --git a/content/docs/genindex.html b/content/docs/genindex.html
index 59ecb7c..9522579 100644
--- a/content/docs/genindex.html
+++ b/content/docs/genindex.html
@@ -81,14 +81,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -112,10 +113,23 @@
<li class="toctree-l1"><a class="reference internal" href="entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -140,9 +154,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -157,11 +171,13 @@
<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/geolocation/geolocation.html
----------------------------------------------------------------------
diff --git a/content/docs/geolocation/geolocation.html b/content/docs/geolocation/geolocation.html
index ed574ae..0b8eed5 100644
--- a/content/docs/geolocation/geolocation.html
+++ b/content/docs/geolocation/geolocation.html
@@ -31,7 +31,7 @@
<link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
- <link rel="next" title="Uploading assets" href="../asset-and-files/uploading-assets.html"/>
+ <link rel="next" title="Uploading assets" href="../assets-and-files/uploading-assets.html"/>
<link rel="prev" title="App Example - Messagee" href="../user-management/messagee-example.html"/>
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -146,9 +160,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -163,11 +177,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -279,7 +295,7 @@ property:</p>
the same location are returned in the order they were created.</p>
<p>The location parameter can be appended to any standard API Services
query. For more information on how to query your API Services data, see
-Querying your data.</p>
+<a class="reference external" href="../data-queries/querying-your-data.html">Querying your Data</a>.</p>
<p>For example, here is how you would find all the devices within 8,046
meters (~10 miles) of the center of San Francisco:</p>
<div class="highlight-python"><div class="highlight"><pre>curl -X GET https://api.usergrid.com/your-org/your-app/devices?ql=location within 8046 of 37.774989,-122.419413
@@ -349,7 +365,7 @@ happened.</p>
<div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
- <a href="../asset-and-files/uploading-assets.html" class="btn btn-neutral float-right" title="Uploading assets" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+ <a href="../assets-and-files/uploading-assets.html" class="btn btn-neutral float-right" title="Uploading assets" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
<a href="../user-management/messagee-example.html" class="btn btn-neutral" title="App Example - Messagee" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/getting-started/creating-a-new-application.html
----------------------------------------------------------------------
diff --git a/content/docs/getting-started/creating-a-new-application.html b/content/docs/getting-started/creating-a-new-application.html
index c470fc1..3b7cb8f 100644
--- a/content/docs/getting-started/creating-a-new-application.html
+++ b/content/docs/getting-started/creating-a-new-application.html
@@ -31,8 +31,8 @@
<link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
- <link rel="next" title="Creating an Usergrid Account" href="creating-account.html"/>
- <link rel="prev" title="Async vs. sync calls" href="../introduction/async-vs-sync.html"/>
+ <link rel="next" title="Using a Sandbox Application" href="using-a-sandbox-app.html"/>
+ <link rel="prev" title="Creating an Usergrid Account" href="creating-account.html"/>
<script src="../_static/js/modernizr.min.js"></script>
@@ -82,18 +82,19 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="creating-account.html">Creating an Usergrid Account</a></li>
<li class="toctree-l1 current"><a class="current reference internal" href="">Creating a new application</a><ul>
<li class="toctree-l2"><a class="reference internal" href="#creating-an-application">Creating an application</a></li>
<li class="toctree-l2"><a class="reference internal" href="#securing-an-application">Securing an application</a></li>
</ul>
</li>
-<li class="toctree-l1"><a class="reference internal" href="creating-account.html">Creating an Usergrid Account</a></li>
<li class="toctree-l1"><a class="reference internal" href="using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="using-the-api.html">Using the API</a></li>
</ul>
@@ -117,10 +118,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -145,9 +159,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -162,11 +176,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -236,16 +252,18 @@ select the organization to which you will add the new application.</li>
to the application drop-down.</li>
<li>In the dialog box, enter a new application name, then click the
Create button. Your new application will automatically be selected in
-the applications drop-down menu. Applications can also be created
-programmatically with a POST request to the API. For more, see
-Application.</li>
+the applications drop-down menu.</li>
</ol>
+<p>Applications can also be created programatically with a <code class="docutils literal"><span class="pre">POST</span></code> request
+to the API. For more, see
+<a class="reference external" href="../orgs-and-apps/application.html">Application</a>.</p>
</div>
<div class="section" id="securing-an-application">
<h2>Securing an application<a class="headerlink" href="#securing-an-application" title="Permalink to this headline">¶</a></h2>
<p>If this is going to be a production application, be sure to configure
security roles that provide only the level of access your users will
-need. For more on security, see Security best practices.</p>
+need. For more on security, see <a class="reference external" href="../security-and-auth/securing-your-app.html">Security Best
+Practices</a> .</p>
</div>
</div>
@@ -256,10 +274,10 @@ need. For more on security, see Security best practices.</p>
<div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
- <a href="creating-account.html" class="btn btn-neutral float-right" title="Creating an Usergrid Account" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+ <a href="using-a-sandbox-app.html" class="btn btn-neutral float-right" title="Using a Sandbox Application" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
- <a href="../introduction/async-vs-sync.html" class="btn btn-neutral" title="Async vs. sync calls" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+ <a href="creating-account.html" class="btn btn-neutral" title="Creating an Usergrid Account" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
</div>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/getting-started/creating-account.html
----------------------------------------------------------------------
diff --git a/content/docs/getting-started/creating-account.html b/content/docs/getting-started/creating-account.html
index e3b6ed6..f17481f 100644
--- a/content/docs/getting-started/creating-account.html
+++ b/content/docs/getting-started/creating-account.html
@@ -31,8 +31,8 @@
<link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
- <link rel="next" title="Using a Sandbox Application" href="using-a-sandbox-app.html"/>
- <link rel="prev" title="Creating a new application" href="creating-a-new-application.html"/>
+ <link rel="next" title="Creating a new application" href="creating-a-new-application.html"/>
+ <link rel="prev" title="Async vs. sync calls" href="../introduction/async-vs-sync.html"/>
<script src="../_static/js/modernizr.min.js"></script>
@@ -82,17 +82,18 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1 current"><a class="current reference internal" href="">Creating an Usergrid Account</a><ul>
<li class="toctree-l2"><a class="reference internal" href="#next-steps">Next steps</a></li>
</ul>
</li>
+<li class="toctree-l1"><a class="reference internal" href="creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="using-the-api.html">Using the API</a></li>
</ul>
@@ -116,10 +117,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -144,9 +158,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -161,11 +175,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -231,7 +247,8 @@ might want to read Usergrid features first.)</p>
create one for you with your new account). The sandbox is a
partitioned area of the data store where you can add example data and
try out API calls. The sandbox isn’t secure, but it’s handy to play
-in. For more about the sandbox, see “Using Your Application Sandbox”.</li>
+in. For more about the sandbox, see <a class="reference external" href="../getting-started/using-a-sandbox-app.html">Using Your Application
+Sandbox</a>.</li>
<li>The ability to create more applications (in addition to the sandbox).
You can (and should!) make these as secure as you need to. These are
the applications that you’ll have behind the apps you make available
@@ -242,14 +259,16 @@ including access levels. ** Manage the data in your app. **
Manage app features, including push notifications, activities,
analytics, and so on. ** Try out API calls with a shell command
window. ** To create an Usergrid account and see a very short
-tutorial to get started with, go to the get started page.</li>
+tutorial to get started with, go to the get started page of the
+Portal.</li>
</ul>
<div class="section" id="next-steps">
<h2>Next steps<a class="headerlink" href="#next-steps" title="Permalink to this headline">¶</a></h2>
<p>Ready to learn and do more?</p>
<ul class="simple">
<li>Install an SDK that will be most useful for your application
-environment. For more about Usergrid’s SDKs, see SDKs.</li>
+environment. For more about Usergrid’s SDKs, see
+<a class="reference external" href="../sdks/tbd.html">SDKs</a>.</li>
<li>Review Usergrid features for information on concepts and features.</li>
<li>Consult the API Reference for usage details.</li>
</ul>
@@ -263,10 +282,10 @@ environment. For more about Usergrid’s SDKs, see SDKs.</li>
<div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
- <a href="using-a-sandbox-app.html" class="btn btn-neutral float-right" title="Using a Sandbox Application" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+ <a href="creating-a-new-application.html" class="btn btn-neutral float-right" title="Creating a new application" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
- <a href="creating-a-new-application.html" class="btn btn-neutral" title="Creating a new application" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+ <a href="../introduction/async-vs-sync.html" class="btn btn-neutral" title="Async vs. sync calls" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
</div>
[15/36] usergrid git commit: Update generated website content.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/sdks/ios-new.html
----------------------------------------------------------------------
diff --git a/content/docs/sdks/ios-new.html b/content/docs/sdks/ios-new.html
new file mode 100644
index 0000000..dfac5d5
--- /dev/null
+++ b/content/docs/sdks/ios-new.html
@@ -0,0 +1,1323 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>Usergrid iOS SDK — Apache Usergrid 1.0 documentation</title>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+
+
+
+
+
+ <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+
+
+ <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+ <div class="wy-grid-for-nav">
+
+
+ <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+ <div class="wy-side-nav-search">
+
+
+
+ <a href="../index.html" class="icon icon-home"> Apache Usergrid
+
+
+
+ </a>
+
+
+
+
+ <div class="version">
+ 1.0
+ </div>
+
+
+
+
+<div role="search">
+ <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+ <input type="text" name="q" placeholder="Search docs" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+
+
+ </div>
+
+ <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+
+
+
+ <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters & clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators & data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security & Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management & Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management & social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets & Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters & Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters & events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating & incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations & Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations & Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code & Docs</a></li>
+</ul>
+
+
+
+ </div>
+
+ </nav>
+
+ <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+ <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+ <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+ <a href="../index.html">Apache Usergrid</a>
+ </nav>
+
+
+
+ <div class="wy-nav-content">
+ <div class="rst-content">
+ <div role="navigation" aria-label="breadcrumbs navigation">
+ <ul class="wy-breadcrumbs">
+ <li><a href="../index.html">Docs</a> »</li>
+
+ <li>Usergrid iOS SDK</li>
+ <li class="wy-breadcrumbs-aside">
+
+
+ <a href="../_sources/sdks/ios-new.txt" rel="nofollow"> View page source</a>
+
+
+ </li>
+ </ul>
+ <hr/>
+</div>
+ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+ <div itemprop="articleBody">
+
+ <div class="section" id="usergrid-ios-sdk">
+<h1>Usergrid iOS SDK<a class="headerlink" href="#usergrid-ios-sdk" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="getting-started">
+<h2>Getting Started<a class="headerlink" href="#getting-started" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="installing-the-sdk">
+<h3>Installing the SDK<a class="headerlink" href="#installing-the-sdk" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="building-from-source">
+<h3>Building from Source<a class="headerlink" href="#building-from-source" title="Permalink to this headline">¶</a></h3>
+</div>
+</div>
+</div>
+<div class="section" id="usergrid-sdk-reference-with-examples">
+<h1>Usergrid SDK Reference with Examples<a class="headerlink" href="#usergrid-sdk-reference-with-examples" title="Permalink to this headline">¶</a></h1>
+<p>The 66 topics listed below are each documented in the Usergrid
+documentation and for each the docs provide an API reference and example
+for each of these clients: curl, iOS, Android, JavaScript, Ruby and
+Node.js.</p>
+<div class="section" id="working-with-collections">
+<h2>Working with Collections<a class="headerlink" href="#working-with-collections" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="creating-collections">
+<h3>1. Creating collections<a class="headerlink" href="#creating-collections" title="Permalink to this headline">¶</a></h3>
+<p>SDK Method</p>
+<div class="highlight-python"><div class="highlight"><pre>(ApigeeClientResponse *)apiRequest: (NSString *)url operation:(NSString *)op data:(NSString *)opData
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="15%" />
+<col width="85%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>url</td>
+<td>A fully-formed url in the following format: <a class="reference external" href="https://api.usergrid.com///">https://api.usergrid.com///</a></td>
+</tr>
+<tr class="row-odd"><td>op</td>
+<td>The HTTP method - in this case, ‘POST’</td>
+</tr>
+<tr class="row-even"><td>opData</td>
+<td>No data is being sent, so the value is nil</td>
+</tr>
+</tbody>
+</table>
+<p>Example Request/Response</p>
+<p>Request:</p>
+<div class="highlight-python"><div class="highlight"><pre>-(NSString*)createCollection {
+
+NSString *url = @"https://api.usergrid.com/your-org/your-app/items";
+NSString *op = @"POST";
+NSString *opData = nil;
+
+ //we recommend you call ApigeeClient from your AppDelegate.
+ //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+ //create an instance of AppDelegate
+ AppDelegate *appDelegate = (AppDelegate *)[ [UIApplication sharedApplication] delegate];
+
+ //call createEntity to initiate the API call
+ ApigeeClientResponse *response = [appDelegate.dataClient apiRequest: url operation: op data: opData];
+
+@try {
+ //success
+}
+@catch (NSException * e) {
+ //fail
+}
+
+}
+</pre></div>
+</div>
+<p>Response:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+ <span class="s">"action"</span> <span class="p">:</span> <span class="s">"post"</span><span class="p">,</span>
+ <span class="s">"application"</span> <span class="p">:</span> <span class="s">"f34f4222-a166-11e2-a7f7-02e81adcf3d0"</span><span class="p">,</span>
+ <span class="s">"params"</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/items"</span><span class="p">,</span>
+ <span class="s">"uri"</span> <span class="p">:</span> <span class="s">"http://api.usergrid.com/your-org/your-app/items"</span><span class="p">,</span>
+ <span class="s">"entities"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">],</span>
+ <span class="s">"timestamp"</span> <span class="p">:</span> <span class="mi">1378857079220</span><span class="p">,</span>
+ <span class="s">"duration"</span> <span class="p">:</span> <span class="mi">31</span><span class="p">,</span>
+ <span class="s">"organization"</span> <span class="p">:</span> <span class="s">"your-org"</span><span class="p">,</span>
+ <span class="s">"applicationName"</span> <span class="p">:</span> <span class="s">"your-app"</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="retrieving-collections">
+<h3>2. Retrieving collections<a class="headerlink" href="#retrieving-collections" title="Permalink to this headline">¶</a></h3>
+<p>SDK Method</p>
+<div class="highlight-python"><div class="highlight"><pre>(ApigeeCollection*)getCollection:(NSString*)type
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="16%" />
+<col width="84%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>type</td>
+<td>The entity type associated with the collection to be retrieved</td>
+</tr>
+</tbody>
+</table>
+<p>Example Request/Response</p>
+<p>Request:</p>
+<div class="highlight-python"><div class="highlight"><pre>-(NSString*)getCollection {
+
+ //specify the entity type that corresponds to the collection to be retrieved
+ NSString *type = @"item";
+
+ //we recommend you call ApigeeClient from your AppDelegate.
+ //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+
+ //create an instance of AppDelegate
+ AppDelegate *appDelegate = (AppDelegate *)[ [UIApplication sharedApplication] delegate];
+
+ //Call getCollection: to initiate the API GET request
+ ApigeeCollection *collection = [appDelegate.dataClient getCollection:@"book"];
+}
+</pre></div>
+</div>
+<p>Response:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+ <span class="s">"action"</span> <span class="p">:</span> <span class="s">"get"</span><span class="p">,</span>
+ <span class="s">"application"</span> <span class="p">:</span> <span class="s">"f34f4222-a166-11e2-a7f7-02e81adcf3d0"</span><span class="p">,</span>
+ <span class="s">"params"</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/items"</span><span class="p">,</span>
+ <span class="s">"uri"</span> <span class="p">:</span> <span class="s">"http://api.usergrid.com/your-org/your-app/items"</span><span class="p">,</span>
+ <span class="s">"entities"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+ <span class="s">"uuid"</span> <span class="p">:</span> <span class="s">"5bb76bca-1657-11e3-903f-9ff6c621a7a4"</span><span class="p">,</span>
+ <span class="s">"type"</span> <span class="p">:</span> <span class="s">"item"</span><span class="p">,</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"milk"</span><span class="p">,</span>
+ <span class="s">"created"</span> <span class="p">:</span> <span class="mi">1378405020796</span><span class="p">,</span>
+ <span class="s">"modified"</span> <span class="p">:</span> <span class="mi">1378405020796</span><span class="p">,</span>
+ <span class="s">"metadata"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4"</span>
+ <span class="p">},</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"milk"</span><span class="p">,</span>
+ <span class="s">"price"</span> <span class="p">:</span> <span class="s">"3.25"</span>
+ <span class="p">},</span> <span class="p">{</span>
+ <span class="s">"uuid"</span> <span class="p">:</span> <span class="s">"1a9356ba-1682-11e3-a72a-81581bbaf055"</span><span class="p">,</span>
+ <span class="s">"type"</span> <span class="p">:</span> <span class="s">"item"</span><span class="p">,</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"bread"</span><span class="p">,</span>
+ <span class="s">"created"</span> <span class="p">:</span> <span class="mi">1378423379867</span><span class="p">,</span>
+ <span class="s">"modified"</span> <span class="p">:</span> <span class="mi">1378423379867</span><span class="p">,</span>
+ <span class="s">"metadata"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/items/1a9356ba-1682-11e3-a72a-81581bbaf055"</span>
+ <span class="p">},</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"bread"</span><span class="p">,</span>
+ <span class="s">"price"</span> <span class="p">:</span> <span class="s">"2.50"</span>
+ <span class="p">}</span> <span class="p">],</span>
+ <span class="s">"timestamp"</span> <span class="p">:</span> <span class="mi">1378426821261</span><span class="p">,</span>
+ <span class="s">"duration"</span> <span class="p">:</span> <span class="mi">35</span><span class="p">,</span>
+ <span class="s">"organization"</span> <span class="p">:</span> <span class="s">"your-org"</span><span class="p">,</span>
+ <span class="s">"applicationName"</span> <span class="p">:</span> <span class="s">"your-app"</span><span class="p">,</span>
+ <span class="s">"count"</span> <span class="p">:</span> <span class="mi">2</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="updating-collections">
+<h3>3. Updating collections<a class="headerlink" href="#updating-collections" title="Permalink to this headline">¶</a></h3>
+<p>SDK Method (ApigeeClientResponse <a href="#id1"><span class="problematic" id="id2">*</span></a>)apiRequest: (NSString <a href="#id3"><span class="problematic" id="id4">*</span></a>)url
+operation:(NSString <a href="#id5"><span class="problematic" id="id6">*</span></a>)op <a class="reference external" href="data:(NSString">data:(NSString</a> <a href="#id7"><span class="problematic" id="id8">*</span></a>)opData Properties Parameter
+Description url A fully-formed request url in the following format:
+<a class="reference external" href="https://api.usergrid.com////?ql=">https://api.usergrid.com////?ql=</a> Note that you must include an empty
+‘?ql=’ query string at the end of the URL</p>
+<p>op The HTTP method - in this case, ‘PUT’ opData A JSON-formatted string
+that contains the entity properties to be updated Example
+Request/Response Show Code Request: -(NSString*)updateCollection {</p>
+<div class="highlight-python"><div class="highlight"><pre>NSString *url = @"https://api.usergrid.com/your-org/your-app/items/?ql";
+NSString *op = @"PUT";
+NSString *opData = @"{\"availability\":\"in-stock\"}"; //we escape the quotes
+
+//we recommend you call ApigeeClient from your AppDelegate.
+//for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+//create an instance of AppDelegate
+AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+
+//call apiRequest to initiate the API call
+ApigeeClientResponse *response = [appDelegate.dataClient apiRequest: url operation: op data: opData];
+
+@try {
+ //success
+}
+@catch (NSException * e) {
+ //fail
+}
+</pre></div>
+</div>
+<p>}</p>
+<p>Response: { “action” : “put”, “application” :
+“f34f4222-a166-11e2-a7f7-02e81adcf3d0”, “params” : { “ql” : [ “” ] },
+“path” : “/items”, “uri” :
+“<a class="reference external" href="http://api.usergrid.com/your-org/your-app/items">http://api.usergrid.com/your-org/your-app/items</a>”, “entities” : [ {
+“uuid” : “31847b9a-1a62-11e3-be04-8d05e96f700d”, “type” : “item”, “name”
+: “milk”, “price” : “3.25”, “availability” : “in-stock” “created” :
+1378849479113, “modified” : 1378849567301, “name” : “milk”, }, { “uuid”
+: “3192ac6a-1a62-11e3-a24f-496ca1d42ce7”, “type” : “item”, “name” :
+“bread”, “price” : “4.00”, “availability” : “in-stock” “created” :
+1378849479206, “modified” : 1378849567351, “name” : “bread”, } ],
+“timestamp” : 1378849567280, “duration” : 207, “organization” :
+“your-org”, “applicationName” : “your-app” }</p>
+</div>
+<div class="section" id="deleting-collections">
+<h3>4. Deleting collections<a class="headerlink" href="#deleting-collections" title="Permalink to this headline">¶</a></h3>
+<p>SDK Method (ApigeeClientResponse <a href="#id9"><span class="problematic" id="id10">*</span></a>)apiRequest: (NSString <a href="#id11"><span class="problematic" id="id12">*</span></a>)url
+operation:(NSString <a href="#id13"><span class="problematic" id="id14">*</span></a>)op <a class="reference external" href="data:(NSString">data:(NSString</a> <a href="#id15"><span class="problematic" id="id16">*</span></a>)opData Properties Parameter
+Description url A fully-formed url in the following format:
+<a class="reference external" href="https://api.usergrid.com////?ql=">https://api.usergrid.com////?ql=</a> Note that you must include an empty
+‘?ql=’ query string at the end of the URL</p>
+<p>op The HTTP method - in this case, ‘DELETE’ opData No data is being
+sent, so the value is nil Example Request/Response The following example
+will delete the first 5 entities in a collection.</p>
+<p>Show Code Request: -(NSString*)deleteCollection {</p>
+<div class="highlight-python"><div class="highlight"><pre>NSString *url = @"https://api.usergrid.com/your-org/your-app/items/?ql='limit=5'";
+NSString *op = @"DELETE";
+NSString *opData = nil;
+
+//we recommend you call ApigeeClient from your AppDelegate.
+//for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+//create an instance of AppDelegate
+AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+
+//call createEntity to initiate the API call
+ApigeeClientResponse *response = [appDelegate.dataClient apiRequest: url operation: op data: opData];
+
+@try {
+ //success
+}
+@catch (NSException * e) {
+ //fail
+}
+</pre></div>
+</div>
+<p>}</p>
+<p>Response: { “action” : “delete”, “application” :
+“f34f4222-a166-11e2-a7f7-02e81adcf3d0”, “params” : { “ql” : [ “” ] },
+“path” : “/items”, “uri” :
+“<a class="reference external" href="http://api.usergrid.com/your-org/your-app/items">http://api.usergrid.com/your-org/your-app/items</a>”, “entities” : [ {
+“uuid” : “53fe3700-0abe-11e3-b1f7-1bd100b8059e”, “type” : “item”, “name”
+: “milk”, “price” : “3.25”, “created” : 1377129832047, “modified” :
+1377129832047, “metadata” : { “path” :
+“/items/53fe3700-0abe-11e3-b1f7-1bd100b8059e” }, “name” : “milk” }, {
+“uuid” : “5ae1fa7a-0abe-11e3-89ab-6be0003c809b”, “type” : “item”, “name”
+: “bread”, “price” : “4.00”, “created” : 1377129843607, “modified” :
+1377129843607, “metadata” : { “path” :
+“/items/5ae1fa7a-0abe-11e3-89ab-6be0003c809b” }, “name” : “bread” } ],
+“timestamp” : 1378848117272, “duration” : 12275, “organization” :
+“your-org”, “applicationName” : “your-app” }</p>
+</div>
+</div>
+<div class="section" id="working-with-entities">
+<h2>Working with Entities<a class="headerlink" href="#working-with-entities" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="creating-a-custom-entity">
+<h3>5. Creating a custom entity<a class="headerlink" href="#creating-a-custom-entity" title="Permalink to this headline">¶</a></h3>
+<p>SDK Method (ApigeeClientResponse <a href="#id17"><span class="problematic" id="id18">*</span></a>)createEntity:(NSDictionary
+<a href="#id19"><span class="problematic" id="id20">*</span></a>)newEntity Parameters Parameter Description newEntity NSDictionary
+object that contains the entity properties Example Request/Response Show
+Code Request: -(NSString*)newEntity {</p>
+<div class="highlight-python"><div class="highlight"><pre>//create an entity object
+NSMutableDictionary *entity = [[NSMutableDictionary alloc] init ];
+
+//Set entity properties
+[entity setObject:@"item" forKey:@"type"]; //Required. New entity type to create
+[entity setObject:@"milk" forKey:@"name"];
+[entity setObject:@"3.25" forKey:@"price"];
+
+//we recommend you call ApigeeClient from your AppDelegate.
+//for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+//create an instance of AppDelegate
+AppDelegate *appDelegate = (AppDelegate *)[ [UIApplication sharedApplication] delegate];
+
+//call createEntity to initiate the API call
+ApigeeClientResponse *response = [appDelegate.dataClient createEntity:entity];
+
+@try {
+ //success
+}
+@catch (NSException * e) {
+ //fail
+}
+</pre></div>
+</div>
+<p>}</p>
+<p>Response: { “action” : “post”, “application” :
+“4a1edb70-d7a8-11e2-9ce3-f315e5aa568a”, “params” : { }, “path” :
+“/items”, “uri” : “<a class="reference external" href="http://api.usergrid.com/my-org/my-app/items">http://api.usergrid.com/my-org/my-app/items</a>”,
+“entities” : [ { “uuid” : “83e9b7ea-e8f5-11e2-84df-e94123890c7a”, “type”
+: “item”, “name” : “milk”, “created” : 1373415195230, “modified” :
+1373415195230, “metadata” : {</p>
+<div class="highlight-python"><div class="highlight"><pre> "path" : "/items/83e9b7ea-e8f5-11e2-84df-e94123890c7a"
+ },
+ "name" : "milk",
+ "price" : "3.25"
+ } ],
+ "timestamp" : 1373415195225,
+ "duration" : 635,
+ "organization" : "my-org",
+ "applicationName" : "my-app"
+}
+</pre></div>
+</div>
+</div>
+<div class="section" id="creating-multiple-custom-entities">
+<h3>6. Creating multiple custom entities<a class="headerlink" href="#creating-multiple-custom-entities" title="Permalink to this headline">¶</a></h3>
+<p>Request Syntax curl -X POST <a class="reference external" href="https://api.usergrid.com////">https://api.usergrid.com////</a> -d ‘[{}, {},
+...]’ Parameters Parameter Description org Organization UUID or name app
+Application UUID or name entity_type Custom entity type to create. API
+Services will create a corresponding collection if one does not already
+exist. To add an entity to an existing collections, use the collection
+name or colleciton UUID in place of the entity type. entity
+Comma-separated list of entity objects to create. Each object should be
+formatted as a comma-separated list of entity properties, formatted as
+key-value pairs in the format : Example Request/Response Show Code
+Request: curl -X POST “<a class="reference external" href="https://api.usergrid.com/your-org/your-app/item">https://api.usergrid.com/your-org/your-app/item</a>”
+-d ‘[{“name”:”milk”, “price”:”3.25”}, {“name”:”bread”, “price”:”2.50”}]’
+Response: { “action” : “post”, “application” :
+“f34f4222-a166-11e2-a7f7-02e9sjwsf3d0”, “params” : { }, “path” :
+“/items”, “uri” : “<a class="reference external" href="http://api.usergrid.com/your-org/your-app/items">http://api.usergrid.com/your-org/your-app/items</a>”,
+“entities” : [ { “uuid” : “f3a8061a-ef0b-11e2-9e92-5f4a65c16193”, “type”
+: “item”, “name” : “milk”, “price” : “3.25”, “created” : 1374084538609,
+“modified” : 1374084538609, “metadata” : { “path” :
+“/multis/f3a8061a-ef0b-11e2-9e92-5f4a65c16193” }, “name” : “milk” }, {
+“uuid” : “f3be262a-ef0b-11e2-a51b-6715d5ef47a6”, “type” : “item”, “name”
+: “bread”, “price” : “2.50”, “created” : 1374084538754, “modified” :
+1374084538754, “metadata” : { “path” :
+“/items/f3be262a-ef0b-11e2-a51b-6715d5ef47a6” }, “name” : “bread” } ],
+“timestamp” : 1374084538584, “duration” : 388, “organization” :
+“your-org”, “applicationName” : “your-app” }</p>
+</div>
+<div class="section" id="creating-an-entity-with-sub-properties">
+<h3>7. Creating an entity with sub-properties<a class="headerlink" href="#creating-an-entity-with-sub-properties" title="Permalink to this headline">¶</a></h3>
+<p>SDK Method (ApigeeClientResponse <a href="#id21"><span class="problematic" id="id22">*</span></a>)createEntity:(NSDictionary
+<a href="#id23"><span class="problematic" id="id24">*</span></a>)newEntity Parameters Parameter Description newEntity
+NSMutableDictionary object that contains the entity properties Example
+Request/Response Show Code Request: -(NSString*)newEntity {</p>
+<div class="highlight-python"><div class="highlight"><pre>//Initialize an object for the new entity to be created
+NSMutableDictionary *entity = [ [NSMutableDictionary alloc] init ];
+
+//Initialize an object for each nested variety object
+NSMutableDictionary *variety_1 = [ [NSMutableDictionary alloc] init ];
+NSMutableDictionary *variety_2 = [ [NSMutableDictionary alloc] init ];
+NSMutableDictionary *variety_3 = [ [NSMutableDictionary alloc] init ];
+
+//Initialize an array to hold the nested variety objects
+NSMutableArray *variety_list = [ [NSMutableArray alloc] init];
+
+[variety_1 setObject:@"1%" forKey:@"name"];
+[variety_1 setObject:@"3.25" forKey:@"price"];
+[variety_1 setObject:@"0393847575533445" forKey:@"sku"];
+
+[variety_2 setObject:@"whole" forKey:@"name"];
+[variety_2 setObject:@"3.85" forKey:@"price"];
+[variety_2 setObject:@"0393394956788445" forKey:@"sku"];
+
+[variety_3 setObject:@"skim" forKey:@"name"];
+[variety_3 setObject:@"4.00" forKey:@"price"];
+[variety_3 setObject:@"0390299933488445" forKey:@"sku"];
+
+//Add the variety objects to the array
+[variety_list addObject:variety_1];
+[variety_list addObject:variety_2];
+[variety_list addObject:variety_3];
+
+//Set the item entity properties
+[entity setObject:@"item" forKey:@"type"]; //Required. New entity type to create
+[entity setObject:@"milk" forKey:@"name"];
+
+//Set the variety_list array as the value of the 'varieties' property
+[entity setObject:variety_list forKey:@"varieties"];
+
+//we recommend you call ApigeeClient from your AppDelegate.
+//for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+//create an instance of AppDelegate
+AppDelegate *appDelegate = (AppDelegate *)[ [UIApplication sharedApplication] delegate];
+
+//call createEntity to initiate the API call
+ApigeeClientResponse *response = [appDelegate.dataClient createEntity:entity];
+
+@try {
+ //success
+}
+@catch (NSException * e) {
+ //fail
+}
+</pre></div>
+</div>
+<p>}</p>
+<p>Response: { “action” : “post”, “application” :
+“f34f4222-a166-11e2-a7f7-02e81adcf3d0”, “params” : { }, “path” :
+“/items”, “uri” : “<a class="reference external" href="http://api.usergrid.com/your-org/your-app/items">http://api.usergrid.com/your-org/your-app/items</a>”,
+“entities” : [ { “uuid” : “0d7cf92a-effb-11e2-917d-c5e707256e71”, “type”
+: “item”, “name” : “milk”, “created” : 1374187231666, “modified” :
+1374187231666, “metadata” : { “path” :
+“/items/0d7cf92a-effb-11e2-917d-c5e707256e71” }, “name” : “milk”,
+“varieties” : [ { “name” : “1%”, “price” : “3.25”, “SKU” :
+“0393847575533445” }, { “name” : “whole”, “price” : “3.85”, “SKU” :
+“0393394956788445” }, { “name” : “skim”, “price” : “4.00”, “SKU” :
+“0390299933488445” } ] } ], “timestamp” : 1374187450826, “duration” :
+50, “organization” : “your-org”, “applicationName” : “your-app” }</p>
+</div>
+<div class="section" id="retrieving-an-entity">
+<h3>8. Retrieving an entity<a class="headerlink" href="#retrieving-an-entity" title="Permalink to this headline">¶</a></h3>
+<p>SDK Method</p>
+<div class="highlight-python"><div class="highlight"><pre>(ApigeeClientResponse *)getEntities: (NSString *)endpoint query:(NSString *)query
+</pre></div>
+</div>
+<p>Properties</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="13%" />
+<col width="87%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>endpoint</td>
+<td>The collection and entity identifier of the entity to be retrieved.</td>
+</tr>
+<tr class="row-odd"><td>query</td>
+<td>An optional query string. Requests for a specific entity should set the value to nil</td>
+</tr>
+</tbody>
+</table>
+<p>Endpoint exported in the following format: /</p>
+<p>Example Request/Response</p>
+<p>Request:</p>
+<div class="highlight-python"><div class="highlight"><pre>-(NSString*)getEntity {
+
+ //specify the entity collection and UUID or name to be retrieved
+ NSString *endpoint = @"items/b3aad0a4-f322-11e2-a9c1-999e12039f87";
+
+ NSString *query = nil;
+
+ //we recommend you call ApigeeClient from your AppDelegate.
+ //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+ //create an instance of AppDelegate
+ AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+
+ //call getEntities to initiate the API call
+ ApigeeClientResponse *response = [appDelegate.dataClient getEntities:endpoint queryString:query];
+
+ @try {
+ //success
+ }
+
+ @catch (NSException * e) {
+ //fail
+ }
+
+}
+</pre></div>
+</div>
+<p>Response:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+ <span class="s">"action"</span> <span class="p">:</span> <span class="s">"get"</span><span class="p">,</span>
+ <span class="s">"application"</span> <span class="p">:</span> <span class="s">"f34f4222-a166-11e2-a7f7-02e81adcf3d0"</span><span class="p">,</span>
+ <span class="s">"params"</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/items"</span><span class="p">,</span>
+ <span class="s">"uri"</span> <span class="p">:</span> <span class="s">"http://api.usergrid.com/amuramoto/sandbox/items"</span><span class="p">,</span>
+ <span class="s">"entities"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+ <span class="s">"uuid"</span> <span class="p">:</span> <span class="s">"5bb76bca-1657-11e3-903f-9ff6c621a7a4"</span><span class="p">,</span>
+ <span class="s">"type"</span> <span class="p">:</span> <span class="s">"item"</span><span class="p">,</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"milk"</span><span class="p">,</span>
+ <span class="s">"created"</span> <span class="p">:</span> <span class="mi">1378405020796</span><span class="p">,</span>
+ <span class="s">"modified"</span> <span class="p">:</span> <span class="mi">1378405020796</span><span class="p">,</span>
+ <span class="s">"metadata"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4"</span>
+ <span class="p">},</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"milk"</span><span class="p">,</span>
+ <span class="s">"price"</span> <span class="p">:</span> <span class="s">"3.25"</span>
+ <span class="p">}</span> <span class="p">],</span>
+ <span class="s">"timestamp"</span> <span class="p">:</span> <span class="mi">1378405025763</span><span class="p">,</span>
+ <span class="s">"duration"</span> <span class="p">:</span> <span class="mi">31</span><span class="p">,</span>
+ <span class="s">"organization"</span> <span class="p">:</span> <span class="s">"amuramoto"</span><span class="p">,</span>
+ <span class="s">"applicationName"</span> <span class="p">:</span> <span class="s">"sandbox"</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="retrieving-multiple-entities">
+<h3>9. Retrieving multiple entities<a class="headerlink" href="#retrieving-multiple-entities" title="Permalink to this headline">¶</a></h3>
+<p>SDK Method</p>
+<div class="highlight-python"><div class="highlight"><pre>(ApigeeClientResponse *)getEntities: (NSString *)type queryString:(NSString *)queryString
+</pre></div>
+</div>
+<p>Properties</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="15%" />
+<col width="85%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>type</td>
+<td>The entity type being retrieved</td>
+</tr>
+<tr class="row-odd"><td>queryString</td>
+<td>A query string of entity properties to be matched for the entities to be retrieved.</td>
+</tr>
+</tbody>
+</table>
+<p>Query string is expected in the following format: = OR = OR ...</p>
+<p>Example Request/Response</p>
+<p>Request:</p>
+<div class="highlight-python"><div class="highlight"><pre>-(NSString*)getEntity {
+
+//specify the entity type to be retrieved
+NSString *type = @"item";
+
+//specify the uuid of the entity to be retrieved in a query string
+NSString *query = @"uuid = b3aad0a4-f322-11e2-a9c1-999e12039f87 or name = 'bread'";
+
+ //we recommend you call ApigeeClient from your AppDelegate.
+ //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+ //create an instance of AppDelegate
+ AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+
+ //call createEntity to initiate the API call
+ ApigeeClientResponse *response = [appDelegate.dataClient getEntities:type queryString:query];
+
+@try {
+ //success
+}
+@catch (NSException * e) {
+ //fail
+}
+
+}
+</pre></div>
+</div>
+<p>Response:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+ <span class="s">"action"</span> <span class="p">:</span> <span class="s">"get"</span><span class="p">,</span>
+ <span class="s">"application"</span> <span class="p">:</span> <span class="s">"f34f4222-a166-11e2-a7f7-02e81adcf3d0"</span><span class="p">,</span>
+ <span class="s">"params"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"ql"</span> <span class="p">:</span> <span class="p">[</span> <span class="s">"name='milk' OR UUID=1a9356ba-1682-11e3-a72a-81581bbaf055"</span> <span class="p">]</span>
+ <span class="p">},</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/items"</span><span class="p">,</span>
+ <span class="s">"uri"</span> <span class="p">:</span> <span class="s">"http://api.usergrid.com/your-org/your-app/items"</span><span class="p">,</span>
+ <span class="s">"entities"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+ <span class="s">"uuid"</span> <span class="p">:</span> <span class="s">"5bb76bca-1657-11e3-903f-9ff6c621a7a4"</span><span class="p">,</span>
+ <span class="s">"type"</span> <span class="p">:</span> <span class="s">"item"</span><span class="p">,</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"milk"</span><span class="p">,</span>
+ <span class="s">"created"</span> <span class="p">:</span> <span class="mi">1378405020796</span><span class="p">,</span>
+ <span class="s">"modified"</span> <span class="p">:</span> <span class="mi">1378405020796</span><span class="p">,</span>
+ <span class="s">"metadata"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4"</span>
+ <span class="p">},</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"milk"</span><span class="p">,</span>
+ <span class="s">"price"</span> <span class="p">:</span> <span class="s">"3.25"</span>
+ <span class="p">},</span> <span class="p">{</span>
+ <span class="s">"uuid"</span> <span class="p">:</span> <span class="s">"1a9356ba-1682-11e3-a72a-81581bbaf055"</span><span class="p">,</span>
+ <span class="s">"type"</span> <span class="p">:</span> <span class="s">"item"</span><span class="p">,</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"bread"</span><span class="p">,</span>
+ <span class="s">"created"</span> <span class="p">:</span> <span class="mi">1378423379867</span><span class="p">,</span>
+ <span class="s">"modified"</span> <span class="p">:</span> <span class="mi">1378423379867</span><span class="p">,</span>
+ <span class="s">"metadata"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/items/1a9356ba-1682-11e3-a72a-81581bbaf055"</span>
+ <span class="p">},</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"bread"</span><span class="p">,</span>
+ <span class="s">"price"</span> <span class="p">:</span> <span class="s">"2.50"</span>
+ <span class="p">}</span> <span class="p">],</span>
+ <span class="s">"timestamp"</span> <span class="p">:</span> <span class="mi">1378423793729</span><span class="p">,</span>
+ <span class="s">"duration"</span> <span class="p">:</span> <span class="mi">63</span><span class="p">,</span>
+ <span class="s">"organization"</span> <span class="p">:</span> <span class="s">"your-org"</span><span class="p">,</span>
+ <span class="s">"applicationName"</span> <span class="p">:</span> <span class="s">"your-app"</span><span class="p">,</span>
+ <span class="s">"count"</span> <span class="p">:</span> <span class="mi">2</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="updating-an-entity">
+<h3>10. Updating an entity<a class="headerlink" href="#updating-an-entity" title="Permalink to this headline">¶</a></h3>
+<p>SDK Method</p>
+<div class="highlight-python"><div class="highlight"><pre>(ApigeeClientResponse *)updateEntity: (NSString *)entityID entity:(NSDictionary *)updatedEntity
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="21%" />
+<col width="79%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>entityID</td>
+<td>UUID of the entity to be updated</td>
+</tr>
+<tr class="row-odd"><td>updatedEntity</td>
+<td>NSMutableDictionary containing the properties to be updated</td>
+</tr>
+</tbody>
+</table>
+<p>Example Request/Response</p>
+<p>Request:</p>
+<div class="highlight-python"><div class="highlight"><pre>-(NSString*)updateEntity {
+
+ //UUID of the entity to be updated
+ NSString *entityID = @"f42752aa-08fe-11e3-8268-5bd5fa5f701f";
+
+ //Create an entity object
+ NSMutableDictionary *updatedEntity = [ [NSMutableDictionary alloc] init ];
+
+ //Set entity properties to be updated
+ [updatedEntity setObject:@"item" forKey:@"type"]; //Required - entity type
+ [updatedEntity setObject:@"in-stock" forKey:@"availability"];
+ [updatedEntity setObject:@"4.00" forKey:@"price"];
+
+ //we recommend you call ApigeeClient from your AppDelegate.
+ //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+ //create an instance of AppDelegate
+ AppDelegate *appDelegate = (AppDelegate *)[ [UIApplication sharedApplication] delegate];
+
+ //call updateEntity to initiate the API call
+ ApigeeClientResponse *response = [appDelegate.dataClient updateEntity:entityID entity:updatedEntity];
+
+ @try {
+
+ //success
+
+ }
+ @catch (NSException * e) {
+ //fail
+ }
+
+}
+</pre></div>
+</div>
+<p>Response:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+ <span class="s">"action"</span> <span class="p">:</span> <span class="s">"put"</span><span class="p">,</span>
+ <span class="s">"application"</span> <span class="p">:</span> <span class="s">"f34f4222-a166-11e2-a7f7-02e81adcf3d0"</span><span class="p">,</span>
+ <span class="s">"params"</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/items"</span><span class="p">,</span>
+ <span class="s">"uri"</span> <span class="p">:</span> <span class="s">"http://api.usergrid.com/your-org/your-app/items"</span><span class="p">,</span>
+ <span class="s">"entities"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+ <span class="s">"uuid"</span> <span class="p">:</span> <span class="s">"5bb76bca-1657-11e3-903f-9ff6c621a7a4"</span><span class="p">,</span>
+ <span class="s">"type"</span> <span class="p">:</span> <span class="s">"item"</span><span class="p">,</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"milk"</span><span class="p">,</span>
+ <span class="s">"created"</span> <span class="p">:</span> <span class="mi">1378405020796</span><span class="p">,</span>
+ <span class="s">"modified"</span> <span class="p">:</span> <span class="mi">1378505705077</span><span class="p">,</span>
+ <span class="s">"availability"</span> <span class="p">:</span> <span class="s">"in-stock"</span><span class="p">,</span>
+ <span class="s">"metadata"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4"</span>
+ <span class="p">},</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"milk"</span><span class="p">,</span>
+ <span class="s">"price"</span> <span class="p">:</span> <span class="s">"4.00"</span>
+ <span class="p">}</span> <span class="p">],</span>
+ <span class="s">"timestamp"</span> <span class="p">:</span> <span class="mi">1378505705050</span><span class="p">,</span>
+ <span class="s">"duration"</span> <span class="p">:</span> <span class="mi">87</span><span class="p">,</span>
+ <span class="s">"organization"</span> <span class="p">:</span> <span class="s">"your-org"</span><span class="p">,</span>
+ <span class="s">"applicationName"</span> <span class="p">:</span> <span class="s">"your-app"</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="updating-a-sub-property">
+<h3>11. Updating a sub-property<a class="headerlink" href="#updating-a-sub-property" title="Permalink to this headline">¶</a></h3>
+<p>SDK Method</p>
+<div class="highlight-python"><div class="highlight"><pre>(ApigeeClientResponse *)updateEntity: (NSString *)entityID entity:(NSDictionary *)updatedEntity
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="23%" />
+<col width="77%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>entityID</td>
+<td>UUID of the entity to be updated</td>
+</tr>
+<tr class="row-odd"><td>updatedEntity</td>
+<td>Entity object containing the properties to be updated</td>
+</tr>
+</tbody>
+</table>
+<p>Example Request/Response</p>
+<p>Request:</p>
+<div class="highlight-python"><div class="highlight"><pre>-(NSString*)updateEntity {
+
+ //UUID of the entity to be updated
+ NSString *entityID = @"f42752aa-08fe-11e3-8268-5bd5fa5f701f";
+
+ //Define our two sub-properties to include in the update
+ NSMutableDictionary *subproperty1 = [ [NSMutableDictionary alloc] init];
+ NSMutableDictionary *subproperty2 = [ [NSMutableDictionary alloc] init];
+ [subproperty1 setObject:@"1%" forKey:@"name"];
+ [subproperty1 setObject:@"3.25" forKey:@"price"];
+ [subproperty2 setObject:@"whole" forKey:@"name"];
+ [subproperty2 setObject:@"4.00" forKey:@"price"];
+
+ //Put our sub-properties into an NSArray
+ NSArray *subproperties = [ [NSArray alloc] initWithObjects:props1,props2, nil];
+
+ //Create an NSMutableDictionary to hold our updates
+ NSMutableDictionary *updatedEntity = [ [NSMutableDictionary alloc] init ];
+
+ //Set the properties to be updated
+ [updatedEntity setObject:@"item" forKey:@"type"]; //Required - entity type
+ [updatedEntity setObject:props forKey:@"varieties"];
+
+ //we recommend you call ApigeeClient from your AppDelegate.
+ //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+ //create an instance of AppDelegate
+ AppDelegate *appDelegate = (AppDelegate *)[ [UIApplication sharedApplication] delegate];
+
+ //call createEntity to initiate the API call
+ ApigeeClientResponse *response = [appDelegate.dataClient updateEntity:entityID entity:updatedEntity];
+
+ @try {
+
+ //success
+
+ }
+ @catch (NSException * e) {
+ //fail
+ }
+
+}
+</pre></div>
+</div>
+<p>Response:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+ <span class="s">"action"</span> <span class="p">:</span> <span class="s">"put"</span><span class="p">,</span>
+ <span class="s">"application"</span> <span class="p">:</span> <span class="s">"f34f4222-a166-11e2-a7f7-02e81adcf3d0"</span><span class="p">,</span>
+ <span class="s">"params"</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/items"</span><span class="p">,</span>
+ <span class="s">"uri"</span> <span class="p">:</span> <span class="s">"http://api.usergrid.com/your-org/your-app/items"</span><span class="p">,</span>
+ <span class="s">"entities"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+ <span class="s">"uuid"</span> <span class="p">:</span> <span class="s">"5bb76bca-1657-11e3-903f-9ff6c621a7a4"</span><span class="p">,</span>
+ <span class="s">"type"</span> <span class="p">:</span> <span class="s">"item"</span><span class="p">,</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"milk"</span><span class="p">,</span>
+ <span class="s">"created"</span> <span class="p">:</span> <span class="mi">1378405020796</span><span class="p">,</span>
+ <span class="s">"modified"</span> <span class="p">:</span> <span class="mi">1378761459069</span><span class="p">,</span>
+ <span class="s">"availability"</span> <span class="p">:</span> <span class="s">"in-stock"</span><span class="p">,</span>
+ <span class="s">"metadata"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4"</span>
+ <span class="p">},</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"milk"</span><span class="p">,</span>
+ <span class="s">"uri"</span> <span class="p">:</span> <span class="s">"http://api.usergrid.com/your-org/your-app/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4"</span><span class="p">,</span>
+ <span class="s">"varieties"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"1%"</span><span class="p">,</span>
+ <span class="s">"price"</span> <span class="p">:</span> <span class="s">"3.25"</span>
+ <span class="p">},</span> <span class="p">{</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"whole"</span><span class="p">,</span>
+ <span class="s">"price"</span> <span class="p">:</span> <span class="s">"4.00"</span>
+ <span class="p">}</span> <span class="p">]</span>
+ <span class="p">}</span> <span class="p">],</span>
+ <span class="s">"timestamp"</span> <span class="p">:</span> <span class="mi">1378761459047</span><span class="p">,</span>
+ <span class="s">"duration"</span> <span class="p">:</span> <span class="mi">62</span><span class="p">,</span>
+ <span class="s">"organization"</span> <span class="p">:</span> <span class="s">"your-org"</span><span class="p">,</span>
+ <span class="s">"applicationName"</span> <span class="p">:</span> <span class="s">"your-app"</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="deleting-data-entities">
+<h3>12. Deleting data entities<a class="headerlink" href="#deleting-data-entities" title="Permalink to this headline">¶</a></h3>
+<p>SDK Method</p>
+<div class="highlight-python"><div class="highlight"><pre>(ApigeeClientResponse *)removeEntity: (NSString *)type entityID:(NSString *)entityID
+</pre></div>
+</div>
+<p>Properties</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="21%" />
+<col width="79%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>type</td>
+<td>The entity type being deleted</td>
+</tr>
+<tr class="row-odd"><td>entityID</td>
+<td>The UUID or name of the entity to be removed</td>
+</tr>
+</tbody>
+</table>
+<p>Example Request/Response</p>
+<p>Request:</p>
+<div class="highlight-python"><div class="highlight"><pre>-(NSString*)deleteEntity {
+
+ //specify the entity type to be deleted
+ NSString *type = @"item";
+
+ //specify the uuid or name of the entity to be deleted
+ NSString *entityId = @"milk";
+
+ //we recommend you call ApigeeClient from your AppDelegate.
+ //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+ //create an instance of AppDelegate
+ AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+
+ //call removeEntity to initiate the API call
+ ApigeeClientResponse *response = [appDelegate.dataClient removeEntity:type entityID:entityId];
+
+ @try {
+ //success
+ }
+ @catch (NSException * e) {
+ //fail
+ }
+}
+</pre></div>
+</div>
+<p>Response:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+ <span class="s">"action"</span> <span class="p">:</span> <span class="s">"delete"</span><span class="p">,</span>
+ <span class="s">"application"</span> <span class="p">:</span> <span class="s">"f34f4222-a166-11e2-a7f7-02e81adcf3d0"</span><span class="p">,</span>
+ <span class="s">"params"</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/items"</span><span class="p">,</span>
+ <span class="s">"uri"</span> <span class="p">:</span> <span class="s">"http://api.usergrid.com/your-org/your-app/items"</span><span class="p">,</span>
+ <span class="s">"entities"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+ <span class="s">"uuid"</span> <span class="p">:</span> <span class="s">"328fe64a-19a0-11e3-8a2a-ebc6f49d1fc4"</span><span class="p">,</span>
+ <span class="s">"type"</span> <span class="p">:</span> <span class="s">"item"</span><span class="p">,</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"milk"</span><span class="p">,</span>
+ <span class="s">"created"</span> <span class="p">:</span> <span class="mi">1378766158500</span><span class="p">,</span>
+ <span class="s">"modified"</span> <span class="p">:</span> <span class="mi">1378766158500</span><span class="p">,</span>
+ <span class="s">"metadata"</span> <span class="p">:</span> <span class="p">{</span>
+ <span class="s">"path"</span> <span class="p">:</span> <span class="s">"/items/328fe64a-19a0-11e3-8a2a-ebc6f49d1fc4"</span>
+ <span class="p">},</span>
+ <span class="s">"name"</span> <span class="p">:</span> <span class="s">"milk"</span><span class="p">,</span>
+ <span class="s">"price"</span> <span class="p">:</span> <span class="s">"3.25"</span>
+ <span class="p">}</span> <span class="p">],</span>
+ <span class="s">"timestamp"</span> <span class="p">:</span> <span class="mi">1378766172016</span><span class="p">,</span>
+ <span class="s">"duration"</span> <span class="p">:</span> <span class="mi">324</span><span class="p">,</span>
+ <span class="s">"organization"</span> <span class="p">:</span> <span class="s">"your-org"</span><span class="p">,</span>
+ <span class="s">"applicationName"</span> <span class="p">:</span> <span class="s">"your-app"</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="data-queries">
+<h2>Data Queries<a class="headerlink" href="#data-queries" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="querying-your-data">
+<h3>13. Querying your data<a class="headerlink" href="#querying-your-data" title="Permalink to this headline">¶</a></h3>
+</div>
+</div>
+<div class="section" id="entity-connections">
+<h2>Entity Connections<a class="headerlink" href="#entity-connections" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="connecting-users-other-data">
+<h3>14. Connecting users other data<a class="headerlink" href="#connecting-users-other-data" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="retrieving-user-connection-data">
+<h3>15. Retrieving user connection data<a class="headerlink" href="#retrieving-user-connection-data" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="disconnecting-entities">
+<h3>16. Disconnecting entities<a class="headerlink" href="#disconnecting-entities" title="Permalink to this headline">¶</a></h3>
+</div>
+</div>
+<div class="section" id="permissions-roles">
+<h2>Permissions & Roles<a class="headerlink" href="#permissions-roles" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="assigning-permissions">
+<h3>17. Assigning permissions<a class="headerlink" href="#assigning-permissions" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="removing-permissions">
+<h3>18. Removing permissions<a class="headerlink" href="#removing-permissions" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="id25">
+<h3>19. Assigning permissions<a class="headerlink" href="#id25" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="id26">
+<h3>20. Removing permissions<a class="headerlink" href="#id26" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="creating-roles">
+<h3>21. Creating roles<a class="headerlink" href="#creating-roles" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="assigning-roles">
+<h3>22. Assigning roles<a class="headerlink" href="#assigning-roles" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="removing-roles">
+<h3>23. Removing roles<a class="headerlink" href="#removing-roles" title="Permalink to this headline">¶</a></h3>
+</div>
+</div>
+<div class="section" id="authentication">
+<h2>Authentication<a class="headerlink" href="#authentication" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="application-user-authentication-user-login">
+<h3>24. Application user authentication (user login)<a class="headerlink" href="#application-user-authentication-user-login" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="application-client-authentication">
+<h3>25. Application client authentication<a class="headerlink" href="#application-client-authentication" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="admin-user-authentication">
+<h3>26. Admin user authentication<a class="headerlink" href="#admin-user-authentication" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="organization-client-authentication">
+<h3>27. Organization client authentication<a class="headerlink" href="#organization-client-authentication" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="revoking-tokens-user-logout">
+<h3>28. Revoking tokens (user logout)<a class="headerlink" href="#revoking-tokens-user-logout" title="Permalink to this headline">¶</a></h3>
+</div>
+</div>
+</div>
+<div class="section" id="working-with-users-groups">
+<h1>Working with Users & Groups<a class="headerlink" href="#working-with-users-groups" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="activities-feeds">
+<h2>Activities & Feeds<a class="headerlink" href="#activities-feeds" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="posting-a-user-activity">
+<h3>37. Posting a user activity<a class="headerlink" href="#posting-a-user-activity" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="posting-an-activity-to-a-group">
+<h3>38. Posting an activity to a group<a class="headerlink" href="#posting-an-activity-to-a-group" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="creating-an-activity-for-a-user-s-followers-in-a-group">
+<h3>39. Creating an activity for a user’s followers in a group<a class="headerlink" href="#creating-an-activity-for-a-user-s-followers-in-a-group" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="retrieving-a-user-s-activity-feed">
+<h3>40. Retrieving a user’s activity feed<a class="headerlink" href="#retrieving-a-user-s-activity-feed" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="retrieving-a-group-s-activity-feed">
+<h3>41. Retrieving a group’s activity feed<a class="headerlink" href="#retrieving-a-group-s-activity-feed" title="Permalink to this headline">¶</a></h3>
+</div>
+</div>
+<div class="section" id="events-counters">
+<h2>Events & Counters<a class="headerlink" href="#events-counters" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="creating-incrementing-counters">
+<h3>42. Creating & incrementing counters<a class="headerlink" href="#creating-incrementing-counters" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="retrieving-counters">
+<h3>43. Retrieving counters<a class="headerlink" href="#retrieving-counters" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="retrieving-counters-by-time-interval">
+<h3>44. Retrieving counters by time interval<a class="headerlink" href="#retrieving-counters-by-time-interval" title="Permalink to this headline">¶</a></h3>
+</div>
+</div>
+<div class="section" id="managing-orgs-apps">
+<h2>Managing Orgs & Apps<a class="headerlink" href="#managing-orgs-apps" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="creating-an-organization">
+<h3>46. Creating an organization<a class="headerlink" href="#creating-an-organization" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="getting-an-organization">
+<h3>47. Getting an organization<a class="headerlink" href="#getting-an-organization" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="activating-an-organization">
+<h3>48. Activating an organization<a class="headerlink" href="#activating-an-organization" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="reactivating-an-organization">
+<h3>49. Reactivating an organization<a class="headerlink" href="#reactivating-an-organization" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="generating-organization-client-credentials">
+<h3>50. Generating organization client credentials<a class="headerlink" href="#generating-organization-client-credentials" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="retrieving-organization-client-credentials">
+<h3>51. Retrieving organization client credentials<a class="headerlink" href="#retrieving-organization-client-credentials" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="getting-an-organization-s-activity-feed">
+<h3>52. Getting an organization’s activity feed<a class="headerlink" href="#getting-an-organization-s-activity-feed" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="getting-the-applications-in-an-organization">
+<h3>53. Getting the applications in an organization<a class="headerlink" href="#getting-the-applications-in-an-organization" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="getting-the-admin-users-in-an-organization">
+<h3>54. Getting the admin users in an organization<a class="headerlink" href="#getting-the-admin-users-in-an-organization" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="removing-an-admin-user-from-an-organization">
+<h3>55. Removing an admin user from an organization<a class="headerlink" href="#removing-an-admin-user-from-an-organization" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="creating-an-organization-application">
+<h3>56. Creating an organization application<a class="headerlink" href="#creating-an-organization-application" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="generating-application-credentials">
+<h3>57. Generating application credentials<a class="headerlink" href="#generating-application-credentials" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="getting-application-credentials">
+<h3>58. Getting application credentials<a class="headerlink" href="#getting-application-credentials" title="Permalink to this headline">¶</a></h3>
+</div>
+</div>
+<div class="section" id="managing-admin-users">
+<h2>Managing Admin Users<a class="headerlink" href="#managing-admin-users" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="creating-an-admin-user">
+<h3>59. Creating an admin user<a class="headerlink" href="#creating-an-admin-user" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="updating-an-admin-user">
+<h3>60. Updating an admin user<a class="headerlink" href="#updating-an-admin-user" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="getting-an-admin-user">
+<h3>61. Getting an admin user<a class="headerlink" href="#getting-an-admin-user" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="setting-an-admin-user-s-password">
+<h3>62. Setting an admin user’s password<a class="headerlink" href="#setting-an-admin-user-s-password" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="resetting-an-admin-user-s-password">
+<h3>63. Resetting an admin user’s password<a class="headerlink" href="#resetting-an-admin-user-s-password" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="activating-an-admin-user">
+<h3>64. Activating an admin user<a class="headerlink" href="#activating-an-admin-user" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="reactivating-an-admin-user">
+<h3>65. Reactivating an admin user<a class="headerlink" href="#reactivating-an-admin-user" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="getting-an-admin-user-s-activity-feed">
+<h3>66. Getting an admin user’s activity feed<a class="headerlink" href="#getting-an-admin-user-s-activity-feed" title="Permalink to this headline">¶</a></h3>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ <footer>
+
+
+ <hr/>
+
+ <div role="contentinfo">
+ <p>
+ © Copyright 2013-2015, Apache Usergrid.
+
+ </p>
+ </div>
+ Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+
+
+
+
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT:'../',
+ VERSION:'1.0',
+ COLLAPSE_INDEX:false,
+ FILE_SUFFIX:'.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+
+
+
+
+
+ <script type="text/javascript" src="../_static/js/theme.js"></script>
+
+
+
+
+ <script type="text/javascript">
+ jQuery(function () {
+ SphinxRtdTheme.StickyNav.enable();
+ });
+ </script>
+
+
+</body>
+</html>
\ No newline at end of file
[32/36] usergrid git commit: Cherry pick: Remove operation cross
references from Markdown representation as Sphinx will not allow me to set
anchors.
Posted by sf...@apache.org.
Cherry pick: Remove operation cross references from Markdown representation as Sphinx will not allow me to set anchors.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/2303eeac
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/2303eeac
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/2303eeac
Branch: refs/heads/entity-size
Commit: 2303eeac8de62bd74ea88cbce07b9f55dfb3e98a
Parents: 7318607
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Aug 25 12:31:03 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Aug 25 14:40:31 2015 -0400
----------------------------------------------------------------------
docs/rest-endpoints/api-docs.html | 1032 +++++++++---------
docs/rest-endpoints/api-docs.md | 653 +++++------
.../main/groovy/usergrid/ApiDocGenerator.groovy | 6 +-
docs/src/main/resources/markdown/model.mustache | 9 -
.../main/resources/markdown/operation.mustache | 2 +
5 files changed, 814 insertions(+), 888 deletions(-)
----------------------------------------------------------------------
[06/36] usergrid git commit: Cherry pick: Remove references to
incubator from docs, README files and POMs.
Posted by sf...@apache.org.
Cherry pick: Remove references to incubator from docs, README files and POMs.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/106d8fa8
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/106d8fa8
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/106d8fa8
Branch: refs/heads/entity-size
Commit: 106d8fa8466176c295f14542c6bb1ec536ca99fa
Parents: f9a354b
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Aug 25 09:58:00 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Aug 25 10:01:30 2015 -0400
----------------------------------------------------------------------
DISCLAIMER | 9 -
NOTICE | 2 +-
README.md | 9 +-
content/community/index.html | 48 +++--
content/index.html | 48 +++--
content/releases/index.html | 38 ++--
docs/installation/ug1-deploy-to-tomcat.md | 6 +-
docs/installation/ug1-launcher-quick-start.md | 2 +-
docs/installation/ug2-deploy-to-tomcat.md | 4 +-
docs/reference/contribute-code.md | 2 +-
docs/user-management/messagee-example.md | 6 +-
portal/README.md | 4 +-
portal/index-template.html | 14 +-
release/release-candidate.sh | 12 +-
release/release.sh | 16 +-
sdks/android/NOTICE | 2 +-
sdks/android/pom.xml | 2 +-
sdks/dotnet/NOTICE | 2 +-
sdks/dotnet/README.md | 4 +-
sdks/html5-javascript/README.md | 10 +-
sdks/html5-javascript/index.html | 2 +-
sdks/java/pom.xml | 6 +-
sdks/perl/README.md | 2 +-
sdks/perl/lib/Usergrid/Client.pm | 2 +-
sdks/php/README.md | 6 +-
sdks/ruby-on-rails/README.md | 2 +-
stack/README.md | 4 +-
.../java/org/apache/usergrid/launcher/App.java | 2 +-
website/README.md | 2 +-
website/content/community/index.html | 12 +-
website/content/index.html | 97 +++++++++
website/content/releases/index.html | 65 ++++++
website/layouts/footer.html | 32 ++-
website/layouts/header.html | 4 +-
website/tmp/checksums | 4 +-
website/tmp/compiled_content | 204 +++++++++----------
36 files changed, 411 insertions(+), 275 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index ffd2c60..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,9 +0,0 @@
-DISCLAIMER
-
-Apache Usergrid is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of
-all newly accepted projects until a further review indicates that the
-infrastructure, communications, and decision making process have stabilized
-in a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of the
-code, it does indicate that the project has yet to be fully endorsed by the ASF.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index b080415..765a303 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache Usergrid (incubating)
+Apache Usergrid
Copyright 2015 The Apache Software Foundation.
This product includes software developed at
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 8da8d99..59302b6 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,22 @@
Apache Usergrid
===============
-
__WARNING__: This is the __two-dot-o__ branch and work is underway here on a new persistence system for Usergrid. Not everything is working in this branch. If you want stability, you should be working against the master branch or a tag. We refer to the new persistence system as Core Persistence and you can find its modules in the stack/corepersistence directory.
Overview
--------
-**Apache Usergrid is a multi-tenant Backend-as-a-Service stack for web & mobile applications, based on RESTful APIs. It is [currently incubating at the Apache Software Foundation](http://usergrid.incubator.apache.org/).**
+**Apache Usergrid is a multi-tenant Backend-as-a-Service stack for web & mobile applications, based on RESTful APIs.**
##Contributing
-We accept all contributions via our GitHub, so you can fork our repo (apache/incubator-usergrid) and then submit a PR back to us for approval. For larger PRs you'll need to have an ICLA form on file with Apache. For more information see our [Contribution Workflow Policy](https://cwiki.apache.org/confluence/display/usergrid/Usergrid+Contribution+Workflow), and specifically our [External Contributors Guide](https://cwiki.apache.org/confluence/display/usergrid/Usergrid+External+Contributors+Guide).
+We accept all contributions via our GitHub, so you can fork our repo (apache/usergrid) and then submit a PR back to us for approval. For larger PRs you'll need to have an ICLA form on file with Apache. For more information see our [Contribution Workflow Policy](https://cwiki.apache.org/confluence/display/usergrid/Usergrid+Contribution+Workflow), and specifically our [External Contributors Guide](https://cwiki.apache.org/confluence/display/usergrid/Usergrid+External+Contributors+Guide).
##Build awesome apps with Usergrid!
Apache Usergrid provides all code necessary to build and power modern mobile applications. This includes the server stack, administrative portal website, SDKs in most popular languages, as well as command line tools.
-Look for much more detailed README files in their corresponding subdirectories, or check out [our website](http://usergrid.incubator.apache.org/) for more info.
+Look for much more detailed README files in their corresponding subdirectories, or check out [our website](http://usergrid.apache.org/) for more info.
* The server-side stack, a Java 7 + Cassandra codebase that powers all of the features, is located under [`/stack`](stack). You can install dependencies and compile it with maven. See [stack/README.md](stack#requirements) for instructions.
@@ -28,5 +27,5 @@ Look for much more detailed README files in their corresponding subdirectories,
* a command-line client “ugc” allowing you to complete most maintenance tasks, as well as queries in a manner similar to the mysql or the mongo shell, located under [`/ugc`](ugc). You can install it on your machine with a simple `sudo gem install ugc`
##For more information
-See the [Apache Usergrid web site](http://usergrid.incubator.apache.org/).
+See the [Apache Usergrid web site](http://usergrid.apache.org/).
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/content/community/index.html
----------------------------------------------------------------------
diff --git a/content/community/index.html b/content/community/index.html
index 97f8b1d..f4eab5c 100644
--- a/content/community/index.html
+++ b/content/community/index.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
- <title>Apache Usergrid (incubating) — </title>
+ <title>Apache Usergrid — </title>
<meta http-equiv="x-ua-compatible" content="ie=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
<meta name="keywords" content="Apache Usergrid, Usergrid, BaaS, Backend-as-a-Service">
@@ -216,7 +216,7 @@
<ul class="nav navbar-nav navbar-right">
<li class="active"><a href="/community/"><span class="icns icon-group"></span></a></li>
<li><a href="/docs" target="_blank"><span class="icns icon-book"></span></a></li>
- <li><a href="http://github.com/apache/incubator-usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
+ <li><a href="http://github.com/apache/usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
<!--<li><a href="https://trello.com/b/exQmJIOn/usergrid" target="_blank"><span class="icns icon-trello"></span></a></li>-->
<li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible"
target="_blank"><span class="icns icon-bug"></span></a></li>
@@ -306,20 +306,20 @@
<div class="col-md-4">
<h3>Users</h3>
<p><em>Perfect if you build apps against Apache Usergrid or deploy Apache Usergrid.</em></p>
- <p>To subscribe, send a blank email to<br/><a href="mailto:user-subscribe@usergrid.incubator.apache.org">user-subscribe@usergrid.incubator.apache.org</a>.</p>
- <p>You can also <a href="https://mail-archives.apache.org/mod_mbox/incubator-usergrid-user/">read the archives</a>.</p>
+ <p>To subscribe, send a blank email to<br/><a href="mailto:user-subscribe@usergrid.apache.org">user-subscribe@usergrid.apache.org</a>.</p>
+ <p>You can also <a href="https://mail-archives.apache.org/mod_mbox/usergrid-user/">read the archives</a>.</p>
</div>
<div class="col-md-4">
<h3>Dev</h3>
<p><em>If you are building contributions & modifications to Apache Usergrid’s stack, portal, cli and SDKs, this is the list for you.</em><p>
- <p>To subscribe, send a blank email to<br/><a href="mailto:dev-subscribe@usergrid.incubator.apache.org">dev-subscribe@usergrid.incubator.apache.org</a>.</p>
- <p>You can also <a href="https://mail-archives.apache.org/mod_mbox/incubator-usergrid-dev/">read the archives</a>.</p>
+ <p>To subscribe, send a blank email to<br/><a href="mailto:dev-subscribe@usergrid.apache.org">dev-subscribe@usergrid.apache.org</a>.</p>
+ <p>You can also <a href="https://mail-archives.apache.org/mod_mbox/usergrid-dev/">read the archives</a>.</p>
</div>
<div class="col-md-4">
<h3>Commits</h3>
<p><em>This list receives an email whenever new code is contributed to Apache Usergrid.</em><p>
- <p>To subscribe, send a blank email to<br/><a href="mailto:commits-subscribe@usergrid.incubator.apache.org">commits-subscribe@usergrid.incubator.apache.org</a>.</p>
- <p>You can also <a href="https://mail-archives.apache.org/mod_mbox/incubator-usergrid-commits/">read the archives</a>.</p>
+ <p>To subscribe, send a blank email to<br/><a href="mailto:commits-subscribe@usergrid.apache.org">commits-subscribe@usergrid.apache.org</a>.</p>
+ <p>You can also <a href="https://mail-archives.apache.org/mod_mbox/usergrid-commits/">read the archives</a>.</p>
</div>
</div>
</div>
@@ -493,32 +493,31 @@
</div>
<div class="col-md-2">
<ul class="nav nav-list">
- <li class="nav-header"><a href="https://github.com/apache/incubator-usergrid/" target="_blank">Code</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/dotnet" target="_blank">.NET / Windows SDK</a></li>
+ <li class="nav-header"><a href="https://github.com/apache/usergrid/" target="_blank">Code</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/dotnet" target="_blank">.NET / Windows SDK</a></li>
</ul>
</div>
<div class="col-md-2">
<ul class="nav nav-list">
<li class="nav-header">Resources</li>
- <li><a href="http://github.com/apache/incubator-usergrid" target="_blank">GitHub Code</a></li>
+ <li><a href="http://github.com/apache/usergrid" target="_blank">GitHub Code</a></li>
<li><a href="docs" target="_blank">Docs</a></li>
<li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" target="_blank">JIRA Bug Tracker</a></li>
<li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
<li><a href="/community/#live">Live Chat</a></li>
<li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
- <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
<li><a href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow" target="_blank">Contribution Guidelines</a></li>
</ul>
</div>
@@ -549,7 +548,6 @@
<div class="row">
<div id="copyright">
<img src="/img/egg-logo.png" /><br/><br/>
- <p>Apache Usergrid is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>
<p>Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.<br>
Apache and the Apache feather logos are trademarks of The Apache Software Foundation.</p>
<p class="credits">Site designed & assembled with love by <a href="https://github.com/ryuneeee">@ryuneeee</a> + <a href="https://github.com/realbeast">@realbeast</a> + <a href="https://twitter.com/timanglade">@timanglade</a> + <a href="https://twitter.com/snoopdave">@snoopdave</a> .</p>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/content/index.html
----------------------------------------------------------------------
diff --git a/content/index.html b/content/index.html
index 7b6cc33..9416909 100644
--- a/content/index.html
+++ b/content/index.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
- <title>Apache Usergrid (incubating) — the BaaS not made for Hipsters</title>
+ <title>Apache Usergrid — the BaaS not made for Hipsters</title>
<meta http-equiv="x-ua-compatible" content="ie=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
<meta name="keywords" content="Apache Usergrid, Usergrid, BaaS, Backend-as-a-Service">
@@ -47,7 +47,7 @@
<ul class="nav navbar-nav navbar-right">
<li class=""><a href="/community/"><span class="icns icon-group"></span></a></li>
<li><a href="/docs" target="_blank"><span class="icns icon-book"></span></a></li>
- <li><a href="http://github.com/apache/incubator-usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
+ <li><a href="http://github.com/apache/usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
<!--<li><a href="https://trello.com/b/exQmJIOn/usergrid" target="_blank"><span class="icns icon-trello"></span></a></li>-->
<li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible"
target="_blank"><span class="icns icon-bug"></span></a></li>
@@ -74,12 +74,12 @@
<h2 class="tagline">The BaaS Framework <em>you</em> run</h2>
<p class="description">Build Apps not Servers! Whether you need to support one App or a hundred, Usergrid is <em>your</em> backend. As easy as a LAMP stack, but built for mobile.
Get Apps to production in record time and stop wasting cycles writing server-side code.<br/><br/>
- Complete SDKs for iOS, Android, HTML5/JS, Node.js, Ruby, Java, .NET, and PHP. Open source since 2011.<br/><br/><em>Currently undergoing incubation at the Apache Software Foundation</em></p>
+ Complete SDKs for iOS, Android, HTML5/JS, Node.js, Ruby, Java, .NET, and PHP. Open source since 2011.<br/><br/></p>
</div>
<div class="btn-wrapper">
- <iframe class="social-btn" src="/static/github-btn.html?user=apache&repo=incubator-usergrid&type=watch&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="85" height="30"></iframe>
- <iframe class="social-btn" src="/static/github-btn.html?user=apache&repo=incubator-usergrid&type=fork&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="85" height="30"></iframe>
+ <iframe class="social-btn" src="/static/github-btn.html?user=apache&repo=usergrid&type=watch&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="85" height="30"></iframe>
+ <iframe class="social-btn" src="/static/github-btn.html?user=apache&repo=usergrid&type=fork&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="85" height="30"></iframe>
<!--<p><span class="or">or</span> <a href="#">Download Usergrid</a></p>-->
</div>
@@ -110,7 +110,7 @@
<div class="col-md-4">
<div class="bf-icon-wrap" style="font-size:40px; vertical-align: 15px;"><i aria-hidden="true" class="icon-apple"></i> <i aria-hidden="true" class="icon-android"></i></div>
<h3>SDKs</h3>
- <p>We have full SDKs for <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ios">iOS</a>, <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/android">Android</a>, and <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/html5-javascript">HTML5/JS</a> but also <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/nodejs">node.js</a>, <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails</a>, pure <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby">pure Ruby</a>, server-side <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/java">Java</a>, <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/dotnet">.NET / Windows</a> and <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/php">PHP</a>!</p>
+ <p>We have full SDKs for <a href="https://github.com/apache/usergrid/tree/master/sdks/ios">iOS</a>, <a href="https://github.com/apache/usergrid/tree/master/sdks/android">Android</a>, and <a href="https://github.com/apache/usergrid/tree/master/sdks/html5-javascript">HTML5/JS</a> but also <a href="https://github.com/apache/usergrid/tree/master/sdks/nodejs">node.js</a>, <a href="https://github.com/apache/usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails</a>, pure <a href="https://github.com/apache/usergrid/tree/master/sdks/ruby">pure Ruby</a>, server-side <a href="https://github.com/apache/usergrid/tree/master/sdks/java">Java</a>, <a href="https://github.com/apache/usergrid/tree/master/sdks/dotnet">.NET / Windows</a> and <a href="https://github.com/apache/usergrid/tree/master/sdks/php">PHP</a>!</p>
</div>
<div class="col-md-4">
<div class="bf-icon-wrap"><span style="font-size:60px" aria-hidden="true" class="icon-road"></span></div>
@@ -131,7 +131,7 @@
<section class="bf-questions">
<div class="container">
<div class="col-md-12 text-center cta">
- Interested? You can <a href="https://github.com/apache/incubator-usergrid/blob/master/stack#requirements" target="_blank" class="btn btn-inverse btn-lg">Try it on your Machine Now</a> <span class="avoidwrap">or <a href="/community/" class="btn btn-inverse btn-lg">Ask a Question on the Lists or at an Event Near You</a></span>
+ Interested? You can <a href="https://github.com/apache/usergrid/blob/master/stack#requirements" target="_blank" class="btn btn-inverse btn-lg">Try it on your Machine Now</a> <span class="avoidwrap">or <a href="/community/" class="btn btn-inverse btn-lg">Ask a Question on the Lists or at an Event Near You</a></span>
</div>
</div>
</section
@@ -142,7 +142,7 @@
<div class="row">
<div class="col-md-12 text-left">
<h2>About the Project</h2>
- <p>Apache Usergrid is currently undergoing Incubation at the Apache Software Foundation. It’s an open-source Backend-as-a-Service (“BaaS” or “mBaaS”) composed of an integrated distributed NoSQL database, application layer and client tier with SDKs for developers looking to rapidly build web and/or mobile applications. It provides elementary services (user registration & management, data storage, file storage, queues) and retrieval features (full text search, geolocation search, joins) to power common app features.</p>
+ <p>Usergrid is an open-source Backend-as-a-Service (“BaaS” or “mBaaS”) composed of an integrated distributed NoSQL database, application layer and client tier with SDKs for developers looking to rapidly build web and/or mobile applications. It provides elementary services (user registration & management, data storage, file storage, queues) and retrieval features (full text search, geolocation search, joins) to power common app features.</p>
<p>It is a multi-tenant system designed for deployment to public cloud environments (such as Amazon Web Services, Rackspace, etc.) or to run on traditional server infrastructures so that anyone can run their own private BaaS deployment.</p>
@@ -178,32 +178,31 @@
</div>
<div class="col-md-2">
<ul class="nav nav-list">
- <li class="nav-header"><a href="https://github.com/apache/incubator-usergrid/" target="_blank">Code</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/dotnet" target="_blank">.NET / Windows SDK</a></li>
+ <li class="nav-header"><a href="https://github.com/apache/usergrid/" target="_blank">Code</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/dotnet" target="_blank">.NET / Windows SDK</a></li>
</ul>
</div>
<div class="col-md-2">
<ul class="nav nav-list">
<li class="nav-header">Resources</li>
- <li><a href="http://github.com/apache/incubator-usergrid" target="_blank">GitHub Code</a></li>
+ <li><a href="http://github.com/apache/usergrid" target="_blank">GitHub Code</a></li>
<li><a href="docs" target="_blank">Docs</a></li>
<li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" target="_blank">JIRA Bug Tracker</a></li>
<li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
<li><a href="/community/#live">Live Chat</a></li>
<li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
- <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
<li><a href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow" target="_blank">Contribution Guidelines</a></li>
</ul>
</div>
@@ -234,7 +233,6 @@
<div class="row">
<div id="copyright">
<img src="/img/egg-logo.png" /><br/><br/>
- <p>Apache Usergrid is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>
<p>Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.<br>
Apache and the Apache feather logos are trademarks of The Apache Software Foundation.</p>
<p class="credits">Site designed & assembled with love by <a href="https://github.com/ryuneeee">@ryuneeee</a> + <a href="https://github.com/realbeast">@realbeast</a> + <a href="https://twitter.com/timanglade">@timanglade</a> + <a href="https://twitter.com/snoopdave">@snoopdave</a> .</p>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/content/releases/index.html
----------------------------------------------------------------------
diff --git a/content/releases/index.html b/content/releases/index.html
index 82925f5..d3ad9d1 100644
--- a/content/releases/index.html
+++ b/content/releases/index.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
- <title>Apache Usergrid (incubating) — </title>
+ <title>Apache Usergrid — </title>
<meta http-equiv="x-ua-compatible" content="ie=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
<meta name="keywords" content="Apache Usergrid, Usergrid, BaaS, Backend-as-a-Service">
@@ -47,7 +47,7 @@
<ul class="nav navbar-nav navbar-right">
<li class=""><a href="/community/"><span class="icns icon-group"></span></a></li>
<li><a href="/docs" target="_blank"><span class="icns icon-book"></span></a></li>
- <li><a href="http://github.com/apache/incubator-usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
+ <li><a href="http://github.com/apache/usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
<!--<li><a href="https://trello.com/b/exQmJIOn/usergrid" target="_blank"><span class="icns icon-trello"></span></a></li>-->
<li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible"
target="_blank"><span class="icns icon-bug"></span></a></li>
@@ -95,7 +95,7 @@
Download the release from a <a href="http://www.apache.org/dyn/closer.cgi/incubator/usergrid/usergrid-1/v1.0.2">mirror: http://www.apache.org/dyn/closer.cgi/incubator/usergrid/usergrid-1/v1.0.2</a>
</p>
<p>
- Project releases are approved by vote of the Apache Usergrid (incubating) Project Management Committee (PMC). Support for a release is provided by project volunteers on the project <a href="http://usergrid.incubator.apache.org/community/#mailing-lists">mailing lists</a>. Bugs found in a release may be discussed on the list and reported through the <a href="https://issues.apache.org/jira/browse/USERGRID">issue tracker</a>. The user mailing list and issue tracker are the only support options hosted by the Apache Usergrid project.
+ Project releases are approved by vote of the Apache Usergrid Project Management Committee (PMC). Support for a release is provided by project volunteers on the project <a href="http://usergrid.apache.org/community/#mailing-lists">mailing lists</a>. Bugs found in a release may be discussed on the list and reported through the <a href="https://issues.apache.org/jira/browse/USERGRID">issue tracker</a>. The user mailing list and issue tracker are the only support options hosted by the Apache Usergrid project.
</p>
<p>
Note: When downloading from a mirror, please be sure to verify that checksums and signatures are correct. To do so, use the checksum and signature files from the main Apache site at <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/usergrid-1/v1.0.2/">https://dist.apache.org/repos/dist/release/incubator/usergrid/usergrid-1/v1.0.2/</a>. Find here the KEYS file, which contains all OpenPGP keys we use to sign releases here: <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/KEYS">https://dist.apache.org/repos/dist/release/incubator/usergrid/KEYS</a>
@@ -149,32 +149,31 @@
</div>
<div class="col-md-2">
<ul class="nav nav-list">
- <li class="nav-header"><a href="https://github.com/apache/incubator-usergrid/" target="_blank">Code</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/dotnet" target="_blank">.NET / Windows SDK</a></li>
+ <li class="nav-header"><a href="https://github.com/apache/usergrid/" target="_blank">Code</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/sdks/dotnet" target="_blank">.NET / Windows SDK</a></li>
</ul>
</div>
<div class="col-md-2">
<ul class="nav nav-list">
<li class="nav-header">Resources</li>
- <li><a href="http://github.com/apache/incubator-usergrid" target="_blank">GitHub Code</a></li>
+ <li><a href="http://github.com/apache/usergrid" target="_blank">GitHub Code</a></li>
<li><a href="docs" target="_blank">Docs</a></li>
<li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" target="_blank">JIRA Bug Tracker</a></li>
<li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
<li><a href="/community/#live">Live Chat</a></li>
<li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
- <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
- <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
+ <li><a href="https://github.com/apache/usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
<li><a href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow" target="_blank">Contribution Guidelines</a></li>
</ul>
</div>
@@ -205,7 +204,6 @@
<div class="row">
<div id="copyright">
<img src="/img/egg-logo.png" /><br/><br/>
- <p>Apache Usergrid is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>
<p>Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.<br>
Apache and the Apache feather logos are trademarks of The Apache Software Foundation.</p>
<p class="credits">Site designed & assembled with love by <a href="https://github.com/ryuneeee">@ryuneeee</a> + <a href="https://github.com/realbeast">@realbeast</a> + <a href="https://twitter.com/timanglade">@timanglade</a> + <a href="https://twitter.com/snoopdave">@snoopdave</a> .</p>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/docs/installation/ug1-deploy-to-tomcat.md
----------------------------------------------------------------------
diff --git a/docs/installation/ug1-deploy-to-tomcat.md b/docs/installation/ug1-deploy-to-tomcat.md
index 5356a94..4c88387 100644
--- a/docs/installation/ug1-deploy-to-tomcat.md
+++ b/docs/installation/ug1-deploy-to-tomcat.md
@@ -16,9 +16,9 @@ For more information:
## Download
-Use GitHub to clone the [apache/incubator-usergrid](https://github.com/apache/incubator-usergrid) repo.
+Use GitHub to clone the [apache/usergrid](https://github.com/apache/usergrid) repo.
-Or you can start by [downloading our latest code](https://github.com/apache/incubator-usergrid/archive/master.zip) and extract it.
+Or you can start by [downloading our latest code](https://github.com/apache/usergrid/archive/master.zip) and extract it.
## Building
@@ -89,7 +89,7 @@ You should not be prompted for login because you already logged into for the Dat
Build the Usergrid Console
---
-The Usergrid Console is an admin interface written in JavaScript that connects to your running Usergrid instance. For evaluation purposes, you can run it within Tomcat. Build it by following the steps [here](https://github.com/apache/incubator-usergrid/blob/master/portal/README.md). Once built, copy the directory _portal/build/usergrid-portal_ to _tomcat/webapps_.
+The Usergrid Console is an admin interface written in JavaScript that connects to your running Usergrid instance. For evaluation purposes, you can run it within Tomcat. Build it by following the steps [here](https://github.com/apache/usergrid/blob/master/portal/README.md). Once built, copy the directory _portal/build/usergrid-portal_ to _tomcat/webapps_.
Login to the Usergrid Console & get started
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/docs/installation/ug1-launcher-quick-start.md
----------------------------------------------------------------------
diff --git a/docs/installation/ug1-launcher-quick-start.md b/docs/installation/ug1-launcher-quick-start.md
index 8399522..fe25e21 100644
--- a/docs/installation/ug1-launcher-quick-start.md
+++ b/docs/installation/ug1-launcher-quick-start.md
@@ -9,7 +9,7 @@
### Download2
-Start by [downloading our latest code](https://github.com/apache/incubator-usergrid/archive/master.zip) and extract it.
+Start by [downloading our latest code](https://github.com/apache/usergrid/archive/master.zip) and extract it.
#### Building 3
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/docs/installation/ug2-deploy-to-tomcat.md
----------------------------------------------------------------------
diff --git a/docs/installation/ug2-deploy-to-tomcat.md b/docs/installation/ug2-deploy-to-tomcat.md
index 10ed013..a07f13a 100644
--- a/docs/installation/ug2-deploy-to-tomcat.md
+++ b/docs/installation/ug2-deploy-to-tomcat.md
@@ -9,7 +9,7 @@ __NOTE__: Beware that Usergrid 2 is UNRELEASED SOFTWARE
* [Tomcat 7+](https://tomcat.apache.org/download-70.cgi)
* [Cassandra 1.2.1*](http://cassandra.apache.org/download/)
* [ElasticSearch 1.4+](https://www.elastic.co/downloads/elasticsearch)
-* [Usergrid 2.0](https://github.com/apache/incubator-usergrid/tree/two-dot-o)
+* [Usergrid 2.0](https://github.com/apache/usergrid/tree/two-dot-o)
##Running
@@ -50,7 +50,7 @@ The stack is now ready to be queried against, but to get the most out of it you'
[nodejs 0.10+](https://nodejs.org/download/)
1. Make sure you've installed node.js above. Any version above .10 or .10 should work fine.
-2. Navigate to ```incubator-usergrid/portal```.
+2. Navigate to ```usergrid/portal```.
3. Open config.js and make sure the override URL is pointing to your local tomcat.
4. Now in the portal folder run the following command ```./build.sh dev```
5. The portal should automatically open ready for use!
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/docs/reference/contribute-code.md
----------------------------------------------------------------------
diff --git a/docs/reference/contribute-code.md b/docs/reference/contribute-code.md
index 5bfd0ce..cfd3073 100644
--- a/docs/reference/contribute-code.md
+++ b/docs/reference/contribute-code.md
@@ -7,7 +7,7 @@ by external contributors, and by those who are committers on the project.
You can read this policy here [Usergrid Contribution Workflow](https://cwiki.apache.org/confluence/display/usergrid/Usergrid+Contribution+Workflow).
Basically, we use GitHub as our code review system. So you should fork the
-apache/incubator-usergrid repo and submit PRs back to the project. Here
+apache/usergrid repo and submit PRs back to the project. Here
are are step-by-step guide for both both external contributors and committers:
* [External Contributors Guide](https://cwiki.apache.org/confluence/display/usergrid/Usergrid+External+Contributors+Guide)
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/docs/user-management/messagee-example.md
----------------------------------------------------------------------
diff --git a/docs/user-management/messagee-example.md b/docs/user-management/messagee-example.md
index 1401d8c..e3f3a02 100644
--- a/docs/user-management/messagee-example.md
+++ b/docs/user-management/messagee-example.md
@@ -122,16 +122,16 @@ Because test-user-1 follows test-user-2, you should see the message sent by test
## iOS SDK
-If you want to write iOS applications that connect to Usergrid, [download the Usergrid iOS SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/ios).
+If you want to write iOS applications that connect to Usergrid, [download the Usergrid iOS SDK](https://github.com/apache/usergrid/tree/master/sdks/ios).
__Note__: The Messagee iOS application uses RestKit, a popular REST framework for iOS, to communicate with Usergrid. Because Usergrid use a REST API, you can use any REST framework to talk with the service. However, the official Usergrid iOS SDK provides a more convenient communication mechanism that you should use unless you're already using RestKit or some other framework in your project.
## Android client and SDK
Messagee is available as a sample Android app that acts as a Usergrid client. The source for the Android version is packaged with the Usergrid Android SDK in the /samples/messagee directory.
-[Download the Usergrid Android SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/android)
+[Download the Usergrid Android SDK](https://github.com/apache/usergrid/tree/master/sdks/android)
## Javascript/HTML5 client and SDK
Messagee is also available as a sample HTML5 app that behaves in much the same way as the two previous examples. The source for the HTML5 version is packaged with the Usergrid Javascript/HTML5 SDK in the /samples/messagee directory.
-[Download the Usergrid Javascript/HTML5 SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/html5-javascript)
+[Download the Usergrid Javascript/HTML5 SDK](https://github.com/apache/usergrid/tree/master/sdks/html5-javascript)
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/portal/README.md
----------------------------------------------------------------------
diff --git a/portal/README.md b/portal/README.md
index d131551..1436d2f 100644
--- a/portal/README.md
+++ b/portal/README.md
@@ -5,7 +5,7 @@ The admin portal source code is fully open source and forkable. You can easily e
The admin portal source is in the Usergrid repo here:
-<https://github.com/apache/incubator-usergrid/tree/master/portal>
+<https://github.com/apache/usergrid/tree/master/portal>
##About the Admin Portal
Use the admin portal for administrative operations, including:
@@ -81,7 +81,7 @@ You can also use the Usergrid Command Line (ugc) for terminal access to the User
## Contributing
We welcome your enhancements!
-The Admin Portal is part of the [Usergrid](http://usergrid.incubator.apache.org/), project. It is open source and licensed under the Apache License, Version 2.0.
+The Admin Portal is part of the [Usergrid](http://usergrid.apache.org/), project. It is open source and licensed under the Apache License, Version 2.0.
1. Fork it
2. Create your feature branch (`git checkout -b my-new-feature`)
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/portal/index-template.html
----------------------------------------------------------------------
diff --git a/portal/index-template.html b/portal/index-template.html
index 900b364..d884685 100644
--- a/portal/index-template.html
+++ b/portal/index-template.html
@@ -110,13 +110,13 @@ under the License.
<li class="sdks span12">
<ul id="intro-9-sdks" class="pull-right">
<li class="title"><label>SDKs and Modules</label></li>
- <li><a target="_blank" href="https://github.com/apache/incubator-usergrid/tree/master/sdks"><i class="sdk-icon-ios"></i></a></li>
- <li><a target="_blank" href="https://github.com/apache/incubator-usergrid/tree/master/sdks"><i class="sdk-icon-android"></i></a></li>
- <li><a target="_blank" href="https://github.com/apache/incubator-usergrid/tree/master/sdks"><i class="sdk-icon-js"></i></a></li>
- <li><a target="_blank" href="https://github.com/apache/incubator-usergrid/tree/master/sdks"><i class="sdk-icon-node"></i></a></li>
- <li><a target="_blank" href="https://github.com/apache/incubator-usergrid/tree/master/sdks"><i class="sdk-icon-ruby"></i></a></li>
- <li><a target="_blank" href="https://github.com/apache/incubator-usergrid/tree/master/sdks"><i class="sdk-icon-net"></i></a></li>
- <li><a target="_blank" href="https://github.com/apache/incubator-usergrid/tree/master/sdks"><i class="sdk-icon-perl"></i></a></li>
+ <li><a target="_blank" href="https://github.com/apache/usergrid/tree/master/sdks"><i class="sdk-icon-ios"></i></a></li>
+ <li><a target="_blank" href="https://github.com/apache/usergrid/tree/master/sdks"><i class="sdk-icon-android"></i></a></li>
+ <li><a target="_blank" href="https://github.com/apache/usergrid/tree/master/sdks"><i class="sdk-icon-js"></i></a></li>
+ <li><a target="_blank" href="https://github.com/apache/usergrid/tree/master/sdks"><i class="sdk-icon-node"></i></a></li>
+ <li><a target="_blank" href="https://github.com/apache/usergrid/tree/master/sdks"><i class="sdk-icon-ruby"></i></a></li>
+ <li><a target="_blank" href="https://github.com/apache/usergrid/tree/master/sdks"><i class="sdk-icon-net"></i></a></li>
+ <li><a target="_blank" href="https://github.com/apache/usergrid/tree/master/sdks"><i class="sdk-icon-perl"></i></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/release/release-candidate.sh
----------------------------------------------------------------------
diff --git a/release/release-candidate.sh b/release/release-candidate.sh
index 0e46f88..4ed7839 100755
--- a/release/release-candidate.sh
+++ b/release/release-candidate.sh
@@ -27,8 +27,8 @@ set -o errexit
set -o nounset
rc_tag_version=0
-usergrid_git_web_url='https://git-wip-us.apache.org/repos/asf?p=incubator-usergrid.git'
-usergrid_svn_dist_url='https://dist.apache.org/repos/dist/dev/incubator/usergrid'
+usergrid_git_web_url='https://git-wip-us.apache.org/repos/asf?p=usergrid.git'
+usergrid_svn_dist_url='https://dist.apache.org/repos/dist/dev/usergrid'
function print_help_and_exit {
cat <<EOF
@@ -177,7 +177,7 @@ git commit -m "Updating .usergridversion to ${current_version_tag}."
echo "Building the source distribution"
dist_dir=${base_dir}/dist
-dist_name="apache-usergrid-${current_version_tag}-incubating"
+dist_name="apache-usergrid-${current_version_tag}"
mkdir -p ${dist_dir}
git archive --prefix=${dist_name}/ -o ${dist_dir}/${dist_name}.tar.gz HEAD
@@ -213,7 +213,7 @@ cd ${base_dir}
current_commit_id=`git rev-parse HEAD`
echo "Done creating the release candidate. The following draft email has been created"
-echo "to send to the dev@usergrid.incubator.apache.org mailing list"
+echo "to send to the dev@usergrid.apache.org mailing list"
echo
# Create the email template for the release candidate to be sent to the mailing lists.
@@ -224,8 +224,8 @@ else
fi
MESSAGE=$(cat <<__EOF__
-To: dev@usergrid.incubator.apache.org
-Subject: [VOTE] Release Apache Usergrid ${current_version} (incubating) RC${rc_tag_version}
+To: dev@usergrid.apache.org
+Subject: [VOTE] Release Apache Usergrid ${current_version} RC${rc_tag_version}
All,
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/release/release.sh
----------------------------------------------------------------------
diff --git a/release/release.sh b/release/release.sh
index 411fb80..102e4d7 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -19,10 +19,10 @@
set -e
set -o nounset
-usergrid_git_url='https://git-wip-us.apache.org/repos/asf/incubator-usergrid.git'
-usergrid_git_web_url='https://git-wip-us.apache.org/repos/asf?p=incubator-usergrid.git'
-usergrid_svn_dist_url='https://dist.apache.org/repos/dist/release/incubator/usergrid'
-usergrid_svn_dev_dist_url='https://dist.apache.org/repos/dist/dev/incubator/usergrid'
+usergrid_git_url='https://git-wip-us.apache.org/repos/asf/usergrid.git'
+usergrid_git_web_url='https://git-wip-us.apache.org/repos/asf?p=usergrid.git'
+usergrid_svn_dist_url='https://dist.apache.org/repos/dist/release/usergrid'
+usergrid_svn_dev_dist_url='https://dist.apache.org/repos/dist/dev/usergrid'
function print_help_and_exit {
cat <<EOF
@@ -137,7 +137,7 @@ git tag -s "${current_version}" -m "usergrid-${current_version} release." $curre
#git push origin --tags
#fi
-dist_name="apache-usergrid-${current_version}-incubating"
+dist_name="apache-usergrid-${current_version}"
dist_dir=${base_dir}/dist
release_dir=${dist_dir}/${current_version}
@@ -185,13 +185,13 @@ current_commit_id=`git rev-parse HEAD`
cd ${base_dir}
echo "Done creating the release. The following draft email has been created"
-echo "to send to the dev@usergrid.incubator.apache.org mailing list."
+echo "to send to the dev@usergrid.apache.org mailing list."
echo
# Create the email template for the release to be sent to the mailing lists.
MESSAGE=$(cat <<__EOF__
-To: dev@usergrid.incubator.apache.org
-Subject: [RESULT][VOTE] Release Apache Usergrid ${current_version} (incubating) RC#{rc_tag_version}
+To: dev@usergrid.apache.org
+Subject: [RESULT][VOTE] Release Apache Usergrid ${current_version} RC#{rc_tag_version}
as the official Apache Usegrid ${current_version} release has passed.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/sdks/android/NOTICE
----------------------------------------------------------------------
diff --git a/sdks/android/NOTICE b/sdks/android/NOTICE
index 5882fcd..b5db9bf 100644
--- a/sdks/android/NOTICE
+++ b/sdks/android/NOTICE
@@ -1,4 +1,4 @@
-Apache Usergrid (incubating)
+Apache Usergrid
Copyright 2014 The Apache Software Foundation.
This product bundles SSToolkit Copyright (c) 2009-2011 Sam Soffes. All rights reserved.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/sdks/android/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/android/pom.xml b/sdks/android/pom.xml
index 2ad8fc8..1ef5cfa 100644
--- a/sdks/android/pom.xml
+++ b/sdks/android/pom.xml
@@ -37,7 +37,7 @@
<packaging>jar</packaging>
<description>A simple java client for usergrid</description>
- <url>http://usergrid.incubator.apache.org</url>
+ <url>http://usergrid.apache.org</url>
<licenses>
<license>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/sdks/dotnet/NOTICE
----------------------------------------------------------------------
diff --git a/sdks/dotnet/NOTICE b/sdks/dotnet/NOTICE
index 252fd9b..84a2bf0 100644
--- a/sdks/dotnet/NOTICE
+++ b/sdks/dotnet/NOTICE
@@ -1,4 +1,4 @@
-Apache Usergrid (incubating)
+Apache Usergrid
Copyright (c) The Apache Software Foundation.
This product uses the following software:
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/sdks/dotnet/README.md
----------------------------------------------------------------------
diff --git a/sdks/dotnet/README.md b/sdks/dotnet/README.md
index 7d0d401..f002238 100644
--- a/sdks/dotnet/README.md
+++ b/sdks/dotnet/README.md
@@ -11,7 +11,7 @@ Solution is composed of following projects:
## Comments and Questions
Please feel free to send your comments/suggestions/questions one of the
several communication platforms.
-<http://usergrid.incubator.apache.org/community/>
+<http://usergrid.apache.org/community/>
## Overview
We welcome your contributions and suggestions. The repository is located [here][RepositoryLocation].
@@ -56,7 +56,7 @@ In order to run the integration tests, do the following:
* Tests have been implemented using NUnit, so you can use any NUnit runner to run the tests.
## Authentication
-Usergrid Authentication is explained in [Usergrid Documentation](http://usergrid.incubator.apache.org/docs/).
+Usergrid Authentication is explained in [Usergrid Documentation](http://usergrid.apache.org/docs/).
You can access your Usergrid data using following credentials:
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/sdks/html5-javascript/README.md
----------------------------------------------------------------------
diff --git a/sdks/html5-javascript/README.md b/sdks/html5-javascript/README.md
index bebc955..787cffc 100755
--- a/sdks/html5-javascript/README.md
+++ b/sdks/html5-javascript/README.md
@@ -84,11 +84,11 @@ The Javascript SDK is in the sdks/html5-javascript folder.
To find out more about Usergrid, see:
-<http://usergrid.incubator.apache.org>
+<http://usergrid.apache.org>
To view the Usergrid documentation, see:
-<http://usergrid.incubator.apache.org/docs/>
+<http://usergrid.apache.org/docs/>
##Node.js
@@ -405,7 +405,7 @@ You can also limit the results returned such that only the fields you specify ar
You can find more information on custom queries here:
-<http://usergrid.incubator.apache.org/docs/query-language/>
+<http://usergrid.apache.org/docs/query-language/>
##Counters
Counters can be used by an application to create custom statistics, such as how many times an a file has been downloaded or how many instances of an application are in use.
@@ -660,7 +660,7 @@ This creates a one-way connection between marty and einstein, where marty "likes
Complete documentation on the entity relationships API can be found here:
-<http://usergrid.incubator.apache.org/docs/relationships/>
+<http://usergrid.apache.org/docs/relationships/>
For example, say we have a new dog named einstein:
@@ -862,7 +862,7 @@ Like [Usergrid](https://github.com/apigee/usergrid-node-module), the Usergrid Ja
usergrid.js and usergrid.min.js are built from modular components using Grunt. If you want to contribute updates to these files, please commit your changes to the modules in /lib/modules. Do not contribute directly to usergrid.js or your changes could get overwritten in a future build.
##More information
-For more information on Usergrid, visit <http://usergrid.incubator.apache.org/>.
+For more information on Usergrid, visit <http://usergrid.apache.org/>.
For more information on Apigee App Services, visit <http://developers.apigee.com>.
## Copyright
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/sdks/html5-javascript/index.html
----------------------------------------------------------------------
diff --git a/sdks/html5-javascript/index.html b/sdks/html5-javascript/index.html
index 1f60c44..309d90b 100755
--- a/sdks/html5-javascript/index.html
+++ b/sdks/html5-javascript/index.html
@@ -40,7 +40,7 @@
<br/>
<h2>API documentation</h2>
For more information on Usergrid, see the Apache docs:
- <a href="http://usergrid.incubator.apache.org/">http://usergrid.incubator.apache.org/</a>
+ <a href="http://usergrid.apache.org/">http://usergrid.apache.org/</a>
<br/>
<br/>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/sdks/java/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/pom.xml b/sdks/java/pom.xml
index 8c4c385..34eda24 100644
--- a/sdks/java/pom.xml
+++ b/sdks/java/pom.xml
@@ -14,10 +14,8 @@
<artifactId>usergrid-java-client</artifactId>
<version>0.0.10-SNAPSHOT</version>
<packaging>jar</packaging>
-
- <description>A simple java client for usergrid</description>
- <url>https://github.com/apigee/usergrid-stack-internal</url>
-
+ <description>A Java client for usergrid</description>
+ <url>http://usergrid.apache.org</url>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/sdks/perl/README.md
----------------------------------------------------------------------
diff --git a/sdks/perl/README.md b/sdks/perl/README.md
index 754a420..61069cc 100644
--- a/sdks/perl/README.md
+++ b/sdks/perl/README.md
@@ -64,7 +64,7 @@ front-end developers, it aims to simplify the development process by enabling
them to rapidly build and operate mobile and web applications without requiring
backend expertise.
-Source: [Usergrid Documentation](https://usergrid.incubator.apache.org/docs/)
+Source: [Usergrid Documentation](https://usergrid.apache.org/docs/)
For more information, visit [http://www.usergrid.org](http://www.usergrid.org)
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/sdks/perl/lib/Usergrid/Client.pm
----------------------------------------------------------------------
diff --git a/sdks/perl/lib/Usergrid/Client.pm b/sdks/perl/lib/Usergrid/Client.pm
index cf3efd0..ccb276b 100644
--- a/sdks/perl/lib/Usergrid/Client.pm
+++ b/sdks/perl/lib/Usergrid/Client.pm
@@ -80,7 +80,7 @@ front-end developers, it aims to simplify the development process by enabling
them to rapidly build and operate mobile and web applications without requiring
backend expertise.
-Source: L<https://usergrid.incubator.apache.org/docs/>
+Source: L<https://usergrid.apache.org/docs/>
For more information, visit L<http://www.usergrid.org>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/sdks/php/README.md
----------------------------------------------------------------------
diff --git a/sdks/php/README.md b/sdks/php/README.md
index 545d519..ec04cc9 100644
--- a/sdks/php/README.md
+++ b/sdks/php/README.md
@@ -51,7 +51,7 @@ This SDK is open source, and we welcome any contributions!
##Comments / Questions
Please feel free to send comments or questions to the various
community communication channels
-<http://usergrid.incubator.apache.org/community/>
+<http://usergrid.apache.org/community/>
##Overview
This open source SDK simplifies writing PHP applications that connect to App Services. The repo is located here:
@@ -62,7 +62,7 @@ You can download the release artfacts via the Apache Mirroring newtwork.
A wealth of Usergrid documentation can be found on the site
-<http://usergrid.incubator.apache.org/docs/>
+<http://usergrid.apache.org/docs/>
##About the samples
@@ -367,7 +367,7 @@ We welcome your enhancements!
5. Create new Pull Request (make sure you describe what you did and why your mod is needed)
##More information
-For more information on Usergrid, visit <http://usergrid.incubator.apache.org>.
+For more information on Usergrid, visit <http://usergrid.apache.org>.
## Copyright
Licensed to the Apache Software Foundation (ASF) under one or more
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/sdks/ruby-on-rails/README.md
----------------------------------------------------------------------
diff --git a/sdks/ruby-on-rails/README.md b/sdks/ruby-on-rails/README.md
index 25efce2..dce855b 100644
--- a/sdks/ruby-on-rails/README.md
+++ b/sdks/ruby-on-rails/README.md
@@ -31,7 +31,7 @@ Or install it yourself as:
#### It's great stuff! Check it out, here:
- Docs: <https://usergrid.incubator.apache.org/docs/>
+ Docs: <https://usergrid.apache.org/docs/>
Open source: <https://github.com/usergrid/usergrid/>
### Getting started with the Usergrid_ironhorse SDK is super simple!
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/stack/README.md
----------------------------------------------------------------------
diff --git a/stack/README.md b/stack/README.md
index 06bfb71..d2c8123 100644
--- a/stack/README.md
+++ b/stack/README.md
@@ -1,8 +1,8 @@
# Usergrid
A highly-scalable data platform for mobile applications.
-* **Documentation**: http://usergrid.incubator.apache.org/docs/
-* **Homepage**: http://http://usergrid.incubator.apache.org/
+* **Documentation**: http://usergrid.apache.org/docs/
+* **Homepage**: http://http://usergrid.apache.org/
## Requirements
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/stack/launcher/src/main/java/org/apache/usergrid/launcher/App.java
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/java/org/apache/usergrid/launcher/App.java b/stack/launcher/src/main/java/org/apache/usergrid/launcher/App.java
index 16abb36..2e436ad 100644
--- a/stack/launcher/src/main/java/org/apache/usergrid/launcher/App.java
+++ b/stack/launcher/src/main/java/org/apache/usergrid/launcher/App.java
@@ -42,7 +42,7 @@ public class App {
// TODO: host portal on Apache infrastructure, or build portal into launcher
private static final String GH_PORTAL_URL =
- "http://usergrid.incubator.apache.org/v101-portal-demo";
+ "http://usergrid.apache.org/v101-portal-demo";
public static boolean MAC_OS_X =
( System.getProperty( "os.name" ).toLowerCase().startsWith( "mac os x" ) );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/website/README.md
----------------------------------------------------------------------
diff --git a/website/README.md b/website/README.md
index bea925e..a25755a 100644
--- a/website/README.md
+++ b/website/README.md
@@ -7,7 +7,7 @@ Source files for the website are in ``${usergrid-project-dir}/website/content``
Generated files for the website are in ``${usergrid-project-dir}/content``
The website is updated by a "sync" tool that monitors the __asf-site__ branch of our Git repo, so after to make changes you must push your updated source and generated files to that branch.
-The content will be published to the [Usegrid website](http://usergrid.incubator.apache.org), after a 5-20 minute delay.
+The content will be published to the [Usegrid website](http://usergrid.apache.org), after a 5-20 minute delay.
## Prerequsites
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/website/content/community/index.html
----------------------------------------------------------------------
diff --git a/website/content/community/index.html b/website/content/community/index.html
index 467c9a3..5be4329 100644
--- a/website/content/community/index.html
+++ b/website/content/community/index.html
@@ -70,20 +70,20 @@
<div class="col-md-4">
<h3>Users</h3>
<p><em>Perfect if you build apps against Apache Usergrid or deploy Apache Usergrid.</em></p>
- <p>To subscribe, send a blank email to<br/><a href="mailto:user-subscribe@usergrid.incubator.apache.org">user-subscribe@usergrid.incubator.apache.org</a>.</p>
- <p>You can also <a href="https://mail-archives.apache.org/mod_mbox/incubator-usergrid-user/">read the archives</a>.</p>
+ <p>To subscribe, send a blank email to<br/><a href="mailto:user-subscribe@usergrid.apache.org">user-subscribe@usergrid.apache.org</a>.</p>
+ <p>You can also <a href="https://mail-archives.apache.org/mod_mbox/usergrid-user/">read the archives</a>.</p>
</div>
<div class="col-md-4">
<h3>Dev</h3>
<p><em>If you are building contributions & modifications to Apache Usergrid’s stack, portal, cli and SDKs, this is the list for you.</em><p>
- <p>To subscribe, send a blank email to<br/><a href="mailto:dev-subscribe@usergrid.incubator.apache.org">dev-subscribe@usergrid.incubator.apache.org</a>.</p>
- <p>You can also <a href="https://mail-archives.apache.org/mod_mbox/incubator-usergrid-dev/">read the archives</a>.</p>
+ <p>To subscribe, send a blank email to<br/><a href="mailto:dev-subscribe@usergrid.apache.org">dev-subscribe@usergrid.apache.org</a>.</p>
+ <p>You can also <a href="https://mail-archives.apache.org/mod_mbox/usergrid-dev/">read the archives</a>.</p>
</div>
<div class="col-md-4">
<h3>Commits</h3>
<p><em>This list receives an email whenever new code is contributed to Apache Usergrid.</em><p>
- <p>To subscribe, send a blank email to<br/><a href="mailto:commits-subscribe@usergrid.incubator.apache.org">commits-subscribe@usergrid.incubator.apache.org</a>.</p>
- <p>You can also <a href="https://mail-archives.apache.org/mod_mbox/incubator-usergrid-commits/">read the archives</a>.</p>
+ <p>To subscribe, send a blank email to<br/><a href="mailto:commits-subscribe@usergrid.apache.org">commits-subscribe@usergrid.apache.org</a>.</p>
+ <p>You can also <a href="https://mail-archives.apache.org/mod_mbox/usergrid-commits/">read the archives</a>.</p>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/website/content/index.html
----------------------------------------------------------------------
diff --git a/website/content/index.html b/website/content/index.html
new file mode 100644
index 0000000..7dbabff
--- /dev/null
+++ b/website/content/index.html
@@ -0,0 +1,97 @@
+---
+title: the BaaS not made for Hipsters
+---
+
+<section class="bf-masthead" id="content" role="main">
+ <div class="bf-masthead-bg">
+ <div class="container">
+ <img class="logo-title img-responsive hidden-xs" src="img/apache_usergrid_logo_white.png" />
+ <div class="text-container">
+ <h2 class="tagline">The BaaS Framework <em>you</em> run</h2>
+ <p class="description">Build Apps not Servers! Whether you need to support one App or a hundred, Usergrid is <em>your</em> backend. As easy as a LAMP stack, but built for mobile.
+ Get Apps to production in record time and stop wasting cycles writing server-side code.<br/><br/>
+ Complete SDKs for iOS, Android, HTML5/JS, Node.js, Ruby, Java, .NET, and PHP. Open source since 2011.<br/><br/></p>
+ </div>
+
+ <div class="btn-wrapper">
+ <iframe class="social-btn" src="/static/github-btn.html?user=apache&repo=usergrid&type=watch&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="85" height="30"></iframe>
+ <iframe class="social-btn" src="/static/github-btn.html?user=apache&repo=usergrid&type=fork&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="85" height="30"></iframe>
+ <!--<p><span class="or">or</span> <a href="#">Download Usergrid</a></p>-->
+ </div>
+
+ </div>
+ </div>
+</section>
+
+<section class="bf-features">
+ <div class="container">
+ <div class="row">
+ <div class="col-md-4">
+ <div class="bf-icon-wrap"><i style="font-size:65px; vertical-align: -5px;" aria-hidden="true" class="icon-user"></i></div>
+ <h3>Users</h3>
+ <p>Sign up users, log in, reset passwords and more, in just one API call. You can put users in groups, assign roles or permissions, let users follow each other and access everything via OAuth 2.0, without writing a single line of server code.</p>
+ </div>
+ <div class="col-md-4">
+ <div class="bf-icon-wrap"><i style="font-size:65px; vertical-align: -5px;" aria-hidden="true" class="icon-hdd"></i></div>
+ <h3>Data</h3>
+ <p>If you can express it in JSON, we can store it! Underneath everything is stored in a standard Cassandra instance, but we’ve added the ability to retrieve data via an SQL-like syntax, manage collections and connections between entities.</p>
+ </div>
+ <div class="col-md-4">
+ <div class="bf-icon-wrap"><i aria-hidden="true" class="icon-picture"></i></div>
+ <h3>Files</h3>
+ <p>Our asset storage can handle anything from text files to videos of several terrabytes, with automatic content-detection and full URL access control. In the back, everything goes Amazon S3 or other preferred cloud file store.</p>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-4">
+ <div class="bf-icon-wrap" style="font-size:40px; vertical-align: 15px;"><i aria-hidden="true" class="icon-apple"></i> <i aria-hidden="true" class="icon-android"></i></div>
+ <h3>SDKs</h3>
+ <p>We have full SDKs for <a href="https://github.com/apache/usergrid/tree/master/sdks/ios">iOS</a>, <a href="https://github.com/apache/usergrid/tree/master/sdks/android">Android</a>, and <a href="https://github.com/apache/usergrid/tree/master/sdks/html5-javascript">HTML5/JS</a> but also <a href="https://github.com/apache/usergrid/tree/master/sdks/nodejs">node.js</a>, <a href="https://github.com/apache/usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails</a>, pure <a href="https://github.com/apache/usergrid/tree/master/sdks/ruby">pure Ruby</a>, server-side <a href="https://github.com/apache/usergrid/tree/master/sdks/java">Java</a>, <a href="https://github.com/apache/usergrid/tree/master/sdks/dotnet">.NET / Windows</a> and <a href="https://github.com/apache/usergrid/tree/master/sdks/php">PHP</a>!</p>
+ </div>
+ <div class="col-md-4">
+ <div class="bf-icon-wrap"><span style="font-size:60px" aria-hidden="true" class="icon-road"></span></div>
+ <h3>Java-based</h3>
+ <p>We build on standard Java components, such as Jersey, Jackson, Apache Cassandra and Lucene. That means you get operational predictability, all the benefits of the JVM, and easy extensibility.</p>
+ </div>
+ <div class="col-md-4">
+ <div class="bf-icon-wrap"><i style="font-size:65px; vertical-align: -5px;" aria-hidden="true" class="icon-lock"></i></div>
+ <h3>Trusted</h3>
+ <p>Usergrid is deployed by <a href="https://baas.io/">Korea Telecom</a>, <a href="http://globo.com">Globo</a>, <a href="http://apigee.com">Apigee</a> and many Fortune 500 companies. Our biggest deployments have hundreds of nodes and handle millions of users.</p>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</section>
+
+<section class="bf-questions">
+ <div class="container">
+ <div class="col-md-12 text-center cta">
+ Interested? You can <a href="https://github.com/apache/usergrid/blob/master/stack#requirements" target="_blank" class="btn btn-inverse btn-lg">Try it on your Machine Now</a> <span class="avoidwrap">or <a href="/community/" class="btn btn-inverse btn-lg">Ask a Question on the Lists or at an Event Near You</a></span>
+ </div>
+ </div>
+</section
+
+<section class="bf-news">
+ <div class="container">
+
+ <div class="row">
+ <div class="col-md-12 text-left">
+ <h2>About the Project</h2>
+ <p>Usergrid is an open-source Backend-as-a-Service (“BaaS” or “mBaaS”) composed of an integrated distributed NoSQL database, application layer and client tier with SDKs for developers looking to rapidly build web and/or mobile applications. It provides elementary services (user registration & management, data storage, file storage, queues) and retrieval features (full text search, geolocation search, joins) to power common app features.</p>
+
+ <p>It is a multi-tenant system designed for deployment to public cloud environments (such as Amazon Web Services, Rackspace, etc.) or to run on traditional server infrastructures so that anyone can run their own private BaaS deployment.</p>
+
+ <p>For architects and back-end teams, it aims to provide a distributed, easily extendable, operationally predictable and highly scalable solution. For front-end developers, it aims to simplify the development process by enabling them to rapidly build and operate mobile and web applications without requiring backend expertise.</p>
+ </div>
+ <!--
+ <div class="col-md-4 text-left">
+ <h2>Recent Releases</h2>
+
+
+ </div>
+ -->
+ </div>
+
+ </div>
+</section>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/106d8fa8/website/content/releases/index.html
----------------------------------------------------------------------
diff --git a/website/content/releases/index.html b/website/content/releases/index.html
new file mode 100644
index 0000000..10e6a2c
--- /dev/null
+++ b/website/content/releases/index.html
@@ -0,0 +1,65 @@
+<section class="bf-tagline">
+ <div class="container">
+ <div class="row">
+ <div class="col-md-12">
+ <h2>Usergrid Releases</h2>
+ </div>
+ </div>
+ </div>
+</section>
+
+<section class="bf-releases">
+ <div class="container">
+ <div class="row">
+ <div class="col-md-12" id="events">
+ <h2 class="icns-download"><span>Releases</span></h2>
+ </div>
+ </div>
+ </br>
+ <div class="row">
+ <div class="col-md-9 done">
+ <p>
+ Releases of Usergrid are made available to the general public at no charge, under the <a href="http://apache.org/licenses/">Apache License</a>, in both binary and source distributions.
+ </p>
+ <p>
+ General Availability (GA) Releases - Usergrid 1.0.2
+ </p>
+ <p>
+ Download the release from a <a href="http://www.apache.org/dyn/closer.cgi/incubator/usergrid/usergrid-1/v1.0.2">mirror: http://www.apache.org/dyn/closer.cgi/incubator/usergrid/usergrid-1/v1.0.2</a>
+ </p>
+ <p>
+ Project releases are approved by vote of the Apache Usergrid Project Management Committee (PMC). Support for a release is provided by project volunteers on the project <a href="http://usergrid.apache.org/community/#mailing-lists">mailing lists</a>. Bugs found in a release may be discussed on the list and reported through the <a href="https://issues.apache.org/jira/browse/USERGRID">issue tracker</a>. The user mailing list and issue tracker are the only support options hosted by the Apache Usergrid project.
+ </p>
+ <p>
+ Note: When downloading from a mirror, please be sure to verify that checksums and signatures are correct. To do so, use the checksum and signature files from the main Apache site at <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/usergrid-1/v1.0.2/">https://dist.apache.org/repos/dist/release/incubator/usergrid/usergrid-1/v1.0.2/</a>. Find here the KEYS file, which contains all OpenPGP keys we use to sign releases here: <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/KEYS">https://dist.apache.org/repos/dist/release/incubator/usergrid/KEYS</a>
+ </p>
+ <p>
+ The PGP signatures can be verified using PGP or GPG. First download the <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/KEYS">KEYS</a> as well as the <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/usergrid-1/v1.0.2/">asc signature</a> file for the particular distribution. Then verify the signatures using:
+ </p>
+ <p>
+ % pgpk -a KEYS
+ </br></br>
+ % pgpv ${filename}.tar.gz.asc
+ </br></br>
+ or
+ </br></br>
+ % pgp -ka KEYS
+ </br></br>
+ % pgp ${filename}.tar.gz.asc
+ </br></br>
+ or
+ </br></br>
+ % gpg --import KEYS
+ </br></br>
+ % gpg --verify ${filename}.tar.gz.asc
+ </br></br>
+ </p>
+ <p>
+ Alternatively, you can verify the MD5 signature on the files. A Unix program called md5 or md5sum is included in many Unix distributions. It is also available as part of <a href="http://www.gnu.org/software/textutils/textutils.html">GNU Textutils</a>. Windows users can get binary md5 programs from <a href="http://www.fourmilab.ch/md5/">here</a>, <a href="http://www.pc-tools.net/win32/md5sums/">here</a>, or <a href="http://www.slavasoft.com/fsum/">here</a>.
+ <p>
+ If you want to build directly from the sources, please check the <a href="/docs/getting-up-and-running-locally/">Project Docs</a>.
+ </p>
+ </div>
+ </div>
+ </div>
+</section>
[34/36] usergrid git commit: Merge branch 'pr/354' into
two-dot-o-dev. This closes #354.
Posted by sf...@apache.org.
Merge branch 'pr/354' into two-dot-o-dev. This closes #354.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/ac9da14b
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ac9da14b
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ac9da14b
Branch: refs/heads/entity-size
Commit: ac9da14ba21921e9727700bb122401c4562b98dc
Parents: 2303eea 2391bfd
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Aug 25 17:40:48 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Aug 25 17:40:48 2015 -0400
----------------------------------------------------------------------
.../corepersistence/CpEntityMapUtilsTest.java | 79 ++++++++++++++++++++
.../model/entity/MapToEntityConverter.java | 10 ++-
2 files changed, 88 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[02/36] usergrid git commit: Adding operation and model
cross-references to Markdown representation
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/f9a354b2/docs/rest-endpoints/api-docs.html
----------------------------------------------------------------------
diff --git a/docs/rest-endpoints/api-docs.html b/docs/rest-endpoints/api-docs.html
index 4d90c8c..d04b4b5 100644
--- a/docs/rest-endpoints/api-docs.html
+++ b/docs/rest-endpoints/api-docs.html
@@ -57,18 +57,18 @@
<a name='Access-Tokens-method'></a>
<h2>Access-Tokens</h2>
-<a name="op-mAlKR6jEhl"/>
+<a name="op-9tip2KQOJU"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /management/token
- <a data-toggle="collapse" data-target="#op-mAlKR6jEhl"
- href="#op-mAlKR6jEhl" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-9tip2KQOJU"
+ href="#op-9tip2KQOJU" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-mAlKR6jEhl" class="panel-body collapse">
+ <div id="op-9tip2KQOJU" class="panel-body collapse">
<p>Login with Admin-User or Organization credentials.</p>
@@ -76,7 +76,7 @@
<ul>
<li>
- <b>login-credentials</b> (<a href="#LoginCredentials">LoginCredentials</a>)<br>
+ <b>login-credentials</b> (<a href="#logincredentials">LoginCredentials</a>)<br>
Login credentials either username/password or id/secret. (Specified in body).
</li>
</ul>
@@ -104,18 +104,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-uIJFfKvsl6"/>
+<a name="op-IUf19l1qrH"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{appId}/token
- <a data-toggle="collapse" data-target="#op-uIJFfKvsl6"
- href="#op-uIJFfKvsl6" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-IUf19l1qrH"
+ href="#op-IUf19l1qrH" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-uIJFfKvsl6" class="panel-body collapse">
+ <div id="op-IUf19l1qrH" class="panel-body collapse">
<p>Login with App-User or Application credentials.</p>
@@ -123,7 +123,7 @@
<ul>
<li>
- <b>login-credentials</b> (<a href="#LoginCredentials">LoginCredentials</a>)<br>
+ <b>login-credentials</b> (<a href="#logincredentials">LoginCredentials</a>)<br>
Login credentials either username/password or id/secret. (Specified in body).
</li>
</ul>
@@ -153,18 +153,18 @@
<a name='Activities-method'></a>
<h2>Activities</h2>
-<a name="op-pKr2VP64e5"/>
+<a name="op-s4NWZiHc78"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{appId}/groups/{groupId}/feed
- <a data-toggle="collapse" data-target="#op-pKr2VP64e5"
- href="#op-pKr2VP64e5" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-s4NWZiHc78"
+ href="#op-s4NWZiHc78" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-pKr2VP64e5" class="panel-body collapse">
+ <div id="op-s4NWZiHc78" class="panel-body collapse">
<p>Get a group's feed through providing all the identifications.</p>
@@ -208,18 +208,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-qOQrBk7lNB"/>
+<a name="op-HDAhoX69jZ"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{appId}/users/{userId}/activities
- <a data-toggle="collapse" data-target="#op-qOQrBk7lNB"
- href="#op-qOQrBk7lNB" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-HDAhoX69jZ"
+ href="#op-HDAhoX69jZ" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-qOQrBk7lNB" class="panel-body collapse">
+ <div id="op-HDAhoX69jZ" class="panel-body collapse">
<p>Create an activity in the activities collection.</p>
@@ -239,7 +239,7 @@
One of the user's identification which includes username or UUID. (Specified in path).
</li>
<li>
- <b>CreateActivity</b> (<a href="#CreateActivity">CreateActivity</a>)<br>
+ <b>CreateActivity</b> (<a href="#createactivity">CreateActivity</a>)<br>
One or more sets of activity properties. (Specified in body).
</li>
</ul>
@@ -267,18 +267,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-FXc5bn3d3I"/>
+<a name="op-twzitiiIB6"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{appId}/users/{userId}/feed
- <a data-toggle="collapse" data-target="#op-FXc5bn3d3I"
- href="#op-FXc5bn3d3I" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-twzitiiIB6"
+ href="#op-twzitiiIB6" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-FXc5bn3d3I" class="panel-body collapse">
+ <div id="op-twzitiiIB6" class="panel-body collapse">
<p>Retrieve a user's feed through providing all the identifications.</p>
@@ -324,18 +324,18 @@
<a name='Admin-Users-method'></a>
<h2>Admin-Users</h2>
-<a name="op-cwbY0V5Wx9"/>
+<a name="op-fY1suiC9CG"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/users
- <a data-toggle="collapse" data-target="#op-cwbY0V5Wx9"
- href="#op-cwbY0V5Wx9" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-fY1suiC9CG"
+ href="#op-fY1suiC9CG" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-cwbY0V5Wx9" class="panel-body collapse">
+ <div id="op-fY1suiC9CG" class="panel-body collapse">
<p>Retrieve details about the admin users in an organization.</p>
@@ -371,18 +371,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-c6KZfPifUw"/>
+<a name="op-9ay9DuEBu7"/>
<div class="panel panel-default">
<div class="panel-heading DELETE">
<h2 class="panel-title DELETE-heading">DELETE /management/orgs/{orgId}/users/{userId}
- <a data-toggle="collapse" data-target="#op-c6KZfPifUw"
- href="#op-c6KZfPifUw" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-9ay9DuEBu7"
+ href="#op-9ay9DuEBu7" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-c6KZfPifUw" class="panel-body collapse">
+ <div id="op-9ay9DuEBu7" class="panel-body collapse">
<p>Remove an admin user from an organization through providing both Id of application and organization.</p>
@@ -422,18 +422,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-QoxREYsNIz"/>
+<a name="op-K7dHVMcYsP"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /management/users
- <a data-toggle="collapse" data-target="#op-QoxREYsNIz"
- href="#op-QoxREYsNIz" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-K7dHVMcYsP"
+ href="#op-K7dHVMcYsP" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-QoxREYsNIz" class="panel-body collapse">
+ <div id="op-K7dHVMcYsP" class="panel-body collapse">
<p>Create a whole new admin user.</p>
@@ -441,7 +441,7 @@
<ul>
<li>
- <b>CreateAdminUser</b> (<a href="#CreateAdminUser">CreateAdminUser</a>)<br>
+ <b>CreateAdminUser</b> (<a href="#createadminuser">CreateAdminUser</a>)<br>
User entity with fields required for User creation. (Specified in body).
</li>
</ul>
@@ -469,18 +469,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-NnjAZL35sG"/>
+<a name="op-o2wkBkogfI"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /management/users/resetpw
- <a data-toggle="collapse" data-target="#op-NnjAZL35sG"
- href="#op-NnjAZL35sG" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-o2wkBkogfI"
+ href="#op-o2wkBkogfI" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-NnjAZL35sG" class="panel-body collapse">
+ <div id="op-o2wkBkogfI" class="panel-body collapse">
<p>Initiate the reset of an admin user's password.</p>
@@ -512,18 +512,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-ibPS5jhpAj"/>
+<a name="op-cpX0wpzVCy"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /management/users/resetpw
- <a data-toggle="collapse" data-target="#op-ibPS5jhpAj"
- href="#op-ibPS5jhpAj" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-cpX0wpzVCy"
+ href="#op-cpX0wpzVCy" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-ibPS5jhpAj" class="panel-body collapse">
+ <div id="op-cpX0wpzVCy" class="panel-body collapse">
<p>Complete the password reset through getting the newpassword and the old one for identification.</p>
@@ -531,7 +531,7 @@
<ul>
<li>
- <b>ResetPWMsg</b> (<a href="#ResetPWMsg">ResetPWMsg</a>)<br>
+ <b>ResetPWMsg</b> (<a href="#resetpwmsg">ResetPWMsg</a>)<br>
Parameters and value for the Captcha challenge, the admin user's response to the Captcha challenge, and the admin user's email address. (Specified in body).
</li>
</ul>
@@ -559,18 +559,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-Bge9rwVR2F"/>
+<a name="op-7hDdXim1A9"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /management/users/{userId}
- <a data-toggle="collapse" data-target="#op-Bge9rwVR2F"
- href="#op-Bge9rwVR2F" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-7hDdXim1A9"
+ href="#op-7hDdXim1A9" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-Bge9rwVR2F" class="panel-body collapse">
+ <div id="op-7hDdXim1A9" class="panel-body collapse">
<p>Retrieve details about an admin user.</p>
@@ -606,18 +606,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-gQEepFPt0p"/>
+<a name="op-9OBDSmeQMQ"/>
<div class="panel panel-default">
<div class="panel-heading PUT">
<h2 class="panel-title PUT-heading">PUT /management/users/{userId}
- <a data-toggle="collapse" data-target="#op-gQEepFPt0p"
- href="#op-gQEepFPt0p" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-9OBDSmeQMQ"
+ href="#op-9OBDSmeQMQ" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-gQEepFPt0p" class="panel-body collapse">
+ <div id="op-9OBDSmeQMQ" class="panel-body collapse">
<p>Update the info of an admin user.</p>
@@ -653,18 +653,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-BGDia29iCi"/>
+<a name="op-w5LTUIm8Aa"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /management/users/{userId}/activate
- <a data-toggle="collapse" data-target="#op-BGDia29iCi"
- href="#op-BGDia29iCi" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-w5LTUIm8Aa"
+ href="#op-w5LTUIm8Aa" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-BGDia29iCi" class="panel-body collapse">
+ <div id="op-w5LTUIm8Aa" class="panel-body collapse">
<p>Activate an admin user from a link provIded in an email notification.</p>
@@ -708,18 +708,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-tvFdo6Wdmr"/>
+<a name="op-5cCk6VmfP1"/>
<div class="panel panel-default">
<div class="panel-heading PUT">
<h2 class="panel-title PUT-heading">PUT /management/users/{userId}/password
- <a data-toggle="collapse" data-target="#op-tvFdo6Wdmr"
- href="#op-tvFdo6Wdmr" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-5cCk6VmfP1"
+ href="#op-5cCk6VmfP1" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-tvFdo6Wdmr" class="panel-body collapse">
+ <div id="op-5cCk6VmfP1" class="panel-body collapse">
<p>Update an admin user's password through getting the newpassword and the old one for identification.</p>
@@ -731,7 +731,7 @@
One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
</li>
<li>
- <b>ResetPW</b> (<a href="#ResetPW">ResetPW</a>)<br>
+ <b>ResetPW</b> (<a href="#resetpw">ResetPW</a>)<br>
The user's old and new password. (Specified in body).
</li>
</ul>
@@ -759,18 +759,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-Y1nYMat7jd"/>
+<a name="op-DHHGIVnyXy"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /management/users/{userId}/reactivate
- <a data-toggle="collapse" data-target="#op-Y1nYMat7jd"
- href="#op-Y1nYMat7jd" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-DHHGIVnyXy"
+ href="#op-DHHGIVnyXy" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-Y1nYMat7jd" class="panel-body collapse">
+ <div id="op-DHHGIVnyXy" class="panel-body collapse">
<p>Reactivate an expired admin user.</p>
@@ -808,18 +808,18 @@
<a name='App-Users-method'></a>
<h2>App-Users</h2>
-<a name="op-KohIJoTygQ"/>
+<a name="op-Lx5NaI3isH"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{appId}/users
- <a data-toggle="collapse" data-target="#op-KohIJoTygQ"
- href="#op-KohIJoTygQ" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-Lx5NaI3isH"
+ href="#op-Lx5NaI3isH" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-KohIJoTygQ" class="panel-body collapse">
+ <div id="op-Lx5NaI3isH" class="panel-body collapse">
<p>Retrieve users though query statement.</p>
@@ -863,18 +863,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-ExiaIQsIeW"/>
+<a name="op-Eosn4udGUG"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{appId}/users
- <a data-toggle="collapse" data-target="#op-ExiaIQsIeW"
- href="#op-ExiaIQsIeW" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-Eosn4udGUG"
+ href="#op-Eosn4udGUG" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-ExiaIQsIeW" class="panel-body collapse">
+ <div id="op-Eosn4udGUG" class="panel-body collapse">
<p>Create a user in the users collection through providing all the identifications.</p>
@@ -890,7 +890,7 @@
One of the application's identification which includes name or uuid. (Specified in path).
</li>
<li>
- <b>CreateUser</b> (<a href="#CreateUser">CreateUser</a>)<br>
+ <b>CreateUser</b> (<a href="#createuser">CreateUser</a>)<br>
The properties of the user. (Specified in body).
</li>
</ul>
@@ -918,18 +918,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-KDDVENxZsp"/>
+<a name="op-f2fcMcbq2u"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{appId}/users/{userId}
- <a data-toggle="collapse" data-target="#op-KDDVENxZsp"
- href="#op-KDDVENxZsp" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-f2fcMcbq2u"
+ href="#op-f2fcMcbq2u" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-KDDVENxZsp" class="panel-body collapse">
+ <div id="op-f2fcMcbq2u" class="panel-body collapse">
<p>Retrieve a user through providing all the identifications.</p>
@@ -973,18 +973,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-Ai5RM27c5I"/>
+<a name="op-1WRy7Zxrom"/>
<div class="panel panel-default">
<div class="panel-heading PUT">
<h2 class="panel-title PUT-heading">PUT /{orgId}/{appId}/users/{userId}
- <a data-toggle="collapse" data-target="#op-Ai5RM27c5I"
- href="#op-Ai5RM27c5I" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-1WRy7Zxrom"
+ href="#op-1WRy7Zxrom" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-Ai5RM27c5I" class="panel-body collapse">
+ <div id="op-1WRy7Zxrom" class="panel-body collapse">
<p>Update a user through providing all the identifications.</p>
@@ -1028,18 +1028,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-1wdqoSlsQ5"/>
+<a name="op-wAYA0cyL6U"/>
<div class="panel panel-default">
<div class="panel-heading DELETE">
<h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/users/{userId}
- <a data-toggle="collapse" data-target="#op-1wdqoSlsQ5"
- href="#op-1wdqoSlsQ5" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-wAYA0cyL6U"
+ href="#op-wAYA0cyL6U" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-1wdqoSlsQ5" class="panel-body collapse">
+ <div id="op-wAYA0cyL6U" class="panel-body collapse">
<p>Remove a user through providing all the identifications.</p>
@@ -1083,18 +1083,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-Tfo6D3w41U"/>
+<a name="op-2gWkZmGFej"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{appId}/users/{user}/password
- <a data-toggle="collapse" data-target="#op-Tfo6D3w41U"
- href="#op-Tfo6D3w41U" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-2gWkZmGFej"
+ href="#op-2gWkZmGFej" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-Tfo6D3w41U" class="panel-body collapse">
+ <div id="op-2gWkZmGFej" class="panel-body collapse">
<p>Set a user's password or reset the user's existing password.</p>
@@ -1114,7 +1114,7 @@
The username of the user. (Specified in path).
</li>
<li>
- <b>ResetPW</b> (<a href="#ResetPW">ResetPW</a>)<br>
+ <b>ResetPW</b> (<a href="#resetpw">ResetPW</a>)<br>
The user's old and new password. (Specified in body).
</li>
</ul>
@@ -1144,18 +1144,18 @@
<a name='Entities-Collections-method'></a>
<h2>Entities-Collections</h2>
-<a name="op-r80zXhSfho"/>
+<a name="op-MPJEDNveAg"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{appId}/users/{userId}/{relation}
- <a data-toggle="collapse" data-target="#op-r80zXhSfho"
- href="#op-r80zXhSfho" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-MPJEDNveAg"
+ href="#op-MPJEDNveAg" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-r80zXhSfho" class="panel-body collapse">
+ <div id="op-MPJEDNveAg" class="panel-body collapse">
<p>Retrieve a user's collections or connections through query statement.</p>
@@ -1207,18 +1207,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-gb3PI7dCpr"/>
+<a name="op-IPmIu3acQ6"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{appId}/{collectionId}
- <a data-toggle="collapse" data-target="#op-gb3PI7dCpr"
- href="#op-gb3PI7dCpr" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-IPmIu3acQ6"
+ href="#op-IPmIu3acQ6" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-gb3PI7dCpr" class="panel-body collapse">
+ <div id="op-IPmIu3acQ6" class="panel-body collapse">
<p>Retrieve collection through query statement.</p>
@@ -1266,18 +1266,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-g5PcMjD3FP"/>
+<a name="op-BamEimBRA0"/>
<div class="panel panel-default">
<div class="panel-heading PUT">
<h2 class="panel-title PUT-heading">PUT /{orgId}/{appId}/{collectionId}
- <a data-toggle="collapse" data-target="#op-g5PcMjD3FP"
- href="#op-g5PcMjD3FP" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-BamEimBRA0"
+ href="#op-BamEimBRA0" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-g5PcMjD3FP" class="panel-body collapse">
+ <div id="op-BamEimBRA0" class="panel-body collapse">
<p>Update collection through query statement.</p>
@@ -1325,18 +1325,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-noESVjTYyy"/>
+<a name="op-vbbvVAAgj9"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2}
- <a data-toggle="collapse" data-target="#op-noESVjTYyy"
- href="#op-noESVjTYyy" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-vbbvVAAgj9"
+ href="#op-vbbvVAAgj9" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-noESVjTYyy" class="panel-body collapse">
+ <div id="op-vbbvVAAgj9" class="panel-body collapse">
<p>Add an entity to a collection through providing all the identifications.</p>
@@ -1392,18 +1392,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-rqV37JpDGT"/>
+<a name="op-fRuzilDgtX"/>
<div class="panel panel-default">
<div class="panel-heading DELETE">
<h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2}
- <a data-toggle="collapse" data-target="#op-rqV37JpDGT"
- href="#op-rqV37JpDGT" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-fRuzilDgtX"
+ href="#op-fRuzilDgtX" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-rqV37JpDGT" class="panel-body collapse">
+ <div id="op-fRuzilDgtX" class="panel-body collapse">
<p>Remove an entity from a collection through providing all the identifications.</p>
@@ -1459,18 +1459,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-GcguK1wiNI"/>
+<a name="op-OTebyGbCOB"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{appId}/{collectionId}/{entityId}
- <a data-toggle="collapse" data-target="#op-GcguK1wiNI"
- href="#op-GcguK1wiNI" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-OTebyGbCOB"
+ href="#op-OTebyGbCOB" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-GcguK1wiNI" class="panel-body collapse">
+ <div id="op-OTebyGbCOB" class="panel-body collapse">
<p>Retrieve an entity through providing Id of application, organization, collection and entity.</p>
@@ -1518,18 +1518,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-717cOaQzyy"/>
+<a name="op-vMFmKcb2Gg"/>
<div class="panel panel-default">
<div class="panel-heading PUT">
<h2 class="panel-title PUT-heading">PUT /{orgId}/{appId}/{collectionId}/{entityId}
- <a data-toggle="collapse" data-target="#op-717cOaQzyy"
- href="#op-717cOaQzyy" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-vMFmKcb2Gg"
+ href="#op-vMFmKcb2Gg" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-717cOaQzyy" class="panel-body collapse">
+ <div id="op-vMFmKcb2Gg" class="panel-body collapse">
<p>One or more properties can be updated with a single request.</p>
@@ -1553,7 +1553,7 @@
One of the entity's identification which includes name or uuid. (Specified in path).
</li>
<li>
- <b>entityproperty</b> (<a href="#CreateEntities">CreateEntities</a>)<br>
+ <b>entityproperty</b> (<a href="#createentities">CreateEntities</a>)<br>
The properties of the entity. (Specified in body).
</li>
</ul>
@@ -1581,18 +1581,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-ZJvngxk5gr"/>
+<a name="op-iHyMbJUKhn"/>
<div class="panel panel-default">
<div class="panel-heading DELETE">
<h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId}
- <a data-toggle="collapse" data-target="#op-ZJvngxk5gr"
- href="#op-ZJvngxk5gr" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-iHyMbJUKhn"
+ href="#op-iHyMbJUKhn" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-ZJvngxk5gr" class="panel-body collapse">
+ <div id="op-iHyMbJUKhn" class="panel-body collapse">
<p>Delete an entity from the collection.</p>
@@ -1640,18 +1640,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-3y5Qc7VbKb"/>
+<a name="op-zWXoRjHTur"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{appId}/{entitytype}
- <a data-toggle="collapse" data-target="#op-3y5Qc7VbKb"
- href="#op-3y5Qc7VbKb" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-zWXoRjHTur"
+ href="#op-zWXoRjHTur" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-3y5Qc7VbKb" class="panel-body collapse">
+ <div id="op-zWXoRjHTur" class="panel-body collapse">
<p>When a new entity is created, Usergrid will automatically create a corresponding collection if one does not already exist. The collection will automatically be named with the plural form of the entity type.</p>
@@ -1671,7 +1671,7 @@
The entity type to create. (Specified in path).
</li>
<li>
- <b>entityproperty</b> (<a href="#CreateEntities">CreateEntities</a>)<br>
+ <b>entityproperty</b> (<a href="#createentities">CreateEntities</a>)<br>
The properties of the entity. (Specified in body).
</li>
</ul>
@@ -1701,18 +1701,18 @@
<a name='Events-method'></a>
<h2>Events</h2>
-<a name="op-U4jz2jPCdU"/>
+<a name="op-0XTUnMPL6J"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{appId}/events
- <a data-toggle="collapse" data-target="#op-U4jz2jPCdU"
- href="#op-U4jz2jPCdU" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-0XTUnMPL6J"
+ href="#op-0XTUnMPL6J" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-U4jz2jPCdU" class="panel-body collapse">
+ <div id="op-0XTUnMPL6J" class="panel-body collapse">
<p>Create an event through providing both Id of organization and application.</p>
@@ -1728,7 +1728,7 @@
One of the application's identification which includes name or uuid. (Specified in path).
</li>
<li>
- <b>CreateEvent</b> (<a href="#CreateEvent">CreateEvent</a>)<br>
+ <b>CreateEvent</b> (<a href="#createevent">CreateEvent</a>)<br>
The required property of the event. (Specified in body).
</li>
</ul>
@@ -1758,18 +1758,18 @@
<a name='Groups-method'></a>
<h2>Groups</h2>
-<a name="op-t6P5Jq7Cgx"/>
+<a name="op-xrKwMqxkJL"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{appId}/groups
- <a data-toggle="collapse" data-target="#op-t6P5Jq7Cgx"
- href="#op-t6P5Jq7Cgx" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-xrKwMqxkJL"
+ href="#op-xrKwMqxkJL" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-t6P5Jq7Cgx" class="panel-body collapse">
+ <div id="op-xrKwMqxkJL" class="panel-body collapse">
<p>Create a new group through providing both Id of organization and application.</p>
@@ -1785,7 +1785,7 @@
One of the application's identification which includes name or uuid. (Specified in path).
</li>
<li>
- <b>groupproperty</b> (<a href="#CreateGroup">CreateGroup</a>)<br>
+ <b>groupproperty</b> (<a href="#creategroup">CreateGroup</a>)<br>
The property of the created group. (Specified in body).
</li>
</ul>
@@ -1813,18 +1813,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-QcQlSI3tb6"/>
+<a name="op-mWlMUxvD5o"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{appId}/groups/{groupId}/activities
- <a data-toggle="collapse" data-target="#op-QcQlSI3tb6"
- href="#op-QcQlSI3tb6" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-mWlMUxvD5o"
+ href="#op-mWlMUxvD5o" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-QcQlSI3tb6" class="panel-body collapse">
+ <div id="op-mWlMUxvD5o" class="panel-body collapse">
<p>Create an activity to a specific group. In this case the activity is created in the activities collection and is accessible at the /activities endpoint to users who have the permission to read that endpoint. In addition, a relationship is established between the activity and the group, and because of that, the activity will appear in the group’s feed. The group 'owns' the activity. Also, the activity will be published in the feed of all users that are members of the group.</p>
@@ -1844,7 +1844,7 @@
One of the group's identification which includes name or uuid. (Specified in path).
</li>
<li>
- <b>CreateActivity</b> (<a href="#CreateActivity">CreateActivity</a>)<br>
+ <b>CreateActivity</b> (<a href="#createactivity">CreateActivity</a>)<br>
One or more sets of activity properties. (Specified in body).
</li>
</ul>
@@ -1872,18 +1872,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-ux3UHzZZ2T"/>
+<a name="op-HZtvmcWXif"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{appId}/groups/{groupId}/users/{userId}
- <a data-toggle="collapse" data-target="#op-ux3UHzZZ2T"
- href="#op-ux3UHzZZ2T" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-HZtvmcWXif"
+ href="#op-HZtvmcWXif" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-ux3UHzZZ2T" class="panel-body collapse">
+ <div id="op-HZtvmcWXif" class="panel-body collapse">
<p>Add a user to a group through providing all the identifications.</p>
@@ -1931,18 +1931,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-XMwyKC5jSE"/>
+<a name="op-hUi9lLujEi"/>
<div class="panel panel-default">
<div class="panel-heading DELETE">
<h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/groups/{groupId}/users/{userId}
- <a data-toggle="collapse" data-target="#op-XMwyKC5jSE"
- href="#op-XMwyKC5jSE" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-hUi9lLujEi"
+ href="#op-hUi9lLujEi" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-XMwyKC5jSE" class="panel-body collapse">
+ <div id="op-hUi9lLujEi" class="panel-body collapse">
<p>Delete user from a group through providing all the identifications.</p>
@@ -1990,18 +1990,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-GyPmx489NH"/>
+<a name="op-DxaIyZ7H6X"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{org_Id}/{app_Id}/groups/{groupId}
- <a data-toggle="collapse" data-target="#op-GyPmx489NH"
- href="#op-GyPmx489NH" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-DxaIyZ7H6X"
+ href="#op-DxaIyZ7H6X" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-GyPmx489NH" class="panel-body collapse">
+ <div id="op-DxaIyZ7H6X" class="panel-body collapse">
<p>Get a group through through providing all the identifications.</p>
@@ -2045,18 +2045,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-RbH6ojRWAU"/>
+<a name="op-xMH6UvAiJQ"/>
<div class="panel panel-default">
<div class="panel-heading PUT">
<h2 class="panel-title PUT-heading">PUT /{org_Id}/{app_Id}/groups/{groupId}
- <a data-toggle="collapse" data-target="#op-RbH6ojRWAU"
- href="#op-RbH6ojRWAU" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-xMH6UvAiJQ"
+ href="#op-xMH6UvAiJQ" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-RbH6ojRWAU" class="panel-body collapse">
+ <div id="op-xMH6UvAiJQ" class="panel-body collapse">
<p>Update a group through providing all the identifications.</p>
@@ -2102,18 +2102,18 @@
<a name='Notifications-method'></a>
<h2>Notifications</h2>
-<a name="op-m7AWoO5aoc"/>
+<a name="op-NNv36bcjPY"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{applicationId}/devices
- <a data-toggle="collapse" data-target="#op-m7AWoO5aoc"
- href="#op-m7AWoO5aoc" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-NNv36bcjPY"
+ href="#op-NNv36bcjPY" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-m7AWoO5aoc" class="panel-body collapse">
+ <div id="op-NNv36bcjPY" class="panel-body collapse">
<p>Create notifications for user through targeting by location and providing all the identifications.</p>
@@ -2129,7 +2129,7 @@
One of the application's identification which includes name or uuid (same as appId). (Specified in path).
</li>
<li>
- <b>notification</b> (<a href="#CreateNotifications">CreateNotifications</a>)<br>
+ <b>notification</b> (<a href="#createnotifications">CreateNotifications</a>)<br>
These parameters are used when forming the notification portion of the request. (Specified in body).
</li>
<li>
@@ -2161,18 +2161,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-WNpFsxnBgP"/>
+<a name="op-NgZ9u50tmC"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{applicationId}/devices/*/notifications
- <a data-toggle="collapse" data-target="#op-WNpFsxnBgP"
- href="#op-WNpFsxnBgP" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-NgZ9u50tmC"
+ href="#op-NgZ9u50tmC" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-WNpFsxnBgP" class="panel-body collapse">
+ <div id="op-NgZ9u50tmC" class="panel-body collapse">
<p>Create notifications for all devices. This request will target all device entities.</p>
@@ -2188,7 +2188,7 @@
One of the application's identification which includes name or uuid (same as appId). (Specified in path).
</li>
<li>
- <b>notification</b> (<a href="#CreateNotifications">CreateNotifications</a>)<br>
+ <b>notification</b> (<a href="#createnotifications">CreateNotifications</a>)<br>
These parameters are used when forming the notification portion of the request. (Specified in body).
</li>
</ul>
@@ -2216,18 +2216,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-PFM9Bas9tu"/>
+<a name="op-O74c4Dc27b"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{applicationId}/devices/{deviceId}/notifications
- <a data-toggle="collapse" data-target="#op-PFM9Bas9tu"
- href="#op-PFM9Bas9tu" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-O74c4Dc27b"
+ href="#op-O74c4Dc27b" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-PFM9Bas9tu" class="panel-body collapse">
+ <div id="op-O74c4Dc27b" class="panel-body collapse">
<p>Create notifications for a single device. This request will target a specific device entity.</p>
@@ -2247,7 +2247,7 @@
One of the device's identification which includes name or uuid. (Specified in path).
</li>
<li>
- <b>notification</b> (<a href="#CreateNotifications">CreateNotifications</a>)<br>
+ <b>notification</b> (<a href="#createnotifications">CreateNotifications</a>)<br>
These parameters are used when forming the notification portion of the request. (Specified in body).
</li>
</ul>
@@ -2275,18 +2275,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-WPm5jSptHa"/>
+<a name="op-wG8IK0i2tT"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{applicationId}/groups/{path}/notifications
- <a data-toggle="collapse" data-target="#op-WPm5jSptHa"
- href="#op-WPm5jSptHa" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-wG8IK0i2tT"
+ href="#op-wG8IK0i2tT" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-WPm5jSptHa" class="panel-body collapse">
+ <div id="op-wG8IK0i2tT" class="panel-body collapse">
<p>Create notifications for a group. This request will target all users associated with a specific group entity.</p>
@@ -2306,7 +2306,7 @@
The path of the group. (Specified in path).
</li>
<li>
- <b>notification</b> (<a href="#CreateNotifications">CreateNotifications</a>)<br>
+ <b>notification</b> (<a href="#createnotifications">CreateNotifications</a>)<br>
These parameters are used when forming the notification portion of the request. (Specified in body).
</li>
</ul>
@@ -2334,18 +2334,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-bbiuZhI6at"/>
+<a name="op-S0nZNfKyl2"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{applicationId}/notifications
- <a data-toggle="collapse" data-target="#op-bbiuZhI6at"
- href="#op-bbiuZhI6at" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-S0nZNfKyl2"
+ href="#op-S0nZNfKyl2" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-bbiuZhI6at" class="panel-body collapse">
+ <div id="op-S0nZNfKyl2" class="panel-body collapse">
<p>Retrieve one or more notifications through providing all the identifications.</p>
@@ -2385,18 +2385,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-t71dxdlXSC"/>
+<a name="op-8DEOQ9kfjU"/>
<div class="panel panel-default">
<div class="panel-heading PUT">
<h2 class="panel-title PUT-heading">PUT /{orgId}/{applicationId}/notifications/{notificationId}
- <a data-toggle="collapse" data-target="#op-t71dxdlXSC"
- href="#op-t71dxdlXSC" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-8DEOQ9kfjU"
+ href="#op-8DEOQ9kfjU" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-t71dxdlXSC" class="panel-body collapse">
+ <div id="op-8DEOQ9kfjU" class="panel-body collapse">
<p>Update a Notification in order to cancel the notifcation or set a new expiration time.</p>
@@ -2416,7 +2416,7 @@
One of the notification's identification which includes name or uuid. (Specified in path).
</li>
<li>
- <b>notificationUpdate</b> (<a href="#NotificationUpdate">NotificationUpdate</a>)<br>
+ <b>notificationUpdate</b> (<a href="#notificationupdate">NotificationUpdate</a>)<br>
Object with Notification fields to be updated. (Specified in body).
</li>
</ul>
@@ -2444,18 +2444,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-mdSmA2HfAi"/>
+<a name="op-aC0kSX5B8s"/>
<div class="panel panel-default">
<div class="panel-heading DELETE">
<h2 class="panel-title DELETE-heading">DELETE /{orgId}/{applicationId}/notifications/{notificationId}
- <a data-toggle="collapse" data-target="#op-mdSmA2HfAi"
- href="#op-mdSmA2HfAi" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-aC0kSX5B8s"
+ href="#op-aC0kSX5B8s" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-mdSmA2HfAi" class="panel-body collapse">
+ <div id="op-aC0kSX5B8s" class="panel-body collapse">
<p>Delete an unsent Notification from the system.</p>
@@ -2499,18 +2499,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-fDBLYOsFpO"/>
+<a name="op-4Xtwetp0KU"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{applicationId}/receipts
- <a data-toggle="collapse" data-target="#op-fDBLYOsFpO"
- href="#op-fDBLYOsFpO" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-4Xtwetp0KU"
+ href="#op-4Xtwetp0KU" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-fDBLYOsFpO" class="panel-body collapse">
+ <div id="op-4Xtwetp0KU" class="panel-body collapse">
<p>Retrieve one or more receipts through providing all the identifications.</p>
@@ -2550,18 +2550,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-vkztq5UkmI"/>
+<a name="op-hW1QIhZgB5"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{applicationId}/users/{userId}/notifications
- <a data-toggle="collapse" data-target="#op-vkztq5UkmI"
- href="#op-vkztq5UkmI" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-hW1QIhZgB5"
+ href="#op-hW1QIhZgB5" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-vkztq5UkmI" class="panel-body collapse">
+ <div id="op-hW1QIhZgB5" class="panel-body collapse">
<p>Create notifications for a user. This request will target a specific user entity.</p>
@@ -2581,7 +2581,7 @@
One of the user's identification which includes username or UUID. (Specified in path).
</li>
<li>
- <b>notification</b> (<a href="#CreateNotifications">CreateNotifications</a>)<br>
+ <b>notification</b> (<a href="#createnotifications">CreateNotifications</a>)<br>
These parameters are used when forming the notification portion of the request. (Specified in body).
</li>
</ul>
@@ -2609,18 +2609,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-rkfuDmFUr8"/>
+<a name="op-eTSjnhDjNu"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{applicationId}/{deviceId}/*/receipts
- <a data-toggle="collapse" data-target="#op-rkfuDmFUr8"
- href="#op-rkfuDmFUr8" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-eTSjnhDjNu"
+ href="#op-eTSjnhDjNu" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-rkfuDmFUr8" class="panel-body collapse">
+ <div id="op-eTSjnhDjNu" class="panel-body collapse">
<p>Retrieve receipts associated with one or more devices through providing all the identifications.</p>
@@ -2664,18 +2664,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-kS2crzbk5F"/>
+<a name="op-yyhbsQF7wa"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{applicationId}/{notificationId}/*/queue
- <a data-toggle="collapse" data-target="#op-kS2crzbk5F"
- href="#op-kS2crzbk5F" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-yyhbsQF7wa"
+ href="#op-yyhbsQF7wa" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-kS2crzbk5F" class="panel-body collapse">
+ <div id="op-yyhbsQF7wa" class="panel-body collapse">
<p>Retrieve the list of devices associated with one or more notifications before the notifications are sent through providing all the identifications.</p>
@@ -2719,18 +2719,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-ZyQWInph9c"/>
+<a name="op-u4auTY46zf"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{applicationId}/{notificationId}/*/receipts
- <a data-toggle="collapse" data-target="#op-ZyQWInph9c"
- href="#op-ZyQWInph9c" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-u4auTY46zf"
+ href="#op-u4auTY46zf" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-ZyQWInph9c" class="panel-body collapse">
+ <div id="op-u4auTY46zf" class="panel-body collapse">
<p>Retrieve receipts for one or more notifications through providing all the identifications.</p>
@@ -2774,18 +2774,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-HN5OXiR8zI"/>
+<a name="op-gjVuYSXEco"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{applicationId}/{receiptId}/*/notifications
- <a data-toggle="collapse" data-target="#op-HN5OXiR8zI"
- href="#op-HN5OXiR8zI" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-gjVuYSXEco"
+ href="#op-gjVuYSXEco" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-HN5OXiR8zI" class="panel-body collapse">
+ <div id="op-gjVuYSXEco" class="panel-body collapse">
<p>Retrieve notifications associated with one or more receipts through providing all the identifications.</p>
@@ -2831,18 +2831,18 @@
<a name='Organizations-Applications-method'></a>
<h2>Organizations-Applications</h2>
-<a name="op-RQ6ZCWebIO"/>
+<a name="op-W0ze85sgr5"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /management/orgs
- <a data-toggle="collapse" data-target="#op-RQ6ZCWebIO"
- href="#op-RQ6ZCWebIO" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-W0ze85sgr5"
+ href="#op-W0ze85sgr5" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-RQ6ZCWebIO" class="panel-body collapse">
+ <div id="op-W0ze85sgr5" class="panel-body collapse">
<p>Create an organization through a form post.</p>
@@ -2850,7 +2850,7 @@
<ul>
<li>
- <b>CreateOrg</b> (<a href="#CreateOrg">CreateOrg</a>)<br>
+ <b>CreateOrg</b> (<a href="#createorg">CreateOrg</a>)<br>
A set of organization properties supplied through a form. (Specified in body).
</li>
</ul>
@@ -2878,18 +2878,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-dpCKpMoj2F"/>
+<a name="op-UnwMezvstn"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /management/orgs/{orgId}
- <a data-toggle="collapse" data-target="#op-dpCKpMoj2F"
- href="#op-dpCKpMoj2F" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-UnwMezvstn"
+ href="#op-UnwMezvstn" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-dpCKpMoj2F" class="panel-body collapse">
+ <div id="op-UnwMezvstn" class="panel-body collapse">
<p>Retrieve an organization given a specified UUID or username.</p>
@@ -2925,18 +2925,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-p47RW7XPb5"/>
+<a name="op-opQwOliCay"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/activate
- <a data-toggle="collapse" data-target="#op-p47RW7XPb5"
- href="#op-p47RW7XPb5" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-opQwOliCay"
+ href="#op-opQwOliCay" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-p47RW7XPb5" class="panel-body collapse">
+ <div id="op-opQwOliCay" class="panel-body collapse">
<p>Activate an organization from a link provIded in an email notification.</p>
@@ -2980,18 +2980,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-e5tFafCsBd"/>
+<a name="op-D4yiCJmiTC"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/apps
- <a data-toggle="collapse" data-target="#op-e5tFafCsBd"
- href="#op-e5tFafCsBd" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-D4yiCJmiTC"
+ href="#op-D4yiCJmiTC" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-e5tFafCsBd" class="panel-body collapse">
+ <div id="op-D4yiCJmiTC" class="panel-body collapse">
<p>Retrieve the applications in an organization through providing both Id of application and organization.</p>
@@ -3027,18 +3027,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-pl1ROfWWI2"/>
+<a name="op-FEhXoTZwDz"/>
<div class="panel panel-default">
<div class="panel-heading DELETE">
<h2 class="panel-title DELETE-heading">DELETE /management/orgs/{orgId}/apps/{appId}
- <a data-toggle="collapse" data-target="#op-pl1ROfWWI2"
- href="#op-pl1ROfWWI2" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-FEhXoTZwDz"
+ href="#op-FEhXoTZwDz" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-pl1ROfWWI2" class="panel-body collapse">
+ <div id="op-FEhXoTZwDz" class="panel-body collapse">
<p>Remove an application from an organization through providing both Id of application and organization.</p>
@@ -3078,18 +3078,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-Vkb4PSG2PH"/>
+<a name="op-4joizUedFL"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/apps/{appId}/credentials
- <a data-toggle="collapse" data-target="#op-Vkb4PSG2PH"
- href="#op-Vkb4PSG2PH" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-4joizUedFL"
+ href="#op-4joizUedFL" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-Vkb4PSG2PH" class="panel-body collapse">
+ <div id="op-4joizUedFL" class="panel-body collapse">
<p>Retrieve the client Id and client secret credentials for an application in an organization.</p>
@@ -3129,18 +3129,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-LeXtTmMulH"/>
+<a name="op-961ASlc5BR"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /management/orgs/{orgId}/apps/{appId}/credentials
- <a data-toggle="collapse" data-target="#op-LeXtTmMulH"
- href="#op-LeXtTmMulH" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-961ASlc5BR"
+ href="#op-961ASlc5BR" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-LeXtTmMulH" class="panel-body collapse">
+ <div id="op-961ASlc5BR" class="panel-body collapse">
<p>Generate the client Id and client secret credentials for an application in an organization.</p>
@@ -3180,18 +3180,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-5fFz8bP9SP"/>
+<a name="op-JMSPdzS1rk"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/credentials
- <a data-toggle="collapse" data-target="#op-5fFz8bP9SP"
- href="#op-5fFz8bP9SP" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-JMSPdzS1rk"
+ href="#op-JMSPdzS1rk" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-5fFz8bP9SP" class="panel-body collapse">
+ <div id="op-JMSPdzS1rk" class="panel-body collapse">
<p>Retrieve the credentials for an organization client.</p>
@@ -3227,18 +3227,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-5zuGWV7yyv"/>
+<a name="op-tEmwpfkRWY"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /management/orgs/{orgId}/credentials
- <a data-toggle="collapse" data-target="#op-5zuGWV7yyv"
- href="#op-5zuGWV7yyv" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-tEmwpfkRWY"
+ href="#op-tEmwpfkRWY" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-5zuGWV7yyv" class="panel-body collapse">
+ <div id="op-tEmwpfkRWY" class="panel-body collapse">
<p>Generate whole new credentials for an organization client.</p>
@@ -3274,18 +3274,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-NhOdW1iTBQ"/>
+<a name="op-G2A5aRUBKf"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/feed
- <a data-toggle="collapse" data-target="#op-NhOdW1iTBQ"
- href="#op-NhOdW1iTBQ" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-G2A5aRUBKf"
+ href="#op-G2A5aRUBKf" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-NhOdW1iTBQ" class="panel-body collapse">
+ <div id="op-G2A5aRUBKf" class="panel-body collapse">
<p>Retrieve an organization's activity feed.</p>
@@ -3321,18 +3321,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-9QfFlGlnkK"/>
+<a name="op-bSex7I5OzZ"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/reactivate
- <a data-toggle="collapse" data-target="#op-9QfFlGlnkK"
- href="#op-9QfFlGlnkK" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-bSex7I5OzZ"
+ href="#op-bSex7I5OzZ" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-9QfFlGlnkK" class="panel-body collapse">
+ <div id="op-bSex7I5OzZ" class="panel-body collapse">
<p>Reactivate an expired organization.</p>
@@ -3368,18 +3368,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-X1kOV5GGXR"/>
+<a name="op-XofOJPEVf7"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /management/users/{userId}/feed
- <a data-toggle="collapse" data-target="#op-X1kOV5GGXR"
- href="#op-X1kOV5GGXR" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-XofOJPEVf7"
+ href="#op-XofOJPEVf7" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-X1kOV5GGXR" class="panel-body collapse">
+ <div id="op-XofOJPEVf7" class="panel-body collapse">
<p>Retrieve an admin user's activity feed.</p>
@@ -3417,18 +3417,18 @@
<a name='Permissions-Roles-method'></a>
<h2>Permissions-Roles</h2>
-<a name="op-mJhEUke3cS"/>
+<a name="op-1AwLz3YMZK"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{appId}/roles
- <a data-toggle="collapse" data-target="#op-mJhEUke3cS"
- href="#op-mJhEUke3cS" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-1AwLz3YMZK"
+ href="#op-1AwLz3YMZK" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-mJhEUke3cS" class="panel-body collapse">
+ <div id="op-1AwLz3YMZK" class="panel-body collapse">
<p>Retrieve the roles in an application through providing all the identifications.</p>
@@ -3468,18 +3468,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-xmyXEQ4NgX"/>
+<a name="op-PfKPwJ9Kpw"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{appId}/roles
- <a data-toggle="collapse" data-target="#op-xmyXEQ4NgX"
- href="#op-xmyXEQ4NgX" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-PfKPwJ9Kpw"
+ href="#op-PfKPwJ9Kpw" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-xmyXEQ4NgX" class="panel-body collapse">
+ <div id="op-PfKPwJ9Kpw" class="panel-body collapse">
<p>Create a new role through providing all the identifications.</p>
@@ -3495,7 +3495,7 @@
One of the application's identification which includes name or uuid. (Specified in path).
</li>
<li>
- <b>roleproperty</b> (<a href="#AddRole">AddRole</a>)<br>
+ <b>roleproperty</b> (<a href="#addrole">AddRole</a>)<br>
The required properties of the role. (Specified in body).
</li>
</ul>
@@ -3523,18 +3523,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-MTvKJpi8Wu"/>
+<a name="op-MjStoajE7h"/>
<div class="panel panel-default">
<div class="panel-heading DELETE">
<h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/roles/{roleId}/permissions
- <a data-toggle="collapse" data-target="#op-MTvKJpi8Wu"
- href="#op-MTvKJpi8Wu" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-MjStoajE7h"
+ href="#op-MjStoajE7h" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-MTvKJpi8Wu" class="panel-body collapse">
+ <div id="op-MjStoajE7h" class="panel-body collapse">
<p>Remove permissions from a role.</p>
@@ -3554,7 +3554,7 @@
One of the role's identification which includes name or uuid. (Specified in path).
</li>
<li>
- <b>Permissions</b> (<a href="#Permissions">Permissions</a>)<br>
+ <b>Permissions</b> (<a href="#permissions">Permissions</a>)<br>
The query statement of the url pattern. (Specified in body).
</li>
</ul>
@@ -3582,18 +3582,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-eKZs7O8UT1"/>
+<a name="op-ksNDhvScIv"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{appId}/roles/{roleId}/users
- <a data-toggle="collapse" data-target="#op-eKZs7O8UT1"
- href="#op-eKZs7O8UT1" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-ksNDhvScIv"
+ href="#op-ksNDhvScIv" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-eKZs7O8UT1" class="panel-body collapse">
+ <div id="op-ksNDhvScIv" class="panel-body collapse">
<p>Retrieve the users in a role through providing all the identifications.</p>
@@ -3637,18 +3637,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-x15ap6fRuI"/>
+<a name="op-C1FmH41GRL"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{appId}/roles/{roleId}/users/{userId}
- <a data-toggle="collapse" data-target="#op-x15ap6fRuI"
- href="#op-x15ap6fRuI" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-C1FmH41GRL"
+ href="#op-C1FmH41GRL" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-x15ap6fRuI" class="panel-body collapse">
+ <div id="op-C1FmH41GRL" class="panel-body collapse">
<p>Add a user to a role through providing all the identifications.</p>
@@ -3696,18 +3696,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-x2p4Zoz1qF"/>
+<a name="op-XlgumSVjzf"/>
<div class="panel panel-default">
<div class="panel-heading DELETE">
<h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/roles/{roleId}/users/{userId}
- <a data-toggle="collapse" data-target="#op-x2p4Zoz1qF"
- href="#op-x2p4Zoz1qF" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-XlgumSVjzf"
+ href="#op-XlgumSVjzf" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-x2p4Zoz1qF" class="panel-body collapse">
+ <div id="op-XlgumSVjzf" class="panel-body collapse">
<p>Remove a user from a role through providing all the identifications.</p>
@@ -3755,18 +3755,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-gszuSB8yhw"/>
+<a name="op-v3zbrKADB7"/>
<div class="panel panel-default">
<div class="panel-heading DELETE">
<h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/roles/{rolename}
- <a data-toggle="collapse" data-target="#op-gszuSB8yhw"
- href="#op-gszuSB8yhw" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-v3zbrKADB7"
+ href="#op-v3zbrKADB7" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-gszuSB8yhw" class="panel-body collapse">
+ <div id="op-v3zbrKADB7" class="panel-body collapse">
<p>Remove a role through providing all the identifications.</p>
@@ -3810,18 +3810,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-R0ZgEZraiO"/>
+<a name="op-3Fm9zjyofT"/>
<div class="panel panel-default">
<div class="panel-heading GET">
<h2 class="panel-title GET-heading">GET /{orgId}/{applicationId}/roles/{roleId}/permissions
- <a data-toggle="collapse" data-target="#op-R0ZgEZraiO"
- href="#op-R0ZgEZraiO" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-3Fm9zjyofT"
+ href="#op-3Fm9zjyofT" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-R0ZgEZraiO" class="panel-body collapse">
+ <div id="op-3Fm9zjyofT" class="panel-body collapse">
<p>Retrieve permissions for a Role.</p>
@@ -3865,18 +3865,18 @@
<!--<div class="panel-footer"></div>-->
</div>
-<a name="op-lukAtsBoEy"/>
+<a name="op-ED0LqFQkHm"/>
<div class="panel panel-default">
<div class="panel-heading POST">
<h2 class="panel-title POST-heading">POST /{orgId}/{applicationId}/roles/{roleId}/permissions
- <a data-toggle="collapse" data-target="#op-lukAtsBoEy"
- href="#op-lukAtsBoEy" class="collapsed collapse-button"> </a>
+ <a data-toggle="collapse" data-target="#op-ED0LqFQkHm"
+ href="#op-ED0LqFQkHm" class="collapsed collapse-button"> </a>
</h2>
</div>
- <div id="op-lukAtsBoEy" class="panel-body collapse">
+ <div id="op-ED0LqFQkHm" class="panel-body collapse">
<p>Add permissions to a role through providing all the identifications.</p>
@@ -3896,7 +3896,7 @@
One of the role's identification which includes name or uuid. (Specified in path).
</li>
<li>
- <b>Permissions</b> (<a href="#Permissions">Permissions</a>)<br>
+ <b>Permissions</b> (<a href="#permissions">Permissions</a>)<br>
Permissions object with array of Usergrid Permission strings to be added. (Specified in body).
</li>
</ul>
@@ -3928,7 +3928,7 @@
<div>
- <a name="AccessTokenResponse"/>
+ <a name="accesstokenresponse"/>
</div>
<div class="panel panel-default">
@@ -3974,7 +3974,7 @@
<tr>
<td>user</td>
<td>
- <a href="#User">User</a>
+ <a href="#user">User</a>
</td>
<td>User object if login was done as a user.</td>
@@ -3985,10 +3985,10 @@
<p><b>Referring API Paths</b></p>
<table width="80%" class="table table-striped">
<tr>
- <td><p><a href="#op-uIJFfKvsl6">/{orgId}/{appId}/token</a></p></td>
+ <td><p><a href="#op-IUf19l1qrH">/{orgId}/{appId}/token</a></p></td>
</tr>
<tr>
- <td><p><a href="#op-mAlKR6jEhl">/management/token</a></p></td>
+ <td><p><a href="#op-9tip2KQOJU">/management/token</a></p></td>
</tr>
</table>
@@ -4000,7 +4000,7 @@
<div>
- <a name="Action"/>
+ <a name="action"/>
</div>
<div class="panel panel-default">
@@ -4075,62 +4075,62 @@
<p><b>Referring API Paths</b></p>
<table width="80%" class="table table-striped">
<tr>
- <td><p><a href="#op-9QfFlGlnkK">/management/orgs/{orgId}/reactivate</a></p></td>
+ <td><p><a href="#op-opQwOliCay">/management/orgs/{orgId}/activate</a></p></td>
</tr>
<tr>
- <td><p><a href="#op-BGDia29iCi">/management/users/{userId}/activate</a></p></td>
+ <td><p><a href="#op-o2wkBkogfI">/management/users/resetpw</a></p></td>
</tr>
<tr>
- <td><p><a href="#op-tvFdo6Wdmr">/management/users/{userId}/password</a></p></td>
+ <td><p><a href="#op-w5LTUIm8Aa">/management/users/{userId}/activate</a></p></td>
</tr>
<tr>
- <td><p><a href="#op-NnjAZL35sG">/management/users/resetpw</a></p></td>
+ <td><p><a href="#op-5cCk6VmfP1">/management/users/{userId}/password</a></p></td>
</tr>
<tr>
- <td><p><a href="#op-Tfo6D3w41U">/{orgId}/{appId}/users/{user}/password</a></p></td>
+ <td><p><a href="#op-bSex7I5OzZ">/management/orgs/{orgId}/reactivate</a></p></td>
</tr>
<tr>
- <td><p><a href="#op-p47RW7XPb5">/management/orgs/{orgId}/activate</a></p></td>
+ <td><p><a href="#op-DHHGIVnyXy">/management/users/{userId}/reactivate</a></p></td>
</tr>
<tr>
- <td><p><a href="#op-Y1nYMat7jd">/management/users/{userId}/reactivate</a></p></td>
+ <td><p><a href="#op-2gWkZmGFej">/{orgId}/{appId}/users/{user}/password</a></p></td>
</tr>
</table>
<p><b>Referring Definitions</b></p>
<table width="80%" class="table table-striped">
<tr>
- <td><p><a href="#Receipt">Receipt</a></p></td>
+ <td><p><a href="#receipt">Receipt</a></p></td>
</tr>
<tr>
- <td><p><a href="#Device">Device</a></p></td>
+ <td><p><a href="#device">Device</a></p></td>
</tr>
<tr>
- <td><p><a href="#Notification">Notification</a></p></td>
+ <td><p><a href="#notification">Notification</a></p></td>
</tr>
<tr>
- <td><p><a href="#Role">Role</a></p></td>
+ <td><p><a href="#role">Role</a></p></td>
</tr>
<tr>
- <td><p><a href="#Event">Event</a></p></td>
+ <td><p><a href="#event">Event</a></p></td>
</tr>
<tr>
- <td><p><a href="#Group">Group</a></p></td>
+ <td><p><a href="#group">Group</a></p></td>
</tr>
<tr>
- <td><p><a href="#Credential">Credential</a></p></td>
+ <td><p><a href="#credential">Credential</a></p></td>
</tr>
<tr>
- <td><p><a href="#Organization">Organization</a></p></td>
+ <td><p><a href="#organization">Organization</a></p></td>
</tr>
<tr>
- <td><p><a href="#AppData">AppData</a></p></td>
+ <td><p><a href="#appdata">AppData</a></p></td>
</tr>
<tr>
- <td><p><a href="#User">User</a></p></td>
+ <td><p><a href="#user">User</a></p></td>
</tr>
<tr>
- <td><p><a href="#ActivityFeed">ActivityFeed</a></p></td>
+ <td><p><a href="#activityfeed">ActivityFeed</a></p></td>
</tr>
</table>
@@ -4141,7 +4141,7 @@
<div>
- <a name="ActivityFeed"/>
+ <a name="activityfeed"/>
</div>
<div class="panel panel-default">
@@ -4169,7 +4169,7 @@
<tr>
<td>entityproperty</td>
<td>
- <a href="#Entity">Entity</a>
+ <a href="#entity">Entity</a>
</td>
<td></td>
@@ -4187,7 +4187,7 @@
<tr>
<td>metadataproperty</td>
<td>
- <a href="#Metadata">Metadata</a>
+ <a href="#metadata">Metadata</a>
</td>
<td></td>
@@ -4196,7 +4196,7 @@
<tr>
<td>objectproperty</td>
<td>
- <a href="#Object">Object</a>
+ <a href="#object">Object</a>
</td>
<td></td>
@@ -4232,7 +4232,7 @@
<tr>
<td>completeMsg</td>
<td>
- <a href="#Action">Action</a>
+ <a href="#action">Action</a>
</td>
<td></td>
@@ -4243,22 +4243,22 @@
<p><b>Referring API Paths</b></p>
<table width="80%" class="table table-striped">
<tr>
- <td><p><a href="#op-X1kOV5GGXR">/management/users/{userId}/feed</a></p></td>
+ <td><p><a href="#op-XofOJPEVf7">/management/users/{userId}/feed</a></p></td>
</tr>
<tr>
- <td><p><a href="#op-pKr2VP64e5">/{orgId}/{appId}/groups/{groupId}/feed</a></p></td>
+ <td><p><a href="#op-HDAhoX69jZ">/{orgId}/{appId}/users/{userId}/activities</a></p></td>
</tr>
<tr>
- <td><p><a href="#op-QcQlSI3tb6">/{orgId}/{appId}/groups/{groupId}/activities</a></p></td>
+ <td><p><a href="#op-mWlMUxvD5o">/{orgId}/{appId}/groups/{groupId}/activities</a></p></td>
</tr>
<tr>
- <td><p><a href="#op-FXc5bn3d3I">/{orgId}/{appId}/users/{userId}/feed</a></p></td>
+ <td><p><a href="#op-G2A5aRUBKf">/management/orgs/{orgId}/feed</a></p></td>
</tr>
<tr>
- <td><p><a href="#op-NhOdW1iTBQ">/management/orgs/{orgId}/feed</a></p></td>
+ <td><p><a href="#op-s4NWZiHc78">/{orgId}/{appId}/groups/{groupId}/feed</a></p></td>
</tr>
<tr>
- <td><p><a href="#op-qOQrBk7lNB">/{orgId}/{appId}/users/{userId}/activities</a></p></td>
+ <td><p><a href="#op-twzitiiIB6">/{orgId}/{appId}/users/{userId}/feed</a></p></td>
</tr>
</table>
@@ -4270,7 +4270,7 @@
<div>
- <a name="AddRole"/>
+ <a name="addrole"/>
</div>
<div class="panel panel-default">
@@ -4318,7 +4318,7 @@
<p><b>Referring API Paths</b></p>
<table width="80%" class="table table-striped">
<tr>
- <td><p><a href="#op-xmyXEQ4NgX">/{orgId}/{appId}/roles</a></p></td>
+ <td><p><a href="#op-PfKPwJ9Kpw">/{orgId}/{appId}/roles</a></p></td>
</tr>
</table>
@@ -4330,7 +4330,7 @@
<div>
- <a name="AppData"/>
+ <a name="appdata"/>
</div>
<div class="panel panel-default">
@@ -4385,7 +4385,7 @@
<tr>
<td>completeMsg</td>
<td>
- <a href="#Action">Action</a>
+ <a href="#action">Action</a>
</td>
<td></td>
@@ -4396,17 +4396,17 @@
<p><b>Referring API Paths</b></p>
<table width="80%" class="table table-striped">
<tr>
- <td><p><a href="#op-pl1ROfWWI2">/management/orgs/{orgId}/apps/{appId}</a></p></td>
+ <td><p><a href="#op-FEhXoTZwDz">/management/orgs/{orgId}/apps/{appId}</a></p></td>
</tr>
<tr>
- <td><p><a href="#op-e5tFafCsBd">/management/orgs/{orgId}/apps</a></p></td>
+ <td><p><a href="#op-D4yiCJmiTC">/management/orgs/{orgId}/apps</a></p></td>
</tr>
</table>
<p><b>Referring Definitions</b></p>
<table width="80%" class="table table-striped">
<tr>
- <td><p><a href="#Organization">Organization</a></p></td>
+ <td><p><a href="#organization">Organization</a></p></td>
</tr>
</table>
@@ -4417,7 +4417,7 @@
<div>
- <a name="CreateActivity"/>
+ <a name="createactivity"/>
</div>
<div class="panel panel-default">
@@ -4472,7 +4472,7 @@
<tr>
<td>image</td>
<td>
- <a href="#ImageModel">ImageModel</a>
+ <a href="#imagemodel">ImageModel</a>
</td>
<td></td>
@@ -4501,10 +4501,10 @@
<p><b>Referring API Paths</b></p>
<table width="80%" class="table table-striped">
<tr>
- <td><p><a href="#op-QcQlSI3tb6">/{orgId}/{appId}/groups/{groupId}/activities</a></p></td>
+ <td><p><a href="#op-HDAhoX69jZ">/{orgId}/{appId}/users/{userId}/activities</a></p></td>
</tr>
<tr>
- <td><p><a href="#op-qOQrBk7lNB">/{orgId}/{appId}/users/{userId}/activities</a></p></td>
+ <td><p><a href="#op-mWlMUxvD5o">/{orgId}/{appId}/groups/{groupId}/activities</a></p></td>
</tr>
</table>
@@ -4516,7 +4516,7 @@
<div>
- <a name="CreateAdminUser"/>
+ <a name="createadminuser"/>
</div>
<div class="panel panel-default">
@@ -4582,7 +4582,7 @@
<p><b>Referring API Paths</b></p>
<table width="80%" class="table table-striped">
<tr>
- <td><p><a href="#op-QoxREYsNIz">/management/users</a></p></td>
+ <td><p><a href="#op-K7dHVMcYsP">/management/users</a></p></td>
</tr>
</table>
@@ -4594,7 +4594,7 @@
<div>
- <a name="CreateEntities"/>
+ <a name="createentities"/>
</div>
<div class="panel panel-default">
@@ -4624,10 +4624,10 @@
<p><b>Referring API Paths</b></p>
<table width="80%" class="table table-striped">
<tr>
- <td><p><a href="#op-3y5Qc7VbKb">/{orgId}/{appId}/{entitytype}</a></p></td>
+ <td><p><a href="#op-zWXoRjHTur">/{orgId}/{appId}/{entitytype}</a></p></td>
</tr>
<tr>
- <td><p><a href="#op-717cOaQzyy">/{orgId}/{appId}/{collectionId}/{entityId}</a></p></td>
+ <td><p><a href="#op-vMFmKcb2Gg">/{orgId}/{appId}/{collectionId}/{entityId}</a></p></td>
</tr>
</table>
@@ -4639,7 +4639,7 @@
<div>
- <a name="CreateEvent"/>
+ <a name="createevent"/>
</div>
<div class="panel panel-default">
@@ -4678,7 +4678,7 @@
<p><b>Referring API Paths</b></p>
<table width="80%" class="table table-striped">
<tr>
- <td><p><a href="#op-U4jz2jPCdU">/{orgId}/{appId}/events</a></p></td>
+ <td><p><a href="#op-0XTUnMPL6J">/{orgId}/{appId}/events</a></p></td>
</tr>
</table>
@@ -4690,7 +4690,7 @@
<div>
- <a name="CreateGroup"/>
+ <a name="creategroup"/>
</div>
<div class="panel panel-default">
@@ -4738,7 +4738,7 @@
<p><b>Referring API Paths</b></p>
<table width="80%" class="table table-striped">
<tr>
- <td><p><a href="#op-t6P5Jq7Cgx">/{orgId}/{appId}/groups</a></p></td>
+ <td><p><a href="#op-xrKwMqxkJL">/{orgId}/{appId}/groups</a></p></td>
</tr>
</table>
@@ -4750,7 +4750,7 @@
<div>
- <a name="CreateNotifications"/>
+ <a name="createnotifications"/>
</div>
<div class="panel panel-default">
@@ -4780,19 +4780,19 @@
<p><b>Referring API Paths</b></p>
<table width="80%" class="table table-striped">
<tr>
- <td><p><a href="#op-WNpFsxnBgP">/{orgId}/{applicationId}/devices/*/notifications</a></p></td>
+ <td><p><a href="#op-wG8IK0i2tT">/{orgId}/{applicationId}/groups/{path}/notifications</a></p></td>
</tr>
<tr>
- <td><p><a href="#op-vkztq5UkmI">/{orgId}/{applicationId}/users/{userId}/notifications</a></p></td>
+ <td><p><a href="#op-NNv36bcjPY">/{orgId}/{applicationId}/devices</a></p></td>
</tr>
<tr>
- <td><p><a href="#op-m7AWoO5aoc">/{orgId}/{applicationId}/devices</a></p></td>
+ <td><p><a href="#op-NgZ9u50tmC">/{orgId}/{applicationId}/devices/*/notifications</a></p></td>
</tr>
<tr>
- <td><p><a href="#op-PFM9Bas9tu">/{orgId}/{applicationId}/devices/{deviceId}/notifications</a></p></td>
+ <td><p><a href="#op-hW1QIhZgB5">/{orgId}/{applicationId}/users/{userId}/notifications</a></p></td>
</tr>
<tr>
- <td><p><a href="#op-WPm5jSptHa">/{orgId}/{applicationId}/groups/{path}/notifications</a></p></td>
+ <td><p><a href="#op-O74c4Dc27b">/{orgId}/{applicationId}/devices/{deviceId}/notifications</a></p></td>
</tr>
</table>
@@ -4804,7 +4804,7 @@
<div>
- <a name="CreateOrg"/>
+ <a name="createorg"/>
</div>
<div class="panel panel-default">
@@ -4879,7 +4879,7 @@
<p><b>Referring API Paths</b></p>
<table width="80%" class="table table-striped">
<tr>
- <td><p><a href="#op-RQ6ZCWebIO">/management/orgs</a></p></td>
+ <td><p><a href="#op-W0ze85sgr5">/management/orgs</a></p></td>
</tr>
</table>
@@ -4891,7 +4891,7 @@
<div>
- <a name="CreateUser"/>
+ <a name="createuser"/>
</div>
<div class="panel panel-default">
@@ -4930,7 +4930,7 @@
<p><b>Referring API Paths</b></p>
<table width="80%" class="table table-striped">
<tr>
- <td><p><a href="#op-ExiaIQsIeW">/{orgId}/{appId}/users</a></p></td>
+ <td><p><a href="#op-Eosn4udGUG">/{orgId}/{appId}/users</a></p></td>
</tr>
</table>
@@ -4942,7 +4942,7 @@
<div>
- <a name="Credential"/>
+ <a name="credential"/>
</div>
<div class="panel panel-default">
@@ -4988,7 +4988,7 @@
<tr>
<td>completeMsg</td>
<td>
- <a href="#Action">Action</a>
+ <a href="#action">Action</a>
</td>
<td></td>
@@ -4999,16 +4999,16 @@
<p><b>Referring API Paths</b></p>
<table width="80%" class="table table-striped">
<tr>
- <td><p><a href="#op-LeXtTmMulH">/management/orgs/{orgId}/apps/{appId}/credentials</a></p></td>
+ <td><p><a href="#op-4joizUedFL">/management/orgs/{orgId}/apps/{appId}/credentials</a></p></td>
</tr>
<tr>
- <td><p><a href="#op-5zuGWV7yyv">/management/orgs/{orgId}/credentials</a></p></td>
+ <td><p><a href="#op-961ASlc5BR">/management/orgs/{orgId}/apps/{appId}/credentials</a></p></td>
</tr>
<tr>
- <td><p><a href="#op-Vkb4PSG2PH">/management/orgs/{orgId}/apps/{appId}/credentials</a></p></td>
+ <td><p><a href="#op-tEmwpfkRWY">/management/orgs/{orgId}/credentials</a></p></td>
</tr>
<tr>
- <td><p><a href="#op-5fFz8bP9SP">/management/orgs/{orgId}/credentials</a></p></td>
+ <td><p><a href="#op-JMSPdzS1rk">/management/orgs/{orgId}/credentials</a></p></td>
</tr>
</table>
@@ -5020,7 +5020,7 @@
<div>
- <a name="Device"/>
+ <a name="device"/>
</div>
<div class="panel panel-default">
@@ -5093,7 +5093,7 @@
<tr>
<td>metadata</td>
<td>
- <a href="#Metadata">Metadata</a>
+ <a href="#metadata">Metadata</a>
</td>
<td></td>
@@ -5102,7 +5102,7 @@
<tr>
<td>completeMsg</td>
<td>
- <a href="#Action">Action</a>
+ <a href="#action">Action</a>
</td>
<td></td>
@@ -5113,7 +5113,7 @@
<p><b>Referring API Paths</b></p>
<table width="80%" class="table table-striped">
<tr>
- <td><p><a href="#op-kS2crzbk5F">/{orgId}/{applicationId}/{notificationId}/*/queue</a></p></td>
+ <td><p><a
<TRUNCATED>
[25/36] usergrid git commit: Update generated website content.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/assets-and-files/file-storage-configuration.html
----------------------------------------------------------------------
diff --git a/content/docs/assets-and-files/file-storage-configuration.html b/content/docs/assets-and-files/file-storage-configuration.html
new file mode 100644
index 0000000..877164b
--- /dev/null
+++ b/content/docs/assets-and-files/file-storage-configuration.html
@@ -0,0 +1,335 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>File storage configuration — Apache Usergrid 1.0 documentation</title>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+
+
+
+
+
+ <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+
+
+ <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+ <div class="wy-grid-for-nav">
+
+
+ <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+ <div class="wy-side-nav-search">
+
+
+
+ <a href="../index.html" class="icon icon-home"> Apache Usergrid
+
+
+
+ </a>
+
+
+
+
+ <div class="version">
+ 1.0
+ </div>
+
+
+
+
+<div role="search">
+ <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+ <input type="text" name="q" placeholder="Search docs" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+
+
+ </div>
+
+ <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+
+
+
+ <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters & clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators & data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security & Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management & Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management & social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets & Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters & Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters & events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating & incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations & Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations & Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code & Docs</a></li>
+</ul>
+
+
+
+ </div>
+
+ </nav>
+
+ <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+ <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+ <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+ <a href="../index.html">Apache Usergrid</a>
+ </nav>
+
+
+
+ <div class="wy-nav-content">
+ <div class="rst-content">
+ <div role="navigation" aria-label="breadcrumbs navigation">
+ <ul class="wy-breadcrumbs">
+ <li><a href="../index.html">Docs</a> »</li>
+
+ <li>File storage configuration</li>
+ <li class="wy-breadcrumbs-aside">
+
+
+ <a href="../_sources/assets-and-files/file-storage-configuration.txt" rel="nofollow"> View page source</a>
+
+
+ </li>
+ </ul>
+ <hr/>
+</div>
+ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+ <div itemprop="articleBody">
+
+ <div class="section" id="file-storage-configuration">
+<h1>File storage configuration<a class="headerlink" href="#file-storage-configuration" title="Permalink to this headline">¶</a></h1>
+<p>Usergrid can store your assets either on your hard drive or in the
+Amazon S3 cloud.</p>
+<div class="section" id="local-storage-configuration">
+<h2>Local storage configuration<a class="headerlink" href="#local-storage-configuration" title="Permalink to this headline">¶</a></h2>
+<p>By default assets are stored in the temporary folder /tmp/usergrid This
+can be changed by editing this file
+/stack/rest/src/main/resources/usergrid-rest-context.xml and replacing
+{usergrid.temp.files} by the wanted destination</p>
+<div class="code xml highlight-python"><div class="highlight"><pre><bean id="binaryStore" class="org.apache.usergrid.services.assets.data.LocalFileBinaryStore">
+ <property name="reposLocation" value="${usergrid.temp.files}"/>
+</bean>
+</pre></div>
+</div>
+</div>
+<div class="section" id="aws-s3-configuration">
+<h2>AwS S3 configuration<a class="headerlink" href="#aws-s3-configuration" title="Permalink to this headline">¶</a></h2>
+<p>To use your AWS S3 storage you need to change the binaryStore classpath
+and add several constructor arguments in
+/stack/rest/src/main/resources/usergrid-rest-context.xml</p>
+<p>Some examples :</p>
+<div class="code xml highlight-python"><div class="highlight"><pre><bean id="binaryStore" class="org.apache.usergrid.services.assets.data.AwsSdkS3BinaryStore">
+ <constructor-arg name="accessId" value="x" />
+ <constructor-arg name="secretKey" value="xx" />
+ <constructor-arg name="bucketName" value="x" />
+ <constructor-arg name="regionName" value="eu-central-1" />
+</bean>
+</pre></div>
+</div>
+<p>the regionName field is not mandatory, this code is also valid</p>
+<div class="code xml highlight-python"><div class="highlight"><pre><bean id="binaryStore" class="org.apache.usergrid.services.assets.data.AwsSdkS3BinaryStore">
+ <constructor-arg name="accessId" value="x" />
+ <constructor-arg name="secretKey" value="xx" />
+ <constructor-arg name="bucketName" value="x" />
+</bean>
+</pre></div>
+</div>
+<p>The filesize is limited to 50GB but you need to keep in mind that the
+file has to be stored on the hard drive before being sended to Amazon.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ <footer>
+
+
+ <hr/>
+
+ <div role="contentinfo">
+ <p>
+ © Copyright 2013-2015, Apache Usergrid.
+
+ </p>
+ </div>
+ Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+
+
+
+
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT:'../',
+ VERSION:'1.0',
+ COLLAPSE_INDEX:false,
+ FILE_SUFFIX:'.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+
+
+
+
+
+ <script type="text/javascript" src="../_static/js/theme.js"></script>
+
+
+
+
+ <script type="text/javascript">
+ jQuery(function () {
+ SphinxRtdTheme.StickyNav.enable();
+ });
+ </script>
+
+
+</body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/assets-and-files/folders.html
----------------------------------------------------------------------
diff --git a/content/docs/assets-and-files/folders.html b/content/docs/assets-and-files/folders.html
new file mode 100644
index 0000000..616413c
--- /dev/null
+++ b/content/docs/assets-and-files/folders.html
@@ -0,0 +1,404 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>Folders — Apache Usergrid 1.0 documentation</title>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+
+
+
+
+
+ <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+ <link rel="next" title="Counters & events" href="../counters-and-events/events-and-counters.html"/>
+ <link rel="prev" title="Retrieving assets" href="retrieving-assets.html"/>
+
+
+ <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+ <div class="wy-grid-for-nav">
+
+
+ <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+ <div class="wy-side-nav-search">
+
+
+
+ <a href="../index.html" class="icon icon-home"> Apache Usergrid
+
+
+
+ </a>
+
+
+
+
+ <div class="version">
+ 1.0
+ </div>
+
+
+
+
+<div role="search">
+ <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+ <input type="text" name="q" placeholder="Search docs" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+
+
+ </div>
+
+ <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+
+
+
+ <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters & clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators & data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security & Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management & Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management & social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets & Files</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Folders</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#linking-a-folder-to-an-asset">Linking a folder to an asset</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#retrieve-list-of-folder-assets">Retrieve list of folder assets</a></li>
+</ul>
+</li>
+</ul>
+<p class="caption"><span class="caption-text">Counters & Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters & events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating & incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations & Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations & Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code & Docs</a></li>
+</ul>
+
+
+
+ </div>
+
+ </nav>
+
+ <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+ <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+ <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+ <a href="../index.html">Apache Usergrid</a>
+ </nav>
+
+
+
+ <div class="wy-nav-content">
+ <div class="rst-content">
+ <div role="navigation" aria-label="breadcrumbs navigation">
+ <ul class="wy-breadcrumbs">
+ <li><a href="../index.html">Docs</a> »</li>
+
+ <li>Folders</li>
+ <li class="wy-breadcrumbs-aside">
+
+
+ <a href="../_sources/assets-and-files/folders.txt" rel="nofollow"> View page source</a>
+
+
+ </li>
+ </ul>
+ <hr/>
+</div>
+ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+ <div itemprop="articleBody">
+
+ <div class="section" id="folders">
+<h1>Folders<a class="headerlink" href="#folders" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="linking-a-folder-to-an-asset">
+<h2>Linking a folder to an asset<a class="headerlink" href="#linking-a-folder-to-an-asset" title="Permalink to this headline">¶</a></h2>
+<p>In order to access the asset for the image in the folder, you need to
+link the folder to the asset. You can do that by issuing a POST request
+in the following format:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">POST</span> <span class="o">/</span><span class="p">{</span><span class="n">org</span><span class="o">-</span><span class="n">uuid</span><span class="p">}</span><span class="o">/</span><span class="p">{</span><span class="n">app</span><span class="o">-</span><span class="n">uuid</span><span class="p">}</span><span class="o">/</span><span class="n">folders</span><span class="o">/</span><span class="p">{</span><span class="n">folder</span><span class="o">-</span><span class="n">uuid</span><span class="p">}</span><span class="o">/</span><span class="n">assets</span><span class="o">/</span><span class="p">{</span><span class="n">assets_id</span><span class="p">}</span>
+</pre></div>
+</div>
+<p>where <code class="docutils literal"><span class="pre">{folder-uuid}</span></code> is the UUID of the folder, and <code class="docutils literal"><span class="pre">{assets-uuid}</span></code>
+is the UUID of the assets entity.</p>
+<p>Here’s how you could link the folder and the asset you created for the
+my-image.jpg image:</p>
+<div class="highlight-python"><div class="highlight"><pre>POST https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/9501cda1-2d21-11e2-b4c6-02e81ac5a17b
+</pre></div>
+</div>
+<p>In the response, you should see the assets entity for the image added to
+the folder:</p>
+<div class="highlight-python"><div class="highlight"><pre>{
+ "action": "post",
+ "application": "3400ba10-cd0c-11e1-bcf7-12313d1c4491",
+ "params": {},
+ "path": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets",
+ "uri": "https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets",
+ "entities": [
+ {
+ "uuid": "9501cda1-2d21-11e2-b4c6-02e81ac5a17b",
+ "type": "asset",
+ "name": "my-image.jpg",
+ "created": 1352763303163,
+ "modified": 1352763303163,
+ "metadata": {
+ "path": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/9501cda1-2d21-11e2-b4c6-02e81ac5a17b"
+ },
+ "owner": "5c0c1789-d503-11e1-b36a-12313b01d5c1",
+ "path": "/myassets/asset1"
+ }
+ ],
+ "timestamp": 1352830448045,
+ "duration": 54,
+ "organization": "my-org”,
+ "applicationName": "my-app"
+}
+</pre></div>
+</div>
+</div>
+<div class="section" id="retrieve-list-of-folder-assets">
+<h2>Retrieve list of folder assets<a class="headerlink" href="#retrieve-list-of-folder-assets" title="Permalink to this headline">¶</a></h2>
+<p>You can also request a list of the linked contents of the folder like
+this:</p>
+<div class="highlight-python"><div class="highlight"><pre>GET https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets
+</pre></div>
+</div>
+<p>The response should look something like this:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+ <span class="s">"action"</span><span class="p">:</span> <span class="s">"get"</span><span class="p">,</span>
+ <span class="s">"application"</span><span class="p">:</span> <span class="s">"3400ba10-cd0c-11e1-bcf7-12313d1c4491"</span><span class="p">,</span>
+ <span class="s">"params"</span><span class="p">:</span> <span class="p">{</span>
+ <span class="s">"_"</span><span class="p">:</span> <span class="p">[</span>
+ <span class="s">"1352830364891"</span>
+ <span class="p">]</span>
+ <span class="p">},</span>
+ <span class="s">"path"</span><span class="p">:</span> <span class="s">"/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets"</span><span class="p">,</span>
+ <span class="s">"uri"</span><span class="p">:</span> <span class="s">"https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets"</span><span class="p">,</span>
+ <span class="s">"entities"</span><span class="p">:</span> <span class="p">[</span>
+ <span class="p">{</span>
+ <span class="s">"uuid"</span><span class="p">:</span> <span class="s">"7bf47435-2ac8-11e2-b4c6-02e81ac5a17b"</span><span class="p">,</span>
+ <span class="s">"type"</span><span class="p">:</span> <span class="s">"asset"</span><span class="p">,</span>
+ <span class="s">"name"</span><span class="p">:</span> <span class="s">"my-image.jpg"</span><span class="p">,</span>
+ <span class="s">"created"</span><span class="p">:</span> <span class="mi">1352505133598</span><span class="p">,</span>
+ <span class="s">"modified"</span><span class="p">:</span> <span class="mi">1352507245108</span><span class="p">,</span>
+ <span class="s">"checksum"</span><span class="p">:</span> <span class="s">"8e0cd3866ee20746c99e9a9825f38ad8"</span><span class="p">,</span>
+ <span class="s">"content-length"</span><span class="p">:</span> <span class="mi">11853</span><span class="p">,</span>
+ <span class="s">"content-type"</span><span class="p">:</span> <span class="s">"image/jpeg"</span><span class="p">,</span>
+ <span class="s">"etag"</span><span class="p">:</span> <span class="s">"</span><span class="se">\"</span><span class="s">8e0cd3866ee20746c99e9a9825f38ad8</span><span class="se">\"</span><span class="s">"</span><span class="p">,</span>
+ <span class="s">"metadata"</span><span class="p">:</span> <span class="p">{</span>
+ <span class="s">"connecting"</span><span class="p">:</span> <span class="p">{</span>
+ <span class="s">"assets"</span><span class="p">:</span> <span class="s">"/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/7bf47435-2ac8-11e2-b4c6-02e81ac5a17b/connecting/assets"</span>
+ <span class="p">},</span>
+ <span class="s">"connection"</span><span class="p">:</span> <span class="s">"assets"</span><span class="p">,</span>
+ <span class="s">"path"</span><span class="p">:</span> <span class="s">"/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/7bf47435-2ac8-11e2-b4c6-02e81ac5a17b"</span>
+ <span class="p">},</span>
+ <span class="s">"owner"</span><span class="p">:</span> <span class="s">"5c0c1789-d503-11e1-b36a-12313b01d5c1"</span><span class="p">,</span>
+ <span class="s">"path"</span><span class="p">:</span> <span class="s">"my-image"</span>
+ <span class="p">}</span>
+ <span class="p">],</span>
+ <span class="s">"timestamp"</span><span class="p">:</span> <span class="mi">1352830363797</span><span class="p">,</span>
+ <span class="s">"duration"</span><span class="p">:</span> <span class="mi">57</span><span class="p">,</span>
+ <span class="s">"organization"</span><span class="p">:</span> <span class="s">"my-org"</span><span class="p">,</span>
+ <span class="s">"applicationName"</span><span class="p">:</span> <span class="s">"my-app"</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ <footer>
+
+ <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+
+ <a href="../counters-and-events/events-and-counters.html" class="btn btn-neutral float-right" title="Counters & events" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+
+
+ <a href="retrieving-assets.html" class="btn btn-neutral" title="Retrieving assets" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+
+ </div>
+
+
+ <hr/>
+
+ <div role="contentinfo">
+ <p>
+ © Copyright 2013-2015, Apache Usergrid.
+
+ </p>
+ </div>
+ Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+
+
+
+
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT:'../',
+ VERSION:'1.0',
+ COLLAPSE_INDEX:false,
+ FILE_SUFFIX:'.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+
+
+
+
+
+ <script type="text/javascript" src="../_static/js/theme.js"></script>
+
+
+
+
+ <script type="text/javascript">
+ jQuery(function () {
+ SphinxRtdTheme.StickyNav.enable();
+ });
+ </script>
+
+
+</body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/assets-and-files/legacy-asset-support.html
----------------------------------------------------------------------
diff --git a/content/docs/assets-and-files/legacy-asset-support.html b/content/docs/assets-and-files/legacy-asset-support.html
new file mode 100644
index 0000000..7085315
--- /dev/null
+++ b/content/docs/assets-and-files/legacy-asset-support.html
@@ -0,0 +1,293 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title><no title> — Apache Usergrid 1.0 documentation</title>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+
+
+
+
+
+ <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+
+
+ <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+ <div class="wy-grid-for-nav">
+
+
+ <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+ <div class="wy-side-nav-search">
+
+
+
+ <a href="../index.html" class="icon icon-home"> Apache Usergrid
+
+
+
+ </a>
+
+
+
+
+ <div class="version">
+ 1.0
+ </div>
+
+
+
+
+<div role="search">
+ <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+ <input type="text" name="q" placeholder="Search docs" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+
+
+ </div>
+
+ <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+
+
+
+ <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters & clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators & data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security & Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management & Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management & social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets & Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters & Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters & events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating & incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations & Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations & Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code & Docs</a></li>
+</ul>
+
+
+
+ </div>
+
+ </nav>
+
+ <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+ <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+ <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+ <a href="../index.html">Apache Usergrid</a>
+ </nav>
+
+
+
+ <div class="wy-nav-content">
+ <div class="rst-content">
+ <div role="navigation" aria-label="breadcrumbs navigation">
+ <ul class="wy-breadcrumbs">
+ <li><a href="../index.html">Docs</a> »</li>
+
+ <li><no title></li>
+ <li class="wy-breadcrumbs-aside">
+
+
+ <a href="../_sources/assets-and-files/legacy-asset-support.txt" rel="nofollow"> View page source</a>
+
+
+ </li>
+ </ul>
+ <hr/>
+</div>
+ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+ <div itemprop="articleBody">
+
+
+
+ </div>
+ </div>
+ <footer>
+
+
+ <hr/>
+
+ <div role="contentinfo">
+ <p>
+ © Copyright 2013-2015, Apache Usergrid.
+
+ </p>
+ </div>
+ Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+
+
+
+
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT:'../',
+ VERSION:'1.0',
+ COLLAPSE_INDEX:false,
+ FILE_SUFFIX:'.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+
+
+
+
+
+ <script type="text/javascript" src="../_static/js/theme.js"></script>
+
+
+
+
+ <script type="text/javascript">
+ jQuery(function () {
+ SphinxRtdTheme.StickyNav.enable();
+ });
+ </script>
+
+
+</body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/assets-and-files/retrieving-assets.html
----------------------------------------------------------------------
diff --git a/content/docs/assets-and-files/retrieving-assets.html b/content/docs/assets-and-files/retrieving-assets.html
new file mode 100644
index 0000000..2cb0706
--- /dev/null
+++ b/content/docs/assets-and-files/retrieving-assets.html
@@ -0,0 +1,372 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>Retrieving assets — Apache Usergrid 1.0 documentation</title>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+
+
+
+
+
+ <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+ <link rel="next" title="Folders" href="folders.html"/>
+ <link rel="prev" title="Uploading assets" href="uploading-assets.html"/>
+
+
+ <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+ <div class="wy-grid-for-nav">
+
+
+ <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+ <div class="wy-side-nav-search">
+
+
+
+ <a href="../index.html" class="icon icon-home"> Apache Usergrid
+
+
+
+ </a>
+
+
+
+
+ <div class="version">
+ 1.0
+ </div>
+
+
+
+
+<div role="search">
+ <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+ <input type="text" name="q" placeholder="Search docs" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+
+
+ </div>
+
+ <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+
+
+
+ <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters & clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators & data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security & Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security & token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-roles.html">Using roles</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management & Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management & social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets & Files</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Retrieving assets</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#retrieving-asset-data">Retrieving asset data</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#request-syntax">Request syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-request">Example request</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#retrieving-an-asset-entity">Retrieving an asset entity</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters & Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters & events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating & incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations & Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations & Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code & Docs</a></li>
+</ul>
+
+
+
+ </div>
+
+ </nav>
+
+ <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+ <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+ <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+ <a href="../index.html">Apache Usergrid</a>
+ </nav>
+
+
+
+ <div class="wy-nav-content">
+ <div class="rst-content">
+ <div role="navigation" aria-label="breadcrumbs navigation">
+ <ul class="wy-breadcrumbs">
+ <li><a href="../index.html">Docs</a> »</li>
+
+ <li>Retrieving assets</li>
+ <li class="wy-breadcrumbs-aside">
+
+
+ <a href="../_sources/assets-and-files/retrieving-assets.txt" rel="nofollow"> View page source</a>
+
+
+ </li>
+ </ul>
+ <hr/>
+</div>
+ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+ <div itemprop="articleBody">
+
+ <div class="section" id="retrieving-assets">
+<h1>Retrieving assets<a class="headerlink" href="#retrieving-assets" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="retrieving-asset-data">
+<h2>Retrieving asset data<a class="headerlink" href="#retrieving-asset-data" title="Permalink to this headline">¶</a></h2>
+<p>To retrieve the asset from an entity, send a <code class="docutils literal"><span class="pre">GET</span></code> request with the
+<code class="docutils literal"><span class="pre">Accept</span></code> header set to the content type of the asset. The content type
+can be retrieved from the <code class="docutils literal"><span class="pre">file-metadata.content-type</span></code> property of the
+entity the asset is attached to.</p>
+<div class="section" id="request-syntax">
+<h3>Request syntax<a class="headerlink" href="#request-syntax" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET -H 'Accept: <content_type>' 'https://api.usergrid.com/<org>/<app>/<collection>/<entity>
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="20%" />
+<col width="80%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>content_type</td>
+<td>The content type of the attached asset. For example, text/plain, image/jpeg.</td>
+</tr>
+<tr class="row-odd"><td>org Organization</td>
+<td>UUID or organization name</td>
+</tr>
+<tr class="row-even"><td>app Application</td>
+<td>UUID or application name</td>
+</tr>
+<tr class="row-odd"><td>collection</td>
+<td>Name or UUID of the collection of the entity the asset is attached to.</td>
+</tr>
+<tr class="row-even"><td>entity</td>
+<td>Name or UUID of the entity the asset is attached to.</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="example-request">
+<h3>Example request<a class="headerlink" href="#example-request" title="Permalink to this headline">¶</a></h3>
+<p>The following request will retrieve the data for a jpeg file attached to
+an entity named ‘cloud’ in the ‘pictures’ collection:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET -H 'Accept: image/jpeg' 'https://api.usergrid.com/your-org/your-app/pictures/cloud
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="retrieving-an-asset-entity">
+<h2>Retrieving an asset entity<a class="headerlink" href="#retrieving-an-asset-entity" title="Permalink to this headline">¶</a></h2>
+<p>To retrieve the entity that an asset is attached to, perform a <code class="docutils literal"><span class="pre">GET</span></code>
+request as you normally would to retrieve an entity. For more
+information, see <a class="reference external" href="../data-storage/entities.html#retrieving-data-entities">Retrieving Data
+Entities</a>.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ <footer>
+
+ <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+
+ <a href="folders.html" class="btn btn-neutral float-right" title="Folders" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+
+
+ <a href="uploading-assets.html" class="btn btn-neutral" title="Uploading assets" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+
+ </div>
+
+
+ <hr/>
+
+ <div role="contentinfo">
+ <p>
+ © Copyright 2013-2015, Apache Usergrid.
+
+ </p>
+ </div>
+ Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+
+
+
+
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT:'../',
+ VERSION:'1.0',
+ COLLAPSE_INDEX:false,
+ FILE_SUFFIX:'.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+
+
+
+
+
+ <script type="text/javascript" src="../_static/js/theme.js"></script>
+
+
+
+
+ <script type="text/javascript">
+ jQuery(function () {
+ SphinxRtdTheme.StickyNav.enable();
+ });
+ </script>
+
+
+</body>
+</html>
\ No newline at end of file
[26/36] usergrid git commit: Update generated website content.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/sdks/ios-new.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/sdks/ios-new.txt b/content/docs/_sources/sdks/ios-new.txt
new file mode 100644
index 0000000..0f5b3fe
--- /dev/null
+++ b/content/docs/_sources/sdks/ios-new.txt
@@ -0,0 +1,982 @@
+# Usergrid iOS SDK
+
+## Getting Started
+
+### Installing the SDK
+### Building from Source
+
+# Usergrid SDK Reference with Examples
+
+The 66 topics listed below are each documented in the Usergrid documentation and
+for each the docs provide an API reference and example for each of these clients:
+curl, iOS, Android, JavaScript, Ruby and Node.js.
+
+## Working with Collections
+
+### 1. Creating collections
+
+SDK Method
+
+ (ApigeeClientResponse *)apiRequest: (NSString *)url operation:(NSString *)op data:(NSString *)opData
+
+Parameters
+
+Parameter Description
+--------- -----------
+url A fully-formed url in the following format: https://api.usergrid.com/<org>/<app>/<collection>
+op The HTTP method - in this case, 'POST'
+opData No data is being sent, so the value is nil
+
+Example Request/Response
+
+Request:
+
+ -(NSString*)createCollection {
+
+ NSString *url = @"https://api.usergrid.com/your-org/your-app/items";
+ NSString *op = @"POST";
+ NSString *opData = nil;
+
+ //we recommend you call ApigeeClient from your AppDelegate.
+ //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+ //create an instance of AppDelegate
+ AppDelegate *appDelegate = (AppDelegate *)[ [UIApplication sharedApplication] delegate];
+
+ //call createEntity to initiate the API call
+ ApigeeClientResponse *response = [appDelegate.dataClient apiRequest: url operation: op data: opData];
+
+ @try {
+ //success
+ }
+ @catch (NSException * e) {
+ //fail
+ }
+
+ }
+
+Response:
+
+ {
+ "action" : "post",
+ "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+ "params" : { },
+ "path" : "/items",
+ "uri" : "http://api.usergrid.com/your-org/your-app/items",
+ "entities" : [ ],
+ "timestamp" : 1378857079220,
+ "duration" : 31,
+ "organization" : "your-org",
+ "applicationName" : "your-app"
+ }
+
+### 2. Retrieving collections
+
+SDK Method
+
+ (ApigeeCollection*)getCollection:(NSString*)type
+
+Parameters
+
+Parameter Description
+--------- -----------
+type The entity type associated with the collection to be retrieved
+
+Example Request/Response
+
+Request:
+
+ -(NSString*)getCollection {
+
+ //specify the entity type that corresponds to the collection to be retrieved
+ NSString *type = @"item";
+
+ //we recommend you call ApigeeClient from your AppDelegate.
+ //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+
+ //create an instance of AppDelegate
+ AppDelegate *appDelegate = (AppDelegate *)[ [UIApplication sharedApplication] delegate];
+
+ //Call getCollection: to initiate the API GET request
+ ApigeeCollection *collection = [appDelegate.dataClient getCollection:@"book"];
+ }
+
+Response:
+
+ {
+ "action" : "get",
+ "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+ "params" : { },
+ "path" : "/items",
+ "uri" : "http://api.usergrid.com/your-org/your-app/items",
+ "entities" : [ {
+ "uuid" : "5bb76bca-1657-11e3-903f-9ff6c621a7a4",
+ "type" : "item",
+ "name" : "milk",
+ "created" : 1378405020796,
+ "modified" : 1378405020796,
+ "metadata" : {
+ "path" : "/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4"
+ },
+ "name" : "milk",
+ "price" : "3.25"
+ }, {
+ "uuid" : "1a9356ba-1682-11e3-a72a-81581bbaf055",
+ "type" : "item",
+ "name" : "bread",
+ "created" : 1378423379867,
+ "modified" : 1378423379867,
+ "metadata" : {
+ "path" : "/items/1a9356ba-1682-11e3-a72a-81581bbaf055"
+ },
+ "name" : "bread",
+ "price" : "2.50"
+ } ],
+ "timestamp" : 1378426821261,
+ "duration" : 35,
+ "organization" : "your-org",
+ "applicationName" : "your-app",
+ "count" : 2
+ }
+
+### 3. Updating collections
+
+SDK Method
+(ApigeeClientResponse *)apiRequest: (NSString *)url operation:(NSString *)op data:(NSString *)opData
+Properties
+Parameter Description
+url A fully-formed request url in the following format:
+https://api.usergrid.com/<org>/<app>/<collection>/?ql=
+Note that you must include an empty '?ql=' query string at the end of the URL
+
+op The HTTP method - in this case, 'PUT'
+opData A JSON-formatted string that contains the entity properties to be updated
+Example Request/Response
+Show Code
+Request:
+-(NSString*)updateCollection {
+
+ NSString *url = @"https://api.usergrid.com/your-org/your-app/items/?ql";
+ NSString *op = @"PUT";
+ NSString *opData = @"{\"availability\":\"in-stock\"}"; //we escape the quotes
+
+ //we recommend you call ApigeeClient from your AppDelegate.
+ //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+ //create an instance of AppDelegate
+ AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+
+ //call apiRequest to initiate the API call
+ ApigeeClientResponse *response = [appDelegate.dataClient apiRequest: url operation: op data: opData];
+
+ @try {
+ //success
+ }
+ @catch (NSException * e) {
+ //fail
+ }
+
+}
+
+Response:
+{
+ "action" : "put",
+ "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+ "params" : {
+ "ql" : [ "" ]
+ },
+ "path" : "/items",
+ "uri" : "http://api.usergrid.com/your-org/your-app/items",
+ "entities" : [ {
+ "uuid" : "31847b9a-1a62-11e3-be04-8d05e96f700d",
+ "type" : "item",
+ "name" : "milk",
+ "price" : "3.25",
+ "availability" : "in-stock"
+ "created" : 1378849479113,
+ "modified" : 1378849567301,
+ "name" : "milk",
+ }, {
+ "uuid" : "3192ac6a-1a62-11e3-a24f-496ca1d42ce7",
+ "type" : "item",
+ "name" : "bread",
+ "price" : "4.00",
+ "availability" : "in-stock"
+ "created" : 1378849479206,
+ "modified" : 1378849567351,
+ "name" : "bread",
+ } ],
+ "timestamp" : 1378849567280,
+ "duration" : 207,
+ "organization" : "your-org",
+ "applicationName" : "your-app"
+}
+
+### 4. Deleting collections
+
+SDK Method
+(ApigeeClientResponse *)apiRequest: (NSString *)url operation:(NSString *)op data:(NSString *)opData
+Properties
+Parameter Description
+url A fully-formed url in the following format:
+https://api.usergrid.com/<org>/<app>/<collection>/?ql=
+Note that you must include an empty '?ql=' query string at the end of the URL
+
+op The HTTP method - in this case, 'DELETE'
+opData No data is being sent, so the value is nil
+Example Request/Response
+The following example will delete the first 5 entities in a collection.
+
+Show Code
+Request:
+-(NSString*)deleteCollection {
+
+ NSString *url = @"https://api.usergrid.com/your-org/your-app/items/?ql='limit=5'";
+ NSString *op = @"DELETE";
+ NSString *opData = nil;
+
+ //we recommend you call ApigeeClient from your AppDelegate.
+ //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+ //create an instance of AppDelegate
+ AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+
+ //call createEntity to initiate the API call
+ ApigeeClientResponse *response = [appDelegate.dataClient apiRequest: url operation: op data: opData];
+
+ @try {
+ //success
+ }
+ @catch (NSException * e) {
+ //fail
+ }
+
+}
+
+Response:
+{
+ "action" : "delete",
+ "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+ "params" : {
+ "ql" : [ "" ]
+ },
+ "path" : "/items",
+ "uri" : "http://api.usergrid.com/your-org/your-app/items",
+ "entities" : [ {
+ "uuid" : "53fe3700-0abe-11e3-b1f7-1bd100b8059e",
+ "type" : "item",
+ "name" : "milk",
+ "price" : "3.25",
+ "created" : 1377129832047,
+ "modified" : 1377129832047,
+ "metadata" : {
+ "path" : "/items/53fe3700-0abe-11e3-b1f7-1bd100b8059e"
+ },
+ "name" : "milk"
+ }, {
+ "uuid" : "5ae1fa7a-0abe-11e3-89ab-6be0003c809b",
+ "type" : "item",
+ "name" : "bread",
+ "price" : "4.00",
+ "created" : 1377129843607,
+ "modified" : 1377129843607,
+ "metadata" : {
+ "path" : "/items/5ae1fa7a-0abe-11e3-89ab-6be0003c809b"
+ },
+ "name" : "bread"
+ } ],
+ "timestamp" : 1378848117272,
+ "duration" : 12275,
+ "organization" : "your-org",
+ "applicationName" : "your-app"
+}
+
+## Working with Entities
+
+### 5. Creating a custom entity
+
+SDK Method
+(ApigeeClientResponse *)createEntity:(NSDictionary *)newEntity
+Parameters
+Parameter Description
+newEntity NSDictionary object that contains the entity properties
+Example Request/Response
+Show Code
+Request:
+-(NSString*)newEntity {
+
+ //create an entity object
+ NSMutableDictionary *entity = [[NSMutableDictionary alloc] init ];
+
+ //Set entity properties
+ [entity setObject:@"item" forKey:@"type"]; //Required. New entity type to create
+ [entity setObject:@"milk" forKey:@"name"];
+ [entity setObject:@"3.25" forKey:@"price"];
+
+ //we recommend you call ApigeeClient from your AppDelegate.
+ //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+ //create an instance of AppDelegate
+ AppDelegate *appDelegate = (AppDelegate *)[ [UIApplication sharedApplication] delegate];
+
+ //call createEntity to initiate the API call
+ ApigeeClientResponse *response = [appDelegate.dataClient createEntity:entity];
+
+ @try {
+ //success
+ }
+ @catch (NSException * e) {
+ //fail
+ }
+
+}
+
+Response:
+ {
+ "action" : "post",
+ "application" : "4a1edb70-d7a8-11e2-9ce3-f315e5aa568a",
+ "params" : { },
+ "path" : "/items", "uri" : "http://api.usergrid.com/my-org/my-app/items",
+ "entities" : [ {
+ "uuid" : "83e9b7ea-e8f5-11e2-84df-e94123890c7a",
+ "type" : "item",
+ "name" : "milk",
+ "created" : 1373415195230,
+ "modified" : 1373415195230,
+ "metadata" : {
+
+ "path" : "/items/83e9b7ea-e8f5-11e2-84df-e94123890c7a"
+ },
+ "name" : "milk",
+ "price" : "3.25"
+ } ],
+ "timestamp" : 1373415195225,
+ "duration" : 635,
+ "organization" : "my-org",
+ "applicationName" : "my-app"
+ }
+
+
+### 6. Creating multiple custom entities
+
+Request Syntax
+curl -X POST https://api.usergrid.com/<org>/<app>/<entity_type>/ -d '[{<entity>}, {<entity>}, ...]'
+Parameters
+Parameter Description
+org Organization UUID or name
+app Application UUID or name
+entity_type Custom entity type to create. API Services will create a corresponding collection if one does not already exist. To add an entity to an existing collections, use the collection name or colleciton UUID in place of the entity type.
+entity Comma-separated list of entity objects to create. Each object should be formatted as a comma-separated list of entity properties, formatted as key-value pairs in the format <property>:<value>
+Example Request/Response
+Show Code
+Request:
+curl -X POST "https://api.usergrid.com/your-org/your-app/item" -d '[{"name":"milk", "price":"3.25"}, {"name":"bread", "price":"2.50"}]'
+Response:
+{
+ "action" : "post",
+ "application" : "f34f4222-a166-11e2-a7f7-02e9sjwsf3d0",
+ "params" : { },
+ "path" : "/items",
+ "uri" : "http://api.usergrid.com/your-org/your-app/items",
+ "entities" : [ {
+ "uuid" : "f3a8061a-ef0b-11e2-9e92-5f4a65c16193",
+ "type" : "item",
+ "name" : "milk",
+ "price" : "3.25",
+ "created" : 1374084538609,
+ "modified" : 1374084538609,
+ "metadata" : {
+ "path" : "/multis/f3a8061a-ef0b-11e2-9e92-5f4a65c16193"
+ },
+ "name" : "milk"
+ }, {
+ "uuid" : "f3be262a-ef0b-11e2-a51b-6715d5ef47a6",
+ "type" : "item",
+ "name" : "bread",
+ "price" : "2.50",
+ "created" : 1374084538754,
+ "modified" : 1374084538754,
+ "metadata" : {
+ "path" : "/items/f3be262a-ef0b-11e2-a51b-6715d5ef47a6"
+ },
+ "name" : "bread"
+ } ],
+ "timestamp" : 1374084538584,
+ "duration" : 388,
+ "organization" : "your-org",
+ "applicationName" : "your-app"
+}
+
+### 7. Creating an entity with sub-properties
+
+SDK Method
+(ApigeeClientResponse *)createEntity:(NSDictionary *)newEntity
+Parameters
+Parameter Description
+newEntity NSMutableDictionary object that contains the entity properties
+Example Request/Response
+Show Code
+Request:
+-(NSString*)newEntity {
+
+ //Initialize an object for the new entity to be created
+ NSMutableDictionary *entity = [ [NSMutableDictionary alloc] init ];
+
+ //Initialize an object for each nested variety object
+ NSMutableDictionary *variety_1 = [ [NSMutableDictionary alloc] init ];
+ NSMutableDictionary *variety_2 = [ [NSMutableDictionary alloc] init ];
+ NSMutableDictionary *variety_3 = [ [NSMutableDictionary alloc] init ];
+
+ //Initialize an array to hold the nested variety objects
+ NSMutableArray *variety_list = [ [NSMutableArray alloc] init];
+
+ [variety_1 setObject:@"1%" forKey:@"name"];
+ [variety_1 setObject:@"3.25" forKey:@"price"];
+ [variety_1 setObject:@"0393847575533445" forKey:@"sku"];
+
+ [variety_2 setObject:@"whole" forKey:@"name"];
+ [variety_2 setObject:@"3.85" forKey:@"price"];
+ [variety_2 setObject:@"0393394956788445" forKey:@"sku"];
+
+ [variety_3 setObject:@"skim" forKey:@"name"];
+ [variety_3 setObject:@"4.00" forKey:@"price"];
+ [variety_3 setObject:@"0390299933488445" forKey:@"sku"];
+
+ //Add the variety objects to the array
+ [variety_list addObject:variety_1];
+ [variety_list addObject:variety_2];
+ [variety_list addObject:variety_3];
+
+ //Set the item entity properties
+ [entity setObject:@"item" forKey:@"type"]; //Required. New entity type to create
+ [entity setObject:@"milk" forKey:@"name"];
+
+ //Set the variety_list array as the value of the 'varieties' property
+ [entity setObject:variety_list forKey:@"varieties"];
+
+ //we recommend you call ApigeeClient from your AppDelegate.
+ //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+ //create an instance of AppDelegate
+ AppDelegate *appDelegate = (AppDelegate *)[ [UIApplication sharedApplication] delegate];
+
+ //call createEntity to initiate the API call
+ ApigeeClientResponse *response = [appDelegate.dataClient createEntity:entity];
+
+ @try {
+ //success
+ }
+ @catch (NSException * e) {
+ //fail
+ }
+
+}
+
+Response:
+{
+ "action" : "post",
+ "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+ "params" : { },
+ "path" : "/items",
+ "uri" : "http://api.usergrid.com/your-org/your-app/items",
+ "entities" : [ {
+ "uuid" : "0d7cf92a-effb-11e2-917d-c5e707256e71",
+ "type" : "item",
+ "name" : "milk",
+ "created" : 1374187231666,
+ "modified" : 1374187231666,
+ "metadata" : {
+ "path" : "/items/0d7cf92a-effb-11e2-917d-c5e707256e71"
+ },
+ "name" : "milk",
+ "varieties" : [ {
+ "name" : "1%",
+ "price" : "3.25",
+ "SKU" : "0393847575533445"
+ }, {
+ "name" : "whole",
+ "price" : "3.85",
+ "SKU" : "0393394956788445"
+ }, {
+ "name" : "skim",
+ "price" : "4.00",
+ "SKU" : "0390299933488445"
+ } ]
+ } ],
+ "timestamp" : 1374187450826,
+ "duration" : 50,
+ "organization" : "your-org",
+ "applicationName" : "your-app"
+}
+
+
+### 8. Retrieving an entity
+
+SDK Method
+
+ (ApigeeClientResponse *)getEntities: (NSString *)endpoint query:(NSString *)query
+
+Properties
+
+Parameter Description
+--------- -----------
+endpoint The collection and entity identifier of the entity to be retrieved.
+query An optional query string. Requests for a specific entity should set the value to nil
+
+Endpoint exported in the following format: <collection>/<entity_UUID_or_name>
+
+Example Request/Response
+
+Request:
+
+ -(NSString*)getEntity {
+
+ //specify the entity collection and UUID or name to be retrieved
+ NSString *endpoint = @"items/b3aad0a4-f322-11e2-a9c1-999e12039f87";
+
+ NSString *query = nil;
+
+ //we recommend you call ApigeeClient from your AppDelegate.
+ //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+ //create an instance of AppDelegate
+ AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+
+ //call getEntities to initiate the API call
+ ApigeeClientResponse *response = [appDelegate.dataClient getEntities:endpoint queryString:query];
+
+ @try {
+ //success
+ }
+
+ @catch (NSException * e) {
+ //fail
+ }
+
+ }
+
+Response:
+
+ {
+ "action" : "get",
+ "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+ "params" : { },
+ "path" : "/items",
+ "uri" : "http://api.usergrid.com/amuramoto/sandbox/items",
+ "entities" : [ {
+ "uuid" : "5bb76bca-1657-11e3-903f-9ff6c621a7a4",
+ "type" : "item",
+ "name" : "milk",
+ "created" : 1378405020796,
+ "modified" : 1378405020796,
+ "metadata" : {
+ "path" : "/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4"
+ },
+ "name" : "milk",
+ "price" : "3.25"
+ } ],
+ "timestamp" : 1378405025763,
+ "duration" : 31,
+ "organization" : "amuramoto",
+ "applicationName" : "sandbox"
+ }
+
+### 9. Retrieving multiple entities
+
+SDK Method
+
+ (ApigeeClientResponse *)getEntities: (NSString *)type queryString:(NSString *)queryString
+
+Properties
+
+Parameter Description
+--------- -----------
+type The entity type being retrieved
+queryString A query string of entity properties to be matched for the entities to be retrieved.
+
+Query string is expected in the following format: <property>=<value> OR <property>=<value> OR ...
+
+Example Request/Response
+
+Request:
+
+ -(NSString*)getEntity {
+
+ //specify the entity type to be retrieved
+ NSString *type = @"item";
+
+ //specify the uuid of the entity to be retrieved in a query string
+ NSString *query = @"uuid = b3aad0a4-f322-11e2-a9c1-999e12039f87 or name = 'bread'";
+
+ //we recommend you call ApigeeClient from your AppDelegate.
+ //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+ //create an instance of AppDelegate
+ AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+
+ //call createEntity to initiate the API call
+ ApigeeClientResponse *response = [appDelegate.dataClient getEntities:type queryString:query];
+
+ @try {
+ //success
+ }
+ @catch (NSException * e) {
+ //fail
+ }
+
+ }
+
+Response:
+
+ {
+ "action" : "get",
+ "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+ "params" : {
+ "ql" : [ "name='milk' OR UUID=1a9356ba-1682-11e3-a72a-81581bbaf055" ]
+ },
+ "path" : "/items",
+ "uri" : "http://api.usergrid.com/your-org/your-app/items",
+ "entities" : [ {
+ "uuid" : "5bb76bca-1657-11e3-903f-9ff6c621a7a4",
+ "type" : "item",
+ "name" : "milk",
+ "created" : 1378405020796,
+ "modified" : 1378405020796,
+ "metadata" : {
+ "path" : "/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4"
+ },
+ "name" : "milk",
+ "price" : "3.25"
+ }, {
+ "uuid" : "1a9356ba-1682-11e3-a72a-81581bbaf055",
+ "type" : "item",
+ "name" : "bread",
+ "created" : 1378423379867,
+ "modified" : 1378423379867,
+ "metadata" : {
+ "path" : "/items/1a9356ba-1682-11e3-a72a-81581bbaf055"
+ },
+ "name" : "bread",
+ "price" : "2.50"
+ } ],
+ "timestamp" : 1378423793729,
+ "duration" : 63,
+ "organization" : "your-org",
+ "applicationName" : "your-app",
+ "count" : 2
+ }
+
+
+### 10. Updating an entity
+
+SDK Method
+
+ (ApigeeClientResponse *)updateEntity: (NSString *)entityID entity:(NSDictionary *)updatedEntity
+
+Parameters
+
+Parameter Description
+--------- -----------
+entityID UUID of the entity to be updated
+updatedEntity NSMutableDictionary containing the properties to be updated
+
+Example Request/Response
+
+Request:
+
+ -(NSString*)updateEntity {
+
+ //UUID of the entity to be updated
+ NSString *entityID = @"f42752aa-08fe-11e3-8268-5bd5fa5f701f";
+
+ //Create an entity object
+ NSMutableDictionary *updatedEntity = [ [NSMutableDictionary alloc] init ];
+
+ //Set entity properties to be updated
+ [updatedEntity setObject:@"item" forKey:@"type"]; //Required - entity type
+ [updatedEntity setObject:@"in-stock" forKey:@"availability"];
+ [updatedEntity setObject:@"4.00" forKey:@"price"];
+
+ //we recommend you call ApigeeClient from your AppDelegate.
+ //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+ //create an instance of AppDelegate
+ AppDelegate *appDelegate = (AppDelegate *)[ [UIApplication sharedApplication] delegate];
+
+ //call updateEntity to initiate the API call
+ ApigeeClientResponse *response = [appDelegate.dataClient updateEntity:entityID entity:updatedEntity];
+
+ @try {
+
+ //success
+
+ }
+ @catch (NSException * e) {
+ //fail
+ }
+
+ }
+
+Response:
+
+ {
+ "action" : "put",
+ "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+ "params" : { },
+ "path" : "/items",
+ "uri" : "http://api.usergrid.com/your-org/your-app/items",
+ "entities" : [ {
+ "uuid" : "5bb76bca-1657-11e3-903f-9ff6c621a7a4",
+ "type" : "item",
+ "name" : "milk",
+ "created" : 1378405020796,
+ "modified" : 1378505705077,
+ "availability" : "in-stock",
+ "metadata" : {
+ "path" : "/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4"
+ },
+ "name" : "milk",
+ "price" : "4.00"
+ } ],
+ "timestamp" : 1378505705050,
+ "duration" : 87,
+ "organization" : "your-org",
+ "applicationName" : "your-app"
+ }
+
+
+### 11. Updating a sub-property
+
+SDK Method
+
+ (ApigeeClientResponse *)updateEntity: (NSString *)entityID entity:(NSDictionary *)updatedEntity
+
+Parameters
+
+Parameter Description
+--------- -----------
+entityID UUID of the entity to be updated
+updatedEntity Entity object containing the properties to be updated
+
+Example Request/Response
+
+Request:
+
+ -(NSString*)updateEntity {
+
+ //UUID of the entity to be updated
+ NSString *entityID = @"f42752aa-08fe-11e3-8268-5bd5fa5f701f";
+
+ //Define our two sub-properties to include in the update
+ NSMutableDictionary *subproperty1 = [ [NSMutableDictionary alloc] init];
+ NSMutableDictionary *subproperty2 = [ [NSMutableDictionary alloc] init];
+ [subproperty1 setObject:@"1%" forKey:@"name"];
+ [subproperty1 setObject:@"3.25" forKey:@"price"];
+ [subproperty2 setObject:@"whole" forKey:@"name"];
+ [subproperty2 setObject:@"4.00" forKey:@"price"];
+
+ //Put our sub-properties into an NSArray
+ NSArray *subproperties = [ [NSArray alloc] initWithObjects:props1,props2, nil];
+
+ //Create an NSMutableDictionary to hold our updates
+ NSMutableDictionary *updatedEntity = [ [NSMutableDictionary alloc] init ];
+
+ //Set the properties to be updated
+ [updatedEntity setObject:@"item" forKey:@"type"]; //Required - entity type
+ [updatedEntity setObject:props forKey:@"varieties"];
+
+ //we recommend you call ApigeeClient from your AppDelegate.
+ //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+ //create an instance of AppDelegate
+ AppDelegate *appDelegate = (AppDelegate *)[ [UIApplication sharedApplication] delegate];
+
+ //call createEntity to initiate the API call
+ ApigeeClientResponse *response = [appDelegate.dataClient updateEntity:entityID entity:updatedEntity];
+
+ @try {
+
+ //success
+
+ }
+ @catch (NSException * e) {
+ //fail
+ }
+
+ }
+
+Response:
+
+ {
+ "action" : "put",
+ "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+ "params" : { },
+ "path" : "/items",
+ "uri" : "http://api.usergrid.com/your-org/your-app/items",
+ "entities" : [ {
+ "uuid" : "5bb76bca-1657-11e3-903f-9ff6c621a7a4",
+ "type" : "item",
+ "name" : "milk",
+ "created" : 1378405020796,
+ "modified" : 1378761459069,
+ "availability" : "in-stock",
+ "metadata" : {
+ "path" : "/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4"
+ },
+ "name" : "milk",
+ "uri" : "http://api.usergrid.com/your-org/your-app/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4",
+ "varieties" : [ {
+ "name" : "1%",
+ "price" : "3.25"
+ }, {
+ "name" : "whole",
+ "price" : "4.00"
+ } ]
+ } ],
+ "timestamp" : 1378761459047,
+ "duration" : 62,
+ "organization" : "your-org",
+ "applicationName" : "your-app"
+ }
+
+
+### 12. Deleting data entities
+
+SDK Method
+
+ (ApigeeClientResponse *)removeEntity: (NSString *)type entityID:(NSString *)entityID
+
+Properties
+
+Parameter Description
+--------- -----------
+type The entity type being deleted
+entityID The UUID or name of the entity to be removed
+
+Example Request/Response
+
+Request:
+
+ -(NSString*)deleteEntity {
+
+ //specify the entity type to be deleted
+ NSString *type = @"item";
+
+ //specify the uuid or name of the entity to be deleted
+ NSString *entityId = @"milk";
+
+ //we recommend you call ApigeeClient from your AppDelegate.
+ //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+ //create an instance of AppDelegate
+ AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+
+ //call removeEntity to initiate the API call
+ ApigeeClientResponse *response = [appDelegate.dataClient removeEntity:type entityID:entityId];
+
+ @try {
+ //success
+ }
+ @catch (NSException * e) {
+ //fail
+ }
+ }
+
+Response:
+
+ {
+ "action" : "delete",
+ "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+ "params" : { },
+ "path" : "/items",
+ "uri" : "http://api.usergrid.com/your-org/your-app/items",
+ "entities" : [ {
+ "uuid" : "328fe64a-19a0-11e3-8a2a-ebc6f49d1fc4",
+ "type" : "item",
+ "name" : "milk",
+ "created" : 1378766158500,
+ "modified" : 1378766158500,
+ "metadata" : {
+ "path" : "/items/328fe64a-19a0-11e3-8a2a-ebc6f49d1fc4"
+ },
+ "name" : "milk",
+ "price" : "3.25"
+ } ],
+ "timestamp" : 1378766172016,
+ "duration" : 324,
+ "organization" : "your-org",
+ "applicationName" : "your-app"
+ }
+
+
+## Data Queries
+
+### 13. Querying your data
+
+## Entity Connections
+
+### 14. Connecting users other data
+### 15. Retrieving user connection data
+### 16. Disconnecting entities
+
+## Permissions & Roles
+
+### 17. Assigning permissions
+### 18. Removing permissions
+### 19. Assigning permissions
+### 20. Removing permissions
+### 21. Creating roles
+### 22. Assigning roles
+### 23. Removing roles
+
+## Authentication
+
+### 24. Application user authentication (user login)
+### 25. Application client authentication
+### 26. Admin user authentication
+### 27. Organization client authentication
+### 28. Revoking tokens (user logout)
+
+# Working with Users & Groups
+
+### 29. Creating users
+### 30. Retrieving user data
+### 31. Setting or updating password
+### 32. Creating groups
+### 33. Retrieving group data
+### 34. Retrieving a group's users
+### 35. Adding users groups
+### 36. Deleting user group
+
+## Activities & Feeds
+
+### 37. Posting a user activity
+### 38. Posting an activity to a group
+### 39. Creating an activity for a user's followers in a group
+### 40. Retrieving a user's activity feed
+### 41. Retrieving a group's activity feed
+
+## Events & Counters
+
+### 42. Creating & incrementing counters
+### 43. Retrieving counters
+### 44. Retrieving counters by time interval
+
+## Managing Orgs & Apps
+
+### 46. Creating an organization
+### 47. Getting an organization
+### 48. Activating an organization
+### 49. Reactivating an organization
+### 50. Generating organization client credentials
+### 51. Retrieving organization client credentials
+### 52. Getting an organization's activity feed
+### 53. Getting the applications in an organization
+### 54. Getting the admin users in an organization
+### 55. Removing an admin user from an organization
+### 56. Creating an organization application
+### 57. Generating application credentials
+### 58. Getting application credentials
+
+## Managing Admin Users
+
+### 59. Creating an admin user
+### 60. Updating an admin user
+### 61. Getting an admin user
+### 62. Setting an admin user's password
+### 63. Resetting an admin user's password
+### 64. Activating an admin user
+### 65. Reactivating an admin user
+### 66. Getting an admin user's activity feed
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/sdks/sdk-outline.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/sdks/sdk-outline.txt b/content/docs/_sources/sdks/sdk-outline.txt
new file mode 100644
index 0000000..48bd3fc
--- /dev/null
+++ b/content/docs/_sources/sdks/sdk-outline.txt
@@ -0,0 +1,111 @@
+# Usergrid SDK Documentation outline
+
+## Getting Started
+
+### Installing the SDK
+### Building from Source
+
+# Usergrid SDK Reference with Examples
+
+The 66 topics listed below are each documented in the Usergrid documentation and
+for each the docs provide an API reference and example for each of these clients:
+curl, iOS, Android, JavaScript, Ruby and Node.js.
+
+## Working with Collections
+
+### 1. Creating collections
+### 2. Retrieving collections
+### 3. Updating collections
+### 4. Deleting collections
+
+## Working with Entities
+
+### 5. Creating a custom entity
+### 6. Creating multiple custom entities
+### 7. Creating an entity with sub-properties
+### 8. Retrieving an entity
+### 9. Retrieving multiple entities
+### 10. Updating an entity
+### 11. Updating a sub-property
+### 12. Deleting data entities
+
+## Data Queries
+
+### 13. Querying your data
+
+## Entity Connections
+
+### 14. Connecting users other data
+### 15. Retrieving user connection data
+### 16. Disconnecting entities
+
+## Permissions & Roles
+
+### 17. Assigning permissions
+### 18. Removing permissions
+### 19. Assigning permissions
+### 20. Removing permissions
+### 21. Creating roles
+### 22. Assigning roles
+### 23. Removing roles
+
+## Authentication
+
+### 24. Application user authentication (user login)
+### 25. Application client authentication
+### 26. Admin user authentication
+### 27. Organization client authentication
+### 28. Revoking tokens (user logout)
+
+# Working with Users & Groups
+
+### 29. Creating users
+### 30. Retrieving user data
+### 31. Setting or updating password
+### 32. Creating groups
+### 33. Retrieving group data
+### 34. Retrieving a group's users
+### 35. Adding users groups
+### 36. Deleting user group
+
+## Activities & Feeds
+
+### 37. Posting a user activity
+### 38. Posting an activity to a group
+### 39. Creating an activity for a user's followers in a group
+### 40. Retrieving a user's activity feed
+### 41. Retrieving a group's activity feed
+
+## Events & Counters
+
+### 42. Creating & incrementing counters
+### 43. Retrieving counters
+### 44. Retrieving counters by time interval
+
+## Managing Orgs & Apps
+
+### 46. Creating an organization
+### 47. Getting an organization
+### 48. Activating an organization
+### 49. Reactivating an organization
+### 50. Generating organization client credentials
+### 51. Retrieving organization client credentials
+### 52. Getting an organization's activity feed
+### 53. Getting the applications in an organization
+### 54. Getting the admin users in an organization
+### 55. Removing an admin user from an organization
+### 56. Creating an organization application
+### 57. Generating application credentials
+### 58. Getting application credentials
+
+## Managing Admin Users
+
+### 59. Creating an admin user
+### 60. Updating an admin user
+### 61. Getting an admin user
+### 62. Setting an admin user's password
+### 63. Resetting an admin user's password
+### 64. Activating an admin user
+### 65. Reactivating an admin user
+### 66. Getting an admin user's activity feed
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/security-and-auth/authenticating-api-requests.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/security-and-auth/authenticating-api-requests.txt b/content/docs/_sources/security-and-auth/authenticating-api-requests.txt
index af52bf6..d29e4cb 100644
--- a/content/docs/_sources/security-and-auth/authenticating-api-requests.txt
+++ b/content/docs/_sources/security-and-auth/authenticating-api-requests.txt
@@ -4,7 +4,7 @@ With the exception of the 'sandbox' application that is created with every Userg
This article describes how to use access tokens to access the Usergrid API, and how to manage access tokens, including revoking and changing token time to live.
-For information on generating access tokens/authenticating users and clients, see Authenticating users and application clients.
+For information on generating access tokens/authenticating users and clients, see [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html).
## Authenticating with access tokens
When you obtain an access token, you must provide it with every subsequent API call that you make. There are two ways to provide your access token.
@@ -18,7 +18,7 @@ You can include the token in an HTTP authorization header:
Authorization: Bearer {access_token}
<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">
-Note: The Usergrid documentation assumes you are providing a valid access token with every API call whether or not it is shown explicitly in the examples. Unless the documentation specifically says that you can access an API endpoint without an access token, you should assume that you must provide it. One application that does not require an access token is the sandbox application. The Guest role has been given full permissions (/** for GET, POST, PUT, and DELETE) for this application. This eliminates the need for a token when making application level calls to the sandbox app. For further information on specifying permissions, see Managing access by defining permission rules.
+Note: The Usergrid documentation assumes you are providing a valid access token with every API call whether or not it is shown explicitly in the examples. Unless the documentation specifically says that you can access an API endpoint without an access token, you should assume that you must provide it. One application that does not require an access token is the sandbox application. The Guest role has been given full permissions (/** for GET, POST, PUT, and DELETE) for this application. This eliminates the need for a token when making application level calls to the sandbox app. For further information on specifying permissions, see [Using Permissions](security-and-auth/using-permissions.html).
</p></div>
## Authenticating with client ID and client secret
@@ -27,7 +27,7 @@ Another option for authenticating your API requests is using either your organiz
<div class="admonition warning"> <p class="first admonition-title">WARNING</p> <p class="last">
Warning: For server-side use only
-You should never authenticate this way from a client-side app such as a mobile app. A hacker could analyze your app and extract the credentials for malicious use even if those credentials are compiled and in binary format. See Security best practices for additional considerations in keeping access to your app and its data secure.
+You should never authenticate this way from a client-side app such as a mobile app. A hacker could analyze your app and extract the credentials for malicious use even if those credentials are compiled and in binary format. See [Security Best Practices](../security-and-auth/securing-your-app.html) for additional considerations in keeping access to your app and its data secure.
</p></div>
This can be a convenient way to authenticate API requests, since there is no need to generate and manage an access token, but please note that you should be very cautious when implementing this type of authentication. Organization-level authentication grants full permission to perform any supported call against your organization and every application in it, and application-level authentication grants full permission to perform any supported call against all of the resources in an application. Should your client id and client secret be compromised, a malicious user would gain broad access to your organization or application.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/security-and-auth/authenticating-users-and-application-clients.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/security-and-auth/authenticating-users-and-application-clients.txt b/content/docs/_sources/security-and-auth/authenticating-users-and-application-clients.txt
index eaa52f4..e1ada48 100644
--- a/content/docs/_sources/security-and-auth/authenticating-users-and-application-clients.txt
+++ b/content/docs/_sources/security-and-auth/authenticating-users-and-application-clients.txt
@@ -49,7 +49,7 @@ The results include the access token needed to make subsequent API requests on b
Using your app’s client id and client secret values, your app can connect to the Usergrid application endpoint to request an access token. The client ID and secret for your app can be found in 'Getting Started' section of the API Services admin portal, under 'Server App Credentials'.
<div class="admonition warning"> <p class="first admonition-title">WARNING</p> <p class="last">
-Warning: You should never authenticate this way from a client-side app such as a mobile app. A hacker could analyze your app and extract the credentials for malicious use even if those credentials are compiled and in binary format. See "safe mobile access" in [Authenticating API requests](authenticating-api-requests.html) for additional considerations in keeping access to your app and its data secure.
+Warning: You should never authenticate this way from a client-side app such as a mobile app. A hacker could analyze your app and extract the credentials for malicious use even if those credentials are compiled and in binary format. See [Security Best Practices](../security-and-auth/securing-your-app.html) for additional considerations in keeping access to your app and its data secure.
</p></div>
### Request syntax
@@ -76,7 +76,7 @@ The results include the access token needed to make subsequent API requests on b
If you do require admin user access, your app can connect to the Usergrid management endpoint to request an access token. Your app supplies the username and password of an admin user in the request.
<div class="admonition warning"> <p class="first admonition-title">WARNING</p> <p class="last">
-Warning: Authenticating as an admin user grants full access to one or more organizations and all of the applications contained in those organizations. Due to this, be cautious when implementing this type of authentication in client-side code. Instead, consider implementing admin user access in server-side code only. See "safe mobile access" in [Authenticating API requests](authenticating-api-requests.html) for additional considerations in keeping access to your app and its data secure.
+Warning: Authenticating as an admin user grants full access to one or more organizations and all of the applications contained in those organizations. Due to this, be cautious when implementing this type of authentication in client-side code. Instead, consider implementing admin user access in server-side code only. See [Security Best Practices](../security-and-auth/securing-your-app.html) for additional considerations in keeping access to your app and its data secure.
</p></div>
### Request syntax
@@ -103,7 +103,7 @@ The results include the access token needed to make subsequent API requests on b
If you do require organization level access, your app can connect to the Usergrid management endpoint to request an access token. Access to an organization requires the client id and client secret credentials. The client ID and secret for your organization can be found on the 'Org Administration' page of the API Services admin console under 'Organization API Credentials'.
<div class="admonition warning"> <p class="first admonition-title">WARNING</p> <p class="last">
-Warning: You should never authenticate this way from a client-side app such as a mobile app. A hacker could analyze your app and extract the credentials for malicious use even if those credentials are compiled and in binary format. See "safe mobile access" in [Authenticating API requests](authenticating-api-requests.html for additional considerations in keeping access to your app and its data secure.
+Warning: You should never authenticate this way from a client-side app such as a mobile app. A hacker could analyze your app and extract the credentials for malicious use even if those credentials are compiled and in binary format. See [Security Best Practices](../security-and-auth/securing-your-app.html) for additional considerations in keeping access to your app and its data secure.
</p></div>
### Request syntax
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/security-and-auth/facebook-sign.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/security-and-auth/facebook-sign.txt b/content/docs/_sources/security-and-auth/facebook-sign.txt
index e2c7411..970cb33 100644
--- a/content/docs/_sources/security-and-auth/facebook-sign.txt
+++ b/content/docs/_sources/security-and-auth/facebook-sign.txt
@@ -21,7 +21,7 @@ where:
## Facebook login example
The Facebook technical guides for login present detailed information on how to add Facebook login to your app. Instructions are provided for JavaScript, iOS, and Android.
-In brief, here are the steps for JavaScript. You can see these steps implemented in the Facebook login example packaged with the JavaScript SDK for Usergrid (which you can download in ZIP format or tar.gz format). The Facebook login example is in the /examples/facebook directory of the extracted download. The code example snippets shown below are taken from the Facebook login example.
+In brief, here are the steps for JavaScript. You can see these steps implemented in the Facebook login example packaged with the JavaScript SDK for Usergrid (which you can download in ZIP format or tar.gz format). The Facebook login example is in the ``/examples/facebook`` directory of the extracted download. The code example snippets shown below are taken from the Facebook login example.
### Step 1: Create a Facebook app
Create a new app on the Facebook App Dashboard. Enter your app's basic information. Once created, note the app ID shown at the top of the dashboard page.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/security-and-auth/user-authentication-types.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/security-and-auth/user-authentication-types.txt b/content/docs/_sources/security-and-auth/user-authentication-types.txt
index 1a14f50..d02e8d3 100644
--- a/content/docs/_sources/security-and-auth/user-authentication-types.txt
+++ b/content/docs/_sources/security-and-auth/user-authentication-types.txt
@@ -5,7 +5,7 @@ Usergrid supports four levels of authentication, but only one of them is used wh
## Configuring authentication levels
Access permissions can only be configured for the 'application user' – this can be done both programmatically and in the admin portal. The application, organization and admin clients cannot be configured, and can only be accessed programmatically via the API.
-For more about creating and managing roles and permissions for application users, see Managing access by defining permission rules. For a look at how security features fit together, see App Security Overview.
+For more about creating and managing roles and permissions for application users, see [Using Permissions](security-and-auth/using-permissions.html) and [Using Roles](security-and-auth/using-roles.html). For a look at how security features fit together, see [App Security Overview](../security-and-auth/app-security.html).
## User authentication level
@@ -16,14 +16,14 @@ For more about creating and managing roles and permissions for application users
</tr>
<tr>
<td>Application user</td>
- <td>This is the standard authentication type you will use to implement user login for your app. The application user level allows access to your Usergrid application as governed by the permission rules you create and associated with users and user groups. For more on setting permissions see Managing access by defining permission rules. Each Application User is represented by a User entity in your Usergrid application. For more about the User entity, see User.</td>
+ <td>This is the standard authentication type you will use to implement user login for your app. The application user level allows access to your Usergrid application as governed by the permission rules you create and associated with users and user groups. For more on setting permissions see [Using Permissions](security-and-auth/using-permissions.html). Each Application User is represented by a User entity in your Usergrid application. For more about the User entity, see User.</td>
</tr>
</table>
## Admin authentication levels
<div class="admonition warning"> <p class="first admonition-title">WARNING</p> <p class="last">
-Warning: Safe use of admin authentication levels. Never use client ID and client secret, or any hard-coded credentials to authenticate this way from a client-side app, such as a mobile app. A hacker could analyze your app and extract the credentials for malicious use even if those credentials are compiled and in binary format. Even when authenticating with username and password, be cautious when using these authentication levels since they grant broad access to your Usergrid account. See "safe mobile access" in Authenticating API requests for additional considerations in keeping access to your app and its data secure.</p></div>
+Warning: Safe use of admin authentication levels. Never use client ID and client secret, or any hard-coded credentials to authenticate this way from a client-side app, such as a mobile app. A hacker could analyze your app and extract the credentials for malicious use even if those credentials are compiled and in binary format. Even when authenticating with username and password, be cautious when using these authentication levels since they grant broad access to your Usergrid account. See [Security Best Practices](../security-and-auth/securing-your-app.html) for additional considerations in keeping access to your app and its data secure.</p></div>
<table class="usergrid-table">
<tr>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/security-and-auth/using-permissions.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/security-and-auth/using-permissions.txt b/content/docs/_sources/security-and-auth/using-permissions.txt
index 34ec664..1454d11 100644
--- a/content/docs/_sources/security-and-auth/using-permissions.txt
+++ b/content/docs/_sources/security-and-auth/using-permissions.txt
@@ -33,7 +33,7 @@ Complex paths can be defined using [Apache Ant pattern syntax](http://ant.apache
</table>
## Assigning permissions
-Permissions can only be assigned to user, group or role entities. Assigning permissions to roles can be particularly useful, as it allows you to create sets of permissions that represent complex access definitions, which can then be assigned to user and group entities. For more on roles, see Using roles.
+Permissions can only be assigned to user, group or role entities. Assigning permissions to roles can be particularly useful, as it allows you to create sets of permissions that represent complex access definitions, which can then be assigned to user and group entities. For more on roles, see [Using Roles](security-and-auth/using-roles.html).
### Request syntax
@@ -47,7 +47,7 @@ org Organization UUID or organization name
app Application UUID or application name
collection The collection of the entity that the permissions are to be assigned to.
entity The UUID of the entity to assign the permissions to. For users, username and for groups, name are also accepted.
-permissions The permissions to assign to the entity. See Permissions syntax for format.
+permissions The permissions to assign to the entity. See [Permissions syntax](security-and-auth/using-permissions.html#permissions-syntax) for format.
For collections, Valid values are users and groups.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/security-and-auth/using-roles.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/security-and-auth/using-roles.txt b/content/docs/_sources/security-and-auth/using-roles.txt
new file mode 100644
index 0000000..2a794e3
--- /dev/null
+++ b/content/docs/_sources/security-and-auth/using-roles.txt
@@ -0,0 +1,304 @@
+# Using roles
+Roles are named sets of one or more permissions, and are useful for defining specific access levels to resources in your Usergrid data store. Multiple roles can be assigned to a user or group, giving you a great deal of flexibility in how access to resources are defined.
+
+For example, in a blogging app you might create a 'reviewer' role that allows GET and PUT access to an articles collection to allow the user to retrieve and update articles, but not allow them to create new articles.
+
+## Default roles
+While you can create as many custom roles as you want per application, all Usegrid applications include three default roles. These roles each serve a special purpose and should not be deleted; however, you can and should adjust the permissions assigned to these roles to suit the needs of you app.
+
+The following table describes each pre-defined role, and the permissions that are assigned to them by default.
+
+<table class="usergrid-table">
+<tr>
+ <th>Role</th>
+ <th class="usergrid-30"> Permissions</th>
+ <th>Description</th>
+</tr>
+<tr>
+ <td>Guest</td>
+ <td>
+
+* post: /devices
+* post: /users
+* put: /devices/*
+
+ </td>
+ <td>
+
+ Assigned to all unauthenticated requests. Includes a basic set of permissions that are commonly needed by unregistered or unauthenticated users.
+ <p>Grants permission for a user to create a user account and for their device to be registered.
+
+ </td>
+</tr>
+<tr>
+ <td>Default</td>
+ <td>
+
+* get, post, put, delete: /**
+
+ </td>
+ <td>
+
+Default for authenticated users. Assigns the associated permissions to all users whose requests are authenticated with a valid access token.
+
+<div class="admonition warning"> <p class="first admonition-title">WARNING</p> <p class="last">
+By default, __grants full access for all resources in your application__. A first task in securing your application should be to restrict access by redefining this role to narrow the access it provides. Remove the default full permission rule and add restrictive permission rules for a production deployment.
+</p></div>
+
+ </td>
+</tr>
+<tr>
+ <td>Administrator</td>
+ <td>None</td>
+ <td>
+
+Unused until you associate it with users or groups. By default, includes no permissions that provide access. Grants no access. Consider this a blank slate. Add permission rules and associate this role with users and groups as needed.
+<div class="admonition note"> <p class="first admonition-title">NOTE</p> <p class="last">
+The Administrator role is <i>not</i> the same as an organization administrator, that is, someone who authenticates as an Admin User. The Admin User is an implicit user created when you create an organization. After authenticating, the Admin User has full access to all of the administration features of the Usergrid API. By comparison, the Administrator role is simply a role (initially without permissions) that can be assigned to any user.
+</p></div>
+
+ </td>
+</tr>
+</table>
+
+## Creating roles
+Generally, it is easiest to a create a role for each access type you want to enable in your app. You may, however, assign multiple roles to any user or group entity, so you have the flexibility to define any schema for applying roles that you like.
+
+The following shows how to create a new role and assign permissions to it.
+
+### Request syntax
+With cURL requests a role entity is created with a POST request, then permissions must be assigned to it with a separate request. For more on assigning permissions with cURL, see [Using Permissions](security-and-auth/using-permissions.html).
+
+The following details how to create a new role entity.
+
+ curl -X POST https://api.usergrid.com/<org>/<app>/roles -d '{"name":<roleName>}'
+
+Parameters
+
+Parameter Description
+--------- -----------
+org Organization UUID or organization name
+app Application UUID or application name
+roleName The name of the role to be created
+
+### Example request
+
+ curl -X POST "https://api.usergrid.com/my-org/my-app/roles/ -d '{"name":"manager"}'
+
+### Example response
+
+ {
+ "action" : "post",
+ "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+ "params" : { },
+ "path" : "/roles",
+ "uri" : "https://api.usergrid.com/your-org/your-app/roles",
+ "entities" : [ {
+ "uuid" : "382d0991-74bb-3548-8166-6b07e44495ef",
+ "type" : "role",
+ "name" : "manager",
+ "created" : 1402612783104,
+ "modified" : 1402612783104,
+ "roleName" : "manager",
+ "title" : "manager",
+ "inactivity" : 0,
+ "metadata" : {
+ "path" : "/roles/382d0991-74bb-3548-8166-6b07e44495ef",
+ "sets" : {
+ "permissions" : "/roles/382d0991-74bb-3548-8166-6b07e44495ef/permissions"
+ },
+ "collections" : {
+ "groups" : "/roles/382d0991-74bb-3548-8166-6b07e44495ef/groups",
+ "users" : "/roles/382d0991-74bb-3548-8166-6b07e44495ef/users"
+ }
+ }
+ } ],
+ "timestamp" : 1402612783102,
+ "duration" : 30,
+ "organization" : "your-org",
+ "applicationName" : "your-app"
+ }
+
+
+### Creating Roles in the Admin Portal
+
+1. In the left sidebar of the Usergrid portal, click Users > Roles. This displays the roles defined for the application.
+Click the '+' button.
+2. In the dialog box, provide a 'title' and 'role name.' A title is an alias for the role name.
+3. Click 'Create'. The role will be created, but will not have any permissions assigned to it.
+4. Click the role you created in the list.
+5. Click the 'Add permissions' button.
+6. In the dialog box, click the check boxes for the HTTP methods you want to grant permissions for, and enter the resource path in the 'Path' field.
+7. The 'Inactivity' field lets you control automatic user logout during periods of inactivity. Set a number of seconds of inactivity before users assigned to this role are automatically logged out.
+
+## Assigning roles
+Once you have created some roles, you will need to explicitly assign them to a user or group entity. The permissions associated with that role will be granted to the entity immediately for any requests they send that are authenticated by a valid access token. Please note that assigning a role to a group will grant the associated permissions to every user in that group.
+
+The following shows how to assign a role to an entity.
+
+### Request syntax
+
+ curl -X POST https://api.usergrid.com/<org>/<app>/roles/<roleName>/<entityType>/<entityID>
+
+Parameters
+
+Parameter Description
+--------- -----------
+org Organization UUID or organization name
+app Application UUID or application name
+roleName The name of the role to be created
+entityType The type of the entity the role is being assigned to. 'Group' and 'user' are valid values.
+entityID The UUID of the entity the role is being assigned to.
+
+For groups, the 'name' property can be used. For users, the 'username' property can be used.
+
+### Example request
+
+ curl -X POST "https://api.usergrid.com/my-org/my-app/roles/manager/users/someUser
+
+
+### Example response
+
+ {
+ "action" : "post",
+ "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+ "params" : { },
+ "path" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users",
+ "uri" : "https://api.usergrid.com/your-org/your-app/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users",
+ "entities" : [ {
+ "uuid" : "410b213a-b379-11e3-a0e5-9953085ea376",
+ "type" : "user",
+ "name" : "someUser",
+ "created" : 1395681911491,
+ "modified" : 1399070010291,
+ "username" : "someUser",
+ "activated" : true,
+ "file" : "fobnszewobnioerabnoiawegbrn\n",
+ "metadata" : {
+ "connecting" : {
+ "friends" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/friends",
+ "likes" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/likes"
+ },
+ "path" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376",
+ "sets" : {
+ "rolenames" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/roles",
+ "permissions" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/permissions"
+ },
+ "connections" : {
+ "completed" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/completed",
+ "follows" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/follows"
+ },
+ "collections" : {
+ "activities" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/activities",
+ "devices" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/devices",
+ "feed" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/feed",
+ "groups" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/groups",
+ "roles" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/roles",
+ "following" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/following",
+ "followers" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/followers"
+ }
+ }
+ } ],
+ "timestamp" : 1402965083889,
+ "duration" : 41,
+ "organization" : "your-org",
+ "applicationName" : "your-app"
+ }
+
+
+### Assigning Roles in the Admin Portal
+
+The easiest way to assign roles to user or group entities is to use the 'Users' tab of the Usergrid admin portal, by doing the following:
+
+1. In the left sidebar of the admin portal, click Users > Users or Users > Groups to display either the list of users or groups in your application.
+2. In the list, click the name of the user or group entity you want to assign roles to to display its details in the right pane.
+3. Click the 'Roles & Permissions' tab above the right pane.
+4. Click the 'Add Role' button.
+5. In the popup, select a role from the drop down menu.
+6. Click the 'Add' button.
+
+
+## Removing roles
+At times it may be necessary to remove a role from a user or group entity, for example if a user changes jobs, or the duties of a group are altered. Please note that removing a role from a group will remove the associated permissions from every user in that group.
+
+The following shows how to remove a role from an entity.
+
+### Request syntax
+
+ curl -X DELETE https://api.usergrid.com/<org>/<app>/roles/<roleName>/<entityType>/<entityID>
+
+Parameters
+
+Parameter Description
+--------- -----------
+org Organization UUID or organization name
+app Application UUID or application name
+roleName The name of the role to be created
+entityType The type of the entity the role is being removed from. 'Group' and 'user' are valid values.
+entityID The UUID of the entity the role is being removed from.
+
+For groups, the 'name' property can be used. For users, the 'username' property can be used.
+
+### Example request
+
+ curl -X DELETE https://api.usergrid.com/my-org/my-app/roles/manager/users/someUser
+
+
+### Example response
+
+ {
+ "action" : "delete",
+ "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+ "params" : { },
+ "path" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users",
+ "uri" : "https://api.usergrid.com/your-org/your-app/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users",
+ "entities" : [ {
+ "uuid" : "410b213a-b379-11e3-a0e5-9953085ea376",
+ "type" : "user",
+ "name" : "someUser",
+ "created" : 1395681911491,
+ "modified" : 1399070010291,
+ "username" : "someUser",
+ "activated" : true,
+ "metadata" : {
+ "connecting" : {
+ "friends" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/friends",
+ "likes" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/likes"
+ },
+ "path" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376",
+ "sets" : {
+ "rolenames" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/roles",
+ "permissions" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/permissions"
+ },
+ "connections" : {
+ "completed" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/completed",
+ "follows" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/follows"
+ },
+ "collections" : {
+ "activities" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/activities",
+ "devices" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/devices",
+ "feed" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/feed",
+ "groups" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/groups",
+ "roles" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/roles",
+ "following" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/following",
+ "followers" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/followers"
+ }
+ }
+ } ],
+ "timestamp" : 1403214283808,
+ "duration" : 358,
+ "organization" : "your-org",
+ "applicationName" : "your-app"
+ }
+
+### Removing Roles in the Admin Portal
+
+The easiest way to remove roles from user or group entities is to use the 'Users' tab of the Usergrid admin portal, by doing the following:
+
+1. In the left sidebar of the Usergrid admin portal, click Users > Users or Users > Groups to display either the list of users or groups in your application.
+2. In the list, click the name of the user or group entity you want to remove roles from to display its details in the right pane.
+3. Click the 'Roles & Permissions' tab above the right pane.
+4. Click the role you created in the list.
+5. Under 'Roles', click the checkbox beside the role you want to remove from the entity.
+6. Click the 'Leave roles' button.
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/user-management/activity.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/user-management/activity.txt b/content/docs/_sources/user-management/activity.txt
index 2703ab8..4f09c8b 100644
--- a/content/docs/_sources/user-management/activity.txt
+++ b/content/docs/_sources/user-management/activity.txt
@@ -16,13 +16,13 @@ information about these actions).
When a user creates an activity, it creates a relationship between the
activity and the user who created it. Because this relationship exists,
the activity will appear in the feed of any of the user’s followers.
-Think of the Activities endpoint (/users/{uuid|username}/activities) as
+Think of the Activities endpoint (``/users/{uuid|username}/activities``) as
an "outbox" of news items created by the user. Think of the Feed
-endpoint (/users/{uuid|username}/feed) as an "inbox" of news items meant
+endpoint (``/users/{uuid|username}/feed``) as an "inbox" of news items meant
to be seen or consumed by the user.
A user can also post an activity to a group (located at
-/groups/{uuid|groupname}/activities). This allows you to emulate
+``/groups/{uuid|groupname}/activities``). This allows you to emulate
Facebook-style group functionality, where a limited number of users can
share content on a common "wall". In any of these cases, there is no
need to construct publish/subscribe relationships manually.
@@ -36,10 +36,9 @@ to the user's activity stream for display as well as to the activity
streams of any of the user's followers.
Using Usergrid APIs you can create, retrieve, update, and delete
-activity entities. See You do not have access to view this node for
-descriptions of these APIs.
+activity entities.
-**Note:** Although not shown in the API examples below, you need to
+__Note:__ Although not shown in the API examples below, you need to
provide a valid access token with each API call. See
[Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
@@ -131,13 +130,13 @@ The ``/users/me`` endpoint is accessible only if you provide an access token wit
When you create an activity it creates a relationship between the activity and the user who created it. In other words, the newly created activity above belongs to john.doe. Another way of saying this is the user "owns" the activity. And because this relationship exists, the activity will appear in the feed of any of the user’s followers (in this example, anyone who is following john.doe). However, it will not appear in the feed of people the user follows. The activity is accessible at the ``/activities`` endpoint to users who have the permission to read that endpoint.
-Notice the properties specified in the request body in the previous example are actor, verb, and content. The actor, verb, and content properties are built into the Activity entity (see Default Data Entity Types). The actor property specifies properties of the entity that performs the action (here, user john.doe). The gravatar URL is used to create an icon for the activity. And because an Activity is simply an API Services data entity, you can also create custom properties.
+Notice the properties specified in the request body in the previous example are actor, verb, and content. The actor, verb, and content properties are built into the Activity entity (see [Activity entity properties](../rest-endpoints/api-doc.html#activity) ). The actor property specifies properties of the entity that performs the action (here, user john.doe). The gravatar URL is used to create an icon for the activity. And because an Activity is simply an API Services data entity, you can also create custom properties.
The verb parameter is descriptive. You can use it to indicate what type of activity is posted, for example, an image versus text. The value post is defined in the JSON Activity Streams specification as “the act of authoring an object and then publishing it online.“
## Posting an activity to a group
-Use the POST method to post an activity to a specific group. In this case the activity is created in the activities collection and is accessible at the /activities endpoint to users who have the permission to read that endpoint. In addition, a relationship is established between the activity and the group, and because of that, the activity will appear in the group’s feed. The group "owns" the activity. Also, the activity will be published in the feed of all users that are members of the group.
+Use the POST method to post an activity to a specific group. In this case the activity is created in the activities collection and is accessible at the ``/activities`` endpoint to users who have the permission to read that endpoint. In addition, a relationship is established between the activity and the group, and because of that, the activity will appear in the group’s feed. The group "owns" the activity. Also, the activity will be published in the feed of all users that are members of the group.
### Request URI
@@ -223,7 +222,7 @@ When you create an activity for a user’s followers in a group:
The activity is accessible at the ``/activities`` endpoint to users who have the permission to read that endpoint. The activity will not be cross-posted to the group’s activity endpoint (``/groups/{uuid|groupname}/activities``)
A relationship is automatically created between the activity entity that was just created and the user within that group (``/groups/{uuid|groupname}/users/{uuid|username}``)
-The user within the group (``/groups/{uuid|groupname}/users/{uuid|username}```) becomes the owner of the activity (through the owner property in the activity).
+The user within the group (``/groups/{uuid|groupname}/users/{uuid|username}``) becomes the owner of the activity (through the owner property in the activity).
### Request URI
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/user-management/group.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/user-management/group.txt b/content/docs/_sources/user-management/group.txt
index 4f76cb6..a48606b 100644
--- a/content/docs/_sources/user-management/group.txt
+++ b/content/docs/_sources/user-management/group.txt
@@ -10,7 +10,7 @@ See the [Group Model section of the API Reference](../rest-endpoints/api-docs.ht
## Creating groups
-A group entity represents an application group of users. You can create, retrieve, update, delete, and query group entities. See User entity properties for a list of the system-defined properties for group entities. In addition, you can create group properties specific to your application.
+A group entity represents an application group of users. You can create, retrieve, update, delete, and query group entities. See [User entity properties](../rest-endpoints/api-doc.html#user) for a list of the system-defined properties for group entities. In addition, you can create group properties specific to your application.
### Request Syntax
@@ -39,7 +39,7 @@ The ``path`` property is required and must be unique, it may include forward sla
### Example
-__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
### Request
@@ -104,7 +104,7 @@ Parameter Description
org_id | uuid Organization UUID or organization name
app_id | uuid Application UUID or application name
groupPath | uuid Group UUID or group path, which must be unique.
-query_string A data store query. For more on queries, see Data queries.
+query_string A data store query. For more on queries, see [Data queries](../data-queries/querying-your-data.html).
### Request
@@ -225,11 +225,9 @@ For more information and code samples, see [Deleting Data Entities](../data-stor
## Adding a user to a group
-See all application entities
-
You can add users to groups from client code using cURL commands or one of the SDKs, as described here.
-When setting up your application on the server, you might find it easier and more convenient to create and populate groups with the admin portal. There, you can create groups, create roles, and define permission rules that govern user access to data and services in your application. For more information, see Security & token authentication.
+When setting up your application on the server, you might find it easier and more convenient to create and populate groups with the admin portal. There, you can create groups, create roles, and define permission rules that govern user access to data and services in your application. For more information, see [Security & Token Authentication](../security-and-auth/app-security.html).
Use the POST method to add a user to a group. If the named group does not yet exist, an error message is returned.
@@ -252,7 +250,7 @@ arg uuid | string username UUID or username of user
### Example
-__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
### Request
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/user-management/messagee-example.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/user-management/messagee-example.txt b/content/docs/_sources/user-management/messagee-example.txt
index 29a61e7..e3f3a02 100644
--- a/content/docs/_sources/user-management/messagee-example.txt
+++ b/content/docs/_sources/user-management/messagee-example.txt
@@ -8,7 +8,7 @@ There are three client versions of Messagee:
* [An Android client version](https://github.com/apigee/usergrid-sample-android-messagee)
* [An HTML5 client](https://github.com/apigee/usergrid-sample-html5-messagee)
-The sections below describe how to create a new app, enter some test users, and run the app. You also learn how to use the Usergrid admin portal, a user interface that streamlines data and application management in the Usergrid system. The portal is also a reference application that shows how to incorporate Usergrid APIs with JavaScript. For a more detailed discussion of the portal's functionality, see Admin portal.
+The sections below describe how to create a new app, enter some test users, and run the app. You also learn how to use the Usergrid admin portal, a user interface that streamlines data and application management in the Usergrid system. The portal is also a reference application that shows how to incorporate Usergrid APIs with JavaScript.
## Creating a user account in Usergrid
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_sources/user-management/working-user-data.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/user-management/working-user-data.txt b/content/docs/_sources/user-management/working-user-data.txt
index a7603fd..5e2b63d 100644
--- a/content/docs/_sources/user-management/working-user-data.txt
+++ b/content/docs/_sources/user-management/working-user-data.txt
@@ -1,7 +1,7 @@
# Working with User Data
You can store and manage user data as User entities. With user data in your application, you can add support for a wide variety of features common to mobile apps. For example, you can:
-* Control access to data by defining permission rules. (See Security & token authentication for more.)
+* Control access to data by defining permission rules. (See [Security & token authentication](../security-and-auth/app-security.html) for more.)
* Present content specific to each user, such as their list of favorites.
* Support social features, such as letting users "follow" one another, for example.
@@ -9,7 +9,7 @@ In mobile applications, data about users is typically added by users themselves
## Creating users
-A user entity represents an application user. Using API Services you can create, retrieve, update, delete, and query user entities. See User entity properties for a list of the system-defined properties for user entities. In addition, you can create user properties specific to your application.
+A user entity represents an application user. Using API Services you can create, retrieve, update, delete, and query user entities. See [User entity properties](../rest-endpoints/api-doc.html#user) for a list of the system-defined properties for user entities. In addition, you can create user properties specific to your application.
### Request Syntax
@@ -38,13 +38,13 @@ The username is mandatory and must be unique. Here's an example:
"password" : "test1234"
}
-Although the password parameter is not mandatory, if you don't specify it, the user will not be able to log in using username and password credentials. If a password is not specified for the user, and you're an Admin, you can set a password for the user (see Setting a password).
+Although the password parameter is not mandatory, if you don't specify it, the user will not be able to log in using username and password credentials. If a password is not specified for the user, and you're an Admin, you can set a password for the user (see [Changing a User Password](#changing-a-user-password)).
__ Note__: The username can contain any combination of characters, including those that represent letters, numbers, and symbols.
### Example
-__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
### Request
@@ -96,7 +96,7 @@ __Note__: Although not shown in the API examples below, you need to provide a va
You can retrieve data about users through cURL or one of the SDKs. Each provides a way to filter the list of users by data associated with the user, such as username or UUID, or other properties in the user entity.
-See User entity properties for a list of the system-defined properties for user entities. In addition, you can create user properties specific to your application.
+See [User entity properties](../rest-endpoints/api-doc.html#user) for a list of the system-defined properties for user entities. In addition, you can create user properties specific to your application.
### Request Syntax
@@ -116,7 +116,7 @@ uuid | org_id Organization UUID or organization name
uuid | app_id Application UUID or application name
user identifier User UUID, username, or email address.
-The alias ``/users/me`` can be used in place of the current user’s uuid, username, or email address. Note: The ``/users/me`` endpoint is accessible only if you provide an access token with the request (see Authenticating users and application clients). If you make an anonymous ("guest") call, the system will not be able to determine which user to return as /users/me.
+The alias ``/users/me`` can be used in place of the current user’s uuid, username, or email address. Note: The ``/users/me`` endpoint is accessible only if you provide an access token with the request (see [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html)). If you make an anonymous ("guest") call, the system will not be able to determine which user to return as ``/users/me``.
__Note__: The username can contain any combination of characters, including those that represent letters, numbers, and symbols.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/_static/css/theme.css
----------------------------------------------------------------------
diff --git a/content/docs/_static/css/theme.css b/content/docs/_static/css/theme.css
index 870e633..b0b1c33 100644
--- a/content/docs/_static/css/theme.css
+++ b/content/docs/_static/css/theme.css
@@ -5314,19 +5314,27 @@ span[id*='MathJax-Span'] {
/*# sourceMappingURL=theme.css.map */
-/* Usergrid specific */
+/* Start - Usergrid Additions */
-.usergrid-table {
+.usergrid-table, docutils {
border: 1px solid grey;
margin-bottom: 2em;
}
+.usergrid-30 {
+ width:30%;
+}
+
.usergrid-table tr td {
padding: 0.5em;
border: 1px solid grey;
font-size: 80%;
}
+.usergrid-table th, .docutils th {
+ background-color: #e5ebeb;
+}
+
.caption-text {
font-size:140%;
}
@@ -5356,159 +5364,21 @@ h2.usergrid-DELETE-heading {
margin-bottom: 2em;
}
-/* css from petstore example */
-
-body {
- font-family: Trebuchet MS, sans-serif;
+div.wy-menu-vertical li {
font-size: 15px;
- color: #444;
- margin-right: 24px;
+ margin-bottom: 0.0em;
+ margin-left: 1.5em;
}
-h1 {
- font-size: 25px;
-}
-h2 {
- font-size: 20px;
-}
-h3 {
+ul.simple li, ol.simple li {
font-size: 16px;
- font-weight: bold;
-}
-hr {
- height: 1px;
- border: 0;
- color: #ddd;
- background-color: #ddd;
- display: none;
-}
-
-.app-desc {
- clear: both;
- margin-left: 20px;
-}
-.param-name {
- width: 100%;
-}
-.license-info {
- margin-left: 20px;
-}
-
-.license-url {
- margin-left: 20px;
-}
-
-.model {
- margin: 0 0 0px 20px;
-}
-
-.method {
- margin-left: 20px;
-}
-
-.method-notes {
- margin: 10px 0 20px 0;
- font-size: 90%;
- color: #555;
-}
-
-pre {
- padding: 10px;
- margin-bottom: 2px;
-}
-
-pre.get {
- background-color: #0f6ab4;
-}
-
-pre.post {
- background-color: #10a54a;
-}
-
-pre.put {
- background-color: #c5862b;
-}
-
-pre.delete {
- background-color: #a41e22;
-}
-
-.huge {
- color: #fff;
-}
-
-pre.example {
- background-color: #f3f3f3;
- padding: 10px;
- border: 1px solid #ddd;
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
}
-code {
- white-space: pre;
+h1 p {
+ font-size:150%;
}
-.nickname {
- font-weight: bold;
-}
-
-.method-path {
- font-size: 1.5em;
- background-color: #0f6ab4;
-}
-
-.parameter {
- width: 500px;
-}
-
-.param {
- width: 500px;
- padding: 10px 0 0 20px;
- font-weight: bold;
-}
-
-.param-desc {
- width: 700px;
- padding: 0 0 0 20px;
- color: #777;
-}
-
-.param-type {
- font-style: italic;
-}
-
-.field-label {
- padding: 0;
- margin: 0;
- clear: both;
-}
-
-.field-items {
- padding: 0 0 15px 0;
- margin-bottom: 15px;
-}
-
-.return-type {
- clear: both;
- padding-bottom: 10px;
-}
-
-.param-header {
- font-weight: bold;
-}
-
-.method-tags {
- text-align: right;
-}
-
-.method-tag {
- background: none repeat scroll 0% 0% #24A600;
- border-radius: 3px;
- padding: 2px 10px;
- margin: 2px;
- color: #FFF;
- display: inline-block;
- text-decoration: none;
-}
-
-
+/* End - Usergrid Additions */
[12/36] usergrid git commit: Update generated website content.
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/security-and-auth/app-security.html
----------------------------------------------------------------------
diff --git a/content/docs/security-and-auth/app-security.html b/content/docs/security-and-auth/app-security.html
index 247cf84..31bfc45 100644
--- a/content/docs/security-and-auth/app-security.html
+++ b/content/docs/security-and-auth/app-security.html
@@ -32,7 +32,7 @@
<link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
<link rel="next" title="Using permissions" href="using-permissions.html"/>
- <link rel="prev" title="Disconnecting entities" href="../entity-connections/disconnecting-entities.html"/>
+ <link rel="prev" title="Troubleshooting" href="../push-notifications/troubleshooting.html"/>
<script src="../_static/js/modernizr.min.js"></script>
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul class="current">
<li class="toctree-l1 current"><a class="current reference internal" href="">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -141,9 +155,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -158,11 +172,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -259,7 +275,7 @@ is protected from malicious attacks. For more information, see
<a href="using-permissions.html" class="btn btn-neutral float-right" title="Using permissions" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
- <a href="../entity-connections/disconnecting-entities.html" class="btn btn-neutral" title="Disconnecting entities" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+ <a href="../push-notifications/troubleshooting.html" class="btn btn-neutral" title="Troubleshooting" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
</div>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/security-and-auth/authenticating-api-requests.html
----------------------------------------------------------------------
diff --git a/content/docs/security-and-auth/authenticating-api-requests.html b/content/docs/security-and-auth/authenticating-api-requests.html
index e5afa55..a5e8cab 100644
--- a/content/docs/security-and-auth/authenticating-api-requests.html
+++ b/content/docs/security-and-auth/authenticating-api-requests.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul class="current">
<li class="toctree-l1"><a class="reference internal" href="app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -145,9 +159,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -162,11 +176,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -232,7 +248,8 @@ access.</p>
API, and how to manage access tokens, including revoking and changing
token time to live.</p>
<p>For information on generating access tokens/authenticating users and
-clients, see Authenticating users and application clients.</p>
+clients, see <a class="reference external" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users and application
+clients</a>.</p>
<div class="section" id="authenticating-with-access-tokens">
<h2>Authenticating with access tokens<a class="headerlink" href="#authenticating-with-access-tokens" title="Permalink to this headline">¶</a></h2>
<p>When you obtain an access token, you must provide it with every
@@ -258,7 +275,7 @@ token is the sandbox application. The Guest role has been given full
permissions (/** for GET, POST, PUT, and DELETE) for this application.
This eliminates the need for a token when making application level calls
to the sandbox app. For further information on specifying permissions,
-see Managing access by defining permission rules.</p>
+see <a class="reference external" href="security-and-auth/using-permissions.html">Using Permissions</a>.</p>
</p></div></div>
<div class="section" id="authenticating-with-client-id-and-client-secret">
<h2>Authenticating with client ID and client secret<a class="headerlink" href="#authenticating-with-client-id-and-client-secret" title="Permalink to this headline">¶</a></h2>
@@ -275,9 +292,10 @@ Started’ section of the admin portal.</p>
Warning: For server-side use only You should never authenticate this<p>way from a client-side app such as a mobile app. A hacker could analyze
your app and extract the credentials for malicious use even if those
-credentials are compiled and in binary format. See Security best
-practices for additional considerations in keeping access to your app
-and its data secure.</p>
+credentials are compiled and in binary format. See <a class="reference external" href="../security-and-auth/securing-your-app.html">Security Best
+Practices</a> for
+additional considerations in keeping access to your app and its data
+secure.</p>
</p></div><p>This can be a convenient way to authenticate API requests, since there
is no need to generate and manage an access token, but please note that
you should be very cautious when implementing this type of
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/security-and-auth/authenticating-users-and-application-clients.html
----------------------------------------------------------------------
diff --git a/content/docs/security-and-auth/authenticating-users-and-application-clients.html b/content/docs/security-and-auth/authenticating-users-and-application-clients.html
index 7e1348f..001b5a6 100644
--- a/content/docs/security-and-auth/authenticating-users-and-application-clients.html
+++ b/content/docs/security-and-auth/authenticating-users-and-application-clients.html
@@ -32,7 +32,7 @@
<link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
<link rel="next" title="Authentication levels" href="user-authentication-types.html"/>
- <link rel="prev" title="Using permissions" href="using-permissions.html"/>
+ <link rel="prev" title="Using roles" href="using-roles.html"/>
<script src="../_static/js/modernizr.min.js"></script>
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul class="current">
<li class="toctree-l1"><a class="reference internal" href="app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="using-roles.html">Using roles</a></li>
<li class="toctree-l1 current"><a class="current reference internal" href="">Authenticating users & app clients</a><ul>
<li class="toctree-l2"><a class="reference internal" href="#authentication-levels">Authentication levels</a></li>
<li class="toctree-l2"><a class="reference internal" href="#application-user-authentication-user-login">Application user authentication (user login)</a><ul>
@@ -171,9 +185,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -188,11 +202,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -338,9 +354,10 @@ Credentials’.</p>
Warning: You should never authenticate this way from a client-side app<p>such as a mobile app. A hacker could analyze your app and extract the
credentials for malicious use even if those credentials are compiled and
-in binary format. See “safe mobile access” in <a class="reference external" href="authenticating-api-requests.html">Authenticating API
-requests</a> for additional
-considerations in keeping access to your app and its data secure.</p>
+in binary format. See <a class="reference external" href="../security-and-auth/securing-your-app.html">Security Best
+Practices</a> for
+additional considerations in keeping access to your app and its data
+secure.</p>
</p></div><div class="section" id="id1">
<h3>Request syntax<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
<div class="highlight-python"><div class="highlight"><pre>curl -X POST "https://api.usergrid.com/<orgName>/<appName>/token" -d '{"grant_type":"client_credentials", "client_id":<application_clientID>, "client_secret":"<application_client_secret>"}'
@@ -380,8 +397,8 @@ supplies the username and password of an admin user in the request.</p>
Warning: Authenticating as an admin user grants full access to one or<p>more organizations and all of the applications contained in those
organizations. Due to this, be cautious when implementing this type of
authentication in client-side code. Instead, consider implementing admin
-user access in server-side code only. See “safe mobile access” in
-<a class="reference external" href="authenticating-api-requests.html">Authenticating API requests</a> for
+user access in server-side code only. See <a class="reference external" href="../security-and-auth/securing-your-app.html">Security Best
+Practices</a> for
additional considerations in keeping access to your app and its data
secure.</p>
</p></div><div class="section" id="id4">
@@ -425,9 +442,10 @@ Administration’ page of the API Services admin console under
Warning: You should never authenticate this way from a client-side app<p>such as a mobile app. A hacker could analyze your app and extract the
credentials for malicious use even if those credentials are compiled and
-in binary format. See “safe mobile access” in [Authenticating API
-requests](authenticating-api-requests.html for additional considerations
-in keeping access to your app and its data secure.</p>
+in binary format. See <a class="reference external" href="../security-and-auth/securing-your-app.html">Security Best
+Practices</a> for
+additional considerations in keeping access to your app and its data
+secure.</p>
</p></div><div class="section" id="id7">
<h3>Request syntax<a class="headerlink" href="#id7" title="Permalink to this headline">¶</a></h3>
<div class="highlight-python"><div class="highlight"><pre>curl -X POST "https://api.usergrid.com/management/token" -d '{"grant_type":"client_credentials", "client_id":<org_clientID>, "client_secret":<org_client_secret>}'
@@ -467,7 +485,7 @@ requests to the organization:</p>
<a href="user-authentication-types.html" class="btn btn-neutral float-right" title="Authentication levels" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
- <a href="using-permissions.html" class="btn btn-neutral" title="Using permissions" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+ <a href="using-roles.html" class="btn btn-neutral" title="Using roles" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
</div>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/security-and-auth/changing-token-time-live-ttl.html
----------------------------------------------------------------------
diff --git a/content/docs/security-and-auth/changing-token-time-live-ttl.html b/content/docs/security-and-auth/changing-token-time-live-ttl.html
index bacf227..4014080 100644
--- a/content/docs/security-and-auth/changing-token-time-live-ttl.html
+++ b/content/docs/security-and-auth/changing-token-time-live-ttl.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul class="current">
<li class="toctree-l1"><a class="reference internal" href="app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1 current"><a class="current reference internal" href="">Changing token expiration (time-to-live)</a><ul>
@@ -151,9 +165,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -168,11 +182,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/security-and-auth/facebook-sign.html
----------------------------------------------------------------------
diff --git a/content/docs/security-and-auth/facebook-sign.html b/content/docs/security-and-auth/facebook-sign.html
index 69ca5a2..859478f 100644
--- a/content/docs/security-and-auth/facebook-sign.html
+++ b/content/docs/security-and-auth/facebook-sign.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul class="current">
<li class="toctree-l1"><a class="reference internal" href="app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -150,9 +164,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -167,11 +181,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -267,7 +283,7 @@ JavaScript, iOS, and Android.</p>
<p>In brief, here are the steps for JavaScript. You can see these steps
implemented in the Facebook login example packaged with the JavaScript
SDK for Usergrid (which you can download in ZIP format or tar.gz
-format). The Facebook login example is in the /examples/facebook
+format). The Facebook login example is in the <code class="docutils literal"><span class="pre">/examples/facebook</span></code>
directory of the extracted download. The code example snippets shown
below are taken from the Facebook login example.</p>
<div class="section" id="step-1-create-a-facebook-app">
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/security-and-auth/revoking-tokens-logout.html
----------------------------------------------------------------------
diff --git a/content/docs/security-and-auth/revoking-tokens-logout.html b/content/docs/security-and-auth/revoking-tokens-logout.html
index f9b899a..a0b3148 100644
--- a/content/docs/security-and-auth/revoking-tokens-logout.html
+++ b/content/docs/security-and-auth/revoking-tokens-logout.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul class="current">
<li class="toctree-l1"><a class="reference internal" href="app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -149,9 +163,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -166,11 +180,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/security-and-auth/securing-your-app.html
----------------------------------------------------------------------
diff --git a/content/docs/security-and-auth/securing-your-app.html b/content/docs/security-and-auth/securing-your-app.html
index f0638cf..d26d968 100644
--- a/content/docs/security-and-auth/securing-your-app.html
+++ b/content/docs/security-and-auth/securing-your-app.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul class="current">
<li class="toctree-l1"><a class="reference internal" href="app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -149,9 +163,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -166,11 +180,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/security-and-auth/user-authentication-types.html
----------------------------------------------------------------------
diff --git a/content/docs/security-and-auth/user-authentication-types.html b/content/docs/security-and-auth/user-authentication-types.html
index 7e8f76d..094f6b7 100644
--- a/content/docs/security-and-auth/user-authentication-types.html
+++ b/content/docs/security-and-auth/user-authentication-types.html
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,10 +114,23 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul class="current">
<li class="toctree-l1"><a class="reference internal" href="app-security.html">Security & token authentication</a></li>
<li class="toctree-l1"><a class="reference internal" href="using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1 current"><a class="current reference internal" href="">Authentication levels</a><ul>
<li class="toctree-l2"><a class="reference internal" href="#configuring-authentication-levels">Configuring authentication levels</a></li>
@@ -146,9 +160,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -163,11 +177,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -238,8 +254,11 @@ this can be done both programmatically and in the admin portal. The
application, organization and admin clients cannot be configured, and
can only be accessed programmatically via the API.</p>
<p>For more about creating and managing roles and permissions for
-application users, see Managing access by defining permission rules. For
-a look at how security features fit together, see App Security Overview.</p>
+application users, see <a class="reference external" href="security-and-auth/using-permissions.html">Using
+Permissions</a> and <a class="reference external" href="security-and-auth/using-roles.html">Using
+Roles</a>. For a look at how
+security features fit together, see <a class="reference external" href="../security-and-auth/app-security.html">App Security
+Overview</a>.</p>
</div>
<div class="section" id="user-authentication-level">
<h2>User authentication level<a class="headerlink" href="#user-authentication-level" title="Permalink to this headline">¶</a></h2>
@@ -257,9 +276,9 @@ a look at how security features fit together, see App Security Overview.</p>
login for your app. The application user level allows access to your
Usergrid application as governed by the permission rules you create and
associated with users and user groups. For more on setting permissions
-see Managing access by defining permission rules. Each Application User
-is represented by a User entity in your Usergrid application. For more
-about the User entity, see User.</p>
+see <a class="reference external" href="security-and-auth/using-permissions.html">Using Permissions</a>.
+Each Application User is represented by a User entity in your Usergrid
+application. For more about the User entity, see User.</p>
</td>
</tr>
</table></div>
@@ -274,9 +293,11 @@ way from a client-side app, such as a mobile app. A hacker could analyze
your app and extract the credentials for malicious use even if those
credentials are compiled and in binary format. Even when authenticating
with username and password, be cautious when using these authentication
-levels since they grant broad access to your Usergrid account. See “safe
-mobile access” in Authenticating API requests for additional
-considerations in keeping access to your app and its data secure.</p>
+levels since they grant broad access to your Usergrid account. See
+<a class="reference external" href="../security-and-auth/securing-your-app.html">Security Best
+Practices</a> for
+additional considerations in keeping access to your app and its data
+secure.</p>
</p></div>
<table class="usergrid-table">
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73186077/content/docs/security-and-auth/using-permissions.html
----------------------------------------------------------------------
diff --git a/content/docs/security-and-auth/using-permissions.html b/content/docs/security-and-auth/using-permissions.html
index 9151f01..746ee1f 100644
--- a/content/docs/security-and-auth/using-permissions.html
+++ b/content/docs/security-and-auth/using-permissions.html
@@ -31,7 +31,7 @@
<link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
- <link rel="next" title="Authenticating users & app clients" href="authenticating-users-and-application-clients.html"/>
+ <link rel="next" title="Using roles" href="using-roles.html"/>
<link rel="prev" title="Security & token authentication" href="app-security.html"/>
@@ -82,14 +82,15 @@
<p class="caption"><span class="caption-text">Introduction</span></p>
<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/overview.html">Documentation Overview</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
</ul>
<p class="caption"><span class="caption-text">Getting Started</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
</ul>
@@ -113,6 +114,18 @@
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
</ul>
+<p class="caption"><span class="caption-text">Push Notifications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/overview.html">Push notifications overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/adding-push-support.html">Adding push notifications support</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/getting-started.html">Getting started with push notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/tutorial.html">Tutorial: Push notifications sample app</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/registering.html">Registering with a notification service</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-notifiers.html">Creating notifiers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/managing-users-and-devices.html">Managing users and devices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/creating-and-managing-notifications.html">Creating and managing notifications</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../push-notifications/troubleshooting.html">Troubleshooting</a></li>
+</ul>
<p class="caption"><span class="caption-text">Security & Authentication</span></p>
<ul class="current">
<li class="toctree-l1"><a class="reference internal" href="app-security.html">Security & token authentication</a></li>
@@ -133,6 +146,7 @@
</li>
</ul>
</li>
+<li class="toctree-l1"><a class="reference internal" href="using-roles.html">Using roles</a></li>
<li class="toctree-l1"><a class="reference internal" href="authenticating-users-and-application-clients.html">Authenticating users & app clients</a></li>
<li class="toctree-l1"><a class="reference internal" href="user-authentication-types.html">Authentication levels</a></li>
<li class="toctree-l1"><a class="reference internal" href="changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
@@ -157,9 +171,9 @@
</ul>
<p class="caption"><span class="caption-text">Assets & Files</span></p>
<ul>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../assets-and-files/folders.html">Folders</a></li>
</ul>
<p class="caption"><span class="caption-text">Counters & Events</span></p>
<ul>
@@ -174,11 +188,13 @@
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization & application management</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/admin-user.html">Admin user</a></li>
</ul>
<p class="caption"><span class="caption-text">API Reference</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#sub-types">Sub-Types</a></li>
</ul>
<p class="caption"><span class="caption-text">Client SDKs</span></p>
<ul>
@@ -305,7 +321,7 @@ assigning the permission only to that user entity.</p>
Assigning permissions to roles can be particularly useful, as it allows
you to create sets of permissions that represent complex access
definitions, which can then be assigned to user and group entities. For
-more on roles, see Using roles.</p>
+more on roles, see <a class="reference external" href="security-and-auth/using-roles.html">Using Roles</a>.</p>
<div class="section" id="request-syntax">
<h3>Request syntax<a class="headerlink" href="#request-syntax" title="Permalink to this headline">¶</a></h3>
<div class="highlight-python"><div class="highlight"><pre>curl -X POST https://api.usergrid.com/<org>/<app>/<collection>/<entity>/permissions -d '{"permission":<permissions>}'
@@ -314,8 +330,8 @@ more on roles, see Using roles.</p>
<p>Parameters</p>
<table border="1" class="docutils">
<colgroup>
-<col width="11%" />
-<col width="89%" />
+<col width="9%" />
+<col width="91%" />
</colgroup>
<thead valign="bottom">
<tr class="row-odd"><th class="head">Parameter</th>
@@ -336,7 +352,7 @@ more on roles, see Using roles.</p>
<td>The UUID of the entity to assign the permissions to. For users, username and for groups, name are also accepted.</td>
</tr>
<tr class="row-even"><td>permissions</td>
-<td>The permissions to assign to the entity. See Permissions syntax for format.</td>
+<td>The permissions to assign to the entity. See <a class="reference external" href="security-and-auth/using-permissions.html#permissions-syntax">Permissions syntax</a> for format.</td>
</tr>
</tbody>
</table>
@@ -446,7 +462,7 @@ the response:</p>
<div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
- <a href="authenticating-users-and-application-clients.html" class="btn btn-neutral float-right" title="Authenticating users & app clients" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+ <a href="using-roles.html" class="btn btn-neutral float-right" title="Using roles" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
<a href="app-security.html" class="btn btn-neutral" title="Security & token authentication" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>