Merge branch 'develop' into experimental

2018-11-06 15:28:20 +01:00
parent f8f4dde3ec 57ee816c90
commit c19b593f5c
7 changed files with 154 additions and 19 deletions
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -276,6 +276,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'),