diff --git a/app/config.json b/app/config.json index 5db6e645033aab52cd6bdbe8614628ec3744d69e..271e21a68ac8d4799bfda6cd1c0d5c91fd31fc3f 100644 --- a/app/config.json +++ b/app/config.json @@ -29,8 +29,8 @@ }, "feed": { "jsonFeed": { - "fr-FR": "https://g1.duniter.fr/feed-fr.json", - "en": "https://g1.duniter.fr/feed-en.json" + "fr-FR": "https://raw.githubusercontent.com/duniter/cesium/master/doc/feed/feed-fr.json", + "en": "https://raw.githubusercontent.com/duniter/cesium/master/doc/feed/feed-en.json" }, "maxContentLength": 650 }, @@ -117,8 +117,8 @@ }, "feed": { "jsonFeed": { - "fr-FR": "https://g1.duniter.fr/feed-fr.json", - "en": "https://g1.duniter.fr/feed-en.json" + "fr-FR": "https://raw.githubusercontent.com/duniter/cesium/master/doc/feed/feed-fr.json", + "en": "https://raw.githubusercontent.com/duniter/cesium/master/doc/feed/feed-en.json" }, "maxContentLength": 650 }, diff --git a/www/feed-fr.json b/doc/feed/feed-fr.json similarity index 100% rename from www/feed-fr.json rename to doc/feed/feed-fr.json diff --git a/gulpfile.js b/gulpfile.js index 65c1381c69bc54c34a9df2130c68145c1961b3bf..fe75b8e0e3f1e31e03512abd8dd48d3146ddb845 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -342,10 +342,14 @@ function webCopyFiles() { gulp.src('./www/img/**/*.*') .pipe(gulp.dest(tmpPath + '/img')), - // Copy manifest.json, feed.json - gulp.src(['./www/manifest.json', './www/feed*.json']) + // Copy manifest.json + gulp.src('./www/manifest.json') .pipe(gulp.dest(tmpPath)), + // Copy feed*.json + //gulp.src('./www/feed*.json') + // .pipe(gulp.dest(tmpPath)), + // Copy lib gulp.src('./www/lib/**/*.*') .pipe(gulp.dest(tmpPath + '/lib')), diff --git a/scripts/release.sh b/scripts/release.sh index 5d8e5865b371de98b7ec70a945b9c70d4910c492..e6d1088e463d9196d84bf008ad816614508ceabf 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -173,7 +173,7 @@ fi echo "----------------------------------" echo "- Building desktop artifacts..." echo "----------------------------------" -. ${PROJECT_DIR}/scripts/release-desktop.sh $1 ''"$description"'' +. ${PROJECT_DIR}/scripts/release-desktop.sh $1 if [[ $? -ne 0 ]]; then exit 1 fi @@ -184,7 +184,7 @@ nvm use ${NODEJS_VERSION} echo "----------------------------------" echo "- Push git android project..." echo "----------------------------------" -. ${PROJECT_DIR}/scripts/release-android-sources.sh $2 ''"$description"'' +. ${PROJECT_DIR}/scripts/release-android-sources.sh $2 echo "**********************************" echo "* Build release succeed !" diff --git a/www/js/config.js b/www/js/config.js index 392100803466a9d52dc283cb51331d8b86f801f9..d7d7dfb18aa4b7fdcfbeba25198bb14090f65208 100644 --- a/www/js/config.js +++ b/www/js/config.js @@ -38,8 +38,8 @@ angular.module("cesium.config", []) }, "feed": { "jsonFeed": { - "fr-FR": "https://g1.duniter.fr/feed-fr.json", - "en": "https://g1.duniter.fr/feed-en.json" + "fr-FR": "https://raw.githubusercontent.com/duniter/cesium/master/www/feed-fr.json", + "en": "https://raw.githubusercontent.com/duniter/cesium/master/www/feed-en.json" }, "maxContentLength": 650 }, @@ -102,4 +102,4 @@ angular.module("cesium.config", []) "newIssueUrl": "https://git.duniter.org/clients/cesium-grp/cesium/issues/new" }) -; \ No newline at end of file +; diff --git a/www/js/controllers/app-controllers.js b/www/js/controllers/app-controllers.js index aca8492f6ae5073cb9dfe260200bbe5d1bb2c186..c3b9c69571dfdc8d30c5f8ffefa399503285c479 100644 --- a/www/js/controllers/app-controllers.js +++ b/www/js/controllers/app-controllers.js @@ -511,7 +511,8 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $ } -function HomeController($scope, $state, $timeout, $ionicHistory, $translate, $http, UIUtils, csConfig, csPlatform, csCurrency, csSettings) { +function HomeController($scope, $state, $timeout, $ionicHistory, $translate, $http, UIUtils, + csConfig, csCache, csPlatform, csCurrency, csSettings) { 'ngInject'; $scope.loading = true; @@ -574,7 +575,7 @@ function HomeController($scope, $state, $timeout, $ionicHistory, $translate, $ht var now = Date.now(); console.debug("[home] Loading feeds from {0}...".format(feedUrl)); - $http.get(feedUrl, {responseType: 'json'}) + $http.get(feedUrl, {responseType: 'json', cache: csCache.get(null, csCache.constants.LONG)}) .success(function(feed) { console.debug('[home] Feeds loaded in {0}ms'.format(Date.now()-now)); if (!feed || !feed.items ||Â !feed.items.length) return // skip if empty