Skip to content
Snippets Groups Projects
Commit 3589bd5f authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

- fix version on footer and home page

- fix release script
parent ed63def0
No related branches found
No related tags found
No related merge requests found
...@@ -30,7 +30,7 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then ...@@ -30,7 +30,7 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then
esac esac
# Commit # Commit
#git reset HEAD git reset HEAD
case "$1" in case "$1" in
rel) rel)
git add package.json config.xml git add package.json config.xml
...@@ -49,13 +49,14 @@ else ...@@ -49,13 +49,14 @@ else
echo " - version: x.y.z" echo " - version: x.y.z"
echo " - android-version: nnn" echo " - android-version: nnn"
fi 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
......
...@@ -28,8 +28,8 @@ angular.module("cesium.config", []) ...@@ -28,8 +28,8 @@ angular.module("cesium.config", [])
"port": "9203" "port": "9203"
} }
}, },
"version": "0.2.2", "version": "0.2.3",
"build": "2016-08-23T07:06:46.865Z", "build": "2016-08-23T09:25:41.250Z",
"newIssueUrl": "https://github.com/duniter/cesium/issues/new?labels=bug" "newIssueUrl": "https://github.com/duniter/cesium/issues/new?labels=bug"
}) })
......
...@@ -54,13 +54,14 @@ function PluginExtensionPointController($scope, PluginService) { ...@@ -54,13 +54,14 @@ function PluginExtensionPointController($scope, PluginService) {
* Abstract controller (inherited by other controllers) * Abstract controller (inherited by other controllers)
*/ */
function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, UIUtils, $q, $timeout, function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, UIUtils, $q, $timeout,
BMA, Wallet, $ionicHistory, Device, Modals, csSettings BMA, Wallet, $ionicHistory, Device, Modals, csSettings, csConfig
) { ) {
'ngInject'; 'ngInject';
$scope.search = {}; $scope.search = {};
$rootScope.walletData = Wallet.data; $rootScope.walletData = Wallet.data;
$rootScope.settings = csSettings.data; $rootScope.settings = csSettings.data;
$rootScope.config = csConfig;
//////////////////////////////////////// ////////////////////////////////////////
// Load currencies // Load currencies
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<div class="text-center no-padding visible-xs stable"> <div class="text-center no-padding visible-xs stable">
<br/> <br/>
<!-- version --> <!-- version -->
<span translate="COMMON.APP_VERSION" translate-values="{version: settings.version}"></span> <span translate="COMMON.APP_VERSION" translate-values="{version: config.version}"></span>
| |
<!-- about --> <!-- about -->
<a href="#" ng-click="showAboutModal()" translate>HOME.BTN_ABOUT</a> <a href="#" ng-click="showAboutModal()" translate>HOME.BTN_ABOUT</a>
......
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
<ion-footer-bar class="bar-stable footer hidden-xs hidden-sm" > <ion-footer-bar class="bar-stable footer hidden-xs hidden-sm" >
<a class="title gray" ng-click="showAboutModal()"> <a class="title gray" ng-click="showAboutModal()">
<!-- version --> <!-- version -->
<span translate="COMMON.APP_VERSION" translate-values="{version: settings.version}"></span> <span translate="COMMON.APP_VERSION" translate-values="{version: config.version}"></span>
| |
<!-- about --> <!-- about -->
<span translate>HOME.BTN_ABOUT</span> <span translate>HOME.BTN_ABOUT</span>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment