Merge branch 'develop' into travis/sourcemaps

2020-01-13 11:19:41 -07:00
parent 528777049a 389e1194ff
commit 5fd27a10bb
24 changed files with 722 additions and 41 deletions
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -134,6 +134,12 @@ export const SETTINGS = {
        supportedLevels: LEVELS_FEATURE,
        default: false,
    },
+    "feature_presence_in_room_list": {
+        isFeature: true,
+        displayName: _td("Show a presence dot next to DMs in the room list"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
    "mjolnirRooms": {
        supportedLevels: ['account'],
        default: [],