You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/08/07 16:57:41 UTC
[1/3] git commit: Updated readme w/ directions for building portal
Repository: incubator-usergrid
Updated Branches:
refs/heads/master 4a625c0ef -> 37d74d101
Updated readme w/ directions for building portal
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/de7982a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/de7982a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/de7982a3
Branch: refs/heads/master
Commit: de7982a3fe6354637f93f7aa15ee5d81e7699be6
Parents: 0f2e203
Author: Rod Simpson <ro...@apigee.com>
Authored: Mon Aug 4 15:42:00 2014 -0600
Committer: Rod Simpson <ro...@apigee.com>
Committed: Mon Aug 4 15:42:00 2014 -0600
----------------------------------------------------------------------
portal/README.md | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/de7982a3/portal/README.md
----------------------------------------------------------------------
diff --git a/portal/README.md b/portal/README.md
index 400fc38..40a7688 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/usergrid/usergrid>
+<https://github.com/apache/incubator-usergrid/tree/master/portal>
##About the admin portal
Use the admin portal for administrative operations, including:
@@ -24,7 +24,13 @@ If you are just running the portal:
1. Install Node.js from http://nodejs.org/download/.
2. From the root directory, run `./build.sh dev`.
3. This will build and run a lightweight server. Naviate to http://localhost:3000
-4. If that doesn't work, in dist is a built copy and a file called rel-usergrid-portal.zip. Unzip and deploy to your favorite web server.
+
+If you are deploying the portal to a server:
+
+1. Install Node.js from http://nodejs.org/download/.
+2. From the root directory, run `./build.sh`.
+3. Check the /dist/usergrid-portal directory. This will contain a built copy of the source code.
+4. Deploy the contents to your favorite web server.
If you are developing:
[2/3] git commit: added info about config for admin portal
Posted by sf...@apache.org.
added info about config for admin portal
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/751c9e4a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/751c9e4a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/751c9e4a
Branch: refs/heads/master
Commit: 751c9e4ad20767fd2985477ba0fa15947e61cea7
Parents: de7982a
Author: Rod Simpson <ro...@apigee.com>
Authored: Tue Aug 5 23:33:26 2014 -0600
Committer: Rod Simpson <ro...@apigee.com>
Committed: Tue Aug 5 23:33:26 2014 -0600
----------------------------------------------------------------------
portal/README.md | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/751c9e4a/portal/README.md
----------------------------------------------------------------------
diff --git a/portal/README.md b/portal/README.md
index 40a7688..b6e7ced 100644
--- a/portal/README.md
+++ b/portal/README.md
@@ -17,7 +17,13 @@ Use the admin portal for administrative operations, including:
* View and modify your data, with full support for users, groups, and custom entities and collections.
* Generate and access credentials for API access.
-##Deploying or Developing
+##Running, Deploying, or Developing
+
+For all cases, edit the "config.js" file in the root of the portal so that it points to your Usergrid:
+
+ Usergrid.overrideUrl = 'https://api.usergrid.com/';
+
+Change 'https://api.usergrid.com/' to the url of your Usergrid.
If you are just running the portal:
[3/3] git commit: Merge branch 'master' of
github.com:rodsimpson/incubator-usergrid
Posted by sf...@apache.org.
Merge branch 'master' of github.com:rodsimpson/incubator-usergrid
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/37d74d10
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/37d74d10
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/37d74d10
Branch: refs/heads/master
Commit: 37d74d1017315b527a93042765298f2ded174964
Parents: 4a625c0 751c9e4
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Aug 7 08:56:39 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Aug 7 08:56:39 2014 -0600
----------------------------------------------------------------------
portal/README.md | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------