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

Merge branch 'develop' into bwindels/customtags-featureflag

Browse source
This commit is contained in:
Bruno Windels 2019-02-08 12:12:43 +00:00
commit 3c5fb61350
12 changed files with 62 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/settings/Settings.js
View file

@ -21,7 +21,6 @@ import {
NotificationBodyEnabledController,
NotificationsEnabledController,
} from "./controllers/NotificationControllers";
import LazyLoadingController from "./controllers/LazyLoadingController";
import CustomStatusController from "./controllers/CustomStatusController";
// These are just a bunch of helper arrays to avoid copy/pasting a bunch of times
@ -106,13 +105,6 @@ export const SETTINGS = {
supportedLevels: LEVELS_FEATURE,
default: false,
},
"feature_lazyloading": {
isFeature: true,
displayName: _td("Increase performance by only loading room members on first view"),
supportedLevels: LEVELS_FEATURE,
controller: new LazyLoadingController(),
default: true,
},
"feature_keybackup": {
isFeature: true,
displayName: _td("Backup of encryption keys to server"),