From 4bc625e8d10ab7735b76814fe9bbf3fb9144d4e1 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Tue, 22 Sep 2015 12:00:34 -0400
Subject: Added 'default' option to channel notification settings that just
 uses the user's notification level

---
 web/react/components/user_settings/user_settings_notifications.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/react/components/user_settings')

diff --git a/web/react/components/user_settings/user_settings_notifications.jsx b/web/react/components/user_settings/user_settings_notifications.jsx
index 42c65ef5d..e83f18aab 100644
--- a/web/react/components/user_settings/user_settings_notifications.jsx
+++ b/web/react/components/user_settings/user_settings_notifications.jsx
@@ -17,7 +17,7 @@ function getNotificationsStateFromStores() {
     if (user.notify_props && user.notify_props.desktop_sound) {
         sound = user.notify_props.desktop_sound;
     }
-    var desktop = 'all';
+    var desktop = 'default';
     if (user.notify_props && user.notify_props.desktop) {
         desktop = user.notify_props.desktop;
     }
-- 
cgit v1.2.3-1-g7c22


From 28e84f1d13a6e90c7373702728d4ba6b2da41d6e Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Fri, 2 Oct 2015 09:18:19 -0400
Subject: Added help text for incoming webhooks.

---
 web/react/components/user_settings/manage_incoming_hooks.jsx | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'web/react/components/user_settings')

diff --git a/web/react/components/user_settings/manage_incoming_hooks.jsx b/web/react/components/user_settings/manage_incoming_hooks.jsx
index fa2e2e5e4..899dbcd05 100644
--- a/web/react/components/user_settings/manage_incoming_hooks.jsx
+++ b/web/react/components/user_settings/manage_incoming_hooks.jsx
@@ -148,6 +148,8 @@ export default class ManageIncomingHooks extends React.Component {
 
         return (
             <div key='addIncomingHook'>
+                {'Create webhook URLs for channels and private groups. These URLs can be used by outside applications to create posts in any channels or private groups you have access to. The specified channel will be used as the default.'}
+                <br/>
                 <label className='control-label'>{'Add a new incoming webhook'}</label>
                 <div className='padding-top'>
                     <select
-- 
cgit v1.2.3-1-g7c22


From 95fe16e0d90e0dfbcf5b6377903a20abff39d4f5 Mon Sep 17 00:00:00 2001
From: it33 <iantien@gmail.com>
Date: Fri, 2 Oct 2015 06:23:26 -0700
Subject: Change text to avoid confusion with Slack Import

---
 web/react/components/user_settings/user_settings_appearance.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/react/components/user_settings')

diff --git a/web/react/components/user_settings/user_settings_appearance.jsx b/web/react/components/user_settings/user_settings_appearance.jsx
index 4372069e7..c4a137ed8 100644
--- a/web/react/components/user_settings/user_settings_appearance.jsx
+++ b/web/react/components/user_settings/user_settings_appearance.jsx
@@ -220,7 +220,7 @@ export default class UserSettingsAppearance extends React.Component {
                     className='theme'
                     onClick={this.handleImportModal}
                 >
-                    {'Import from Slack'}
+                    {'Import theme colors from Slack'}
                 </a>
             </div>
         );
-- 
cgit v1.2.3-1-g7c22