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

Conflicts: src/settings/Settings.ts src/settings/UIFeature.ts
2020-09-17 13:42:27 +01:00
parent c11abb74e0 1e9e0dee87
commit ae44a6d1fa
18 changed files with 219 additions and 103 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,
@@ -622,6 +623,26 @@ export const SETTINGS: {[setting: string]: ISetting} = {
        supportedLevels: LEVELS_UI_FEATURE,
        default: true,
    },
+    [UIFeature.Voip]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
+    [UIFeature.Feedback]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
+    [UIFeature.Registration]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
+    [UIFeature.PasswordReset]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
+    [UIFeature.Deactivate]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
    [UIFeature.ShareQRCode]: {
        supportedLevels: LEVELS_UI_FEATURE,
        default: true,