diff --git a/release.sh b/release.sh index d86c211a75278d9409c8bfc0f1c15ba3b1d123c7..9052f7016d38dbf5f2431ba397a4e9f3c065d3e4 100755 --- a/release.sh +++ b/release.sh @@ -30,7 +30,7 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then esac # Commit - #git reset HEAD + git reset HEAD case "$1" in rel) git add package.json config.xml @@ -49,13 +49,14 @@ else echo " - version: x.y.z" echo " - android-version: nnn" fi -#gulp default --env default -#ionic build android --release +gulp default --env default -#ionic build firefoxos --release +ionic build android --release -#gulp build:web --release +ionic build firefoxos --release + +gulp build:web --release diff --git a/www/js/config.js b/www/js/config.js index 70e1dad95a7ada0c3c19325a2e28f513644add21..65aae5932fd2125cec62b2f5c103cebd02bc445a 100644 --- a/www/js/config.js +++ b/www/js/config.js @@ -28,8 +28,8 @@ angular.module("cesium.config", []) "port": "9203" } }, - "version": "0.2.2", - "build": "2016-08-23T07:06:46.865Z", + "version": "0.2.3", + "build": "2016-08-23T09:25:41.250Z", "newIssueUrl": "https://github.com/duniter/cesium/issues/new?labels=bug" }) diff --git a/www/js/controllers/app-controllers.js b/www/js/controllers/app-controllers.js index 373f5be516583921f2e9af2f4c7fd4ab3f9b7f4a..7d8555f61bad53f14f24978cc45329f5558f5942 100644 --- a/www/js/controllers/app-controllers.js +++ b/www/js/controllers/app-controllers.js @@ -54,13 +54,14 @@ function PluginExtensionPointController($scope, PluginService) { * Abstract controller (inherited by other controllers) */ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, UIUtils, $q, $timeout, - BMA, Wallet, $ionicHistory, Device, Modals, csSettings + BMA, Wallet, $ionicHistory, Device, Modals, csSettings, csConfig ) { 'ngInject'; $scope.search = {}; $rootScope.walletData = Wallet.data; $rootScope.settings = csSettings.data; + $rootScope.config = csConfig; //////////////////////////////////////// // Load currencies diff --git a/www/templates/home/home.html b/www/templates/home/home.html index 9368b4fc819872f3ae4f6d055e430b2a16f86743..43e97f4d82fd8e36d5ea95d55005828696ca97e4 100644 --- a/www/templates/home/home.html +++ b/www/templates/home/home.html @@ -46,7 +46,7 @@ <div class="text-center no-padding visible-xs stable"> <br/> <!-- version --> - <span translate="COMMON.APP_VERSION" translate-values="{version: settings.version}"></span> + <span translate="COMMON.APP_VERSION" translate-values="{version: config.version}"></span> | <!-- about --> <a href="#" ng-click="showAboutModal()" translate>HOME.BTN_ABOUT</a> diff --git a/www/templates/menu.html b/www/templates/menu.html index 31d0b60055025e433482840f21bf5b373599d347..eea7ca5f0c352878165530202f51a43e844c8b69 100644 --- a/www/templates/menu.html +++ b/www/templates/menu.html @@ -122,7 +122,7 @@ <ion-footer-bar class="bar-stable footer hidden-xs hidden-sm" > <a class="title gray" ng-click="showAboutModal()"> <!-- version --> - <span translate="COMMON.APP_VERSION" translate-values="{version: settings.version}"></span> + <span translate="COMMON.APP_VERSION" translate-values="{version: config.version}"></span> | <!-- about --> <span translate>HOME.BTN_ABOUT</span>