From a122b98136d9d459a7537b16a3d27a02ca1fd4a3 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Tue, 25 Jul 2017 19:54:22 +0200
Subject: [PATCH] [fix] fix build 0.14.1
---
README.md | 1 +
config.xml | 9 +++++++--
ionic.project | 2 +-
package.json | 1 +
www/js/config.js | 10 +++++-----
5 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index 16b079c3..1950f283 100644
--- a/README.md
+++ b/README.md
@@ -148,6 +148,7 @@ To build Cesium, you will have to:
- Installing Cordova plugins (need for platforms specific builds)
```
ionic state restore
+ ionic browser add crosswalk@12.41.296.5
```
diff --git a/config.xml b/config.xml
index 2c9a648c..39bc9df1 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,10 @@
<?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="14100">
+<widget
+ id="fr.duniter.cesium"
+ version="0.14.1"
+ android-versionCode="14100"
+ 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
@@ -94,6 +99,7 @@
<platform name="ubuntu">
<icon height="57" src="www/img/logo_57px.png" width="57" />
</platform>
+ <engine name="android" spec="^6.2.3" />
<plugin name="cordova-plugin-camera" spec="^2.4.1" />
<plugin name="cordova-plugin-console" spec="^1.0.7" />
<plugin name="cordova-plugin-device" spec="^1.1.6" />
@@ -111,5 +117,4 @@
<plugin name="phonegap-plugin-barcodescanner" spec="git+https://github.com/phonegap/phonegap-plugin-barcodescanner.git">
<variable name="CAMERA_USAGE_DESCRIPTION" value=" " />
</plugin>
- <engine name="android" spec="^6.2.3" />
</widget>
diff --git a/ionic.project b/ionic.project
index e7acc660..d6981951 100644
--- a/ionic.project
+++ b/ionic.project
@@ -26,4 +26,4 @@
"version": "12.41.296.5"
}
]
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index c39275bc..3fc3c463 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
"cordova-plugin-camera": "^2.4.1",
"cordova-plugin-compat": "^1.1.0",
"cordova-plugin-console": "^1.0.7",
+ "cordova-plugin-crosswalk-webview": "^2.3.0",
"cordova-plugin-device": "^1.1.6",
"cordova-plugin-dialogs": "^1.3.3",
"cordova-plugin-inappbrowser": "^1.7.1",
diff --git a/www/js/config.js b/www/js/config.js
index 7aaed20d..9cbe394d 100644
--- a/www/js/config.js
+++ b/www/js/config.js
@@ -10,7 +10,7 @@ angular.module("cesium.config", [])
.constant("csConfig", {
"cacheTimeMs": 300000,
- "fallbackLanguage": "en",
+ "fallbackLanguage": "fr",
"rememberMe": true,
"showUDHistory": false,
"timeout": 300000,
@@ -31,16 +31,16 @@ angular.module("cesium.config", [])
"en": "license/license_g1-en.txt"
},
"node": {
- "host": "g1.duniter.org",
+ "host": "g1.duniter.fr",
"port": "443"
},
"fallbackNodes": [
{
- "host": "g1.duniter.fr",
+ "host": "g1.duniter.org",
"port": "443"
},
{
- "host": "g1.duniter.org",
+ "host": "g1.duniter.fr",
"port": "443"
}
],
@@ -59,7 +59,7 @@ angular.module("cesium.config", [])
}
},
"version": "0.14.1",
- "build": "2017-07-25T17:36:22.237Z",
+ "build": "2017-07-25T17:46:15.009Z",
"newIssueUrl": "https://github.com/duniter/cesium/issues/new?labels=bug"
})
--
GitLab