Merge branch 'develop' into luke/groups-are-communities

src/UserSettingsStore.js

@@ -30,6 +30,10 @@ const FEATURES = [
         id: 'feature_groups',
         name: _td("Communities"),
     },
+    {
+        id: 'feature_pinning',
+        name: _td("Message Pinning"),
+    },
 ];
 
 export default {
@@ -98,6 +102,17 @@ export default {
         Notifier.setEnabled(enable);
     },
 
+    getEnableNotificationBody: function() {
+        return Notifier.isBodyEnabled();
+    },
+
+    setEnableNotificationBody: function(enable) {
+        if (!Notifier.supportsDesktopNotifications()) {
+            return;
+        }
+        Notifier.setBodyEnabled(enable);
+    },
+
     getEnableAudioNotifications: function() {
         return Notifier.isAudioEnabled();
     },