imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into joriks/font-scaling-message-preview

Browse source
This commit is contained in:
Jorik Schellekens 2020-06-18 15:19:28 +01:00 • committed by GitHub
commit 15881fc7d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
101 changed files with 1697 additions and 739 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/settings/Settings.js
View file

@ -140,9 +140,10 @@ export const SETTINGS = {
},
"feature_new_room_list": {
isFeature: true,
displayName: _td("Use the improved room list (in development - refresh to apply changes)"),
displayName: _td("Use the improved room list (in development - will refresh to apply changes)"),
supportedLevels: LEVELS_FEATURE,
default: false,
controller: new ReloadOnChangeController(),
},
"feature_custom_themes": {
isFeature: true,
@ -520,11 +521,6 @@ export const SETTINGS = {
displayName: _td("Enable message search in encrypted rooms"),
default: true,
},
"keepSecretStoragePassphraseForSession": {
supportedLevels: ['device', 'config'],
displayName: _td("Keep recovery passphrase in memory for this session"),
default: false,
},
"crawlerSleepTime": {
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
displayName: _td("How fast should messages be downloaded."),