diff options
| -rw-r--r-- | doc/install/Requirements.md | 21 | ||||
| -rw-r--r-- | web/react/stores/socket_store.jsx | 6 |
2 files changed, 25 insertions, 2 deletions
diff --git a/doc/install/Requirements.md b/doc/install/Requirements.md index 1e0a12fb9..61fa8e7be 100644 --- a/doc/install/Requirements.md +++ b/doc/install/Requirements.md @@ -10,6 +10,27 @@ Supported Operating Systems and Browsers for the Mattermost Web Client include: - iPhone 4s and higher (Safari on iOS 8.3+, Chrome 43+) - Android 5 and higher (Chrome 43+) +### Email Client + +Supported Email Clients for rendering Mattermost email notifications include: + +Web based clients: +- Gmail +- Office 365 +- Outlook +- Yahoo +- AOL + +Desktop Clients: +- Apple Mail version 7+ +- Outlook 2016+ +- Thunderbird 38.2+ + +Mobile Clients: +- Gmail Mobile App (Android, iOS) +- iOS Mail App (iOS 7+) +- Blackberry Mail App (OS version 4+) + ### Server Supported Operating Systems for the Mattermost Server include: diff --git a/web/react/stores/socket_store.jsx b/web/react/stores/socket_store.jsx index 4d69a6716..4efeb7c8f 100644 --- a/web/react/stores/socket_store.jsx +++ b/web/react/stores/socket_store.jsx @@ -165,7 +165,7 @@ function handleNewPostEvent(msg) { } // Send desktop notification - if (UserStore.getCurrentId() !== msg.user_id) { + if (UserStore.getCurrentId() !== msg.user_id || post.props.from_webhook === 'true') { const msgProps = msg.props; let mentions = []; @@ -189,7 +189,9 @@ function handleNewPostEvent(msg) { } let username = 'Someone'; - if (UserStore.hasProfile(msg.user_id)) { + if (post.props.override_username && global.window.mm_config.EnablePostUsernameOverride === 'true') { + username = post.props.override_username; + } else if (UserStore.hasProfile(msg.user_id)) { username = UserStore.getProfile(msg.user_id).username; } |