summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2016-01-24 23:49:01 -0500
committer=Corey Hulen <corey@hulen.com>2016-01-24 23:49:01 -0500
commit3ec816cc0ecacbb88a1bb829650bc615b1e3afa5 (patch)
tree6dbd8c10294770fc3105612559c1ebc1b3c703a7
parente8faaa9dd14949ef39c8f4587c3472a4a54046e7 (diff)
downloadchat-3ec816cc0ecacbb88a1bb829650bc615b1e3afa5.tar.gz
chat-3ec816cc0ecacbb88a1bb829650bc615b1e3afa5.tar.bz2
chat-3ec816cc0ecacbb88a1bb829650bc615b1e3afa5.zip
PLT-1576 display iOS device in session history
-rw-r--r--web/react/components/activity_log_modal.jsx6
1 files changed, 5 insertions, 1 deletions
diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx
index f5341c0bc..6a880f0ee 100644
--- a/web/react/components/activity_log_modal.jsx
+++ b/web/react/components/activity_log_modal.jsx
@@ -100,8 +100,12 @@ export default class ActivityLogModal extends React.Component {
if (currentSession.props.platform === 'Windows') {
devicePicture = 'fa fa-windows';
- } else if (currentSession.props.platform === 'Macintosh' || currentSession.props.platform === 'iPhone') {
+ } else if (currentSession.props.platform === 'Macintosh' ||
+ currentSession.props.platform === 'iPhone') {
devicePicture = 'fa fa-apple';
+ } else if (currentSession.props.platform.browser.indexOf('Mattermost/') === 0) {
+ devicePicture = 'fa fa-apple';
+ devicePlatform = 'iPhone';
} else if (currentSession.props.platform === 'Linux') {
if (currentSession.props.os.indexOf('Android') >= 0) {
devicePlatform = 'Android';