From a8b7e3f09cb9c1915b6d6536a4ee021cd4a368c0 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Sat, 6 May 2017 19:17:35 +0200
Subject: [PATCH] fix JS console error on Chart.js
---
app/config.json | 38 ++++++++++++++++++++++++++++++++++++++
release.sh | 7 +++++--
2 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/app/config.json b/app/config.json
index 751d25089..8408c042d 100644
--- a/app/config.json
+++ b/app/config.json
@@ -37,6 +37,44 @@
}
},
+ "default_fr": {
+ "cacheTimeMs": 60000,
+ "fallbackLanguage": "fr",
+ "rememberMe": false,
+ "showUDHistory": false,
+ "timeout": 10000,
+ "timeWarningExpireMembership": 5184000,
+ "timeWarningExpire": 7776000,
+ "useLocalStorage": false,
+ "useRelative": false,
+ "initPhase": false,
+ "expertMode": false,
+ "decimalCount": 2,
+ "httpsMode": false,
+ "helptip": {
+ "enable": true,
+ "installDocUrl": "https://github.com/duniter/duniter/blob/master/doc/install-a-node.md"
+ },
+ "node": {
+ "host": "g1.duniter.fr",
+ "port": "443"
+ },
+ "plugins":{
+ "es": {
+ "enable": true,
+ "askEnable": false,
+ "host": "g1.data.duniter.fr",
+ "port": "443",
+ "notifications": {
+ "txSent": true,
+ "txReceived": true,
+ "certSent": true,
+ "certReceived": true
+ }
+ }
+ }
+ },
+
"gtest": {
"cacheTimeMs": 60000,
"fallbackLanguage": "en",
diff --git a/release.sh b/release.sh
index 3b4e16581..990bd9395 100755
--- a/release.sh
+++ b/release.sh
@@ -35,11 +35,14 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then
esac
# Update config file
- gulp config --env default
+ gulp config --env default_fr
- # Build assets
+ # Build assets for mobile device
ionic build android --release
ionic build firefoxos --release
+
+ # Update config file
+ gulp config --env default
gulp build:web --release
ionic build ubuntu --release
cd platforms/ubuntu/native/cesium; debuild
--
GitLab