From ba0cbe723be7adcfa7b5a43e50b3932f8c7a929f Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Mon, 23 Nov 2015 12:14:50 -0800
Subject: Disabling the all mention

---
 .../components/user_settings/user_settings_notifications.jsx      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'web/react/components/user_settings/user_settings_notifications.jsx')

diff --git a/web/react/components/user_settings/user_settings_notifications.jsx b/web/react/components/user_settings/user_settings_notifications.jsx
index e36aed395..bba69a7d4 100644
--- a/web/react/components/user_settings/user_settings_notifications.jsx
+++ b/web/react/components/user_settings/user_settings_notifications.jsx
@@ -512,7 +512,7 @@ export default class NotificationsTab extends React.Component {
             }.bind(this);
             inputs.push(
                 <div key='userNotificationAllOption'>
-                    <div className='checkbox'>
+                    <div className='checkbox hidden'>
                         <label>
                             <input
                                 type='checkbox'
@@ -590,9 +590,9 @@ export default class NotificationsTab extends React.Component {
             if (this.state.mentionKey) {
                 keys.push('@' + user.username);
             }
-            if (this.state.allKey) {
-                keys.push('@all');
-            }
+            // if (this.state.allKey) {
+            //     keys.push('@all');
+            // }
             if (this.state.channelKey) {
                 keys.push('@channel');
             }
-- 
cgit v1.2.3-1-g7c22


From 30bf72262ef3f85ad0ad24ea8e57a14415464af3 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Mon, 23 Nov 2015 12:54:28 -0800
Subject: fixing eslint

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

(limited to 'web/react/components/user_settings/user_settings_notifications.jsx')

diff --git a/web/react/components/user_settings/user_settings_notifications.jsx b/web/react/components/user_settings/user_settings_notifications.jsx
index bba69a7d4..e025bf670 100644
--- a/web/react/components/user_settings/user_settings_notifications.jsx
+++ b/web/react/components/user_settings/user_settings_notifications.jsx
@@ -590,9 +590,11 @@ export default class NotificationsTab extends React.Component {
             if (this.state.mentionKey) {
                 keys.push('@' + user.username);
             }
+
             // if (this.state.allKey) {
             //     keys.push('@all');
             // }
+
             if (this.state.channelKey) {
                 keys.push('@channel');
             }
-- 
cgit v1.2.3-1-g7c22