Merge remote-tracking branch 'origin/experimental' into dbkr/sas

src/settings/Settings.js

@@ -22,6 +22,7 @@ import {
     NotificationsEnabledController,
 } from "./controllers/NotificationControllers";
 import LazyLoadingController from "./controllers/LazyLoadingController";
+import CustomStatusController from "./controllers/CustomStatusController";
 
 // These are just a bunch of helper arrays to avoid copy/pasting a bunch of times
 const LEVELS_ROOM_SETTINGS = ['device', 'room-device', 'room-account', 'account', 'config'];
@@ -88,6 +89,7 @@ export const SETTINGS = {
         displayName: _td("Custom user status messages"),
         supportedLevels: LEVELS_FEATURE,
         default: false,
+        controller: new CustomStatusController(),
     },
     "feature_lazyloading": {
         isFeature: true,
@@ -108,12 +110,6 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
-    "feature_gridview": {
-        isFeature: true,
-        displayName: _td("Allow up to 6 rooms in a community to be shown simultaneously in a grid via the context menu"),
-        supportedLevels: LEVELS_FEATURE,
-        default: false,
-    },
     "feature_sas": {
         isFeature: true,
         displayName: _td("Two-way device verification using short text"),
@@ -330,9 +326,9 @@ export const SETTINGS = {
         supportedLevels: ['room-device'],
         default: false,
     },
-    "RoomSubList.showEmpty": {
+    "promptBeforeInviteUnknownUsers": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        displayName: _td('Show empty room list headings'),
+        displayName: _td('Prompt before sending invites to potentially invalid matrix IDs'),
         default: true,
     },
     "showDeveloperTools": {