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 14:10:51 +01:00 · 2020-09-17 14:10:51 +01:00 · c904b4f416
commit c904b4f416
parent 5bf6697e48 53ee5d82c7
13 changed files with 210 additions and 65 deletions
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@ -631,6 +631,30 @@ export const SETTINGS: {[setting: string]: ISetting} = {
        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,
+    },
+    [UIFeature.ShareSocial]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
+    [UIFeature.IdentityServer]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
    [UIFeature.Flair]: {
        supportedLevels: LEVELS_UI_FEATURE,
        default: true,
--- a/src/settings/UIFeature.ts
+++ b/src/settings/UIFeature.ts
@ -20,5 +20,11 @@ export enum UIFeature {
    Widgets = "UIFeature.widgets",
    Voip = "UIFeature.voip",
    Feedback = "UIFeature.feedback",
+    Registration = "UIFeature.registration",
+    PasswordReset = "UIFeature.passwordReset",
+    Deactivate = "UIFeature.deactivate",
+    ShareQRCode = "UIFeature.shareQrCode",
+    ShareSocial = "UIFeature.shareSocial",
+    IdentityServer = "UIFeature.identityServer",
    Flair = "UIFeature.flair",
 }