aboutsummaryrefslogtreecommitdiffstats
path: root/src/containers/settings
diff options
context:
space:
mode:
authorLibravatar Amine Mouafik <amine@mouafik.fr>2019-11-27 22:02:18 +0700
committerLibravatar Amine Mouafik <amine@mouafik.fr>2019-11-27 22:02:18 +0700
commit7a0453ebd728092f05ee65abc1a7c3efdda168d1 (patch)
treef648f20a4edd9159761eeeb49323b836606e7b7f /src/containers/settings
parentRevert "Deprecate electron-rebuild, follow electron-builder suggestion" (diff)
downloadferdium-app-7a0453ebd728092f05ee65abc1a7c3efdda168d1.tar.gz
ferdium-app-7a0453ebd728092f05ee65abc1a7c3efdda168d1.tar.zst
ferdium-app-7a0453ebd728092f05ee65abc1a7c3efdda168d1.zip
#232 Remove default lock password behavior, allow empty password
Diffstat (limited to 'src/containers/settings')
-rw-r--r--src/containers/settings/EditSettingsScreen.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 07efbb881..b64cd77be 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -10,7 +10,7 @@ import UserStore from '../../stores/UserStore';
10import TodosStore from '../../features/todos/store'; 10import TodosStore from '../../features/todos/store';
11import Form from '../../lib/Form'; 11import Form from '../../lib/Form';
12import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages'; 12import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages';
13import { DEFAULT_APP_SETTINGS, DEFAULT_LOCK_PASSWORD, HIBERNATION_STRATEGIES } from '../../config'; 13import { DEFAULT_APP_SETTINGS, HIBERNATION_STRATEGIES } from '../../config';
14import { config as spellcheckerConfig } from '../../features/spellchecker'; 14import { config as spellcheckerConfig } from '../../features/spellchecker';
15 15
16import { getSelectOptions } from '../../helpers/i18n-helpers'; 16import { getSelectOptions } from '../../helpers/i18n-helpers';
@@ -309,7 +309,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
309 lockedPassword: { 309 lockedPassword: {
310 label: intl.formatMessage(messages.lockPassword), 310 label: intl.formatMessage(messages.lockPassword),
311 value: settings.all.app.lockedPassword, 311 value: settings.all.app.lockedPassword,
312 default: DEFAULT_LOCK_PASSWORD, 312 default: '',
313 type: 'password', 313 type: 'password',
314 }, 314 },
315 scheduledDNDEnabled: { 315 scheduledDNDEnabled: {