Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178

Conflicts: src/settings/Settings.ts src/settings/UIFeature.ts
2020-09-17 13:31:00 +01:00
parent 9cc789756b 148a57c58e
commit 5bf6697e48
17 changed files with 167 additions and 100 deletions
@@ -588,6 +588,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
    "showCallButtonsInComposer": {
        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
        default: true,
+        controller: new UIFeatureController(UIFeature.Voip),
    },
    "e2ee.manuallyVerifyAllSessions": {
        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
@@ -618,6 +619,18 @@ export const SETTINGS: {[setting: string]: ISetting} = {
        supportedLevels: LEVELS_UI_FEATURE,
        default: true,
    },
+    [UIFeature.Widgets]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
+    [UIFeature.Voip]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
+    [UIFeature.Feedback]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
    [UIFeature.Flair]: {
        supportedLevels: LEVELS_UI_FEATURE,
        default: true,