You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ti...@apache.org on 2013/12/20 10:15:13 UTC
svn commit: r1552550 [4/13] - in /incubator/usergrid/site:
content/community/ content/docs/ layouts/ lib/helpers/ publish/community/
publish/docs/access-token/ publish/docs/activity/
publish/docs/admin-portal/ publish/docs/admin-user/ publish/docs/app-...
Added: incubator/usergrid/site/content/docs/roles-and-permissions.md
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/content/docs/roles-and-permissions.md?rev=1552550&view=auto
==============================================================================
--- incubator/usergrid/site/content/docs/roles-and-permissions.md (added)
+++ incubator/usergrid/site/content/docs/roles-and-permissions.md Fri Dec 20 09:15:11 2013
@@ -0,0 +1,22 @@
+---
+title: Roles & Permissions
+category: docs
+layout: docs
+---
+
+## Roles
+
+A role represents a set of permissions that enable certain operations to
+be performed on a specific endpoint. You can assign a user to a role,
+and in this way give the user the permissions associated with that role.
+
+**Note:** The /rolenames endpoint is no longer valid. If your code currently
+makes calls to /rolenames, you need to change the calls to use /roles.
+
+## Permissions
+
+Each role contains multiple permissions. Permissions work by whitelisting by default, meaning any permission that is not explicitely granted is denied by default. Permission is an HTTP verb (GET to allow reads, POST to allow creation, PUT to allow edits and DELETE to allow deletes) combined with a path, with optional wildcards. For example the permission put:/users/* allows editing any user.
+
+Permissions can be added to roles, groups or to users directly, and a userâs permission is the combination of its personal permissions and the permissions of any role heâs been assigned, and the permissions of any group heâs a member of.
+
+Permissions are only valid within the scope of a single application, so the permission paths do not need to be prefixed with /org\_name\_or\_uuid/app\_name\_or\_uuid.
\ No newline at end of file
Added: incubator/usergrid/site/content/docs/upgrading.md
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/content/docs/upgrading.md?rev=1552550&view=auto
==============================================================================
--- incubator/usergrid/site/content/docs/upgrading.md (added)
+++ incubator/usergrid/site/content/docs/upgrading.md Fri Dec 20 09:15:11 2013
@@ -0,0 +1,7 @@
+---
+title: Upgrading from Previous Versions
+category: docs
+layout: docs
+---
+
+If you built and used a previous version of Usergrid, that may be using a different schema, we have an easy built-in tool to audit your Cassandra column family structure and upgrade the dataset as necessary. Once you have pulled, built and launched the new version of Usergrid, just hit [http://localhost:8080/system/database/setup](http://localhost:8080/system/database/setup) to run the upgrade tool.
\ No newline at end of file
Added: incubator/usergrid/site/content/docs/users-devices.md
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/content/docs/users-devices.md?rev=1552550&view=auto
==============================================================================
--- incubator/usergrid/site/content/docs/users-devices.md (added)
+++ incubator/usergrid/site/content/docs/users-devices.md Fri Dec 20 09:15:11 2013
@@ -0,0 +1,112 @@
+---
+title: Users & Devices
+category: docs
+layout: docs
+---
+
+Users and Devices are the primary ways to identify access to the system. Devices are great to track anonymous access, while Users allow you to model signing up, signing in, etc.
+
+Users
+-----
+
+### Properties
+
+Property Type Description
+------------ --------- ---------------------------------------------------------------------------------
+ uuid UUID Userâs unique entity ID
+ type string Type of entity, in this case âuserâ
+ created long [UNIX timestamp](http://en.wikipedia.org/wiki/Unix_time) of entity creation
+ modified long [UNIX timestamp](http://en.wikipedia.org/wiki/Unix_time) of entity modification
+ username string Valid and unique string username (mandatory)
+ password string User password
+ email string Valid and unique email address
+ name string User display name
+ activated boolean Whether the user account is activated
+ disabled boolean Whether the user account is administratively disabled
+ firstname string User first name
+ middlename string User middle name
+ lastname string User last name
+ picture string User picture
+
+
+### Sets
+
+ Set Type Description
+ ------------- -------- ---------------------------------------
+ connections string Set of connection types (e.g., likes)
+ rolenames string Set of roles assigned to a user
+ permissions string Set of user permissions
+ credentials string Set of user credentials
+
+### Relationshops
+
+ Collection Type Description
+ ------------ ---------- -----------------------------------------------------
+ groups group Collection of groups to which a user belongs
+ devices device Collection of devices in the service
+ activities activity Collection of activities a user has performed
+ feed activity Inbox of activity notifications a user has received
+ roles role Set of roles assigned to a user
+
+### Facebook Sign-in
+
+You can authenticate your Apache Usergrid requests by logging into
+Facebook. To access Apache Usergrid resources, you need to provide an
+access token with each request (unless you use the sandbox app). You can
+get an access token by connecting to an appropriate web service endpoint
+and providing the correct client credentials â this is further described
+in [Authenticating users and application
+clients](/authenticating-users-and-application-clients). However, you
+can also obtain an access token by logging into Facebook.
+
+To enable authentication to Apache Usergrid through Facebook, do the
+following in your app:
+
+1. Make a login call to the Facebook API (do this using the [Facebook
+ SDK](https://developers.facebook.com/docs/sdks/) or
+ [API](https://developers.facebook.com/docs/facebook-login/)). If the
+ login succeeds, a Facebook access token is returned.
+2. Send the Facebook access token to Apache Usergrid. If the Facebook
+ access token is valid and the user does not already exist in App
+ Services, Apache Usergrid provisions a new Apache Usergrid user. It also
+ returns an Apache Usergrid access token, which you can use for
+ subsequent Apache Usergrid API calls. Behind the scenes, Apache Usergrid
+ uses the Facebook access token to retrieve the user's profile
+ information from Facebook.
+
+ If the Facebook access token is invalid, Facebook returns an OAuth
+ authentication error, and the login does not succeed.
+
+The request to authenticate to Apache Usergrid using a Facebook access
+token is:
+
+ GET https://api.usergrid.com/{my_org}/{my_app}/auth/facebook?fb_access_token={fb_access_token}
+
+where:
+
+* {my\_org} is the organization UUID or organization name.\
+* {my\_app} is the application UUID or application name.\
+* {fb\_access\_token} is the Facebook access token.
+
+
+Devices
+-------
+
+### Properties
+
+Property Type Description
+---------- -------- ---------------------------------------------------------------------------------
+ uuid UUID Entity unique ID
+ type string Entity type (e.g., device)
+ created long [UNIX timestamp](http://en.wikipedia.org/wiki/Unix_time) of entity creation
+ modified long [UNIX timestamp](http://en.wikipedia.org/wiki/Unix_time) of entity modification
+ name string Device name (mandatory)
+
+
+### Relationships
+
+Devices have the following associated collection.
+
+ Collection Type Description
+ ------------ ------ -----------------------------------------------
+ users user Collection of users to which a device belongs
Modified: incubator/usergrid/site/layouts/default.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/layouts/default.html?rev=1552550&r1=1552549&r2=1552550&view=diff
==============================================================================
--- incubator/usergrid/site/layouts/default.html (original)
+++ incubator/usergrid/site/layouts/default.html Fri Dec 20 09:15:11 2013
@@ -9,27 +9,28 @@
<div class="col-md-3">
<div class="bf-sidebar hidden-print" role="complementary">
<ul class="nav nav-list">
- <li><a href="#">Getting Up & Running Locally</a></li>
- <li><a href="#"><code>ugc</code> â the Command-line Client</a></li>
+ <li><a href="/docs/getting-up-and-running-locally/">Getting Up & Running Locally</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/ugc#usergrid-command-line-ugc"><code>ugc</code> â the Command-line Client</a></li>
<li class="nav-header"><span>Concepts</span></li>
<li>
<a href="/docs/organizations-admins/">Organizations & Admins</a>
<ul>
<li>
- <a href="/docs/applications">Applications</a>
+ <a href="/docs/applications/">Applications</a>
<ul>
- <li><a href="#">Roles & Permissions</a></li>
- <li><a href="#">Queues</a></li>
- <li><a href="#">Events & Counters</a></li>
+ <li><a href="/docs/roles-and-permissions/">Roles & Permissions</a></li>
+ <!--<li><a href="#">Queues</a></li>-->
+ <li><a href="/docs/events-and-counters/">Events & Counters</a></li>
+ <li><a href="/docs/relationships/">Relationships (Joins)</a></li>
<li>
- <a href="#">Collections</a>
+ <a href="/docs/collections">Collections</a>
<ul>
- <li><a href="#">Query Language</a></li>
- <li><a href="#">Users & Devices</a></li>
- <li><a href="#">Groups</a></li>
- <li><a href="#">Activities</a></li>
- <li><a href="#">Assets</a></li>
+ <li><a href="/docs/query-language/">Query Language</a></li>
+ <li><a href="/docs/users-devices/">Users & Devices</a></li>
+ <li><a href="/docs/groups/">Groups</a></li>
+ <li><a href="/docs/activities/">Activities</a></li>
+ <li><a href="/docs/assets/">Assets</a></li>
</ul>
</li>
</ul>
@@ -39,27 +40,28 @@
<li class="nav-header"><span>Usage</span></li>
- <li><a href="/docs/rest-api">REST API</a></li>
- <li><a class="icns-apple" href="#">iOS SDK</a></li>
- <li><a class="icns-android" href="#">Android SDK</a></li>
- <li><a class="icns-html5" href="/docs/html5-javascript-sdk">HTML5 / JavaScript SDK</a></li>
- <li><a class="icns-windows" href="#">Windows 8 / Windows Phone / .net SDK</a></li>
- <li><a href="/docs/nodejs-module">Node.js module</a></li>
- <li><a href="/docs/ruby-gem">Ruby gem</a></li>
- <li><a href="#">Ruby on Rails gem</a></li>
- <li><a href="#">PHP library</a></li>
+ <li>REST API â Coming Soon</li>
+ <li><a class="icns-apple" href="https://github.com/usergrid/usergrid/tree/master/sdks/ios">iOS SDK</a></li>
+ <li><a class="icns-android" href="https://github.com/usergrid/usergrid/tree/master/sdks/android">Android SDK</a></li>
+ <li><a class="icns-html5" href="">HTML5 / JavaScript SDK</a></li>
+ <li><a class="icns-windows" href="https://github.com/usergrid/usergrid/tree/master/sdks/dotnet">Windows 8 / Windows Phone / .net SDK</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/nodejs">Node.js module</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby">Ruby gem</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails gem</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/php">PHP library</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/java">Java library</a></li>
<li class="nav-header"><span>Internals</span></li>
- <li><a href="#">Design & Goals</a></li>
- <li><a href="#">Java Architecture</a></li>
- <li><a href="#">Cassandra Schema</a></li>
- <li><a href="#">Contributing</a></li>
+ <li>Design & Goals â Coming Soon</li>
+ <li>Java Architecture â Coming Soon</li>
+ <li>Cassandra Schema â Coming Soon</li>
+ <li><a href="/docs/contributing/">Contributing</a></li>
<li class="nav-header"><span>Operations</span></li>
- <li><a href="#">Deploying</a></li>
- <li><a href="#">Monitoring</a></li>
- <li><a href="#">Upgrading</a></li>
- <li><a href="#">Security</a></li>
+ <li>Deploying â Coming Soon</li>
+ <li>Monitoring â Coming Soon</li>
+ <li><a href="/docs/upgrading/">Upgrading</a></li>
+ <li>Security â Coming Soon</li>
</ul>
</div>
</div>
@@ -68,7 +70,7 @@
<div class="page-article">
<div class="page-header">
<h1><%= @item[:title] %></h1>
- <small><a href="https://github.com/timanglade/usergrid-site/blob/master/content<%= @item.path %>">contribute to this article on github</a></small>
+ <small><a target="_blank" href="https://github.com/usergrid/website/blob/master/content<%= @item.path[0..-2] %>.md">contribute to this article on github</a></small>
</div>
<%= @content %>
</div>
@@ -78,8 +80,8 @@
<div class="col-md-3"></div>
<div class="col-md-9">
<div class="github-callout">
- <strong>Questions?</strong> Please do <a href="https://groups.google.com/forum/#!forum/usergrid">ask on the mailing-list</a>!<br/>
- <strong>Found an error?</strong> Weâd greatly appreciate a pull request about <a href="https://github.com/timanglade/usergrid-site/blob/master/content<%= @item.path %>">this article on github</a>.</div>
+ <strong>Questions?</strong> Please do <a href="/community">ask on the mailing-lists</a>!<br/>
+ <strong>Found an error?</strong> Weâd greatly appreciate a pull request about <a target="_blank" href="https://github.com/usergrid/website/blob/master/content<%= @item.path[0..-2] %>.md">this article on github</a>.</div>
</div>
</div>
</div>
Modified: incubator/usergrid/site/layouts/header.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/layouts/header.html?rev=1552550&r1=1552549&r2=1552550&view=diff
==============================================================================
--- incubator/usergrid/site/layouts/header.html (original)
+++ incubator/usergrid/site/layouts/header.html Fri Dec 20 09:15:11 2013
@@ -211,8 +211,8 @@
</div>
<nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
<ul class="nav navbar-nav navbar-right">
- <!--<li class="<%= 'active' if @docs %>"><a href="/docs/"><span class="icns icon-book"></span></a></li>-->
<li class="<%= 'active' if @community %>"><a href="/community/"><span class="icns icon-group"></span></a></li>
+ <li class="<%= 'active' if @docs %>"><a href="/docs/"><span class="icns icon-book"></span></a></li>
<li><a href="http://github.com/usergrid/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/browse/USERGRID" target="_blank"><span class="icns icon-bug"></span></a></li>
Modified: incubator/usergrid/site/lib/helpers/release.rb
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/lib/helpers/release.rb?rev=1552550&r1=1552549&r2=1552550&view=diff
==============================================================================
--- incubator/usergrid/site/lib/helpers/release.rb (original)
+++ incubator/usergrid/site/lib/helpers/release.rb Fri Dec 20 09:15:11 2013
@@ -5,8 +5,10 @@ require 'date'
module ReleaseHelper
def releases()
- file = open('https://api.github.com/repos/usergrid/usergrid/releases')
+ file = open('https://api.github.com/repos/usergrid/usergrid/releases', :http_basic_authentication => ["timanglade",'%2}:*3.$<=,9=9#82(7394/3]77#{x}e8C6CPCN8o6#>6<79Wk'])
return JSON.parse(file.read)
+
+ #return nil
# if type != 'timestamp'
# parsed['response']['docs'][0][type]
# else
Modified: incubator/usergrid/site/publish/community/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/community/index.html?rev=1552550&r1=1552549&r2=1552550&view=diff
==============================================================================
--- incubator/usergrid/site/publish/community/index.html (original)
+++ incubator/usergrid/site/publish/community/index.html Fri Dec 20 09:15:11 2013
@@ -253,11 +253,11 @@
</div>
<div class="row">
<div class="col-md-3">
- <h3>SF Bay Area Hack Day #1 <small>January 24</small></h3>
- <p>Come learn how to deploy & use Usergrid and meet committers at the Apigee offices, 2pmâ6pm, Thursday January 24. <a href="http://www.meetup.com/apache-usergrid-bay-area/events/155130502/">Register on Meetup.com</a><p>
+ <h3>SF Bay Area Hack Day #1 <small>January 23</small></h3>
+ <p>Come learn how to deploy & use Usergrid and meet committers at the Apigee offices, 2pmâ6pm, Thursday January 23. <a href="http://www.meetup.com/apache-usergrid-bay-area/events/155130502/">Register on Meetup.com</a><p>
</div>
<div class="col-md-3">
- <h3>SF Bay Area Meetup #1 <small>January 24</small></h3>
+ <h3>SF Bay Area Meetup #1 <small>January 23</small></h3>
<p>Canât join us for the afternoon hack day? Weâll host an evening meetup right afterwards! Or join us for both! <a href="http://www.meetup.com/apache-usergrid-bay-area/events/155130862/">Register on Meetup.com</a><p>
</div>
<div class="col-md-3">
Modified: incubator/usergrid/site/publish/docs/access-token/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/access-token/index.html?rev=1552550&r1=1552549&r2=1552550&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/access-token/index.html (original)
+++ incubator/usergrid/site/publish/docs/access-token/index.html Fri Dec 20 09:15:11 2013
@@ -45,8 +45,8 @@
</div>
<nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
<ul class="nav navbar-nav navbar-right">
- <!--<li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>-->
<li class=""><a href="/community/"><span class="icns icon-group"></span></a></li>
+ <li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>
<li><a href="http://github.com/usergrid/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/browse/USERGRID" target="_blank"><span class="icns icon-bug"></span></a></li>
@@ -65,27 +65,28 @@
<div class="col-md-3">
<div class="bf-sidebar hidden-print" role="complementary">
<ul class="nav nav-list">
- <li><a href="#">Getting Up & Running Locally</a></li>
- <li><a href="#"><code>ugc</code> â the Command-line Client</a></li>
+ <li><a href="/docs/getting-up-and-running-locally/">Getting Up & Running Locally</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/ugc#usergrid-command-line-ugc"><code>ugc</code> â the Command-line Client</a></li>
<li class="nav-header"><span>Concepts</span></li>
<li>
<a href="/docs/organizations-admins/">Organizations & Admins</a>
<ul>
<li>
- <a href="/docs/applications">Applications</a>
+ <a href="/docs/applications/">Applications</a>
<ul>
- <li><a href="#">Roles & Permissions</a></li>
- <li><a href="#">Queues</a></li>
- <li><a href="#">Events & Counters</a></li>
+ <li><a href="/docs/roles-and-permissions/">Roles & Permissions</a></li>
+ <!--<li><a href="#">Queues</a></li>-->
+ <li><a href="/docs/events-and-counters/">Events & Counters</a></li>
+ <li><a href="/docs/relationships/">Relationships (Joins)</a></li>
<li>
- <a href="#">Collections</a>
+ <a href="/docs/collections">Collections</a>
<ul>
- <li><a href="#">Query Language</a></li>
- <li><a href="#">Users & Devices</a></li>
- <li><a href="#">Groups</a></li>
- <li><a href="#">Activities</a></li>
- <li><a href="#">Assets</a></li>
+ <li><a href="/docs/query-language/">Query Language</a></li>
+ <li><a href="/docs/users-devices/">Users & Devices</a></li>
+ <li><a href="/docs/groups/">Groups</a></li>
+ <li><a href="/docs/activities/">Activities</a></li>
+ <li><a href="/docs/assets/">Assets</a></li>
</ul>
</li>
</ul>
@@ -95,27 +96,28 @@
<li class="nav-header"><span>Usage</span></li>
- <li><a href="/docs/rest-api">REST API</a></li>
- <li><a class="icns-apple" href="#">iOS SDK</a></li>
- <li><a class="icns-android" href="#">Android SDK</a></li>
- <li><a class="icns-html5" href="/docs/html5-javascript-sdk">HTML5 / JavaScript SDK</a></li>
- <li><a class="icns-windows" href="#">Windows 8 / Windows Phone / .net SDK</a></li>
- <li><a href="/docs/nodejs-module">Node.js module</a></li>
- <li><a href="/docs/ruby-gem">Ruby gem</a></li>
- <li><a href="#">Ruby on Rails gem</a></li>
- <li><a href="#">PHP library</a></li>
+ <li>REST API â Coming Soon</li>
+ <li><a class="icns-apple" href="https://github.com/usergrid/usergrid/tree/master/sdks/ios">iOS SDK</a></li>
+ <li><a class="icns-android" href="https://github.com/usergrid/usergrid/tree/master/sdks/android">Android SDK</a></li>
+ <li><a class="icns-html5" href="">HTML5 / JavaScript SDK</a></li>
+ <li><a class="icns-windows" href="https://github.com/usergrid/usergrid/tree/master/sdks/dotnet">Windows 8 / Windows Phone / .net SDK</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/nodejs">Node.js module</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby">Ruby gem</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails gem</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/php">PHP library</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/java">Java library</a></li>
<li class="nav-header"><span>Internals</span></li>
- <li><a href="#">Design & Goals</a></li>
- <li><a href="#">Java Architecture</a></li>
- <li><a href="#">Cassandra Schema</a></li>
- <li><a href="#">Contributing</a></li>
+ <li>Design & Goals â Coming Soon</li>
+ <li>Java Architecture â Coming Soon</li>
+ <li>Cassandra Schema â Coming Soon</li>
+ <li><a href="/docs/contributing/">Contributing</a></li>
<li class="nav-header"><span>Operations</span></li>
- <li><a href="#">Deploying</a></li>
- <li><a href="#">Monitoring</a></li>
- <li><a href="#">Upgrading</a></li>
- <li><a href="#">Security</a></li>
+ <li>Deploying â Coming Soon</li>
+ <li>Monitoring â Coming Soon</li>
+ <li><a href="/docs/upgrading/">Upgrading</a></li>
+ <li>Security â Coming Soon</li>
</ul>
</div>
</div>
@@ -124,7 +126,7 @@
<div class="page-article">
<div class="page-header">
<h1>Access token</h1>
- <small><a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/access-token/">contribute to this article on github</a></small>
+ <small><a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/access-token.md">contribute to this article on github</a></small>
</div>
<div class="toc">
<ul>
@@ -332,8 +334,8 @@ client.login(username, password,
<div class="col-md-3"></div>
<div class="col-md-9">
<div class="github-callout">
- <strong>Questions?</strong> Please do <a href="https://groups.google.com/forum/#!forum/usergrid">ask on the mailing-list</a>!<br/>
- <strong>Found an error?</strong> Weâd greatly appreciate a pull request about <a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/access-token/">this article on github</a>.</div>
+ <strong>Questions?</strong> Please do <a href="/community">ask on the mailing-lists</a>!<br/>
+ <strong>Found an error?</strong> Weâd greatly appreciate a pull request about <a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/access-token.md">this article on github</a>.</div>
</div>
</div>
</div>
@@ -346,7 +348,7 @@ client.login(username, password,
<ul class="nav nav-list">
<li class="nav-header"><a href="/">Home</a></li>
<li class="nav-header"><a href="/community/">Community</a></li>
- <!-- <li><a href="/community#events">Events</a></li> -->
+ <li><a href="/community/#events">Events</a></li>
<li><a href="/community/#mailing-lists">Mailing Lists</a></li>
<li><a href="/community/#deployments">Deployments</a></li>
<li><a href="/community/#committers">Commiters</a></li>
@@ -402,7 +404,7 @@ client.login(username, password,
<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 name of Apache TLP sponsor. 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>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>.</p>
Modified: incubator/usergrid/site/publish/docs/activity/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/activity/index.html?rev=1552550&r1=1552549&r2=1552550&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/activity/index.html (original)
+++ incubator/usergrid/site/publish/docs/activity/index.html Fri Dec 20 09:15:11 2013
@@ -45,8 +45,8 @@
</div>
<nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
<ul class="nav navbar-nav navbar-right">
- <!--<li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>-->
<li class=""><a href="/community/"><span class="icns icon-group"></span></a></li>
+ <li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>
<li><a href="http://github.com/usergrid/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/browse/USERGRID" target="_blank"><span class="icns icon-bug"></span></a></li>
@@ -65,27 +65,28 @@
<div class="col-md-3">
<div class="bf-sidebar hidden-print" role="complementary">
<ul class="nav nav-list">
- <li><a href="#">Getting Up & Running Locally</a></li>
- <li><a href="#"><code>ugc</code> â the Command-line Client</a></li>
+ <li><a href="/docs/getting-up-and-running-locally/">Getting Up & Running Locally</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/ugc#usergrid-command-line-ugc"><code>ugc</code> â the Command-line Client</a></li>
<li class="nav-header"><span>Concepts</span></li>
<li>
<a href="/docs/organizations-admins/">Organizations & Admins</a>
<ul>
<li>
- <a href="/docs/applications">Applications</a>
+ <a href="/docs/applications/">Applications</a>
<ul>
- <li><a href="#">Roles & Permissions</a></li>
- <li><a href="#">Queues</a></li>
- <li><a href="#">Events & Counters</a></li>
+ <li><a href="/docs/roles-and-permissions/">Roles & Permissions</a></li>
+ <!--<li><a href="#">Queues</a></li>-->
+ <li><a href="/docs/events-and-counters/">Events & Counters</a></li>
+ <li><a href="/docs/relationships/">Relationships (Joins)</a></li>
<li>
- <a href="#">Collections</a>
+ <a href="/docs/collections">Collections</a>
<ul>
- <li><a href="#">Query Language</a></li>
- <li><a href="#">Users & Devices</a></li>
- <li><a href="#">Groups</a></li>
- <li><a href="#">Activities</a></li>
- <li><a href="#">Assets</a></li>
+ <li><a href="/docs/query-language/">Query Language</a></li>
+ <li><a href="/docs/users-devices/">Users & Devices</a></li>
+ <li><a href="/docs/groups/">Groups</a></li>
+ <li><a href="/docs/activities/">Activities</a></li>
+ <li><a href="/docs/assets/">Assets</a></li>
</ul>
</li>
</ul>
@@ -95,27 +96,28 @@
<li class="nav-header"><span>Usage</span></li>
- <li><a href="/docs/rest-api">REST API</a></li>
- <li><a class="icns-apple" href="#">iOS SDK</a></li>
- <li><a class="icns-android" href="#">Android SDK</a></li>
- <li><a class="icns-html5" href="/docs/html5-javascript-sdk">HTML5 / JavaScript SDK</a></li>
- <li><a class="icns-windows" href="#">Windows 8 / Windows Phone / .net SDK</a></li>
- <li><a href="/docs/nodejs-module">Node.js module</a></li>
- <li><a href="/docs/ruby-gem">Ruby gem</a></li>
- <li><a href="#">Ruby on Rails gem</a></li>
- <li><a href="#">PHP library</a></li>
+ <li>REST API â Coming Soon</li>
+ <li><a class="icns-apple" href="https://github.com/usergrid/usergrid/tree/master/sdks/ios">iOS SDK</a></li>
+ <li><a class="icns-android" href="https://github.com/usergrid/usergrid/tree/master/sdks/android">Android SDK</a></li>
+ <li><a class="icns-html5" href="">HTML5 / JavaScript SDK</a></li>
+ <li><a class="icns-windows" href="https://github.com/usergrid/usergrid/tree/master/sdks/dotnet">Windows 8 / Windows Phone / .net SDK</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/nodejs">Node.js module</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby">Ruby gem</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails gem</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/php">PHP library</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/java">Java library</a></li>
<li class="nav-header"><span>Internals</span></li>
- <li><a href="#">Design & Goals</a></li>
- <li><a href="#">Java Architecture</a></li>
- <li><a href="#">Cassandra Schema</a></li>
- <li><a href="#">Contributing</a></li>
+ <li>Design & Goals â Coming Soon</li>
+ <li>Java Architecture â Coming Soon</li>
+ <li>Cassandra Schema â Coming Soon</li>
+ <li><a href="/docs/contributing/">Contributing</a></li>
<li class="nav-header"><span>Operations</span></li>
- <li><a href="#">Deploying</a></li>
- <li><a href="#">Monitoring</a></li>
- <li><a href="#">Upgrading</a></li>
- <li><a href="#">Security</a></li>
+ <li>Deploying â Coming Soon</li>
+ <li>Monitoring â Coming Soon</li>
+ <li><a href="/docs/upgrading/">Upgrading</a></li>
+ <li>Security â Coming Soon</li>
</ul>
</div>
</div>
@@ -124,7 +126,7 @@
<div class="page-article">
<div class="page-header">
<h1>Activity</h1>
- <small><a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/activity/">contribute to this article on github</a></small>
+ <small><a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/activity.md">contribute to this article on github</a></small>
</div>
<div class="toc">
<ul>
@@ -1159,8 +1161,8 @@ client.request(options, function (err, d
<div class="col-md-3"></div>
<div class="col-md-9">
<div class="github-callout">
- <strong>Questions?</strong> Please do <a href="https://groups.google.com/forum/#!forum/usergrid">ask on the mailing-list</a>!<br/>
- <strong>Found an error?</strong> Weâd greatly appreciate a pull request about <a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/activity/">this article on github</a>.</div>
+ <strong>Questions?</strong> Please do <a href="/community">ask on the mailing-lists</a>!<br/>
+ <strong>Found an error?</strong> Weâd greatly appreciate a pull request about <a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/activity.md">this article on github</a>.</div>
</div>
</div>
</div>
@@ -1173,7 +1175,7 @@ client.request(options, function (err, d
<ul class="nav nav-list">
<li class="nav-header"><a href="/">Home</a></li>
<li class="nav-header"><a href="/community/">Community</a></li>
- <!-- <li><a href="/community#events">Events</a></li> -->
+ <li><a href="/community/#events">Events</a></li>
<li><a href="/community/#mailing-lists">Mailing Lists</a></li>
<li><a href="/community/#deployments">Deployments</a></li>
<li><a href="/community/#committers">Commiters</a></li>
@@ -1229,7 +1231,7 @@ client.request(options, function (err, d
<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 name of Apache TLP sponsor. 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>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>.</p>
Modified: incubator/usergrid/site/publish/docs/admin-portal/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/admin-portal/index.html?rev=1552550&r1=1552549&r2=1552550&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/admin-portal/index.html (original)
+++ incubator/usergrid/site/publish/docs/admin-portal/index.html Fri Dec 20 09:15:11 2013
@@ -45,8 +45,8 @@
</div>
<nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
<ul class="nav navbar-nav navbar-right">
- <!--<li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>-->
<li class=""><a href="/community/"><span class="icns icon-group"></span></a></li>
+ <li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>
<li><a href="http://github.com/usergrid/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/browse/USERGRID" target="_blank"><span class="icns icon-bug"></span></a></li>
@@ -65,27 +65,28 @@
<div class="col-md-3">
<div class="bf-sidebar hidden-print" role="complementary">
<ul class="nav nav-list">
- <li><a href="#">Getting Up & Running Locally</a></li>
- <li><a href="#"><code>ugc</code> â the Command-line Client</a></li>
+ <li><a href="/docs/getting-up-and-running-locally/">Getting Up & Running Locally</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/ugc#usergrid-command-line-ugc"><code>ugc</code> â the Command-line Client</a></li>
<li class="nav-header"><span>Concepts</span></li>
<li>
<a href="/docs/organizations-admins/">Organizations & Admins</a>
<ul>
<li>
- <a href="/docs/applications">Applications</a>
+ <a href="/docs/applications/">Applications</a>
<ul>
- <li><a href="#">Roles & Permissions</a></li>
- <li><a href="#">Queues</a></li>
- <li><a href="#">Events & Counters</a></li>
+ <li><a href="/docs/roles-and-permissions/">Roles & Permissions</a></li>
+ <!--<li><a href="#">Queues</a></li>-->
+ <li><a href="/docs/events-and-counters/">Events & Counters</a></li>
+ <li><a href="/docs/relationships/">Relationships (Joins)</a></li>
<li>
- <a href="#">Collections</a>
+ <a href="/docs/collections">Collections</a>
<ul>
- <li><a href="#">Query Language</a></li>
- <li><a href="#">Users & Devices</a></li>
- <li><a href="#">Groups</a></li>
- <li><a href="#">Activities</a></li>
- <li><a href="#">Assets</a></li>
+ <li><a href="/docs/query-language/">Query Language</a></li>
+ <li><a href="/docs/users-devices/">Users & Devices</a></li>
+ <li><a href="/docs/groups/">Groups</a></li>
+ <li><a href="/docs/activities/">Activities</a></li>
+ <li><a href="/docs/assets/">Assets</a></li>
</ul>
</li>
</ul>
@@ -95,27 +96,28 @@
<li class="nav-header"><span>Usage</span></li>
- <li><a href="/docs/rest-api">REST API</a></li>
- <li><a class="icns-apple" href="#">iOS SDK</a></li>
- <li><a class="icns-android" href="#">Android SDK</a></li>
- <li><a class="icns-html5" href="/docs/html5-javascript-sdk">HTML5 / JavaScript SDK</a></li>
- <li><a class="icns-windows" href="#">Windows 8 / Windows Phone / .net SDK</a></li>
- <li><a href="/docs/nodejs-module">Node.js module</a></li>
- <li><a href="/docs/ruby-gem">Ruby gem</a></li>
- <li><a href="#">Ruby on Rails gem</a></li>
- <li><a href="#">PHP library</a></li>
+ <li>REST API â Coming Soon</li>
+ <li><a class="icns-apple" href="https://github.com/usergrid/usergrid/tree/master/sdks/ios">iOS SDK</a></li>
+ <li><a class="icns-android" href="https://github.com/usergrid/usergrid/tree/master/sdks/android">Android SDK</a></li>
+ <li><a class="icns-html5" href="">HTML5 / JavaScript SDK</a></li>
+ <li><a class="icns-windows" href="https://github.com/usergrid/usergrid/tree/master/sdks/dotnet">Windows 8 / Windows Phone / .net SDK</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/nodejs">Node.js module</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby">Ruby gem</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails gem</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/php">PHP library</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/java">Java library</a></li>
<li class="nav-header"><span>Internals</span></li>
- <li><a href="#">Design & Goals</a></li>
- <li><a href="#">Java Architecture</a></li>
- <li><a href="#">Cassandra Schema</a></li>
- <li><a href="#">Contributing</a></li>
+ <li>Design & Goals â Coming Soon</li>
+ <li>Java Architecture â Coming Soon</li>
+ <li>Cassandra Schema â Coming Soon</li>
+ <li><a href="/docs/contributing/">Contributing</a></li>
<li class="nav-header"><span>Operations</span></li>
- <li><a href="#">Deploying</a></li>
- <li><a href="#">Monitoring</a></li>
- <li><a href="#">Upgrading</a></li>
- <li><a href="#">Security</a></li>
+ <li>Deploying â Coming Soon</li>
+ <li>Monitoring â Coming Soon</li>
+ <li><a href="/docs/upgrading/">Upgrading</a></li>
+ <li>Security â Coming Soon</li>
</ul>
</div>
</div>
@@ -124,7 +126,7 @@
<div class="page-article">
<div class="page-header">
<h1>Admin portal</h1>
- <small><a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/admin-portal/">contribute to this article on github</a></small>
+ <small><a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/admin-portal.md">contribute to this article on github</a></small>
</div>
<div class="toc">
<ul>
@@ -497,8 +499,8 @@
<div class="col-md-3"></div>
<div class="col-md-9">
<div class="github-callout">
- <strong>Questions?</strong> Please do <a href="https://groups.google.com/forum/#!forum/usergrid">ask on the mailing-list</a>!<br/>
- <strong>Found an error?</strong> Weâd greatly appreciate a pull request about <a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/admin-portal/">this article on github</a>.</div>
+ <strong>Questions?</strong> Please do <a href="/community">ask on the mailing-lists</a>!<br/>
+ <strong>Found an error?</strong> Weâd greatly appreciate a pull request about <a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/admin-portal.md">this article on github</a>.</div>
</div>
</div>
</div>
@@ -511,7 +513,7 @@
<ul class="nav nav-list">
<li class="nav-header"><a href="/">Home</a></li>
<li class="nav-header"><a href="/community/">Community</a></li>
- <!-- <li><a href="/community#events">Events</a></li> -->
+ <li><a href="/community/#events">Events</a></li>
<li><a href="/community/#mailing-lists">Mailing Lists</a></li>
<li><a href="/community/#deployments">Deployments</a></li>
<li><a href="/community/#committers">Commiters</a></li>
@@ -567,7 +569,7 @@
<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 name of Apache TLP sponsor. 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>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>.</p>
Modified: incubator/usergrid/site/publish/docs/admin-user/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/admin-user/index.html?rev=1552550&r1=1552549&r2=1552550&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/admin-user/index.html (original)
+++ incubator/usergrid/site/publish/docs/admin-user/index.html Fri Dec 20 09:15:11 2013
@@ -45,8 +45,8 @@
</div>
<nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
<ul class="nav navbar-nav navbar-right">
- <!--<li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>-->
<li class=""><a href="/community/"><span class="icns icon-group"></span></a></li>
+ <li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>
<li><a href="http://github.com/usergrid/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/browse/USERGRID" target="_blank"><span class="icns icon-bug"></span></a></li>
@@ -65,27 +65,28 @@
<div class="col-md-3">
<div class="bf-sidebar hidden-print" role="complementary">
<ul class="nav nav-list">
- <li><a href="#">Getting Up & Running Locally</a></li>
- <li><a href="#"><code>ugc</code> â the Command-line Client</a></li>
+ <li><a href="/docs/getting-up-and-running-locally/">Getting Up & Running Locally</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/ugc#usergrid-command-line-ugc"><code>ugc</code> â the Command-line Client</a></li>
<li class="nav-header"><span>Concepts</span></li>
<li>
<a href="/docs/organizations-admins/">Organizations & Admins</a>
<ul>
<li>
- <a href="/docs/applications">Applications</a>
+ <a href="/docs/applications/">Applications</a>
<ul>
- <li><a href="#">Roles & Permissions</a></li>
- <li><a href="#">Queues</a></li>
- <li><a href="#">Events & Counters</a></li>
+ <li><a href="/docs/roles-and-permissions/">Roles & Permissions</a></li>
+ <!--<li><a href="#">Queues</a></li>-->
+ <li><a href="/docs/events-and-counters/">Events & Counters</a></li>
+ <li><a href="/docs/relationships/">Relationships (Joins)</a></li>
<li>
- <a href="#">Collections</a>
+ <a href="/docs/collections">Collections</a>
<ul>
- <li><a href="#">Query Language</a></li>
- <li><a href="#">Users & Devices</a></li>
- <li><a href="#">Groups</a></li>
- <li><a href="#">Activities</a></li>
- <li><a href="#">Assets</a></li>
+ <li><a href="/docs/query-language/">Query Language</a></li>
+ <li><a href="/docs/users-devices/">Users & Devices</a></li>
+ <li><a href="/docs/groups/">Groups</a></li>
+ <li><a href="/docs/activities/">Activities</a></li>
+ <li><a href="/docs/assets/">Assets</a></li>
</ul>
</li>
</ul>
@@ -95,27 +96,28 @@
<li class="nav-header"><span>Usage</span></li>
- <li><a href="/docs/rest-api">REST API</a></li>
- <li><a class="icns-apple" href="#">iOS SDK</a></li>
- <li><a class="icns-android" href="#">Android SDK</a></li>
- <li><a class="icns-html5" href="/docs/html5-javascript-sdk">HTML5 / JavaScript SDK</a></li>
- <li><a class="icns-windows" href="#">Windows 8 / Windows Phone / .net SDK</a></li>
- <li><a href="/docs/nodejs-module">Node.js module</a></li>
- <li><a href="/docs/ruby-gem">Ruby gem</a></li>
- <li><a href="#">Ruby on Rails gem</a></li>
- <li><a href="#">PHP library</a></li>
+ <li>REST API â Coming Soon</li>
+ <li><a class="icns-apple" href="https://github.com/usergrid/usergrid/tree/master/sdks/ios">iOS SDK</a></li>
+ <li><a class="icns-android" href="https://github.com/usergrid/usergrid/tree/master/sdks/android">Android SDK</a></li>
+ <li><a class="icns-html5" href="">HTML5 / JavaScript SDK</a></li>
+ <li><a class="icns-windows" href="https://github.com/usergrid/usergrid/tree/master/sdks/dotnet">Windows 8 / Windows Phone / .net SDK</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/nodejs">Node.js module</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby">Ruby gem</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails gem</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/php">PHP library</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/java">Java library</a></li>
<li class="nav-header"><span>Internals</span></li>
- <li><a href="#">Design & Goals</a></li>
- <li><a href="#">Java Architecture</a></li>
- <li><a href="#">Cassandra Schema</a></li>
- <li><a href="#">Contributing</a></li>
+ <li>Design & Goals â Coming Soon</li>
+ <li>Java Architecture â Coming Soon</li>
+ <li>Cassandra Schema â Coming Soon</li>
+ <li><a href="/docs/contributing/">Contributing</a></li>
<li class="nav-header"><span>Operations</span></li>
- <li><a href="#">Deploying</a></li>
- <li><a href="#">Monitoring</a></li>
- <li><a href="#">Upgrading</a></li>
- <li><a href="#">Security</a></li>
+ <li>Deploying â Coming Soon</li>
+ <li>Monitoring â Coming Soon</li>
+ <li><a href="/docs/upgrading/">Upgrading</a></li>
+ <li>Security â Coming Soon</li>
</ul>
</div>
</div>
@@ -124,7 +126,7 @@
<div class="page-article">
<div class="page-header">
<h1>Admin user</h1>
- <small><a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/admin-user/">contribute to this article on github</a></small>
+ <small><a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/admin-user.md">contribute to this article on github</a></small>
</div>
<div class="toc">
<ul>
@@ -778,8 +780,8 @@ client.request(options, function (err, d
<div class="col-md-3"></div>
<div class="col-md-9">
<div class="github-callout">
- <strong>Questions?</strong> Please do <a href="https://groups.google.com/forum/#!forum/usergrid">ask on the mailing-list</a>!<br/>
- <strong>Found an error?</strong> Weâd greatly appreciate a pull request about <a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/admin-user/">this article on github</a>.</div>
+ <strong>Questions?</strong> Please do <a href="/community">ask on the mailing-lists</a>!<br/>
+ <strong>Found an error?</strong> Weâd greatly appreciate a pull request about <a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/admin-user.md">this article on github</a>.</div>
</div>
</div>
</div>
@@ -792,7 +794,7 @@ client.request(options, function (err, d
<ul class="nav nav-list">
<li class="nav-header"><a href="/">Home</a></li>
<li class="nav-header"><a href="/community/">Community</a></li>
- <!-- <li><a href="/community#events">Events</a></li> -->
+ <li><a href="/community/#events">Events</a></li>
<li><a href="/community/#mailing-lists">Mailing Lists</a></li>
<li><a href="/community/#deployments">Deployments</a></li>
<li><a href="/community/#committers">Commiters</a></li>
@@ -848,7 +850,7 @@ client.request(options, function (err, d
<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 name of Apache TLP sponsor. 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>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>.</p>
Modified: incubator/usergrid/site/publish/docs/app-security/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/app-security/index.html?rev=1552550&r1=1552549&r2=1552550&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/app-security/index.html (original)
+++ incubator/usergrid/site/publish/docs/app-security/index.html Fri Dec 20 09:15:11 2013
@@ -45,8 +45,8 @@
</div>
<nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
<ul class="nav navbar-nav navbar-right">
- <!--<li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>-->
<li class=""><a href="/community/"><span class="icns icon-group"></span></a></li>
+ <li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>
<li><a href="http://github.com/usergrid/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/browse/USERGRID" target="_blank"><span class="icns icon-bug"></span></a></li>
@@ -65,27 +65,28 @@
<div class="col-md-3">
<div class="bf-sidebar hidden-print" role="complementary">
<ul class="nav nav-list">
- <li><a href="#">Getting Up & Running Locally</a></li>
- <li><a href="#"><code>ugc</code> â the Command-line Client</a></li>
+ <li><a href="/docs/getting-up-and-running-locally/">Getting Up & Running Locally</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/ugc#usergrid-command-line-ugc"><code>ugc</code> â the Command-line Client</a></li>
<li class="nav-header"><span>Concepts</span></li>
<li>
<a href="/docs/organizations-admins/">Organizations & Admins</a>
<ul>
<li>
- <a href="/docs/applications">Applications</a>
+ <a href="/docs/applications/">Applications</a>
<ul>
- <li><a href="#">Roles & Permissions</a></li>
- <li><a href="#">Queues</a></li>
- <li><a href="#">Events & Counters</a></li>
+ <li><a href="/docs/roles-and-permissions/">Roles & Permissions</a></li>
+ <!--<li><a href="#">Queues</a></li>-->
+ <li><a href="/docs/events-and-counters/">Events & Counters</a></li>
+ <li><a href="/docs/relationships/">Relationships (Joins)</a></li>
<li>
- <a href="#">Collections</a>
+ <a href="/docs/collections">Collections</a>
<ul>
- <li><a href="#">Query Language</a></li>
- <li><a href="#">Users & Devices</a></li>
- <li><a href="#">Groups</a></li>
- <li><a href="#">Activities</a></li>
- <li><a href="#">Assets</a></li>
+ <li><a href="/docs/query-language/">Query Language</a></li>
+ <li><a href="/docs/users-devices/">Users & Devices</a></li>
+ <li><a href="/docs/groups/">Groups</a></li>
+ <li><a href="/docs/activities/">Activities</a></li>
+ <li><a href="/docs/assets/">Assets</a></li>
</ul>
</li>
</ul>
@@ -95,27 +96,28 @@
<li class="nav-header"><span>Usage</span></li>
- <li><a href="/docs/rest-api">REST API</a></li>
- <li><a class="icns-apple" href="#">iOS SDK</a></li>
- <li><a class="icns-android" href="#">Android SDK</a></li>
- <li><a class="icns-html5" href="/docs/html5-javascript-sdk">HTML5 / JavaScript SDK</a></li>
- <li><a class="icns-windows" href="#">Windows 8 / Windows Phone / .net SDK</a></li>
- <li><a href="/docs/nodejs-module">Node.js module</a></li>
- <li><a href="/docs/ruby-gem">Ruby gem</a></li>
- <li><a href="#">Ruby on Rails gem</a></li>
- <li><a href="#">PHP library</a></li>
+ <li>REST API â Coming Soon</li>
+ <li><a class="icns-apple" href="https://github.com/usergrid/usergrid/tree/master/sdks/ios">iOS SDK</a></li>
+ <li><a class="icns-android" href="https://github.com/usergrid/usergrid/tree/master/sdks/android">Android SDK</a></li>
+ <li><a class="icns-html5" href="">HTML5 / JavaScript SDK</a></li>
+ <li><a class="icns-windows" href="https://github.com/usergrid/usergrid/tree/master/sdks/dotnet">Windows 8 / Windows Phone / .net SDK</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/nodejs">Node.js module</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby">Ruby gem</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails gem</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/php">PHP library</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/java">Java library</a></li>
<li class="nav-header"><span>Internals</span></li>
- <li><a href="#">Design & Goals</a></li>
- <li><a href="#">Java Architecture</a></li>
- <li><a href="#">Cassandra Schema</a></li>
- <li><a href="#">Contributing</a></li>
+ <li>Design & Goals â Coming Soon</li>
+ <li>Java Architecture â Coming Soon</li>
+ <li>Cassandra Schema â Coming Soon</li>
+ <li><a href="/docs/contributing/">Contributing</a></li>
<li class="nav-header"><span>Operations</span></li>
- <li><a href="#">Deploying</a></li>
- <li><a href="#">Monitoring</a></li>
- <li><a href="#">Upgrading</a></li>
- <li><a href="#">Security</a></li>
+ <li>Deploying â Coming Soon</li>
+ <li>Monitoring â Coming Soon</li>
+ <li><a href="/docs/upgrading/">Upgrading</a></li>
+ <li>Security â Coming Soon</li>
</ul>
</div>
</div>
@@ -124,7 +126,7 @@
<div class="page-article">
<div class="page-header">
<h1>App security</h1>
- <small><a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/app-security/">contribute to this article on github</a></small>
+ <small><a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/app-security.md">contribute to this article on github</a></small>
</div>
<div class="toc">
<ul>
@@ -152,8 +154,8 @@
<div class="col-md-3"></div>
<div class="col-md-9">
<div class="github-callout">
- <strong>Questions?</strong> Please do <a href="https://groups.google.com/forum/#!forum/usergrid">ask on the mailing-list</a>!<br/>
- <strong>Found an error?</strong> Weâd greatly appreciate a pull request about <a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/app-security/">this article on github</a>.</div>
+ <strong>Questions?</strong> Please do <a href="/community">ask on the mailing-lists</a>!<br/>
+ <strong>Found an error?</strong> Weâd greatly appreciate a pull request about <a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/app-security.md">this article on github</a>.</div>
</div>
</div>
</div>
@@ -166,7 +168,7 @@
<ul class="nav nav-list">
<li class="nav-header"><a href="/">Home</a></li>
<li class="nav-header"><a href="/community/">Community</a></li>
- <!-- <li><a href="/community#events">Events</a></li> -->
+ <li><a href="/community/#events">Events</a></li>
<li><a href="/community/#mailing-lists">Mailing Lists</a></li>
<li><a href="/community/#deployments">Deployments</a></li>
<li><a href="/community/#committers">Commiters</a></li>
@@ -222,7 +224,7 @@
<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 name of Apache TLP sponsor. 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>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>.</p>
Modified: incubator/usergrid/site/publish/docs/application/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/application/index.html?rev=1552550&r1=1552549&r2=1552550&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/application/index.html (original)
+++ incubator/usergrid/site/publish/docs/application/index.html Fri Dec 20 09:15:11 2013
@@ -45,8 +45,8 @@
</div>
<nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
<ul class="nav navbar-nav navbar-right">
- <!--<li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>-->
<li class=""><a href="/community/"><span class="icns icon-group"></span></a></li>
+ <li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>
<li><a href="http://github.com/usergrid/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/browse/USERGRID" target="_blank"><span class="icns icon-bug"></span></a></li>
@@ -65,27 +65,28 @@
<div class="col-md-3">
<div class="bf-sidebar hidden-print" role="complementary">
<ul class="nav nav-list">
- <li><a href="#">Getting Up & Running Locally</a></li>
- <li><a href="#"><code>ugc</code> â the Command-line Client</a></li>
+ <li><a href="/docs/getting-up-and-running-locally/">Getting Up & Running Locally</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/ugc#usergrid-command-line-ugc"><code>ugc</code> â the Command-line Client</a></li>
<li class="nav-header"><span>Concepts</span></li>
<li>
<a href="/docs/organizations-admins/">Organizations & Admins</a>
<ul>
<li>
- <a href="/docs/applications">Applications</a>
+ <a href="/docs/applications/">Applications</a>
<ul>
- <li><a href="#">Roles & Permissions</a></li>
- <li><a href="#">Queues</a></li>
- <li><a href="#">Events & Counters</a></li>
+ <li><a href="/docs/roles-and-permissions/">Roles & Permissions</a></li>
+ <!--<li><a href="#">Queues</a></li>-->
+ <li><a href="/docs/events-and-counters/">Events & Counters</a></li>
+ <li><a href="/docs/relationships/">Relationships (Joins)</a></li>
<li>
- <a href="#">Collections</a>
+ <a href="/docs/collections">Collections</a>
<ul>
- <li><a href="#">Query Language</a></li>
- <li><a href="#">Users & Devices</a></li>
- <li><a href="#">Groups</a></li>
- <li><a href="#">Activities</a></li>
- <li><a href="#">Assets</a></li>
+ <li><a href="/docs/query-language/">Query Language</a></li>
+ <li><a href="/docs/users-devices/">Users & Devices</a></li>
+ <li><a href="/docs/groups/">Groups</a></li>
+ <li><a href="/docs/activities/">Activities</a></li>
+ <li><a href="/docs/assets/">Assets</a></li>
</ul>
</li>
</ul>
@@ -95,27 +96,28 @@
<li class="nav-header"><span>Usage</span></li>
- <li><a href="/docs/rest-api">REST API</a></li>
- <li><a class="icns-apple" href="#">iOS SDK</a></li>
- <li><a class="icns-android" href="#">Android SDK</a></li>
- <li><a class="icns-html5" href="/docs/html5-javascript-sdk">HTML5 / JavaScript SDK</a></li>
- <li><a class="icns-windows" href="#">Windows 8 / Windows Phone / .net SDK</a></li>
- <li><a href="/docs/nodejs-module">Node.js module</a></li>
- <li><a href="/docs/ruby-gem">Ruby gem</a></li>
- <li><a href="#">Ruby on Rails gem</a></li>
- <li><a href="#">PHP library</a></li>
+ <li>REST API â Coming Soon</li>
+ <li><a class="icns-apple" href="https://github.com/usergrid/usergrid/tree/master/sdks/ios">iOS SDK</a></li>
+ <li><a class="icns-android" href="https://github.com/usergrid/usergrid/tree/master/sdks/android">Android SDK</a></li>
+ <li><a class="icns-html5" href="">HTML5 / JavaScript SDK</a></li>
+ <li><a class="icns-windows" href="https://github.com/usergrid/usergrid/tree/master/sdks/dotnet">Windows 8 / Windows Phone / .net SDK</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/nodejs">Node.js module</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby">Ruby gem</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails gem</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/php">PHP library</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/java">Java library</a></li>
<li class="nav-header"><span>Internals</span></li>
- <li><a href="#">Design & Goals</a></li>
- <li><a href="#">Java Architecture</a></li>
- <li><a href="#">Cassandra Schema</a></li>
- <li><a href="#">Contributing</a></li>
+ <li>Design & Goals â Coming Soon</li>
+ <li>Java Architecture â Coming Soon</li>
+ <li>Cassandra Schema â Coming Soon</li>
+ <li><a href="/docs/contributing/">Contributing</a></li>
<li class="nav-header"><span>Operations</span></li>
- <li><a href="#">Deploying</a></li>
- <li><a href="#">Monitoring</a></li>
- <li><a href="#">Upgrading</a></li>
- <li><a href="#">Security</a></li>
+ <li>Deploying â Coming Soon</li>
+ <li>Monitoring â Coming Soon</li>
+ <li><a href="/docs/upgrading/">Upgrading</a></li>
+ <li>Security â Coming Soon</li>
</ul>
</div>
</div>
@@ -124,7 +126,7 @@
<div class="page-article">
<div class="page-header">
<h1>Application</h1>
- <small><a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/application/">contribute to this article on github</a></small>
+ <small><a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/application.md">contribute to this article on github</a></small>
</div>
<div class="toc">
<ul>
@@ -322,8 +324,8 @@
<div class="col-md-3"></div>
<div class="col-md-9">
<div class="github-callout">
- <strong>Questions?</strong> Please do <a href="https://groups.google.com/forum/#!forum/usergrid">ask on the mailing-list</a>!<br/>
- <strong>Found an error?</strong> Weâd greatly appreciate a pull request about <a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/application/">this article on github</a>.</div>
+ <strong>Questions?</strong> Please do <a href="/community">ask on the mailing-lists</a>!<br/>
+ <strong>Found an error?</strong> Weâd greatly appreciate a pull request about <a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/application.md">this article on github</a>.</div>
</div>
</div>
</div>
@@ -336,7 +338,7 @@
<ul class="nav nav-list">
<li class="nav-header"><a href="/">Home</a></li>
<li class="nav-header"><a href="/community/">Community</a></li>
- <!-- <li><a href="/community#events">Events</a></li> -->
+ <li><a href="/community/#events">Events</a></li>
<li><a href="/community/#mailing-lists">Mailing Lists</a></li>
<li><a href="/community/#deployments">Deployments</a></li>
<li><a href="/community/#committers">Commiters</a></li>
@@ -392,7 +394,7 @@
<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 name of Apache TLP sponsor. 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>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>.</p>