diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-01-25 11:23:55 -0500 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-01-25 11:23:55 -0500 |
| commit | ea71731f838fc010cfc7511c09875184d1b2396b (patch) | |
| tree | 7841e6908a42badb5171760426d2ca5898a76bda /web/react/components/activity_log_modal.jsx | |
| parent | 6b534f1b0dae2614ec267a82f1c4dc1b096b7b1c (diff) | |
| parent | 5478ea34e436109ece417c3704a1fa36d3aba4a5 (diff) | |
| download | chat-ea71731f838fc010cfc7511c09875184d1b2396b.tar.gz chat-ea71731f838fc010cfc7511c09875184d1b2396b.tar.bz2 chat-ea71731f838fc010cfc7511c09875184d1b2396b.zip | |
merging
Diffstat (limited to 'web/react/components/activity_log_modal.jsx')
| -rw-r--r-- | web/react/components/activity_log_modal.jsx | 6 |
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'; |