Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups

This commit is contained in:
David Baker 2018-10-25 17:42:46 +01:00
commit b59b8b7fca
102 changed files with 2211 additions and 1019 deletions

View file

@ -88,7 +88,7 @@ export const SETTINGS = {
displayName: _td("Increase performance by only loading room members on first view"),
supportedLevels: LEVELS_FEATURE,
controller: new LazyLoadingController(),
default: false,
default: true,
},
"feature_keybackup": {
isFeature: true,
@ -296,4 +296,9 @@ export const SETTINGS = {
displayName: _td('Show empty room list headings'),
default: true,
},
"showDeveloperTools": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td('Show developer tools'),
default: false,
},
};