diff options
| author | David Lu <david.lu@hotmail.com> | 2016-06-04 11:21:50 -0700 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-06-04 14:21:50 -0400 |
| commit | f3825ba766625806e0776a17146ca5fff372612e (patch) | |
| tree | f108503fe620907022130d447dc81746f8465a09 /webapp/components/user_settings | |
| parent | 6f0a7e4b137e193e6cfaac6aa90f0c91ec6b139c (diff) | |
| download | chat-f3825ba766625806e0776a17146ca5fff372612e.tar.gz chat-f3825ba766625806e0776a17146ca5fff372612e.tar.bz2 chat-f3825ba766625806e0776a17146ca5fff372612e.zip | |
PLT-2994 Added @all (#3233)
* Added @all
* Uncomment @all server side
Diffstat (limited to 'webapp/components/user_settings')
| -rw-r--r-- | webapp/components/user_settings/user_settings_notifications.jsx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/webapp/components/user_settings/user_settings_notifications.jsx b/webapp/components/user_settings/user_settings_notifications.jsx index 6b07f59e2..be61e5fbc 100644 --- a/webapp/components/user_settings/user_settings_notifications.jsx +++ b/webapp/components/user_settings/user_settings_notifications.jsx @@ -842,7 +842,7 @@ class NotificationsTab extends React.Component { /> <FormattedMessage id='user.settings.notifications.channelWide' - defaultMessage='Channel-wide mentions "@channel"' + defaultMessage='Channel-wide mentions "@channel", "@all"' /> </label> </div> @@ -896,12 +896,9 @@ class NotificationsTab extends React.Component { keys.push('@' + user.username); } - // if (this.state.allKey) { - // keys.push('@all'); - // } - if (this.state.channelKey) { keys.push('@channel'); + keys.push('@all'); } if (this.state.customKeys.length > 0) { keys = keys.concat(this.state.customKeys.split(',')); |