From ea0dcb44210226fb4fc8cbf165b73d06d70dad7d Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Wed, 23 Sep 2015 13:21:35 -0700
Subject: Small fix for react key warning

---
 web/react/components/user_settings/custom_theme_chooser.jsx  | 7 +++++--
 web/react/components/user_settings/premade_theme_chooser.jsx | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

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

diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx
index 44630a318..c680d75d1 100644
--- a/web/react/components/user_settings/custom_theme_chooser.jsx
+++ b/web/react/components/user_settings/custom_theme_chooser.jsx
@@ -53,9 +53,12 @@ export default class CustomThemeChooser extends React.Component {
 
         const elements = [];
         let colors = '';
-        Constants.THEME_ELEMENTS.forEach((element) => {
+        Constants.THEME_ELEMENTS.forEach((element, index) => {
             elements.push(
-                <div className='col-sm-4 form-group'>
+                <div
+                    className='col-sm-4 form-group'
+                    key={'custom-theme-key' + index}
+                >
                     <label className='custom-label'>{element.uiName}</label>
                     <div
                         className='input-group color-picker'
diff --git a/web/react/components/user_settings/premade_theme_chooser.jsx b/web/react/components/user_settings/premade_theme_chooser.jsx
index e6aa2f5b9..f8f916bd0 100644
--- a/web/react/components/user_settings/premade_theme_chooser.jsx
+++ b/web/react/components/user_settings/premade_theme_chooser.jsx
@@ -23,7 +23,10 @@ export default class PremadeThemeChooser extends React.Component {
                 }
 
                 premadeThemes.push(
-                    <div className='col-sm-3 premade-themes'>
+                    <div
+                        className='col-sm-3 premade-themes'
+                        key={'premade-theme-key' + k}
+                    >
                         <div
                             className={activeClass}
                             onClick={() => this.props.updateTheme(premadeTheme)}
-- 
cgit v1.2.3-1-g7c22


From a59f8def8c6fa2bc87e3dc0ee9ff5a3caf157c4a Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Thu, 24 Sep 2015 10:58:06 -0400
Subject: Added help text to notification settings to say which browsers
 support them

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

(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 8d364cde7..ba14f019f 100644
--- a/web/react/components/user_settings/user_settings_notifications.jsx
+++ b/web/react/components/user_settings/user_settings_notifications.jsx
@@ -265,9 +265,12 @@ export default class NotificationsTab extends React.Component {
                 e.preventDefault();
             }.bind(this);
 
+            const extraInfo = <span>{'Desktop notifications are available on Firefox, Safari, and Chrome.'}</span>;
+
             desktopSection = (
                 <SettingItemMax
                     title='Send desktop notifications'
+                    extraInfo={extraInfo}
                     inputs={inputs}
                     submit={this.handleSubmit}
                     server_error={serverError}
@@ -343,9 +346,12 @@ export default class NotificationsTab extends React.Component {
                 e.preventDefault();
             }.bind(this);
 
+            const extraInfo = <span>{'Desktop notification sounds are available on Firefox, Safari, Chrome, Internet Explorer, and Edge.'}</span>;
+
             soundSection = (
                 <SettingItemMax
                     title='Desktop notification sounds'
+                    extraInfo={extraInfo}
                     inputs={inputs}
                     submit={this.handleSubmit}
                     server_error={serverError}
-- 
cgit v1.2.3-1-g7c22


From 1ca84a8f8a2af05d39abbd888823faf62c7840b4 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Thu, 24 Sep 2015 21:05:21 +0500
Subject: plt-298 - Improving UI for webhooks

---
 .../user_settings/manage_incoming_hooks.jsx        | 65 +++++++++++-----------
 1 file changed, 31 insertions(+), 34 deletions(-)

(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 df089a403..12c041c7f 100644
--- a/web/react/components/user_settings/manage_incoming_hooks.jsx
+++ b/web/react/components/user_settings/manage_incoming_hooks.jsx
@@ -107,23 +107,23 @@ export default class ManageIncomingHooks extends React.Component {
         this.state.hooks.forEach((hook) => {
             const c = ChannelStore.get(hook.channel_id);
             hooks.push(
-                <div>
-                    <div className='divider-light'></div>
-                    <span>
-                        <strong>{'URL: '}</strong>{Utils.getWindowLocationOrigin() + '/hooks/' + hook.id}
-                    </span>
-                    <br/>
-                    <span>
+                <div className='font--small'>
+                    <div className='padding-top x2 divider-light'></div>
+                    <div className='padding-top x2'>
+                        <strong>{'URL: '}</strong><span className='word-break--all'>{Utils.getWindowLocationOrigin() + '/hooks/' + hook.id}</span>
+                    </div>
+                    <div className='padding-top'>
                         <strong>{'Channel: '}</strong>{c.name}
-                    </span>
-                    <br/>
-                    <a
-                        className={'btn btn-sm btn-primary'}
-                        href='#'
-                        onClick={this.removeHook.bind(this, hook.id)}
-                    >
-                        {'Remove'}
-                    </a>
+                    </div>
+                    <div className='padding-top'>
+                        <a
+                            className={'text-danger'}
+                            href='#'
+                            onClick={this.removeHook.bind(this, hook.id)}
+                        >
+                            {'Remove'}
+                        </a>
+                    </div>
                 </div>
             );
         });
@@ -134,41 +134,38 @@ export default class ManageIncomingHooks extends React.Component {
         } else if (hooks.length > 0) {
             displayHooks = hooks;
         } else {
-            displayHooks = <label>{'None'}</label>;
+            displayHooks = <label>{' None'}</label>;
         }
 
         const existingHooks = (
-            <div>
-                <label className='control-label'>{'Existing incoming webhooks'}</label>
-                <br/>
+            <div className='padding-top x2'>
+                <label className='control-label padding-top x2'>{'Existing incoming webhooks'}</label>
                 {displayHooks}
             </div>
         );
 
         return (
-            <div
-                key='addIncomingHook'
-                className='form-group'
-            >
+            <div key='addIncomingHook'>
                 <label className='control-label'>{'Add a new incoming webhook'}</label>
-                <br/>
-                <div>
+                <div className='padding-top'>
                     <select
                         ref='channelName'
+                        className='form-control'
                         value={this.state.channelId}
                         onChange={this.updateChannelId}
                     >
                         {options}
                     </select>
-                    <br/>
                     {serverError}
-                    <a
-                        className={'btn btn-sm btn-primary' + disableButton}
-                        href='#'
-                        onClick={this.addNewHook}
-                    >
-                        {'Add'}
-                    </a>
+                    <div className='padding-top'>
+                        <a
+                            className={'btn btn-sm btn-primary' + disableButton}
+                            href='#'
+                            onClick={this.addNewHook}
+                        >
+                            {'Add'}
+                        </a>
+                    </div>
                 </div>
                 {existingHooks}
             </div>
-- 
cgit v1.2.3-1-g7c22


From b03d8610de3b4e475c168522bc78e9ef857e64fb Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Fri, 25 Sep 2015 08:43:06 -0400
Subject: Fix acconut settings being scrolled to bottom when opened.

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

(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 7617f04d1..4372069e7 100644
--- a/web/react/components/user_settings/user_settings_appearance.jsx
+++ b/web/react/components/user_settings/user_settings_appearance.jsx
@@ -81,6 +81,8 @@ export default class UserSettingsAppearance extends React.Component {
 
                 $('#user_settings').off('hidden.bs.modal', this.handleClose);
                 this.props.updateTab('general');
+                $('.ps-container.modal-body').scrollTop(0);
+                $('.ps-container.modal-body').perfectScrollbar('update');
                 $('#user_settings').modal('hide');
             },
             (err) => {
-- 
cgit v1.2.3-1-g7c22


From 9d1dddb7f4cd6ee9682bb48d88f5f0271a72dcba Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Fri, 25 Sep 2015 22:44:36 +0500
Subject: plt-366 - Adding Windows 8 theme

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

(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 12c041c7f..1bbfbd162 100644
--- a/web/react/components/user_settings/manage_incoming_hooks.jsx
+++ b/web/react/components/user_settings/manage_incoming_hooks.jsx
@@ -134,7 +134,7 @@ export default class ManageIncomingHooks extends React.Component {
         } else if (hooks.length > 0) {
             displayHooks = hooks;
         } else {
-            displayHooks = <label>{' None'}</label>;
+            displayHooks = <label>{': None'}</label>;
         }
 
         const existingHooks = (
-- 
cgit v1.2.3-1-g7c22