Merge branch 'develop' into expand-codeblock

2021-01-18 17:54:06 +01:00
parent 49dce58027 83fb698bbc
commit 8a4af2f348
23 changed files with 382 additions and 172 deletions
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -426,7 +426,8 @@ export const SETTINGS: {[setting: string]: ISetting} = {
        default: true,
    },
    "allowedWidgets": {
-        supportedLevels: [SettingLevel.ROOM_ACCOUNT],
+        supportedLevels: [SettingLevel.ROOM_ACCOUNT, SettingLevel.ROOM_DEVICE],
+        supportedLevelsAreOrdered: true,
        default: {}, // none allowed
    },
    "analyticsOptIn": {