Merge branch 'poljar/seshat-pr' into develop

2019-11-20 13:33:03 +01:00 · 2019-11-20 13:33:03 +01:00 · 44b212bc4c
commit 44b212bc4c
parent 55e5e63199 4bd46f9d69
9 changed files with 920 additions and 18 deletions
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@ -148,6 +148,12 @@ export const SETTINGS = {
        default: false,
        controller: new ReloadOnChangeController(),
    },
+    "feature_event_indexing": {
+        isFeature: true,
+        supportedLevels: LEVELS_FEATURE,
+        displayName: _td("Enable local event indexing and E2EE search (requires restart)"),
+        default: false,
+    },
    "useCiderComposer": {
        displayName: _td("Use the new, faster, composer for writing messages"),
        supportedLevels: LEVELS_ACCOUNT_SETTINGS,