diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-02-05 10:31:33 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-02-05 10:31:33 -0500 |
| commit | fc6f38707623c23cb2a976c596fe2192921d4dbd (patch) | |
| tree | afb31f0b6b3d146dcbf79c9558fdd8168402eef6 /web | |
| parent | 535abbf2ac7ba13bad59546e7ffb87c8f3972f22 (diff) | |
| parent | 9390d97321188834a56bd592a3a0a41e9b8ba28a (diff) | |
| download | chat-fc6f38707623c23cb2a976c596fe2192921d4dbd.tar.gz chat-fc6f38707623c23cb2a976c596fe2192921d4dbd.tar.bz2 chat-fc6f38707623c23cb2a976c596fe2192921d4dbd.zip | |
Merge pull request #2082 from mattermost/plt-1848
PLT-1848 Stats for recently active and new users now shows date with the time
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/admin_console/analytics.jsx | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/web/react/components/admin_console/analytics.jsx b/web/react/components/admin_console/analytics.jsx index 2a3070854..ec9ad4da0 100644 --- a/web/react/components/admin_console/analytics.jsx +++ b/web/react/components/admin_console/analytics.jsx @@ -1,7 +1,6 @@ // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -import * as Utils from '../../utils/utils.jsx'; import Constants from '../../utils/constants.jsx'; import LineChart from './line_chart.jsx'; import DoughnutChart from './doughnut_chart.jsx'; @@ -10,7 +9,7 @@ import StatisticCount from './statistic_count.jsx'; var Tooltip = ReactBootstrap.Tooltip; var OverlayTrigger = ReactBootstrap.OverlayTrigger; -import {injectIntl, intlShape, defineMessages, FormattedMessage} from 'mm-intl'; +import {injectIntl, intlShape, defineMessages, FormattedMessage, FormattedDate} from 'mm-intl'; const holders = defineMessages({ analyticsTotalUsers: { @@ -324,7 +323,17 @@ export default class Analytics extends React.Component { </time> </OverlayTrigger> </td> - <td>{Utils.displayDateTime(user.last_activity_at)}</td> + <td> + <FormattedDate + value={user.last_activity_at} + day='numeric' + month='long' + year='numeric' + hour12={true} + hour='2-digit' + minute='2-digit' + /> + </td> </tr> ); }) @@ -380,7 +389,17 @@ export default class Analytics extends React.Component { </time> </OverlayTrigger> </td> - <td>{Utils.displayDateTime(user.create_at)}</td> + <td> + <FormattedDate + value={user.create_at} + day='numeric' + month='long' + year='numeric' + hour12={true} + hour='2-digit' + minute='2-digit' + /> + </td> </tr> ); }) |