diff --git a/config.xml b/config.xml index 1e598a418c258fe1b52595239fb17c75e30c206c..30b6e41dff9efd50b565e51c45d09da823e9f97d 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-versionCode="106050" id="fr.duniter.cesium" ios-CFBundleIdentifier="org.duniter.cesium" version="1.6.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-versionCode="106060" id="fr.duniter.cesium" ios-CFBundleIdentifier="org.duniter.cesium" version="1.6.6" 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/dist/desktop b/dist/desktop index 074f02140b2fe1652cf67e3f12e54627dcde9190..7a51ea325dc733f669c85ab07b680659fde51aca 160000 --- a/dist/desktop +++ b/dist/desktop @@ -1 +1 @@ -Subproject commit 074f02140b2fe1652cf67e3f12e54627dcde9190 +Subproject commit 7a51ea325dc733f669c85ab07b680659fde51aca diff --git a/install.sh b/install.sh index c0f955ebb6a216a058f0846db14b9418a74c5c37..8bb5cf8bb6865e5144c366851f12905a46822fd2 100755 --- a/install.sh +++ b/install.sh @@ -15,7 +15,7 @@ if [ "_$CESIUM_DIR" = "_" ]; then fi latest_version() { - echo "v1.6.5" #lastest + echo "v1.6.6" #lastest } api_release_url() { diff --git a/package.json b/package.json index dfd474de81499d12f5e510b502ecba0bb480c471..985582f173f7481ab4d1fb262122ac0f4235dca1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cesium", - "version": "1.6.5", + "version": "1.6.6", "description": "Cesium Wallet for G1 libre currency", "author": "Benoit Lavenier <benoit.lavenier@e-is.pro>", "license": "AGPL-3.0", diff --git a/platforms/android b/platforms/android index b1d608bdb8b49d8a71d13efe24ce96c0619c6d23..d23c13ed36c3200ed3d6f9a0c0b36bffc7652787 160000 --- a/platforms/android +++ b/platforms/android @@ -1 +1 @@ -Subproject commit b1d608bdb8b49d8a71d13efe24ce96c0619c6d23 +Subproject commit d23c13ed36c3200ed3d6f9a0c0b36bffc7652787 diff --git a/resources/web-ext/manifest.json b/resources/web-ext/manifest.json index 31f0b51a89a9b41a85def0e2e196afd32296a00e..e29a8c6bbaed44667c4e1443c4af7b5bddd256ed 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.5", + "version": "1.6.6", "description": "Manage your Duniter Wallet on a libre currency, like Äž1", "background": { "scripts": ["background.js"] diff --git a/www/js/config.js b/www/js/config.js index 934e0f1a6288a45e722daa16b7aa7459ec883bb4..74c90ea4e5cb0d698580d9197a13f7d59b2d6dae 100644 --- a/www/js/config.js +++ b/www/js/config.js @@ -10,11 +10,11 @@ angular.module("cesium.config", []) .constant("csConfig", { "cacheTimeMs": 300000, - "demo": true, - "fallbackLanguage": "en", + "demo": false, + "fallbackLanguage": "fr", "rememberMe": true, "showUDHistory": true, - "timeout": 40000, + "timeout": 300000, "timeWarningExpireMembership": 5184000, "timeWarningExpire": 7776000, "keepAuthIdle": 600, @@ -23,17 +23,17 @@ angular.module("cesium.config", []) "expertMode": false, "decimalCount": 2, "httpsMode": false, - "shareBaseUrl": "https://g1.duniter.fr", + "shareBaseUrl": "https://demo.cesium.app", "helptip": { "enable": true, "installDocUrl": { - "fr-FR": "https://duniter.org/fr/wiki/duniter/installer/", + "fr-FR": "https://duniter.org/fr/miner-des-blocs/installer/", "en": "https://duniter.org/en/wiki/duniter/install/" } }, "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" }, @@ -54,7 +54,19 @@ angular.module("cesium.config", []) "port": 443 }, { - "host": "g1.monnaielibreoccitanie.org", + "host": "g1.librelois.fr", + "port": 443 + }, + { + "host": "g1.e-is.pro", + "port": 443 + }, + { + "host": "duniter.moul.re", + "port": 443 + }, + { + "host": "g1.presles.fr", "port": 443 }, { @@ -62,14 +74,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": { @@ -77,15 +87,19 @@ angular.module("cesium.config", []) "enable": true, "askEnable": true, "useRemoteStorage": true, - "host": "g1.data.duniter.fr", + "host": "g1.data.e-is.pro", "port": 443, "fallbackNodes": [ + { + "host": "g1.data.presles.fr", + "port": 443 + }, { "host": "g1.data.le-sou.org", "port": 443 }, { - "host": "g1.data.duniter.fr", + "host": "g1.data.mithril.re", "port": 443 } ], @@ -98,9 +112,9 @@ angular.module("cesium.config", []) "defaultCountry": "France" } }, - "version": "1.6.5", - "build": "2020-04-30T16:11:11.201Z", + "version": "1.6.6", + "build": "2020-05-01T14:57:18.055Z", "newIssueUrl": "https://git.duniter.org/clients/cesium-grp/cesium/issues/new" }) -; +; \ No newline at end of file diff --git a/www/js/services/utils-services.js b/www/js/services/utils-services.js index 2b0bd5950e37d0200c828af26076e28ac4c8e41a..6193485c8af0a8382f71d1bcc548eaf40df18259 100644 --- a/www/js/services/utils-services.js +++ b/www/js/services/utils-services.js @@ -105,8 +105,7 @@ angular.module('cesium.utils.services', ['angular-fullscreen-toggle']) .then(function(translations) { var message = translations["DEMO.FEATURE_NOT_AVAILABLE"] + "<br/><br/>" + translations["DEMO.INSTALL_HELP"]; return alertInfo(message, undefined, {cssClass: 'large'}); - }) - + }); } function askConfirm(message, title, options) { diff --git a/www/manifest.json b/www/manifest.json index 6d2d82e7ac52d667c41b13d9dd72e2e7f4468494..85ffc9af5ac4b3c0657ce924856fa61265909a05 100644 --- a/www/manifest.json +++ b/www/manifest.json @@ -2,7 +2,7 @@ "short_name": "Cesium", "name": "Cesium", "manifest_version": 1, - "version": "1.6.5", + "version": "1.6.6", "default_locale": "fr", "description": "Cesium Wallet for Äž1 libre currency", "icons": [