Merge branch 'master' of https://github.com/mattermost/platform into plt-375

Conflicts:
	web/react/components/user_settings/user_settings_appearance.jsx

3 files changed, 10 insertions, 9 deletions

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
diff --git a/web/react/components/user_settings/user_settings_appearance.jsx b/web/react/components/user_settings/user_settings_appearance.jsx
index e9ca0f4a5..c4a137ed8 100644
--- a/web/react/components/user_settings/user_settings_appearance.jsx
+++ b/web/react/components/user_settings/user_settings_appearance.jsx
@@ -214,15 +214,14 @@ export default class UserSettingsAppearance extends React.Component {
                     <div className='divider-dark first'/>
                     {themeUI}
                     <div className='divider-dark'/>
-                    <br/>
-                    <a
-                        href='#'
-                        className='theme'
-                        onClick={this.handleImportModal}
-                    >
-                        {'Import from Slack'}
-                    </a>
                 </div>
+                <br/>
+                <a
+                    className='theme'
+                    onClick={this.handleImportModal}
+                >
+                    {'Import theme colors from Slack'}
+                </a>
             </div>
         );
     }
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;
     }