Repository: incubator-usergrid Updated Branches: refs/heads/master a89c57b89 -> ae9677800
USERGRID-247 Default config.js setup. Added extra gitignore files. Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/80803faf Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/80803faf Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/80803faf Branch: refs/heads/master Commit: 80803faf4cb64fd13c8c81c4659a857b9ffdffc8 Parents: 7131c5a Author: John D. Ament <[email protected]> Authored: Tue Nov 11 20:41:38 2014 -0500 Committer: John D. Ament <[email protected]> Committed: Tue Nov 11 20:41:38 2014 -0500 ---------------------------------------------------------------------- .gitignore | 3 ++- portal/config.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/80803faf/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 47ed041..2ed09aa 100644 --- a/.gitignore +++ b/.gitignore @@ -27,8 +27,9 @@ Icon /portal/test/coverage/instrument/js/usergrid-coverage.min.js /portal/test/coverage/instrument/js/usergrid.min.js /stack/corepersistence/priamcluster/aws.properties -#Webstorm artifacts +#Webstorm/IntelliJ artifacts .idea/ +*.iml stack/corepersistence/collection/nbactions.xml stack/corepersistence/graph/nbactions.xml stack/corepersistence/model/nbactions.xml http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/80803faf/portal/config.js ---------------------------------------------------------------------- diff --git a/portal/config.js b/portal/config.js index e04ba9d..ebc9e7e 100644 --- a/portal/config.js +++ b/portal/config.js @@ -24,7 +24,7 @@ Usergrid.showNotifcations = true; // used only if hostname does not match a real server name -Usergrid.overrideUrl = 'https://api.usergrid.com/'; +Usergrid.overrideUrl = 'http://localhost:8080/'; Usergrid.options = { client:{
