Merge branch 'develop' into travis/room-list/enable

2020-07-09 22:28:16 -06:00
parent 9bf2505e51 60695838d6
commit 75dbd5f1d4
67 changed files with 2347 additions and 823 deletions
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -160,12 +160,6 @@ export const SETTINGS = {
        supportedLevels: LEVELS_FEATURE,
        default: false,
    },
-    "feature_irc_ui": {
-        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        displayName: _td('Enable IRC layout option in the appearance tab'),
-        default: false,
-        isFeature: true,
-    },
    "mjolnirRooms": {
        supportedLevels: ['account'],
        default: [],
@@ -575,7 +569,7 @@ export const SETTINGS = {
    },
    "useIRCLayout": {
        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        displayName: _td("Use IRC layout"),
+        displayName: _td("Enable experimental, compact IRC style layout"),
        default: false,
    },
 };