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

Merge branch 'develop' into gsouquet/threaded-messaging-2349

Browse source
This commit is contained in:
Germain Souquet 2021-08-25 08:53:16 +01:00
commit 77a463e679
170 changed files with 2911 additions and 1951 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/settings/Settings.tsx
View file

@ -242,7 +242,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
},
"feature_many_integration_managers": {
isFeature: true,
displayName: _td("Multiple integration managers"),
displayName: _td("Multiple integration managers (requires manual setup)"),
supportedLevels: LEVELS_FEATURE,
default: false,
},
@ -285,12 +285,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
default: false,
controller: new PseudonymousAnalyticsController(),
},
"advancedRoomListLogging": {
// TODO: Remove flag before launch: https://github.com/vector-im/element-web/issues/14231
displayName: _td("Enable advanced debugging for the room list"),
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
default: false,
},
"doNotDisturb": {
supportedLevels: [SettingLevel.DEVICE],
default: false,
@ -677,7 +671,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
},
"lowBandwidth": {
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
displayName: _td('Low bandwidth mode'),
displayName: _td('Low bandwidth mode (requires compatible homeserver)'),
default: false,
controller: new ReloadOnChangeController(),
},