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

Conflicts: src/settings/Settings.ts src/settings/UIFeature.ts
2020-09-16 16:09:08 +01:00 · 2020-09-16 16:09:08 +01:00 · a784e29622
commit a784e29622
parent 45420ff13b 4d15a44d61
11 changed files with 79 additions and 46 deletions
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@ -618,6 +618,10 @@ export const SETTINGS: {[setting: string]: ISetting} = {
        supportedLevels: LEVELS_UI_FEATURE,
        default: true,
    },
+    [UIFeature.Widgets]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
    [UIFeature.Feedback]: {
        supportedLevels: LEVELS_UI_FEATURE,
        default: true,
--- a/src/settings/UIFeature.ts
+++ b/src/settings/UIFeature.ts
@ -17,5 +17,6 @@ limitations under the License.
 // see settings.md for documentation on conventions
 export enum UIFeature {
    URLPreviews = "UIFeature.urlPreviews",
+    Widgets = "UIFeature.widgets",
    Feedback = "UIFeature.feedback",
 }