diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-06-30 11:58:22 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-06-30 11:58:22 -0400 |
| commit | a00b4e00adeacfbe59b523d46e566186631eab52 (patch) | |
| tree | 83949f6e97ecac3c09084b06c943b1fdf33f8873 /web/react/stores/user_store.jsx | |
| parent | ae21685e357416dab708e304fd8d9c005b11278d (diff) | |
| parent | 8be4df00b4d30c220d6f0d13734501c8c94e6495 (diff) | |
| download | chat-a00b4e00adeacfbe59b523d46e566186631eab52.tar.gz chat-a00b4e00adeacfbe59b523d46e566186631eab52.tar.bz2 chat-a00b4e00adeacfbe59b523d46e566186631eab52.zip | |
Merge pull request #106 from mattermost/mm-1119
fixes mm-1119 adds @all and @channel mention capabilites
Diffstat (limited to 'web/react/stores/user_store.jsx')
| -rw-r--r-- | web/react/stores/user_store.jsx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/web/react/stores/user_store.jsx b/web/react/stores/user_store.jsx index bbca92c84..e1df4879f 100644 --- a/web/react/stores/user_store.jsx +++ b/web/react/stores/user_store.jsx @@ -240,6 +240,9 @@ var UserStore = assign({}, EventEmitter.prototype, { if (first.length > 0) keys.push(first); } + if (user.notify_props.all === "true") keys.push('@all'); + if (user.notify_props.channel === "true") keys.push('@channel'); + return keys; } else { return []; |