usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [09/44] git commit: merging upstream
Date Wed, 02 Apr 2014 23:21:50 GMT
merging upstream


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0818271c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0818271c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0818271c

Branch: refs/pull/92/head
Commit: 0818271cf1375cd8909bf1a7b182962587c21f87
Parents: fb0aab0
Author: amuramoto <amuramoto@apigee.com>
Authored: Tue Apr 1 10:53:03 2014 -0700
Committer: amuramoto <amuramoto@apigee.com>
Committed: Tue Apr 1 10:53:03 2014 -0700

----------------------------------------------------------------------
 portal/js/global/help-service.js                |    2 +-
 portal/js/libs/usergrid-libs.min.js             |    4 +-
 portal/js/usergrid-dev.min.js                   |    4 +-
 portal/js/usergrid-dev.min.js.orig              | 4939 ++++++++++++++++++
 portal/js/usergrid.min.js                       |    4 +-
 portal/js/usergrid.min.js.orig                  |    6 +
 .../instrument/js/usergrid-coverage.min.js      |    2 +-
 .../test/coverage/instrument/js/usergrid.min.js |    2 +-
 8 files changed, 4954 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0818271c/portal/js/global/help-service.js
----------------------------------------------------------------------
diff --git a/portal/js/global/help-service.js b/portal/js/global/help-service.js
index de067df..6335e3c 100644
--- a/portal/js/global/help-service.js
+++ b/portal/js/global/help-service.js
@@ -122,7 +122,7 @@ AppServices.Services.factory('help', function($rootScope, $http, $analytics)
{
 
 
   var getHelpJson = function(path) {
-    return $http.jsonp('http://sdk.apigee.com.s3.amazonaws.com/portal_help' + path + '/helpJson.json?callback=JSON_CALLBACK');
+    return $http.jsonp('https://sdk.apigee.com/portal_help' + path + '/helpJson.json?callback=JSON_CALLBACK');
   };
 
   var getHelpStatus = function(helpType) {


Mime
View raw message