From b25f2aab5d675042ef378eb3e9f0c062da20d14b Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Wed, 22 Feb 2017 12:55:41 +0100
Subject: [PATCH] do NOT use relative unit by default, in Settings - fix #351
---
app/config.json | 2 +-
doc/configuration.md | 4 ++--
www/js/services/settings-services.js | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/app/config.json b/app/config.json
index 3eb9a7d67..a2828157b 100644
--- a/app/config.json
+++ b/app/config.json
@@ -46,7 +46,7 @@
"timeWarningExpireMembership": 5184000,
"timeWarningExpire": 7776000,
"useLocalStorage": true,
- "useRelative": true,
+ "useRelative": false,
"initPhase": true,
"expertMode": false,
"decimalCount": 4,
diff --git a/doc/configuration.md b/doc/configuration.md
index d834f2e48..4fc5e1fa0 100644
--- a/doc/configuration.md
+++ b/doc/configuration.md
@@ -18,7 +18,7 @@ angular.module("cesium.config", [])
"timeWarningExpireMembership": 5184000,
"timeWarningExpire": 7776000,
"useLocalStorage": true,
- "useRelative": true,
+ "useRelative": false,
"initPhase": false,
"expertMode": false,
"decimalCount": 4,
@@ -129,7 +129,7 @@ rememberMe | Default value of the 'Remember me' button, in the
showUDHistory | Should display UD history in the transaction history ? | `false`
showLoginSalt | Should display salt value (pass phrase) in the login screen. If `false`, masked. | `false`
useLocalStorage | Enable data storage (settings, credentials, cache) in the browser local storage ? | `true`
-useRelative | Should user relative unit by default ? | `true`
+useRelative | Should use relative unit (UD) by default ? | `false`
wallet.showPubkey | Should display pubkey and uid in 'My account' screen ? | `true`
wallet.notificationReadTime | Time (in second) since the last notification read. | `0` (never read)
diff --git a/www/js/services/settings-services.js b/www/js/services/settings-services.js
index 28939903a..038d6b9c5 100644
--- a/www/js/services/settings-services.js
+++ b/www/js/services/settings-services.js
@@ -44,7 +44,7 @@ angular.module('cesium.settings.services', ['ngResource', 'ngApi', 'cesium.confi
defaultSettings = angular.merge({
timeout : 4000,
cacheTimeMs: 60000, /*1 min*/
- useRelative: true,
+ useRelative: false,
timeWarningExpireMembership: 2592000 * 2 /*=2 mois*/,
timeWarningExpire: 2592000 * 3 /*=3 mois*/,
useLocalStorage: Device.enable, // on mobile device, use local storage by default
@@ -57,6 +57,7 @@ angular.module('cesium.settings.services', ['ngResource', 'ngApi', 'cesium.confi
expertMode: false,
decimalCount: 4,
forceNetworkViewToHttp: false,
+ uiEffects: true,
newIssueUrl: "https://github.com/duniter/cesium/issues/new?labels=bug",
helptip: {
enable: true,
--
GitLab