Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups

2018-11-20 18:08:39 +00:00 · 2018-11-20 18:08:39 +00:00 · 8ccaf53d20
commit 8ccaf53d20
parent 6d6e6b5a4e 93cd3b4206
47 changed files with 2578 additions and 205 deletions
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@ -282,6 +282,16 @@ export const SETTINGS = {
        default: true,
        controller: new AudioNotificationsEnabledController(),
    },
+    "pinMentionedRooms": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td("Pin rooms I'm mentioned in to the top of the room list"),
+        default: false,
+    },
+    "pinUnreadRooms": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td("Pin unread rooms to the top of the room list"),
+        default: false,
+    },
    "enableWidgetScreenshots": {
        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
        displayName: _td('Enable widget screenshots on supported widgets'),