From 2406317d417d7129feee4bec55db77be48447b0d Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Wed, 22 Apr 2020 18:27:31 +0200
Subject: [PATCH] v1.6.4
---
config.xml | 2 +-
install.sh | 2 +-
package.json | 4 ++--
www/js/config.js | 22 ++++++++++++----------
www/manifest.json | 2 +-
5 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/config.xml b/config.xml
index 0fc189edc..0c39ae35f 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="106030" id="fr.duniter.cesium" ios-CFBundleIdentifier="org.duniter.cesium" version="1.6.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="106040" id="fr.duniter.cesium" ios-CFBundleIdentifier="org.duniter.cesium" version="1.6.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Cesium</name>
<description>
An simple App for Duniter wallet
diff --git a/install.sh b/install.sh
index 719c4af6b..9b3be3e56 100755
--- a/install.sh
+++ b/install.sh
@@ -15,7 +15,7 @@ if [ "_$CESIUM_DIR" = "_" ]; then
fi
latest_version() {
- echo "v1.6.3" #lastest
+ echo "v1.6.4" #lastest
}
api_release_url() {
diff --git a/package.json b/package.json
index 8848a4137..a49317c60 100644
--- a/package.json
+++ b/package.json
@@ -101,6 +101,7 @@
"cordova-plugin-whitelist": "^1.3.4",
"cordova-plugin-x-toast": "^2.7.2",
"ionic-plugin-keyboard": "^2.2.1",
+ "node-sass": "^4.13.1",
"phonegap-plugin-barcodescanner": "^8.1.0"
},
"devDependencies": {
@@ -144,7 +145,6 @@
"lazypipe": "^1.0.2",
"merge2": "^1.3.0",
"mv": "^2.1.1",
- "node-sass": "^4.13.1",
"playup": "^1.1.0",
"vinyl-fs": "^3.0.3",
"yargs": "^5.0.0"
@@ -223,4 +223,4 @@
"engines": {
"yarn": ">= 1.0.0"
}
-}
+}
\ No newline at end of file
diff --git a/www/js/config.js b/www/js/config.js
index f6dfc28b9..a9a2f61c9 100644
--- a/www/js/config.js
+++ b/www/js/config.js
@@ -10,10 +10,10 @@ angular.module("cesium.config", [])
.constant("csConfig", {
"cacheTimeMs": 300000,
- "fallbackLanguage": "fr",
+ "fallbackLanguage": "en",
"rememberMe": true,
"showUDHistory": true,
- "timeout": 300000,
+ "timeout": 40000,
"timeWarningExpireMembership": 5184000,
"timeWarningExpire": 7776000,
"keepAuthIdle": 600,
@@ -31,8 +31,8 @@ angular.module("cesium.config", [])
}
},
"license": {
- "fr-FR": "license/license_g1-fr-FR",
"en": "license/license_g1-en",
+ "fr-FR": "license/license_g1-fr-FR",
"es-ES": "license/license_g1-es-ES",
"eo-EO": "license/license_g1-eo-EO"
},
@@ -44,12 +44,12 @@ angular.module("cesium.config", [])
"maxContentLength": 1300
},
"node": {
- "host": "g1.duniter.fr",
+ "host": "g1.duniter.org",
"port": 443
},
"fallbackNodes": [
{
- "host": "g1.duniter.fr",
+ "host": "g1.cgeek.fr",
"port": 443
},
{
@@ -61,12 +61,14 @@ angular.module("cesium.config", [])
"port": 443
},
{
- "host": "duniter.normandie-libre.fr",
+ "host": "g1.duniter.fr",
"port": 443
- },
+ }
+ ],
+ "developers": [
{
- "host": "g1.duniter.org",
- "port": 443
+ "name": "Benoit Lavenier",
+ "pubkey": "38MEAZN68Pz1DTvT3tqgxx4yQP6snJCQhPqEFxbDk4aE"
}
],
"plugins": {
@@ -96,7 +98,7 @@ angular.module("cesium.config", [])
}
},
"version": "1.6.4",
- "build": "2020-04-22T14:53:36.845Z",
+ "build": "2020-04-22T16:26:26.791Z",
"newIssueUrl": "https://git.duniter.org/clients/cesium-grp/cesium/issues/new"
})
diff --git a/www/manifest.json b/www/manifest.json
index 3784a853d..f7b9f733e 100644
--- a/www/manifest.json
+++ b/www/manifest.json
@@ -2,7 +2,7 @@
"short_name": "Cesium",
"name": "Cesium",
"manifest_version": 1,
- "version": "1.6.3",
+ "version": "1.6.4",
"default_locale": "fr",
"description": "Cesium Wallet for Äž1 libre currency",
"icons": [
--
GitLab