Merge branch 'experimental' of github.com:matrix-org/matrix-react-sdk into erikj/state_counters

2019-01-10 16:56:47 +00:00 · 2019-01-10 16:56:47 +00:00 · cbf9ff6aee
commit cbf9ff6aee
parent fa6b33d629 1c42f4f5a0
58 changed files with 1168 additions and 320 deletions
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@ -108,6 +108,12 @@ 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,
+    },
    "MessageComposerInput.dontSuggestEmoji": {
        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
        displayName: _td('Disable Emoji suggestions while typing'),