diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-01-30 11:49:00 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-30 11:49:00 -0500 |
commit | 39ee5737b7aa84833a1dc5b03c492b46e22209bd (patch) | |
tree | 61736473b9d62cd9aa9a4575198022b063711c55 /webapp/stores/notification_store.jsx | |
parent | 63d68b3e36c2deaaeb7174edc1950fab3752d887 (diff) | |
download | chat-39ee5737b7aa84833a1dc5b03c492b46e22209bd.tar.gz chat-39ee5737b7aa84833a1dc5b03c492b46e22209bd.tar.bz2 chat-39ee5737b7aa84833a1dc5b03c492b46e22209bd.zip |
PLT-2555/PLT-5009/PLT-5225 Changed system messages to be rendered by the client (#5209)
* Moved rendering of (message deleted) into PostMessageView
* Added additional post types to constants on client
* Changed system messages to be rendered in the client's language
* Updated new system messages to have relevant usernames highlighted and have markdown rendered in header change messages
Diffstat (limited to 'webapp/stores/notification_store.jsx')
-rw-r--r-- | webapp/stores/notification_store.jsx | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/webapp/stores/notification_store.jsx b/webapp/stores/notification_store.jsx index 4c89fe480..93d544cd1 100644 --- a/webapp/stores/notification_store.jsx +++ b/webapp/stores/notification_store.jsx @@ -6,7 +6,6 @@ import EventEmitter from 'events'; import Constants from 'utils/constants.jsx'; import UserStore from './user_store.jsx'; import ChannelStore from './channel_store.jsx'; -import PreferenceStore from './preference_store.jsx'; import * as UserAgent from 'utils/user_agent.jsx'; import * as Utils from 'utils/utils.jsx'; import * as PostUtils from 'utils/post_utils.jsx'; @@ -35,8 +34,6 @@ class NotificationStoreClass extends EventEmitter { if ((UserStore.getCurrentId() !== post.user_id || post.props.from_webhook === 'true')) { if (PostUtils.isSystemMessage(post)) { return; - } else if (!PreferenceStore.getBool(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, 'join_leave', true) && post.type === Constants.POST_TYPE_JOIN_LEAVE) { - return; } let mentions = []; |