You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/08/25 16:05:20 UTC
[01/26] usergrid git commit: Fix logic issue when recaptcha is
disabled
Repository: usergrid
Updated Branches:
refs/heads/asf-site 2cf496632 -> 2bb0a3c80
refs/heads/master ae6d8112f -> 2bb0a3c80
refs/heads/two-dot-o-dev 72016ea89 -> 106d8fa84
Fix logic issue when recaptcha is disabled
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/322886b4
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/322886b4
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/322886b4
Branch: refs/heads/asf-site
Commit: 322886b4d87ad34c849ba76e04ddf14fb996e310
Parents: 49ae4ac
Author: ryan bridges <rb...@apigee.com>
Authored: Tue Jun 2 14:38:36 2015 -0400
Committer: ryan bridges <rb...@apigee.com>
Committed: Tue Jun 2 14:38:36 2015 -0400
----------------------------------------------------------------------
.../rest/applications/users/UsersResource.java | 45 +++++++--------
.../rest/management/users/UsersResource.java | 61 ++++++++------------
2 files changed, 43 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/322886b4/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java
index 1a1b576..044f54e 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java
@@ -85,7 +85,7 @@ public class UsersResource extends ServiceResource {
logger.info( "ServiceResource.addIdParameter" );
- UUID itemId = UUID.fromString( entityId.getPath() );
+ UUID itemId = UUID.fromString(entityId.getPath());
addParameter( getServiceParameters(), itemId );
@@ -116,12 +116,12 @@ public class UsersResource extends ServiceResource {
addParameter( getServiceParameters(), itemName.getPath() );
- addMatrixParams( getServiceParameters(), ui, itemName );
+ addMatrixParams(getServiceParameters(), ui, itemName);
Identifier id = Identifier.from( itemName.getPath() );
if ( id == null ) {
throw new IllegalArgumentException( "Not a valid user identifier: " + itemName.getPath() );
}
- return getSubResource( UserResource.class ).init( id );
+ return getSubResource( UserResource.class ).init(id);
}
@@ -129,7 +129,7 @@ public class UsersResource extends ServiceResource {
@Path("resetpw")
@Produces(MediaType.TEXT_HTML)
public Viewable showPasswordResetForm( @Context UriInfo ui ) {
- return handleViewable( "resetpw_email_form", this );
+ return handleViewable("resetpw_email_form", this);
}
@@ -142,32 +142,28 @@ public class UsersResource extends ServiceResource {
@FormParam("recaptcha_response_field") String uresponse ) {
try {
- ReCaptchaImpl reCaptcha = new ReCaptchaImpl();
- reCaptcha.setPrivateKey( properties.getRecaptchaPrivate() );
+ if ( isBlank(email) ) {
+ errorMsg = "No email provided, try again...";
+ throw new Exception("No email provided");
+ }else if (useReCaptcha()){
+ ReCaptchaImpl reCaptcha = new ReCaptchaImpl();
+ reCaptcha.setPrivateKey( properties.getRecaptchaPrivate() );
- ReCaptchaResponse reCaptchaResponse =
+ ReCaptchaResponse reCaptchaResponse =
reCaptcha.checkAnswer( httpServletRequest.getRemoteAddr(), challenge, uresponse );
- if ( isBlank( email ) ) {
- errorMsg = "No email provided, try again...";
- return handleViewable( "resetpw_email_form", this );
- }
-
- if ( !useReCaptcha() || reCaptchaResponse.isValid() ) {
- user = management.getAppUserByIdentifier( getApplicationId(), Identifier.fromEmail( email ) );
- if ( user != null ) {
- management.startAppUserPasswordResetFlow( getApplicationId(), user );
- return handleViewable( "resetpw_email_success", this );
- }
- else {
- errorMsg = "We don't recognize that email, try again...";
- return handleViewable( "resetpw_email_form", this );
+ if(!reCaptchaResponse.isValid()){
+ errorMsg = "Incorrect Captcha, try again...";
+ throw new Exception("Incorrect Captcha");
}
}
- else {
- errorMsg = "Incorrect Captcha, try again...";
- return handleViewable( "resetpw_email_form", this );
+ user = management.getAppUserByIdentifier(getApplicationId(), Identifier.fromEmail(email));
+ if (user == null) {
+ errorMsg = "We don't recognize that email, try again...";
+ throw new Exception("Unrecognized email address");
}
+ management.startAppUserPasswordResetFlow( getApplicationId(), user );
+ return handleViewable("resetpw_email_success", this);
}
catch ( RedirectionException e ) {
throw e;
@@ -177,7 +173,6 @@ public class UsersResource extends ServiceResource {
}
}
-
public String getErrorMsg() {
return errorMsg;
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/322886b4/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
index d907632..ffa4bf1 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
@@ -80,7 +80,7 @@ public class UsersResource extends AbstractContextResource {
@Path(RootResource.USER_ID_PATH)
public UserResource getUserById( @Context UriInfo ui, @PathParam( "userId" ) String userIdStr ) throws Exception {
- return getUserResource(management.getAdminUserByUuid( UUID.fromString( userIdStr ) ), "user id", userIdStr);
+ return getUserResource(management.getAdminUserByUuid(UUID.fromString(userIdStr)), "user id", userIdStr);
}
@@ -103,7 +103,7 @@ public class UsersResource extends AbstractContextResource {
if (user == null) {
throw new ManagementException("Could not find organization for " + type + " : " + value);
}
- return getSubResource(UserResource.class).init( user );
+ return getSubResource(UserResource.class).init(user);
}
@@ -176,60 +176,45 @@ public class UsersResource extends AbstractContextResource {
@POST
- @Path( "resetpw" )
- @Consumes( "application/x-www-form-urlencoded" )
- @Produces( MediaType.TEXT_HTML )
- public Viewable handlePasswordResetForm( @Context UriInfo ui, @FormParam( "email" ) String email,
- @FormParam( "recaptcha_challenge_field" ) String challenge,
- @FormParam( "recaptcha_response_field" ) String uresponse ) {
+ @Path("resetpw")
+ @Consumes("application/x-www-form-urlencoded")
+ @Produces(MediaType.TEXT_HTML)
+ public Viewable handlePasswordResetForm( @Context UriInfo ui, @FormParam("email") String email,
+ @FormParam("recaptcha_challenge_field") String challenge,
+ @FormParam("recaptcha_response_field") String uresponse ) {
try {
- if ( isBlank( email ) ) {
+ if ( isBlank(email) ) {
errorMsg = "No email provided, try again...";
- return handleViewable( "resetpw_email_form", this );
- }
-
- //we don't require recaptcha - only use it if it is present in the props file
- boolean reCaptchaPassed = false;
- if ( useReCaptcha() ) {
-
+ throw new Exception("No email provided");
+ }else if (useReCaptcha()){
ReCaptchaImpl reCaptcha = new ReCaptchaImpl();
- reCaptcha.setPrivateKey(properties.getRecaptchaPrivate());
+ reCaptcha.setPrivateKey( properties.getRecaptchaPrivate() );
ReCaptchaResponse reCaptchaResponse =
- reCaptcha.checkAnswer(httpServletRequest.getRemoteAddr(), challenge, uresponse);
+ reCaptcha.checkAnswer( httpServletRequest.getRemoteAddr(), challenge, uresponse );
- if (reCaptchaResponse.isValid()) {
- reCaptchaPassed = true;
+ if(!reCaptchaResponse.isValid()){
+ errorMsg = "Incorrect Captcha, try again...";
+ throw new Exception("Incorrect Captcha");
}
- } else {
- reCaptchaPassed = true;
}
-
- if (reCaptchaPassed) {
- user = management.findAdminUser(email);
- if (user != null) {
- management.startAdminUserPasswordResetFlow(user);
- return handleViewable("resetpw_email_success", this);
- } else {
- errorMsg = "We don't recognize that email, try again...";
- return handleViewable("resetpw_email_form", this);
- }
- } else {
- errorMsg = "Incorrect Captcha, try again...";
- return handleViewable("resetpw_email_form", this);
+ user = management.findAdminUser(email);
+ if (user == null) {
+ errorMsg = "We don't recognize that email, try again...";
+ throw new Exception("Unrecognized email address");
}
-
+ management.startAdminUserPasswordResetFlow(user);
+ return handleViewable("resetpw_email_success", this);
}
catch ( RedirectionException e ) {
throw e;
}
catch ( Exception e ) {
- return handleViewable( "error", e );
+ return handleViewable( "resetpw_email_form", e );
}
}
-
public String getErrorMsg() {
return errorMsg;
}
[03/26] usergrid git commit: Ensure that case is being preserved when
setting entity properties.
Posted by sn...@apache.org.
Ensure that case is being preserved when setting entity properties.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/10bd0334
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/10bd0334
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/10bd0334
Branch: refs/heads/asf-site
Commit: 10bd033494d0cf8bd5d23db1c25665453980a5a5
Parents: 107a465
Author: Michael Russo <mi...@gmail.com>
Authored: Mon Jun 29 18:14:42 2015 -0700
Committer: Michael Russo <mi...@gmail.com>
Committed: Mon Jun 29 18:14:42 2015 -0700
----------------------------------------------------------------------
.../main/java/org/apache/usergrid/persistence/AbstractEntity.java | 3 ++-
.../src/main/java/org/apache/usergrid/persistence/Schema.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/10bd0334/stack/core/src/main/java/org/apache/usergrid/persistence/AbstractEntity.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/AbstractEntity.java b/stack/core/src/main/java/org/apache/usergrid/persistence/AbstractEntity.java
index 5cfe102..6e4061e 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/AbstractEntity.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/AbstractEntity.java
@@ -150,7 +150,8 @@ public abstract class AbstractEntity implements Entity {
@Override
public void setProperties( Map<String, Object> properties ) {
- dynamic_properties = new TreeMap<String, Object>( String.CASE_INSENSITIVE_ORDER );
+ //dynamic_properties = new TreeMap<String, Object>( String.CASE_INSENSITIVE_ORDER );
+ dynamic_properties = new TreeMap<String, Object>( );
addProperties( properties );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/10bd0334/stack/core/src/main/java/org/apache/usergrid/persistence/Schema.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/Schema.java b/stack/core/src/main/java/org/apache/usergrid/persistence/Schema.java
index c5eecef..1cda492 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/Schema.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/Schema.java
@@ -1597,7 +1597,8 @@ public class Schema {
}
}
- Map<String, Object> properties_map = new TreeMap<String, Object>( String.CASE_INSENSITIVE_ORDER );
+ //Map<String, Object> properties_map = new TreeMap<String, Object>( String.CASE_INSENSITIVE_ORDER );
+ Map<String, Object> properties_map = new TreeMap<String, Object>( );
for ( Entry<String, ByteBuffer> column : columns.entrySet() ) {
String propertyName = column.getKey();
Object propertyValue = deserializeEntityProperty( entityType, propertyName, column.getValue() );
[13/26] usergrid git commit: Remove references to incubator from docs,
README files and POMs.
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/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
[14/26] usergrid git commit: Remove references to incubator from docs,
README files and POMs.
Posted by sn...@apache.org.
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/03ad8137
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/03ad8137
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/03ad8137
Branch: refs/heads/asf-site
Commit: 03ad8137234f294ca6be75aa70ddf09cc819ecaf
Parents: ae6d811
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 09:58:00 2015 -0400
----------------------------------------------------------------------
DISCLAIMER | 9 -
NOTICE | 2 +-
README.md | 8 +-
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 | 2 +-
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 | 12 +-
website/content/releases/index.html | 2 +-
website/layouts/footer.html | 32 ++-
website/layouts/header.html | 4 +-
website/tmp/checksums | 4 +-
website/tmp/compiled_content | 204 +++++++++----------
36 files changed, 255 insertions(+), 278 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/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/03ad8137/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/03ad8137/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index a35594a..87cef17 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,16 @@
Apache Usergrid
===============
-**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.
@@ -21,5 +21,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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/portal/index-template.html
----------------------------------------------------------------------
diff --git a/portal/index-template.html b/portal/index-template.html
index ca713dc..c9fcea9 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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/sdks/java/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/pom.xml b/sdks/java/pom.xml
index 4265ff8..b1b98e7 100644
--- a/sdks/java/pom.xml
+++ b/sdks/java/pom.xml
@@ -20,7 +20,7 @@
<version>1.0.0</version>
<packaging>jar</packaging>
<description>A 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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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 cee20d5..9ddee73 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
@@ -44,7 +44,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/03ad8137/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/03ad8137/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/03ad8137/website/content/index.html
----------------------------------------------------------------------
diff --git a/website/content/index.html b/website/content/index.html
index cc44555..7dbabff 100644
--- a/website/content/index.html
+++ b/website/content/index.html
@@ -10,12 +10,12 @@ title: the BaaS not made for Hipsters
<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>
@@ -46,7 +46,7 @@ title: the BaaS not made for Hipsters
<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>
@@ -67,7 +67,7 @@ title: the BaaS not made for Hipsters
<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
@@ -78,7 +78,7 @@ title: the BaaS not made for Hipsters
<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>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/website/content/releases/index.html
----------------------------------------------------------------------
diff --git a/website/content/releases/index.html b/website/content/releases/index.html
index d897df9..10e6a2c 100644
--- a/website/content/releases/index.html
+++ b/website/content/releases/index.html
@@ -28,7 +28,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>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/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/03ad8137/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>
[23/26] usergrid git commit: Updating website content.
Posted by sn...@apache.org.
Updating website content.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/2bb0a3c8
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/2bb0a3c8
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/2bb0a3c8
Branch: refs/heads/asf-site
Commit: 2bb0a3c8065af288f3752facfe5854e7293e6225
Parents: 03ad813
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Aug 25 10:04:34 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Aug 25 10:04:34 2015 -0400
----------------------------------------------------------------------
docs/rest-endpoints/api-docs.html | 5273 ++++++++++++++++++++++++++++++++
website/tmp/checksums | 4 +-
2 files changed, 5275 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[17/26] usergrid git commit: Remove references to incubator from docs,
README files and POMs.
Posted by sn...@apache.org.
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/03ad8137
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/03ad8137
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/03ad8137
Branch: refs/heads/master
Commit: 03ad8137234f294ca6be75aa70ddf09cc819ecaf
Parents: ae6d811
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 09:58:00 2015 -0400
----------------------------------------------------------------------
DISCLAIMER | 9 -
NOTICE | 2 +-
README.md | 8 +-
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 | 2 +-
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 | 12 +-
website/content/releases/index.html | 2 +-
website/layouts/footer.html | 32 ++-
website/layouts/header.html | 4 +-
website/tmp/checksums | 4 +-
website/tmp/compiled_content | 204 +++++++++----------
36 files changed, 255 insertions(+), 278 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/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/03ad8137/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/03ad8137/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index a35594a..87cef17 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,16 @@
Apache Usergrid
===============
-**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.
@@ -21,5 +21,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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/portal/index-template.html
----------------------------------------------------------------------
diff --git a/portal/index-template.html b/portal/index-template.html
index ca713dc..c9fcea9 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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/sdks/java/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/pom.xml b/sdks/java/pom.xml
index 4265ff8..b1b98e7 100644
--- a/sdks/java/pom.xml
+++ b/sdks/java/pom.xml
@@ -20,7 +20,7 @@
<version>1.0.0</version>
<packaging>jar</packaging>
<description>A 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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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/03ad8137/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 cee20d5..9ddee73 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
@@ -44,7 +44,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/03ad8137/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/03ad8137/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/03ad8137/website/content/index.html
----------------------------------------------------------------------
diff --git a/website/content/index.html b/website/content/index.html
index cc44555..7dbabff 100644
--- a/website/content/index.html
+++ b/website/content/index.html
@@ -10,12 +10,12 @@ title: the BaaS not made for Hipsters
<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>
@@ -46,7 +46,7 @@ title: the BaaS not made for Hipsters
<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>
@@ -67,7 +67,7 @@ title: the BaaS not made for Hipsters
<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
@@ -78,7 +78,7 @@ title: the BaaS not made for Hipsters
<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>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/website/content/releases/index.html
----------------------------------------------------------------------
diff --git a/website/content/releases/index.html b/website/content/releases/index.html
index d897df9..10e6a2c 100644
--- a/website/content/releases/index.html
+++ b/website/content/releases/index.html
@@ -28,7 +28,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>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/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/03ad8137/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>
[10/26] usergrid git commit: Adding operation and model
cross-references to Markdown representation
Posted by sn...@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>
[02/26] usergrid git commit: Adding additional logging and exception
handling to recaptcha
Posted by sn...@apache.org.
Adding additional logging and exception handling to recaptcha
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/2b336ef1
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/2b336ef1
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/2b336ef1
Branch: refs/heads/asf-site
Commit: 2b336ef12600fb9a8f54211cc209a6a13227bc5e
Parents: 322886b
Author: ryan bridges <rb...@apigee.com>
Authored: Wed Jun 3 12:57:43 2015 -0400
Committer: ryan bridges <rb...@apigee.com>
Committed: Wed Jun 3 12:57:43 2015 -0400
----------------------------------------------------------------------
.../usergrid/rest/applications/users/UsersResource.java | 9 ++++++---
.../usergrid/rest/management/users/UsersResource.java | 8 ++++++--
2 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/2b336ef1/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java
index 044f54e..6325d5a 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java
@@ -36,6 +36,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.PathSegment;
import javax.ws.rs.core.UriInfo;
+import net.tanesha.recaptcha.ReCaptchaException;
import org.apache.usergrid.rest.RootResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -154,14 +155,15 @@ public class UsersResource extends ServiceResource {
if(!reCaptchaResponse.isValid()){
errorMsg = "Incorrect Captcha, try again...";
- throw new Exception("Incorrect Captcha");
+ throw new Exception("reCAPTCHA error message: "+reCaptchaResponse.getErrorMessage());
}
}
user = management.getAppUserByIdentifier(getApplicationId(), Identifier.fromEmail(email));
if (user == null) {
errorMsg = "We don't recognize that email, try again...";
- throw new Exception("Unrecognized email address");
+ throw new Exception("Unrecognized email address "+email);
}
+ logger.info(String.format("Starting AppUser Password Reset Flow for %s on %s", user.getUuid(), getApplicationId()));
management.startAppUserPasswordResetFlow( getApplicationId(), user );
return handleViewable("resetpw_email_success", this);
}
@@ -169,7 +171,8 @@ public class UsersResource extends ServiceResource {
throw e;
}
catch ( Exception e ) {
- return handleViewable( "resetpw_email_form", e );
+ logger.error(String.format("Exception in password reset form. (%s) %s ", e.getClass().getCanonicalName(), e.getMessage()));
+ return handleViewable( "resetpw_email_form", this );
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/2b336ef1/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
index ffa4bf1..816905c 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
@@ -34,6 +34,7 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.UriInfo;
+import net.tanesha.recaptcha.ReCaptchaException;
import org.apache.commons.lang.StringUtils;
import org.apache.usergrid.management.exceptions.ManagementException;
import org.apache.usergrid.rest.RootResource;
@@ -196,14 +197,16 @@ public class UsersResource extends AbstractContextResource {
if(!reCaptchaResponse.isValid()){
errorMsg = "Incorrect Captcha, try again...";
- throw new Exception("Incorrect Captcha");
+ throw new Exception("reCAPTCHA error message: "+reCaptchaResponse.getErrorMessage());
}
}
user = management.findAdminUser(email);
+
if (user == null) {
errorMsg = "We don't recognize that email, try again...";
throw new Exception("Unrecognized email address");
}
+ logger.info("Starting Admin User Password Reset Flow for "+user.getUuid());
management.startAdminUserPasswordResetFlow(user);
return handleViewable("resetpw_email_success", this);
}
@@ -211,7 +214,8 @@ public class UsersResource extends AbstractContextResource {
throw e;
}
catch ( Exception e ) {
- return handleViewable( "resetpw_email_form", e );
+ logger.error(String.format("Exception in password reset form. (%s) %s ", e.getClass().getCanonicalName(), e.getMessage()));
+ return handleViewable( "resetpw_email_form", this );
}
}
[06/26] usergrid git commit: Merge branch 'recaptcha-fix'
Posted by sn...@apache.org.
Merge branch 'recaptcha-fix'
* recaptcha-fix:
Adding additional logging and exception handling to recaptcha
Fix logic issue when recaptcha is disabled
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/f011b3dd
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/f011b3dd
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/f011b3dd
Branch: refs/heads/asf-site
Commit: f011b3dddf93998a799dfe48e632f0d8856d8792
Parents: 8e32c13 2b336ef
Author: GERey <gr...@apigee.com>
Authored: Wed Aug 12 12:50:26 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Wed Aug 12 12:50:26 2015 -0700
----------------------------------------------------------------------
.../rest/applications/users/UsersResource.java | 50 ++++++++--------
.../rest/management/users/UsersResource.java | 63 ++++++++------------
2 files changed, 50 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
[24/26] usergrid git commit: Updating website content.
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/2bb0a3c8/website/tmp/checksums
----------------------------------------------------------------------
diff --git a/website/tmp/checksums b/website/tmp/checksums
index 3a01b9f..de40507 100644
--- a/website/tmp/checksums
+++ b/website/tmp/checksums
@@ -1,2 +1,2 @@
-{: 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
+{: data{�[: itemI"/bootstrap/bootstrap/:ETI"!P8YZWF2XVhhPXMyktcnXkZtZK20=;F[;I"/community/;TI"!kL2h7aHDWKvIbSFNK3fhdeSGT5Y=;F[;I" /css/bootflat-extensions/;TI"!nJPXvCBwMIP0LbJ5MibmXedwLlM=;F[;I"/css/bootflat-square/;TI"!y9bD5MNcyNuZiFY4l3g/V6ycgn0=;F[;I"/css/bootflat/;TI"!KFSprem0PtNpZPHzOauIyjHPIP4=;F[;I"/css/font-awesome/;TI"!H2Ai5mBUoYWYDVe9RqEEtKRUbHI=;F[;I"/css/usergrid-site/;TI"!EyBOddtBqKnnyW60jH8mpxAMWwU=;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"!tBJfH06ldsif0rJ3hU/lAIoICb4=;F[;I"#/font/fontawesome-webfont-eot/;TI"!HTuCQbdQ2D0jnoaGMaCnJ1fooQ4=;F[;I"#/font/fontawesome-webfont-svg/;TI"
!Gt4+xHYXoOBuQtFWHwTphuBGuAk=;F[;I"#/font/fontawesome-webfont-ttf/;TI"!52gnejpjFMLMVGZclxf4N75RkDE=;F[;I"$/font/fontawesome-webfont-woff/;TI"!sGLWy4QFrLujxeuG6ptEZFpLVgc=;F[;I"/font/FontAwesome/;TI"!ZsCDU4iDNBmt7T/5NZk5O0MkF0A=;F[;I"/img/alberto/;TI"!jQ5ItOSmfhyuqWDRLufXZ2z1w0I=;F[;I"/img/alex/;TI"!Ky1fktYJU7tN0rNteIG35CODv20=;F[;I""/img/apache_usergrid_favicon/;TI"!2KmFDuHtCt6c+j+zKHhDCBsFguU=;F[;I"%/img/apache_usergrid_logo_white/;TI"!g1hxANDPy3UIS8XDhuVtsVSibC4=;F[;I"+/img/apache_usergrid_logo_white_small/;TI"!U7sdZSZXWR4K7wf+wQ2bro94Aj4=;F[;I" /img/check_flat/default/;TI"!HICNYKYzPbZOcDdxZ3wDO6CpUwE=;F[;I"/img/dave/;TI"!JxTZFkpuJELWKae5scqSSTfmjxk=;F[;I"
/img/ed/;TI"!f6EboJEdvKYArTNrYW48qduz3rQ=;F[;I"/img/egg-logo/;TI"!XZy6+LX0BT6YR4Mxdk1xVzkgcvg=;F[;I"/img/grey/;TI"!CGkqOEhPLtb/cODvllgbM62hYW4=;F[;I"/img/nate/;TI"!or/rUtKpnz1qPUoKuXlE6NRiWDk=;F[;I"/img/rod/;TI"!/FtBZ/NuGmakYe5Y+U8q
b3US11g=;F[;I"/img/scott/;TI"!VP48kS5hwGbwt0y7tK1VosAKhrM=;F[;I"/img/strong/;TI"!zoDtlWZq6PdxSiXsSvpLUwZ90q4=;F[;I"/img/sungju/;TI"!jfH8MgWXaTOAbljEVnIyDnVPMmU=;F[;I"/img/tim/;TI"!wGZZtr/2VOkDSpDsOcOT0kPd6q4=;F[;I"/img/todd/;TI"!pis7nHqzzGDBeXQkF+pFveUZAYA=;F[;I"/img/usergrid-logo/;TI"!QF4iA3G39F32hS+a4CKezt3oXfk=;F[;I"/img/usergrid/;TI"!+D5iEapsN6wb2p8OPc3NrpY5l58=;F[;I"/img/usergrid_160/;TI"!wtbKaRLJszP7nYwRHRHLvhM+adg=;F[;I"/img/usergrid_200/;TI"!cHqNb2ZzOqJ3aZ5QwhRjP7guEQk=;F[;I"/img/usergrid_300/;TI"!pKUFpyCqs7AcgvLlfzX0cFyWyo8=;F[;I"#/img/usergrid_300_transparent/;TI"!EM4Zb8imfjYCBWcHeNwLsbfNn7s=;F[;I"/img/usergrid_400/;TI"!9sBbyF8tRrFHxV9sI2+4raohwJQ=;F[;I"/img/usergrid_800/;TI"!XuceYaKWC17Tc6+lV/D7LLmKADc=;F[;I"/img/usergrid_card/;TI"!nLokCQoKqFhMvACA8XVh0KHGYEc=;F[;I"/img/usergrid_logo/;TI"!88BLs5sRaytM879+vIW1E42F79A=;F[;I" /img/usergrid_logo_205_50/;TI"!+GcGg8aO35
5cRXOM5kYo0PrkxSI=;F[;I" /img/usergrid_logo_260_50/;TI"!CJSlnscom104QspyzlNpn+r8pWo=;F[;I" /img/usergrid_logo_720/;TI"!eCvcZaAfHHgFoTMJXIRPhfEgxn4=;F[;I" /img/usergrid_logo_720p/;TI"!2397GU3aqvskG7/pfK8JlQV+E48=;F[;I" /img/usergrid_logo_900_200/;TI"!0Kp4qNegUjegNBCTo4yVylYJ3Kg=;F[;I" /img/usergrid_logo_white/;TI"!f+l9Dey22CI8VyT7uPgZCgP+I+Q=;F[;I" /img/usergrid_profile_128/;TI"!ztCGGOtzEzfahM1O4bH73UXFEaI=;F[;I" /img/usergrid_profile_256/;TI"!Ync5MzjQsR8MvYCdvpP99FwX+x0=;F[;I"%/img/usergrid_profile_256_white/;TI"!iF8bN7XI6lSYgXP+nBaVzHd5aqs=;F[;I"'/img/usergrid_profile_512_margins/;TI"!ZXhrT044A+o8NwFQTpg3HXKsHHM=;F[;I"$/img/usergrid_profile_64_white/;TI"!oMfVf1xTRYujCJhoh6z3WJEkgoA=;F[;I"&/img/usergrid_profile_background/;TI"!a8bupmK715mbpIyry8pQYt0tKSk=;F[;I"!/img/usergrid_screencast_bg/;TI"!8QYUcKGWMca/66M1C0eGQJPbAOc=;F[;I" /img/usergrid_small_100/;TI"!ilqIdvCg8Sw1WJbfHRlm+MSLeTA=;F[;I"/img/usergr
id_wiki/;TI"!dTqhAdJQjYO36EtbUzFN0PvM1Gc=;F[;I"/;TI"!Pj6uQZvk8rEu2rXEXTKIlsnu8Yg=;F[;I"/js/bootstrap/;TI"!0i4nsaovkJU9xl7jgr93tTl1FvM=;F[;I"/js/head/;TI"!cmZC3LtAriA1mYB833XgdJiUMZA=;F[;I"/js/html5shiv/;TI"!hGZoNoHC+UBHty/6Y+bNye6WQFk=;F[;I"/js/jquery-1/;TI"!97ro4Ty0EZEpIRjLqBjDevFuvPA=;F[;I"/js/jquery/;TI"!6DHDZllnsgQRZlGW+5T9MG7gV6w=;F[;I"/js/respond/;TI"!08U4hKAk+BF9OagHLMsKQ2lvHoE=;F[;I"/js/usergrid-site/;TI"!6Df7xGM7WpU+Z8nHYFfZaZkrHTA=;F[;I"/static/github-btn/;TI"!X6F7QEKQDjkP8ixHKDMA6PVRD8U=;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"!KktraYuI4zunn/a3KVpq2duonaU=;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"!vUCUu5eppA3TPtB6pxQSHS1mSfg=;F[;I"/img/stliu/;TI"!lz+OfscZWgvuGpln5p5NVfk7SaY=;F[;I"/releases/;TI"!KWqWzb3keqtDYjoUruMDyL19dtE=;F[;I"/img/intellij/;TI"!nuliBDsLr0pPZb1Ei0Qgiz123sU=;F[;I"/img/structure101/;TI"!8gDjzdyWe0oVtkvh4OpJ0erdSKk=;F[;I"/img/yourkit/;TI"!vxCYnQmkGISxt9FZIVQxJxs4f48=;F[;I"/img/jeff/;TI"!Ft7erel+Uq3X6HCSPOZehLbYm8o=;F: versioni
\ No newline at end of file
[11/26] usergrid git commit: Adding operation and model
cross-references to Markdown representation
Posted by sn...@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/two-dot-o-dev
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(-)
----------------------------------------------------------------------
[20/26] usergrid git commit: Cherry pick: Remove references to
incubator from docs, README files and POMs.
Posted by sn...@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/two-dot-o-dev
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>
[26/26] usergrid git commit: Updating website content.
Posted by sn...@apache.org.
Updating website content.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/2bb0a3c8
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/2bb0a3c8
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/2bb0a3c8
Branch: refs/heads/master
Commit: 2bb0a3c8065af288f3752facfe5854e7293e6225
Parents: 03ad813
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Aug 25 10:04:34 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Aug 25 10:04:34 2015 -0400
----------------------------------------------------------------------
docs/rest-endpoints/api-docs.html | 5273 ++++++++++++++++++++++++++++++++
website/tmp/checksums | 4 +-
2 files changed, 5275 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[15/26] usergrid git commit: Remove references to incubator from docs,
README files and POMs.
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/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>
[07/26] usergrid git commit: Merge branch 'fix-entity-properties' of
https://github.com/michaelarusso/incubator-usergrid
Posted by sn...@apache.org.
Merge branch 'fix-entity-properties' of https://github.com/michaelarusso/incubator-usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/da9e4f63
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/da9e4f63
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/da9e4f63
Branch: refs/heads/asf-site
Commit: da9e4f633045e47fc70b6543b428a78ddf0f0597
Parents: f011b3d 10bd033
Author: GERey <gr...@apigee.com>
Authored: Wed Aug 12 13:59:29 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Wed Aug 12 13:59:29 2015 -0700
----------------------------------------------------------------------
.../main/java/org/apache/usergrid/persistence/AbstractEntity.java | 3 ++-
.../src/main/java/org/apache/usergrid/persistence/Schema.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[16/26] usergrid git commit: Remove references to incubator from docs,
README files and POMs.
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/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
[21/26] usergrid git commit: Updating website content.
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/2bb0a3c8/website/tmp/checksums
----------------------------------------------------------------------
diff --git a/website/tmp/checksums b/website/tmp/checksums
index 3a01b9f..de40507 100644
--- a/website/tmp/checksums
+++ b/website/tmp/checksums
@@ -1,2 +1,2 @@
-{: 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
+{: data{�[: itemI"/bootstrap/bootstrap/:ETI"!P8YZWF2XVhhPXMyktcnXkZtZK20=;F[;I"/community/;TI"!kL2h7aHDWKvIbSFNK3fhdeSGT5Y=;F[;I" /css/bootflat-extensions/;TI"!nJPXvCBwMIP0LbJ5MibmXedwLlM=;F[;I"/css/bootflat-square/;TI"!y9bD5MNcyNuZiFY4l3g/V6ycgn0=;F[;I"/css/bootflat/;TI"!KFSprem0PtNpZPHzOauIyjHPIP4=;F[;I"/css/font-awesome/;TI"!H2Ai5mBUoYWYDVe9RqEEtKRUbHI=;F[;I"/css/usergrid-site/;TI"!EyBOddtBqKnnyW60jH8mpxAMWwU=;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"!tBJfH06ldsif0rJ3hU/lAIoICb4=;F[;I"#/font/fontawesome-webfont-eot/;TI"!HTuCQbdQ2D0jnoaGMaCnJ1fooQ4=;F[;I"#/font/fontawesome-webfont-svg/;TI"
!Gt4+xHYXoOBuQtFWHwTphuBGuAk=;F[;I"#/font/fontawesome-webfont-ttf/;TI"!52gnejpjFMLMVGZclxf4N75RkDE=;F[;I"$/font/fontawesome-webfont-woff/;TI"!sGLWy4QFrLujxeuG6ptEZFpLVgc=;F[;I"/font/FontAwesome/;TI"!ZsCDU4iDNBmt7T/5NZk5O0MkF0A=;F[;I"/img/alberto/;TI"!jQ5ItOSmfhyuqWDRLufXZ2z1w0I=;F[;I"/img/alex/;TI"!Ky1fktYJU7tN0rNteIG35CODv20=;F[;I""/img/apache_usergrid_favicon/;TI"!2KmFDuHtCt6c+j+zKHhDCBsFguU=;F[;I"%/img/apache_usergrid_logo_white/;TI"!g1hxANDPy3UIS8XDhuVtsVSibC4=;F[;I"+/img/apache_usergrid_logo_white_small/;TI"!U7sdZSZXWR4K7wf+wQ2bro94Aj4=;F[;I" /img/check_flat/default/;TI"!HICNYKYzPbZOcDdxZ3wDO6CpUwE=;F[;I"/img/dave/;TI"!JxTZFkpuJELWKae5scqSSTfmjxk=;F[;I"
/img/ed/;TI"!f6EboJEdvKYArTNrYW48qduz3rQ=;F[;I"/img/egg-logo/;TI"!XZy6+LX0BT6YR4Mxdk1xVzkgcvg=;F[;I"/img/grey/;TI"!CGkqOEhPLtb/cODvllgbM62hYW4=;F[;I"/img/nate/;TI"!or/rUtKpnz1qPUoKuXlE6NRiWDk=;F[;I"/img/rod/;TI"!/FtBZ/NuGmakYe5Y+U8q
b3US11g=;F[;I"/img/scott/;TI"!VP48kS5hwGbwt0y7tK1VosAKhrM=;F[;I"/img/strong/;TI"!zoDtlWZq6PdxSiXsSvpLUwZ90q4=;F[;I"/img/sungju/;TI"!jfH8MgWXaTOAbljEVnIyDnVPMmU=;F[;I"/img/tim/;TI"!wGZZtr/2VOkDSpDsOcOT0kPd6q4=;F[;I"/img/todd/;TI"!pis7nHqzzGDBeXQkF+pFveUZAYA=;F[;I"/img/usergrid-logo/;TI"!QF4iA3G39F32hS+a4CKezt3oXfk=;F[;I"/img/usergrid/;TI"!+D5iEapsN6wb2p8OPc3NrpY5l58=;F[;I"/img/usergrid_160/;TI"!wtbKaRLJszP7nYwRHRHLvhM+adg=;F[;I"/img/usergrid_200/;TI"!cHqNb2ZzOqJ3aZ5QwhRjP7guEQk=;F[;I"/img/usergrid_300/;TI"!pKUFpyCqs7AcgvLlfzX0cFyWyo8=;F[;I"#/img/usergrid_300_transparent/;TI"!EM4Zb8imfjYCBWcHeNwLsbfNn7s=;F[;I"/img/usergrid_400/;TI"!9sBbyF8tRrFHxV9sI2+4raohwJQ=;F[;I"/img/usergrid_800/;TI"!XuceYaKWC17Tc6+lV/D7LLmKADc=;F[;I"/img/usergrid_card/;TI"!nLokCQoKqFhMvACA8XVh0KHGYEc=;F[;I"/img/usergrid_logo/;TI"!88BLs5sRaytM879+vIW1E42F79A=;F[;I" /img/usergrid_logo_205_50/;TI"!+GcGg8aO35
5cRXOM5kYo0PrkxSI=;F[;I" /img/usergrid_logo_260_50/;TI"!CJSlnscom104QspyzlNpn+r8pWo=;F[;I" /img/usergrid_logo_720/;TI"!eCvcZaAfHHgFoTMJXIRPhfEgxn4=;F[;I" /img/usergrid_logo_720p/;TI"!2397GU3aqvskG7/pfK8JlQV+E48=;F[;I" /img/usergrid_logo_900_200/;TI"!0Kp4qNegUjegNBCTo4yVylYJ3Kg=;F[;I" /img/usergrid_logo_white/;TI"!f+l9Dey22CI8VyT7uPgZCgP+I+Q=;F[;I" /img/usergrid_profile_128/;TI"!ztCGGOtzEzfahM1O4bH73UXFEaI=;F[;I" /img/usergrid_profile_256/;TI"!Ync5MzjQsR8MvYCdvpP99FwX+x0=;F[;I"%/img/usergrid_profile_256_white/;TI"!iF8bN7XI6lSYgXP+nBaVzHd5aqs=;F[;I"'/img/usergrid_profile_512_margins/;TI"!ZXhrT044A+o8NwFQTpg3HXKsHHM=;F[;I"$/img/usergrid_profile_64_white/;TI"!oMfVf1xTRYujCJhoh6z3WJEkgoA=;F[;I"&/img/usergrid_profile_background/;TI"!a8bupmK715mbpIyry8pQYt0tKSk=;F[;I"!/img/usergrid_screencast_bg/;TI"!8QYUcKGWMca/66M1C0eGQJPbAOc=;F[;I" /img/usergrid_small_100/;TI"!ilqIdvCg8Sw1WJbfHRlm+MSLeTA=;F[;I"/img/usergr
id_wiki/;TI"!dTqhAdJQjYO36EtbUzFN0PvM1Gc=;F[;I"/;TI"!Pj6uQZvk8rEu2rXEXTKIlsnu8Yg=;F[;I"/js/bootstrap/;TI"!0i4nsaovkJU9xl7jgr93tTl1FvM=;F[;I"/js/head/;TI"!cmZC3LtAriA1mYB833XgdJiUMZA=;F[;I"/js/html5shiv/;TI"!hGZoNoHC+UBHty/6Y+bNye6WQFk=;F[;I"/js/jquery-1/;TI"!97ro4Ty0EZEpIRjLqBjDevFuvPA=;F[;I"/js/jquery/;TI"!6DHDZllnsgQRZlGW+5T9MG7gV6w=;F[;I"/js/respond/;TI"!08U4hKAk+BF9OagHLMsKQ2lvHoE=;F[;I"/js/usergrid-site/;TI"!6Df7xGM7WpU+Z8nHYFfZaZkrHTA=;F[;I"/static/github-btn/;TI"!X6F7QEKQDjkP8ixHKDMA6PVRD8U=;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"!KktraYuI4zunn/a3KVpq2duonaU=;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"!vUCUu5eppA3TPtB6pxQSHS1mSfg=;F[;I"/img/stliu/;TI"!lz+OfscZWgvuGpln5p5NVfk7SaY=;F[;I"/releases/;TI"!KWqWzb3keqtDYjoUruMDyL19dtE=;F[;I"/img/intellij/;TI"!nuliBDsLr0pPZb1Ei0Qgiz123sU=;F[;I"/img/structure101/;TI"!8gDjzdyWe0oVtkvh4OpJ0erdSKk=;F[;I"/img/yourkit/;TI"!vxCYnQmkGISxt9FZIVQxJxs4f48=;F[;I"/img/jeff/;TI"!Ft7erel+Uq3X6HCSPOZehLbYm8o=;F: versioni
\ No newline at end of file
[19/26] usergrid git commit: Cherry pick: Remove references to
incubator from docs, README files and POMs.
Posted by sn...@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
[22/26] usergrid git commit: Updating website content.
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/2bb0a3c8/docs/rest-endpoints/api-docs.html
----------------------------------------------------------------------
diff --git a/docs/rest-endpoints/api-docs.html b/docs/rest-endpoints/api-docs.html
new file mode 100644
index 0000000..77af7f5
--- /dev/null
+++ b/docs/rest-endpoints/api-docs.html
@@ -0,0 +1,5273 @@
+<html>
+<head>
+ <title>Usergrid API Reference</title>
+
+ <!-- Latest compiled and minified CSS -->
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
+
+ <!-- Optional theme -->
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css">
+
+ <link rel="stylesheet" href="api-docs.css">
+
+</head>
+<body>
+
+<div class="row">
+ <div class="col-md-1"></div>
+ <div class="col-md-10">
+
+ <h1>Usergrid API Reference</h1>
+ <p>Generated from Swagger.</p>
+<h2>Methods</h2><p>API methods are organized by the tags.</p>
+<p>Following the methods is a listing of all <a href='#models'>Default Entity Models.</p>
+<a name='Access-Tokens-method'></a>
+<h2>Access-Tokens</h2>
+
+<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="#collapse-gEdcCxS6DT"
+ href="#collapse-gEdcCxS6DT" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-gEdcCxS6DT" class="panel-body collapse">
+
+ <p>Login with Admin-User or Organization credentials.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>login-credentials</b> ( <a href="#logincredentials">LoginCredentials</a>) <br>
+ Login credentials either username/password or id/secret. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: Object containing access_token.</li>
+ <li>Schema: [<a href="#accesstokenreponse">AccessTokenReponse</a>]</li>
+ </ul>
+ </li>
+ <li>
+ <b>default</b>
+ <ul>
+ <li>Description: Unexpected error.</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-P5nOlnx80Z"
+ href="#collapse-P5nOlnx80Z" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-P5nOlnx80Z" class="panel-body collapse">
+
+ <p>Login with App-User or Application credentials.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>login-credentials</b> ( <a href="#logincredentials">LoginCredentials</a>) <br>
+ Login credentials either username/password or id/secret. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of new created Admin user's info.</li>
+ <li>Schema: [<a href="#accesstokenreponse">AccessTokenReponse</a>]</li>
+ </ul>
+ </li>
+ <li>
+ <b>default</b>
+ <ul>
+ <li>Description: Unexpected error.</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Activities-method'></a>
+<h2>Activities</h2>
+
+<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="#collapse-BDjqC7RbiP"
+ href="#collapse-BDjqC7RbiP" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-BDjqC7RbiP" class="panel-body collapse">
+
+ <p>Get a group's feed through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>groupId</b> (string) <br>
+ One of the group's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of group's activity.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-MymDhPxuNc"
+ href="#collapse-MymDhPxuNc" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-MymDhPxuNc" class="panel-body collapse">
+
+ <p>Create an activity in the activities collection.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>userId-3</b> (string) <br>
+ 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>
+ One or more sets of activity properties. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of user's activity.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-r9YdnB0HsU"
+ href="#collapse-r9YdnB0HsU" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-r9YdnB0HsU" class="panel-body collapse">
+
+ <p>Retrieve a user's feed through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>userId-3</b> (string) <br>
+ One of the user's identification which includes username or UUID. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of user's activity feed.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Admin-Users-method'></a>
+<h2>Admin-Users</h2>
+
+<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="#collapse-LeUIEnAMyf"
+ href="#collapse-LeUIEnAMyf" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-LeUIEnAMyf" class="panel-body collapse">
+
+ <p>Retrieve details about the admin users in an organization.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of retrieved Admin user's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-VJJOap3EXn"
+ href="#collapse-VJJOap3EXn" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-VJJOap3EXn" class="panel-body collapse">
+
+ <p>Remove an admin user from an organization through providing both Id of application and organization.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>userId-2</b> (string) <br>
+ One of the user's identification which includes username, email address or UUID. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of deleted Admin user's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-E0CUzBQnDb"
+ href="#collapse-E0CUzBQnDb" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-E0CUzBQnDb" class="panel-body collapse">
+
+ <p>Create a whole new admin user.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>adminuserproperty</b> ( <a href="#createadminuser">CreateAdminUser</a>) <br>
+ One or more sets of user properties of which username is mandatory and must be unique. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of new created Admin user's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-XVK8rSraHx"
+ href="#collapse-XVK8rSraHx" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-XVK8rSraHx" class="panel-body collapse">
+
+ <p>Initiate the reset of an admin user's password.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of complete messages.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-I51SW8KWWY"
+ href="#collapse-I51SW8KWWY" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-I51SW8KWWY" class="panel-body collapse">
+
+ <p>Complete the password reset through getting the newpassword and the old one for identification.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <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>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of complete messages.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-obTftsm3ru"
+ href="#collapse-obTftsm3ru" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-obTftsm3ru" class="panel-body collapse">
+
+ <p>Retrieve details about an admin user.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>userId</b> (string) <br>
+ One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of user's details</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-wBXlRwN84T"
+ href="#collapse-wBXlRwN84T" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-wBXlRwN84T" class="panel-body collapse">
+
+ <p>Update the info of an admin user.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>userId</b> (string) <br>
+ One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of user's details.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-LjEbVuoasa"
+ href="#collapse-LjEbVuoasa" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-LjEbVuoasa" class="panel-body collapse">
+
+ <p>Activate an admin user from a link provIded in an email notification.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>userId</b> (string) <br>
+ One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
+ </li>
+ <li>
+ <b>token</b> (string) <br>
+ Activation token's query statement. (Specified in query).
+ </li>
+ <li>
+ <b>confirm_email</b> (boolean) <br>
+ Query statement of whether send confimation email or not. (Specified in query).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of complete messages.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-W1bf0k8OU1"
+ href="#collapse-W1bf0k8OU1" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-W1bf0k8OU1" class="panel-body collapse">
+
+ <p>Update an admin user's password through getting the newpassword and the old one for identification.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>userId</b> (string) <br>
+ 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>
+ The user's old and new password. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of complete messages.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-yvurfiNPg6"
+ href="#collapse-yvurfiNPg6" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-yvurfiNPg6" class="panel-body collapse">
+
+ <p>Reactivate an expired admin user.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>userId</b> (string) <br>
+ One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of complete messages.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+<a name='App-Users-method'></a>
+<h2>App-Users</h2>
+
+<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="#collapse-8cyslVDGEC"
+ href="#collapse-8cyslVDGEC" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-8cyslVDGEC" class="panel-body collapse">
+
+ <p>Retrieve users though query statement.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>queryStatement</b> (string) <br>
+ The query statement of the User. (Specified in query).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of retrieved user's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-Pl4WUft8YB"
+ href="#collapse-Pl4WUft8YB" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-Pl4WUft8YB" class="panel-body collapse">
+
+ <p>Create a user in the users collection through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ 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>
+ The properties of the user. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of created user's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-bE9Ym68E6m"
+ href="#collapse-bE9Ym68E6m" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-bE9Ym68E6m" class="panel-body collapse">
+
+ <p>Retrieve a user through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>userId-2</b> (string) <br>
+ One of the user's identification which includes username, email address or UUID. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of retrieved user's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-HvLdtR2mCP"
+ href="#collapse-HvLdtR2mCP" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-HvLdtR2mCP" class="panel-body collapse">
+
+ <p>Update a user through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>userId-3</b> (string) <br>
+ One of the user's identification which includes username or UUID. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of updated user's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-L1WJfKWUiL"
+ href="#collapse-L1WJfKWUiL" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-L1WJfKWUiL" class="panel-body collapse">
+
+ <p>Remove a user through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>userId-3</b> (string) <br>
+ One of the user's identification which includes username or UUID. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of deleted user's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-1vF6VfPxlo"
+ href="#collapse-1vF6VfPxlo" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-1vF6VfPxlo" class="panel-body collapse">
+
+ <p>Set a user's password or reset the user's existing password.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>username</b> (string) <br>
+ The username of the user. (Specified in path).
+ </li>
+ <li>
+ <b>ResetPW</b> ( <a href="#resetpw">ResetPW</a>) <br>
+ The user's old and new password. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of complete messages.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Entities-Collections-method'></a>
+<h2>Entities-Collections</h2>
+
+<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="#collapse-SKLbbje8hp"
+ href="#collapse-SKLbbje8hp" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-SKLbbje8hp" class="panel-body collapse">
+
+ <p>Retrieve a user's collections or connections through query statement.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>userId-3</b> (string) <br>
+ One of the user's identification which includes username or UUID. (Specified in path).
+ </li>
+ <li>
+ <b>relation</b> (string) <br>
+ The relation between user and collections. (Specified in path).
+ </li>
+ <li>
+ <b>queryStatement</b> (string) <br>
+ The query statement of the user. (Specified in query).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of user's collections info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-BnJmqIJWLK"
+ href="#collapse-BnJmqIJWLK" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-BnJmqIJWLK" class="panel-body collapse">
+
+ <p>Retrieve collection through query statement.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>collectionId</b> (string) <br>
+ One of the collection's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>queryStatement</b> (string) <br>
+ Any values specified in the query statement should be enclosed in single-quotes. (Specified in query).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of retrieved collection's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-8GsKTGtwP3"
+ href="#collapse-8GsKTGtwP3" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-8GsKTGtwP3" class="panel-body collapse">
+
+ <p>Update collection through query statement.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>collectionId</b> (string) <br>
+ One of the collection's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>queryStatement</b> (string) <br>
+ Any values specified in the query statement should be enclosed in single-quotes. (Specified in query).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of updated collection's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-WXiKAeQmqc"
+ href="#collapse-WXiKAeQmqc" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-WXiKAeQmqc" class="panel-body collapse">
+
+ <p>Add an entity to a collection through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>collectionId</b> (string) <br>
+ One of the collection's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>entityId1</b> (string) <br>
+ The Id of the 1st entity. (Specified in path).
+ </li>
+ <li>
+ <b>relation</b> (string) <br>
+ The relation between 1st entity and 2nd entity. (Specified in path).
+ </li>
+ <li>
+ <b>entityId2</b> (string) <br>
+ The Id of the 2nd entity. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of added entity's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-bQ4lMAahOq"
+ href="#collapse-bQ4lMAahOq" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-bQ4lMAahOq" class="panel-body collapse">
+
+ <p>Remove an entity from a collection through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>collectionId</b> (string) <br>
+ One of the collection's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>entityId1</b> (string) <br>
+ The Id of the 1st entity. (Specified in path).
+ </li>
+ <li>
+ <b>relation</b> (string) <br>
+ The relation between 1st entity and 2nd entity. (Specified in path).
+ </li>
+ <li>
+ <b>entityId2</b> (string) <br>
+ The Id of the 2nd entity. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of deleted entity's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-LfRVgcKy0e"
+ href="#collapse-LfRVgcKy0e" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-LfRVgcKy0e" class="panel-body collapse">
+
+ <p>Retrieve an entity through providing Id of application, organization, collection and entity.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>collectionId</b> (string) <br>
+ One of the collection's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>entityId</b> (string) <br>
+ One of the entity's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of retrieved entity's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-53FMqcYprS"
+ href="#collapse-53FMqcYprS" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-53FMqcYprS" class="panel-body collapse">
+
+ <p>One or more properties can be updated with a single request.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>collectionId</b> (string) <br>
+ One of the collection's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>entityId</b> (string) <br>
+ 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>
+ The properties of the entity. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of updated entity's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-x0fUMugxTk"
+ href="#collapse-x0fUMugxTk" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-x0fUMugxTk" class="panel-body collapse">
+
+ <p>Delete an entity from the collection.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>collectionId</b> (string) <br>
+ One of the collection's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>entityId</b> (string) <br>
+ One of the entity's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of deleted entity's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-fKO9w8IS3H"
+ href="#collapse-fKO9w8IS3H" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-fKO9w8IS3H" 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>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>entitytype</b> (string) <br>
+ The entity type to create. (Specified in path).
+ </li>
+ <li>
+ <b>entityproperty</b> ( <a href="#createentities">CreateEntities</a>) <br>
+ The properties of the entity. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of created custom entity's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Events-method'></a>
+<h2>Events</h2>
+
+<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="#collapse-FyODoXUU0P"
+ href="#collapse-FyODoXUU0P" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-FyODoXUU0P" class="panel-body collapse">
+
+ <p>Create an event through providing both Id of organization and application.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ 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>
+ The required property of the event. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of created event's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Groups-method'></a>
+<h2>Groups</h2>
+
+<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="#collapse-X9IATeVHQJ"
+ href="#collapse-X9IATeVHQJ" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-X9IATeVHQJ" class="panel-body collapse">
+
+ <p>Create a new group through providing both Id of organization and application.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ 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>
+ The property of the created group. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of created group's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-XRztIpefKm"
+ href="#collapse-XRztIpefKm" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-XRztIpefKm" 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>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>groupId</b> (string) <br>
+ 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>
+ One or more sets of activity properties. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of user's activity.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-F22rbeoDIB"
+ href="#collapse-F22rbeoDIB" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-F22rbeoDIB" class="panel-body collapse">
+
+ <p>Add a user to a group through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>groupId</b> (string) <br>
+ One of the group's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>userId-3</b> (string) <br>
+ One of the user's identification which includes username or UUID. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of added user's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-UJ0DlU2DF1"
+ href="#collapse-UJ0DlU2DF1" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-UJ0DlU2DF1" class="panel-body collapse">
+
+ <p>Delete user from a group through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>groupId</b> (string) <br>
+ One of the group's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>userId-3</b> (string) <br>
+ One of the user's identification which includes username or UUID. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of deleted user's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-sW9A1GCCYb"
+ href="#collapse-sW9A1GCCYb" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-sW9A1GCCYb" class="panel-body collapse">
+
+ <p>Get a group through through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>groupId</b> (string) <br>
+ One of the group's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of retrieved group's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-JwNPOcAUbp"
+ href="#collapse-JwNPOcAUbp" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-JwNPOcAUbp" class="panel-body collapse">
+
+ <p>Update a group through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>groupId</b> (string) <br>
+ One of the group's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of updated group's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Organizations-Applications-method'></a>
+<h2>Organizations-Applications</h2>
+
+<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="#collapse-PHBIYkyndy"
+ href="#collapse-PHBIYkyndy" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-PHBIYkyndy" class="panel-body collapse">
+
+ <p>Create an organization through a form post.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>CreateOrg</b> ( <a href="#createorg">CreateOrg</a>) <br>
+ A set of organization properties supplied through a form. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of created Organization.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-pmEmHuzOFF"
+ href="#collapse-pmEmHuzOFF" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-pmEmHuzOFF" class="panel-body collapse">
+
+ <p>Retrieve an organization given a specified UUID or username.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of created Organization.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-J5sdDDYfLH"
+ href="#collapse-J5sdDDYfLH" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-J5sdDDYfLH" class="panel-body collapse">
+
+ <p>Activate an organization from a link provIded in an email notification.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>token</b> (string) <br>
+ Activation token. (Specified in query).
+ </li>
+ <li>
+ <b>confirm_email</b> (boolean) <br>
+ Send confirmation email or not. (Specified in query).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of complete messages.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-yn8aYlIPp4"
+ href="#collapse-yn8aYlIPp4" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-yn8aYlIPp4" class="panel-body collapse">
+
+ <p>Retrieve the applications in an organization through providing both Id of application and organization.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of retrieved application data.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-q9eP5Exdqb"
+ href="#collapse-q9eP5Exdqb" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-q9eP5Exdqb" class="panel-body collapse">
+
+ <p>Retrieve the client Id and client secret credentials for an application in an organization.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of retrieved credentials info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-teBxMuCYSA"
+ href="#collapse-teBxMuCYSA" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-teBxMuCYSA" class="panel-body collapse">
+
+ <p>Generate the client Id and client secret credentials for an application in an organization.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of generated credentials info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-tO97qqxsOS"
+ href="#collapse-tO97qqxsOS" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-tO97qqxsOS" class="panel-body collapse">
+
+ <p>Retrieve the credentials for an organization client.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of Credential</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-sToqaMe7zq"
+ href="#collapse-sToqaMe7zq" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-sToqaMe7zq" class="panel-body collapse">
+
+ <p>Generate whole new credentials for an organization client.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of Credential</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-DTPDaFQjvh"
+ href="#collapse-DTPDaFQjvh" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-DTPDaFQjvh" class="panel-body collapse">
+
+ <p>Retrieve an organization's activity feed.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of the organization's ActivityFeed.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-zl2N2OX9tm"
+ href="#collapse-zl2N2OX9tm" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-zl2N2OX9tm" class="panel-body collapse">
+
+ <p>Reactivate an expired organization.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of complete messages.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-RpoAIFLgUh"
+ href="#collapse-RpoAIFLgUh" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-RpoAIFLgUh" class="panel-body collapse">
+
+ <p>Retrieve an admin user's activity feed.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>userId</b> (string) <br>
+ One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of user's activity</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Permissions-Roles-method'></a>
+<h2>Permissions-Roles</h2>
+
+<div class="panel panel-default">
+
+ <div class="panel-heading GET">
+ <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/roles
+ <a data-t
<TRUNCATED>
[04/26] usergrid git commit: Don't show disabled admins in the portal.
Posted by sn...@apache.org.
Don't show disabled admins in the portal.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/1fa5d101
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/1fa5d101
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/1fa5d101
Branch: refs/heads/asf-site
Commit: 1fa5d1015fa899fa248d6ea2b081c5628cc994c1
Parents: 2547ee8
Author: Michael Russo <mi...@gmail.com>
Authored: Thu Jul 30 15:02:09 2015 -0700
Committer: Michael Russo <mi...@gmail.com>
Committed: Thu Jul 30 15:02:09 2015 -0700
----------------------------------------------------------------------
portal/bower.json | 2 +-
portal/js/global/ug-service.js | 16 ++++++++++++++--
portal/package.json | 2 +-
3 files changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1fa5d101/portal/bower.json
----------------------------------------------------------------------
diff --git a/portal/bower.json b/portal/bower.json
index 2a221cb..3c4784c 100644
--- a/portal/bower.json
+++ b/portal/bower.json
@@ -1,6 +1,6 @@
{
"name": "usergrid-portal",
- "version": "2.0.16",
+ "version": "2.0.17",
"ignore": [
".jshintrc",
"**/*.txt",
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1fa5d101/portal/js/global/ug-service.js
----------------------------------------------------------------------
diff --git a/portal/js/global/ug-service.js b/portal/js/global/ug-service.js
index 9eed13a..1ec8558 100644
--- a/portal/js/global/ug-service.js
+++ b/portal/js/global/ug-service.js
@@ -221,7 +221,13 @@ AppServices.Services.factory('ug', function (configuration, $rootScope,utility,
if (err) {
$rootScope.$broadcast('alert', 'error', 'error getting administrators');
}
- $rootScope.$broadcast('administrators-received', administrators);
+ var enabledAdmins = [];
+ for(var i=0; i<administrators.length; i++){
+ if(administrators[i].disabled === false){
+ enabledAdmins.push(administrators[i]);
+ }
+ }
+ $rootScope.$broadcast('administrators-received', enabledAdmins);
});
},
createApplication: function (appName) {
@@ -239,7 +245,13 @@ AppServices.Services.factory('ug', function (configuration, $rootScope,utility,
if (err) {
$rootScope.$broadcast('alert', 'error', 'error creating administrator');
}
- $rootScope.$broadcast('administrators-received', administrators);
+ var enabledAdmins = [];
+ for(var i=0; i<administrators.length; i++){
+ if(administrators[i].disabled === false){
+ enabledAdmins.push(administrators[i]);
+ }
+ }
+ $rootScope.$broadcast('administrators-received', enabledAdmins);
});
},
getFeed: function () {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1fa5d101/portal/package.json
----------------------------------------------------------------------
diff --git a/portal/package.json b/portal/package.json
index 3829983..38d6455 100644
--- a/portal/package.json
+++ b/portal/package.json
@@ -1,6 +1,6 @@
{
"name": "usergrid",
- "version": "2.0.16",
+ "version": "2.0.17",
"packageName": "appsvc-ui",
"description": "full usergrid portal",
"main": "./scripts/web-server.js",
[09/26] usergrid git commit: Adding operation and model
cross-references to Markdown representation
Posted by sn...@apache.org.
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}}
[05/26] usergrid git commit: removing unneeded file
Posted by sn...@apache.org.
removing unneeded file
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/8e32c136
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/8e32c136
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/8e32c136
Branch: refs/heads/asf-site
Commit: 8e32c136af2f9035439c77ad642989c46c791324
Parents: 2cf4966
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Aug 12 10:33:26 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Aug 12 10:33:26 2015 -0400
----------------------------------------------------------------------
docs/sdks/ios.md | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/8e32c136/docs/sdks/ios.md
----------------------------------------------------------------------
diff --git a/docs/sdks/ios.md b/docs/sdks/ios.md
deleted file mode 100644
index 328b09a..0000000
--- a/docs/sdks/ios.md
+++ /dev/null
@@ -1 +0,0 @@
-# iOS SDK
\ No newline at end of file
[18/26] usergrid git commit: Cherry pick: Remove references to
incubator from docs, README files and POMs.
Posted by sn...@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>
[08/26] usergrid git commit: Merge branch 'hide-disabled-admins' of
https://github.com/michaelarusso/incubator-usergrid
Posted by sn...@apache.org.
Merge branch 'hide-disabled-admins' of https://github.com/michaelarusso/incubator-usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/ae6d8112
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ae6d8112
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ae6d8112
Branch: refs/heads/asf-site
Commit: ae6d8112f4d6c42c7823ccb865e7c916674208ef
Parents: da9e4f6 1fa5d10
Author: GERey <gr...@apigee.com>
Authored: Wed Aug 12 14:39:41 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Wed Aug 12 14:39:41 2015 -0700
----------------------------------------------------------------------
portal/bower.json | 2 +-
portal/js/global/ug-service.js | 16 ++++++++++++++--
portal/package.json | 2 +-
3 files changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[12/26] usergrid git commit: Remove references to incubator from docs,
README files and POMs.
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/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>
[25/26] usergrid git commit: Updating website content.
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/2bb0a3c8/docs/rest-endpoints/api-docs.html
----------------------------------------------------------------------
diff --git a/docs/rest-endpoints/api-docs.html b/docs/rest-endpoints/api-docs.html
new file mode 100644
index 0000000..77af7f5
--- /dev/null
+++ b/docs/rest-endpoints/api-docs.html
@@ -0,0 +1,5273 @@
+<html>
+<head>
+ <title>Usergrid API Reference</title>
+
+ <!-- Latest compiled and minified CSS -->
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
+
+ <!-- Optional theme -->
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css">
+
+ <link rel="stylesheet" href="api-docs.css">
+
+</head>
+<body>
+
+<div class="row">
+ <div class="col-md-1"></div>
+ <div class="col-md-10">
+
+ <h1>Usergrid API Reference</h1>
+ <p>Generated from Swagger.</p>
+<h2>Methods</h2><p>API methods are organized by the tags.</p>
+<p>Following the methods is a listing of all <a href='#models'>Default Entity Models.</p>
+<a name='Access-Tokens-method'></a>
+<h2>Access-Tokens</h2>
+
+<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="#collapse-gEdcCxS6DT"
+ href="#collapse-gEdcCxS6DT" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-gEdcCxS6DT" class="panel-body collapse">
+
+ <p>Login with Admin-User or Organization credentials.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>login-credentials</b> ( <a href="#logincredentials">LoginCredentials</a>) <br>
+ Login credentials either username/password or id/secret. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: Object containing access_token.</li>
+ <li>Schema: [<a href="#accesstokenreponse">AccessTokenReponse</a>]</li>
+ </ul>
+ </li>
+ <li>
+ <b>default</b>
+ <ul>
+ <li>Description: Unexpected error.</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-P5nOlnx80Z"
+ href="#collapse-P5nOlnx80Z" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-P5nOlnx80Z" class="panel-body collapse">
+
+ <p>Login with App-User or Application credentials.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>login-credentials</b> ( <a href="#logincredentials">LoginCredentials</a>) <br>
+ Login credentials either username/password or id/secret. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of new created Admin user's info.</li>
+ <li>Schema: [<a href="#accesstokenreponse">AccessTokenReponse</a>]</li>
+ </ul>
+ </li>
+ <li>
+ <b>default</b>
+ <ul>
+ <li>Description: Unexpected error.</li>
+ <li>Schema: [<a href="#error">Error</a>]</li>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Activities-method'></a>
+<h2>Activities</h2>
+
+<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="#collapse-BDjqC7RbiP"
+ href="#collapse-BDjqC7RbiP" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-BDjqC7RbiP" class="panel-body collapse">
+
+ <p>Get a group's feed through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>groupId</b> (string) <br>
+ One of the group's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of group's activity.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-MymDhPxuNc"
+ href="#collapse-MymDhPxuNc" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-MymDhPxuNc" class="panel-body collapse">
+
+ <p>Create an activity in the activities collection.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>userId-3</b> (string) <br>
+ 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>
+ One or more sets of activity properties. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of user's activity.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-r9YdnB0HsU"
+ href="#collapse-r9YdnB0HsU" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-r9YdnB0HsU" class="panel-body collapse">
+
+ <p>Retrieve a user's feed through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>userId-3</b> (string) <br>
+ One of the user's identification which includes username or UUID. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of user's activity feed.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Admin-Users-method'></a>
+<h2>Admin-Users</h2>
+
+<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="#collapse-LeUIEnAMyf"
+ href="#collapse-LeUIEnAMyf" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-LeUIEnAMyf" class="panel-body collapse">
+
+ <p>Retrieve details about the admin users in an organization.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of retrieved Admin user's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-VJJOap3EXn"
+ href="#collapse-VJJOap3EXn" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-VJJOap3EXn" class="panel-body collapse">
+
+ <p>Remove an admin user from an organization through providing both Id of application and organization.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>userId-2</b> (string) <br>
+ One of the user's identification which includes username, email address or UUID. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of deleted Admin user's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-E0CUzBQnDb"
+ href="#collapse-E0CUzBQnDb" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-E0CUzBQnDb" class="panel-body collapse">
+
+ <p>Create a whole new admin user.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>adminuserproperty</b> ( <a href="#createadminuser">CreateAdminUser</a>) <br>
+ One or more sets of user properties of which username is mandatory and must be unique. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of new created Admin user's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-XVK8rSraHx"
+ href="#collapse-XVK8rSraHx" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-XVK8rSraHx" class="panel-body collapse">
+
+ <p>Initiate the reset of an admin user's password.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of complete messages.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-I51SW8KWWY"
+ href="#collapse-I51SW8KWWY" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-I51SW8KWWY" class="panel-body collapse">
+
+ <p>Complete the password reset through getting the newpassword and the old one for identification.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <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>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of complete messages.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-obTftsm3ru"
+ href="#collapse-obTftsm3ru" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-obTftsm3ru" class="panel-body collapse">
+
+ <p>Retrieve details about an admin user.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>userId</b> (string) <br>
+ One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of user's details</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-wBXlRwN84T"
+ href="#collapse-wBXlRwN84T" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-wBXlRwN84T" class="panel-body collapse">
+
+ <p>Update the info of an admin user.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>userId</b> (string) <br>
+ One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of user's details.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-LjEbVuoasa"
+ href="#collapse-LjEbVuoasa" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-LjEbVuoasa" class="panel-body collapse">
+
+ <p>Activate an admin user from a link provIded in an email notification.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>userId</b> (string) <br>
+ One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
+ </li>
+ <li>
+ <b>token</b> (string) <br>
+ Activation token's query statement. (Specified in query).
+ </li>
+ <li>
+ <b>confirm_email</b> (boolean) <br>
+ Query statement of whether send confimation email or not. (Specified in query).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of complete messages.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-W1bf0k8OU1"
+ href="#collapse-W1bf0k8OU1" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-W1bf0k8OU1" class="panel-body collapse">
+
+ <p>Update an admin user's password through getting the newpassword and the old one for identification.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>userId</b> (string) <br>
+ 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>
+ The user's old and new password. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of complete messages.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-yvurfiNPg6"
+ href="#collapse-yvurfiNPg6" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-yvurfiNPg6" class="panel-body collapse">
+
+ <p>Reactivate an expired admin user.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>userId</b> (string) <br>
+ One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of complete messages.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+<a name='App-Users-method'></a>
+<h2>App-Users</h2>
+
+<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="#collapse-8cyslVDGEC"
+ href="#collapse-8cyslVDGEC" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-8cyslVDGEC" class="panel-body collapse">
+
+ <p>Retrieve users though query statement.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>queryStatement</b> (string) <br>
+ The query statement of the User. (Specified in query).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of retrieved user's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-Pl4WUft8YB"
+ href="#collapse-Pl4WUft8YB" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-Pl4WUft8YB" class="panel-body collapse">
+
+ <p>Create a user in the users collection through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ 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>
+ The properties of the user. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of created user's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-bE9Ym68E6m"
+ href="#collapse-bE9Ym68E6m" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-bE9Ym68E6m" class="panel-body collapse">
+
+ <p>Retrieve a user through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>userId-2</b> (string) <br>
+ One of the user's identification which includes username, email address or UUID. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of retrieved user's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-HvLdtR2mCP"
+ href="#collapse-HvLdtR2mCP" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-HvLdtR2mCP" class="panel-body collapse">
+
+ <p>Update a user through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>userId-3</b> (string) <br>
+ One of the user's identification which includes username or UUID. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of updated user's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-L1WJfKWUiL"
+ href="#collapse-L1WJfKWUiL" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-L1WJfKWUiL" class="panel-body collapse">
+
+ <p>Remove a user through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>userId-3</b> (string) <br>
+ One of the user's identification which includes username or UUID. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of deleted user's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-1vF6VfPxlo"
+ href="#collapse-1vF6VfPxlo" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-1vF6VfPxlo" class="panel-body collapse">
+
+ <p>Set a user's password or reset the user's existing password.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>username</b> (string) <br>
+ The username of the user. (Specified in path).
+ </li>
+ <li>
+ <b>ResetPW</b> ( <a href="#resetpw">ResetPW</a>) <br>
+ The user's old and new password. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of complete messages.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Entities-Collections-method'></a>
+<h2>Entities-Collections</h2>
+
+<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="#collapse-SKLbbje8hp"
+ href="#collapse-SKLbbje8hp" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-SKLbbje8hp" class="panel-body collapse">
+
+ <p>Retrieve a user's collections or connections through query statement.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>userId-3</b> (string) <br>
+ One of the user's identification which includes username or UUID. (Specified in path).
+ </li>
+ <li>
+ <b>relation</b> (string) <br>
+ The relation between user and collections. (Specified in path).
+ </li>
+ <li>
+ <b>queryStatement</b> (string) <br>
+ The query statement of the user. (Specified in query).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of user's collections info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-BnJmqIJWLK"
+ href="#collapse-BnJmqIJWLK" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-BnJmqIJWLK" class="panel-body collapse">
+
+ <p>Retrieve collection through query statement.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>collectionId</b> (string) <br>
+ One of the collection's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>queryStatement</b> (string) <br>
+ Any values specified in the query statement should be enclosed in single-quotes. (Specified in query).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of retrieved collection's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-8GsKTGtwP3"
+ href="#collapse-8GsKTGtwP3" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-8GsKTGtwP3" class="panel-body collapse">
+
+ <p>Update collection through query statement.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>collectionId</b> (string) <br>
+ One of the collection's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>queryStatement</b> (string) <br>
+ Any values specified in the query statement should be enclosed in single-quotes. (Specified in query).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of updated collection's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-WXiKAeQmqc"
+ href="#collapse-WXiKAeQmqc" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-WXiKAeQmqc" class="panel-body collapse">
+
+ <p>Add an entity to a collection through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>collectionId</b> (string) <br>
+ One of the collection's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>entityId1</b> (string) <br>
+ The Id of the 1st entity. (Specified in path).
+ </li>
+ <li>
+ <b>relation</b> (string) <br>
+ The relation between 1st entity and 2nd entity. (Specified in path).
+ </li>
+ <li>
+ <b>entityId2</b> (string) <br>
+ The Id of the 2nd entity. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of added entity's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-bQ4lMAahOq"
+ href="#collapse-bQ4lMAahOq" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-bQ4lMAahOq" class="panel-body collapse">
+
+ <p>Remove an entity from a collection through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>collectionId</b> (string) <br>
+ One of the collection's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>entityId1</b> (string) <br>
+ The Id of the 1st entity. (Specified in path).
+ </li>
+ <li>
+ <b>relation</b> (string) <br>
+ The relation between 1st entity and 2nd entity. (Specified in path).
+ </li>
+ <li>
+ <b>entityId2</b> (string) <br>
+ The Id of the 2nd entity. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of deleted entity's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-LfRVgcKy0e"
+ href="#collapse-LfRVgcKy0e" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-LfRVgcKy0e" class="panel-body collapse">
+
+ <p>Retrieve an entity through providing Id of application, organization, collection and entity.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>collectionId</b> (string) <br>
+ One of the collection's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>entityId</b> (string) <br>
+ One of the entity's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of retrieved entity's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-53FMqcYprS"
+ href="#collapse-53FMqcYprS" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-53FMqcYprS" class="panel-body collapse">
+
+ <p>One or more properties can be updated with a single request.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>collectionId</b> (string) <br>
+ One of the collection's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>entityId</b> (string) <br>
+ 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>
+ The properties of the entity. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of updated entity's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-x0fUMugxTk"
+ href="#collapse-x0fUMugxTk" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-x0fUMugxTk" class="panel-body collapse">
+
+ <p>Delete an entity from the collection.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>collectionId</b> (string) <br>
+ One of the collection's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>entityId</b> (string) <br>
+ One of the entity's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of deleted entity's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-fKO9w8IS3H"
+ href="#collapse-fKO9w8IS3H" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-fKO9w8IS3H" 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>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>entitytype</b> (string) <br>
+ The entity type to create. (Specified in path).
+ </li>
+ <li>
+ <b>entityproperty</b> ( <a href="#createentities">CreateEntities</a>) <br>
+ The properties of the entity. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of created custom entity's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Events-method'></a>
+<h2>Events</h2>
+
+<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="#collapse-FyODoXUU0P"
+ href="#collapse-FyODoXUU0P" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-FyODoXUU0P" class="panel-body collapse">
+
+ <p>Create an event through providing both Id of organization and application.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ 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>
+ The required property of the event. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of created event's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Groups-method'></a>
+<h2>Groups</h2>
+
+<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="#collapse-X9IATeVHQJ"
+ href="#collapse-X9IATeVHQJ" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-X9IATeVHQJ" class="panel-body collapse">
+
+ <p>Create a new group through providing both Id of organization and application.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ 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>
+ The property of the created group. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of created group's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-XRztIpefKm"
+ href="#collapse-XRztIpefKm" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-XRztIpefKm" 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>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>groupId</b> (string) <br>
+ 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>
+ One or more sets of activity properties. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of user's activity.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-F22rbeoDIB"
+ href="#collapse-F22rbeoDIB" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-F22rbeoDIB" class="panel-body collapse">
+
+ <p>Add a user to a group through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>groupId</b> (string) <br>
+ One of the group's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>userId-3</b> (string) <br>
+ One of the user's identification which includes username or UUID. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of added user's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-UJ0DlU2DF1"
+ href="#collapse-UJ0DlU2DF1" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-UJ0DlU2DF1" class="panel-body collapse">
+
+ <p>Delete user from a group through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>groupId</b> (string) <br>
+ One of the group's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>userId-3</b> (string) <br>
+ One of the user's identification which includes username or UUID. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of deleted user's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-sW9A1GCCYb"
+ href="#collapse-sW9A1GCCYb" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-sW9A1GCCYb" class="panel-body collapse">
+
+ <p>Get a group through through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>groupId</b> (string) <br>
+ One of the group's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of retrieved group's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-JwNPOcAUbp"
+ href="#collapse-JwNPOcAUbp" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-JwNPOcAUbp" class="panel-body collapse">
+
+ <p>Update a group through providing all the identifications.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>groupId</b> (string) <br>
+ One of the group's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of updated group's info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Organizations-Applications-method'></a>
+<h2>Organizations-Applications</h2>
+
+<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="#collapse-PHBIYkyndy"
+ href="#collapse-PHBIYkyndy" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-PHBIYkyndy" class="panel-body collapse">
+
+ <p>Create an organization through a form post.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>CreateOrg</b> ( <a href="#createorg">CreateOrg</a>) <br>
+ A set of organization properties supplied through a form. (Specified in body).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of created Organization.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-pmEmHuzOFF"
+ href="#collapse-pmEmHuzOFF" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-pmEmHuzOFF" class="panel-body collapse">
+
+ <p>Retrieve an organization given a specified UUID or username.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of created Organization.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-J5sdDDYfLH"
+ href="#collapse-J5sdDDYfLH" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-J5sdDDYfLH" class="panel-body collapse">
+
+ <p>Activate an organization from a link provIded in an email notification.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>token</b> (string) <br>
+ Activation token. (Specified in query).
+ </li>
+ <li>
+ <b>confirm_email</b> (boolean) <br>
+ Send confirmation email or not. (Specified in query).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of complete messages.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-yn8aYlIPp4"
+ href="#collapse-yn8aYlIPp4" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-yn8aYlIPp4" class="panel-body collapse">
+
+ <p>Retrieve the applications in an organization through providing both Id of application and organization.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of retrieved application data.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-q9eP5Exdqb"
+ href="#collapse-q9eP5Exdqb" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-q9eP5Exdqb" class="panel-body collapse">
+
+ <p>Retrieve the client Id and client secret credentials for an application in an organization.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of retrieved credentials info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-teBxMuCYSA"
+ href="#collapse-teBxMuCYSA" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-teBxMuCYSA" class="panel-body collapse">
+
+ <p>Generate the client Id and client secret credentials for an application in an organization.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ <li>
+ <b>appId</b> (string) <br>
+ One of the application's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of generated credentials info.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-tO97qqxsOS"
+ href="#collapse-tO97qqxsOS" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-tO97qqxsOS" class="panel-body collapse">
+
+ <p>Retrieve the credentials for an organization client.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of Credential</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-sToqaMe7zq"
+ href="#collapse-sToqaMe7zq" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-sToqaMe7zq" class="panel-body collapse">
+
+ <p>Generate whole new credentials for an organization client.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of Credential</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-DTPDaFQjvh"
+ href="#collapse-DTPDaFQjvh" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-DTPDaFQjvh" class="panel-body collapse">
+
+ <p>Retrieve an organization's activity feed.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of the organization's ActivityFeed.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-zl2N2OX9tm"
+ href="#collapse-zl2N2OX9tm" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-zl2N2OX9tm" class="panel-body collapse">
+
+ <p>Reactivate an expired organization.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>orgId</b> (string) <br>
+ One of the organization's identification which includes name or uuid. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of complete messages.</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+
+<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="#collapse-RpoAIFLgUh"
+ href="#collapse-RpoAIFLgUh" class="collapsed collapse-button"> </a>
+ </h2>
+ </div>
+
+ <div id="collapse-RpoAIFLgUh" class="panel-body collapse">
+
+ <p>Retrieve an admin user's activity feed.</p>
+
+ <h3>Parameters</h3>
+
+ <ul>
+ <li>
+ <b>userId</b> (string) <br>
+ One of the user's identification which includes username, real name, email address or UUID. (Specified in path).
+ </li>
+ </ul>
+
+ <h3>Responses</h3>
+
+ <ul>
+ <li>
+ <b>200</b>
+ <ul>
+ <li>Description: An array of user's activity</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>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+ <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Permissions-Roles-method'></a>
+<h2>Permissions-Roles</h2>
+
+<div class="panel panel-default">
+
+ <div class="panel-heading GET">
+ <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/roles
+ <a data-t
<TRUNCATED>