diff --git a/Dockerfile b/Dockerfile
index 3e8e3d341bfa23c60f39358c7732719893e99e2e..f6dba3efd9f826c75603298d1712945637019a0b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,10 +9,10 @@ ENV DEBIAN_FRONTEND=noninteractive \
NODE_VERSION=10.20.0 \
NPM_VERSION=6.14.4 \
YARN_VERSION=1.22.4 \
- IONIC_CLI_VERSION=6.5.0 \
+ IONIC_CLI_VERSION=6.6.0 \
CORDOVA_VERSION=8.1.2 \
GRADLE_VERSION=4.10.3 \
- GULP_VERSION=2.2.0
+ GULP_VERSION=3.9.1
# Install basics
RUN apk update && \
diff --git a/doc/build_ios.md b/doc/build_ios.md
index ddcaf2f84ef1787f31dd219e917f5f80da93a872..155d549d0168a642babaf63b31be58e1793ca6a8 100644
--- a/doc/build_ios.md
+++ b/doc/build_ios.md
@@ -82,7 +82,7 @@ npm install -g nw-gyp node-pre-gyp
2. Install global dependencies (see [Development Guide](./development_guide.md) for versions to used) :
```
-npm install -g yarn gulp cordova@9.0.0 ionic@1.7.16
+npm install -g yarn gulp@3.9.1 cordova @ionic/cli@6.6.0
```
3. Install project dependencies :
diff --git a/doc/development_guide.md b/doc/development_guide.md
index 162087e71b5d4a4206598e25d86509593e8cbe48..596b3a4faf2f7544fa237bc20936dd548b6316f6 100644
--- a/doc/development_guide.md
+++ b/doc/development_guide.md
@@ -27,7 +27,7 @@ To build Cesium, you will have to:
3. Installing node build tools, as global dependencies:
```bash
- npm install -g yarn gulp cordova @ionic/cli web-ext
+ npm install -g yarn gulp@3.9.1 cordova@8.1.2 @ionic/cli@6.6.0 web-ext
```
## Get the source code and dependencies
diff --git a/doc/fr/development_tutorial-01.md b/doc/fr/development_tutorial-01.md
index 3b13012fc44f2175adfc26f57585ff133622fd0b..48d957ab0b70df5d710bb82e4cea70bbfd2c5e02 100644
--- a/doc/fr/development_tutorial-01.md
+++ b/doc/fr/development_tutorial-01.md
@@ -127,7 +127,7 @@ cd cesium
Puis, lancez le téléchargement et l'installation des modules Cesium à l'aide de la commande :
```bash
-npm install -g yarn cordova ionic@1.7.16
+npm install -g yarn gulp@3.9.1 cordova@8.1.2 @ionic/cli@6.6.0 web-ext
```
Puis pour les dépendances non globales :
diff --git a/package.json b/package.json
index 8795a74136029b5f960aa2bbc7ac46f8dbe94671..8848a41374f47e2cb8431952c3f1475b752c52db 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cesium",
- "version": "1.6.3",
+ "version": "1.6.4",
"description": "Cesium Wallet for G1 libre currency",
"author": "Benoit Lavenier <benoit.lavenier@e-is.pro>",
"license": "AGPL-3.0",
@@ -104,7 +104,7 @@
"phonegap-plugin-barcodescanner": "^8.1.0"
},
"devDependencies": {
- "@ionic/cli": "^6.5.0",
+ "@ionic/cli": "^6.6.0",
"@ionic/v1-toolkit": "^3.1.2",
"cordova-uglify": "^0.3.4",
"del": "^3.0.0",
diff --git a/platforms/android b/platforms/android
index c7a8b1fcbea7e08dc1a10a948c21bbf7f2e18f41..b1d608bdb8b49d8a71d13efe24ce96c0619c6d23 160000
--- a/platforms/android
+++ b/platforms/android
@@ -1 +1 @@
-Subproject commit c7a8b1fcbea7e08dc1a10a948c21bbf7f2e18f41
+Subproject commit b1d608bdb8b49d8a71d13efe24ce96c0619c6d23
diff --git a/resources/web-ext/manifest.json b/resources/web-ext/manifest.json
index 7eccfba85faf8bcc7587dd93230a9c7d476bdaa4..f45f324f8706b56c7f4493fcecbab17329fb264b 100644
--- a/resources/web-ext/manifest.json
+++ b/resources/web-ext/manifest.json
@@ -1,7 +1,7 @@
{
"name": "Cesium",
"short_name": "Cesium",
- "version": "1.6.3",
+ "version": "1.6.4",
"description": "Manage your Duniter Wallet on a libre currency, like Äž1",
"background": {
"scripts": ["background.js"]
diff --git a/scripts/env-android.sh b/scripts/env-android.sh
index ee6b932df2c96a6d3039862cc716f3b3706282b6..32d7d52ddafc864aac662fa50df052afcfd23dcb 100755
--- a/scripts/env-android.sh
+++ b/scripts/env-android.sh
@@ -68,3 +68,5 @@ if [[ -d "${PROJECT_DIR}/.local/android" ]]; then
else
echo "No directory '${PROJECT_DIR}/.local/android' found. Please create it, with a file 'release-signing.properties' for release signing"
fi
+
+ echo "Environment is ready!"
diff --git a/www/js/config.js b/www/js/config.js
index 212ae9a290b704bc680699a798f41463f727815e..f6dfc28b9a7f9c9d4f9cf4ba4c8b475a4c41ec19 100644
--- a/www/js/config.js
+++ b/www/js/config.js
@@ -10,10 +10,10 @@ angular.module("cesium.config", [])
.constant("csConfig", {
"cacheTimeMs": 300000,
- "fallbackLanguage": "en",
+ "fallbackLanguage": "fr",
"rememberMe": true,
"showUDHistory": true,
- "timeout": 40000,
+ "timeout": 300000,
"timeWarningExpireMembership": 5184000,
"timeWarningExpire": 7776000,
"keepAuthIdle": 600,
@@ -31,8 +31,8 @@ angular.module("cesium.config", [])
}
},
"license": {
- "en": "license/license_g1-en",
"fr-FR": "license/license_g1-fr-FR",
+ "en": "license/license_g1-en",
"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.org",
+ "host": "g1.duniter.fr",
"port": 443
},
"fallbackNodes": [
{
- "host": "g1.cgeek.fr",
+ "host": "g1.duniter.fr",
"port": 443
},
{
@@ -61,14 +61,12 @@ angular.module("cesium.config", [])
"port": 443
},
{
- "host": "g1.duniter.fr",
+ "host": "duniter.normandie-libre.fr",
"port": 443
- }
- ],
- "developers": [
+ },
{
- "name": "Benoit Lavenier",
- "pubkey": "38MEAZN68Pz1DTvT3tqgxx4yQP6snJCQhPqEFxbDk4aE"
+ "host": "g1.duniter.org",
+ "port": 443
}
],
"plugins": {
@@ -97,8 +95,8 @@ angular.module("cesium.config", [])
"defaultCountry": "France"
}
},
- "version": "1.6.3",
- "build": "2020-04-14T15:27:37.888Z",
+ "version": "1.6.4",
+ "build": "2020-04-22T14:53:36.845Z",
"newIssueUrl": "https://git.duniter.org/clients/cesium-grp/cesium/issues/new"
})
diff --git a/yarn.lock b/yarn.lock
index 5a30262ea604164fc13b1f3a1280b90ca9b21376..7a65fc6c5ddb75dfd85a7d3b2f19bd456dc9d388 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7049,7 +7049,7 @@ node-gyp@^3.8.0:
tar "^2.0.0"
which "1"
-node-sass@^4.13.0, node-sass@^4.8.3:
+node-sass@^4.13.1, node-sass@^4.8.3:
version "4.13.1"
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.1.tgz#9db5689696bb2eec2c32b98bfea4c7a2e992d0a3"
integrity sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw==