diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-01-25 10:34:19 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-01-25 10:34:19 -0500 |
| commit | d20f9f6ae1431cc3cac0b89bbda1f8d85e1f3c45 (patch) | |
| tree | de7b65a3cf73ab288ae82e9ecd8492aa00c3b27b /web/react/components | |
| parent | 2fcba4f3ddd132ada496a8cf9d8a1d69ba423b1a (diff) | |
| parent | 3ec816cc0ecacbb88a1bb829650bc615b1e3afa5 (diff) | |
| download | chat-d20f9f6ae1431cc3cac0b89bbda1f8d85e1f3c45.tar.gz chat-d20f9f6ae1431cc3cac0b89bbda1f8d85e1f3c45.tar.bz2 chat-d20f9f6ae1431cc3cac0b89bbda1f8d85e1f3c45.zip | |
Merge pull request #1972 from mattermost/PLT-1576
PLT-1576 display iOS device in session history
Diffstat (limited to 'web/react/components')
| -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'; |