summaryrefslogtreecommitdiffstats
path: root/web/react/components
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-02-05 12:46:02 -0500
committerJoram Wilander <jwawilander@gmail.com>2016-02-05 12:46:02 -0500
commit29b5821c4098325ccec172ee0bc386c8b3b8f815 (patch)
tree507d1147a180084c8c2cd04e9fb0861fbbe29383 /web/react/components
parent4fabe574fadb3e35a5f87c31a421daf1cff57af8 (diff)
parentd416a04e52783460328f5e26295071d75d8897cd (diff)
downloadchat-29b5821c4098325ccec172ee0bc386c8b3b8f815.tar.gz
chat-29b5821c4098325ccec172ee0bc386c8b3b8f815.tar.bz2
chat-29b5821c4098325ccec172ee0bc386c8b3b8f815.zip
Merge pull request #2074 from rgarmsen2295/plt-1882
PLT-1882 Fixed issue with on-hover timestamps
Diffstat (limited to 'web/react/components')
-rw-r--r--web/react/components/time_since.jsx3
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/components/time_since.jsx b/web/react/components/time_since.jsx
index ba8dbffcc..1560d2469 100644
--- a/web/react/components/time_since.jsx
+++ b/web/react/components/time_since.jsx
@@ -2,6 +2,7 @@
// See License.txt for license information.
import Constants from '../utils/constants.jsx';
+import * as Utils from '../utils/utils.jsx';
import {FormattedRelative, FormattedDate} from 'mm-intl';
@@ -24,7 +25,7 @@ export default class TimeSince extends React.Component {
if (this.props.sameUser) {
return (
<time className='post__time'>
- <FormattedRelative value={this.props.eventTime} />
+ {Utils.displayTimeFormatted(this.props.eventTime)}
</time>
);
}