Merge pull request #6658 from matrix-org/gsouquet/threaded-messaging-2349

2021-09-01 08:47:10 +01:00
parent e0363ddee5 bf3c8e5664
commit 7621a9a0f3
20 changed files with 506 additions and 11 deletions
@@ -211,6 +211,15 @@ export const SETTINGS: {[setting: string]: ISetting} = {
        supportedLevels: LEVELS_FEATURE,
        default: false,
    },
+    "feature_thread": {
+        isFeature: true,
+        // Requires a reload as we change an option flag on the `js-sdk`
+        // And the entire sync history needs to be parsed again
+        controller: new ReloadOnChangeController(),
+        displayName: _td("Threaded messaging"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
    "feature_custom_status": {
        isFeature: true,
        displayName: _td("Custom user status messages"),