From 67efb8bde264e3ea0823e40558d29dd89120c0c9 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sat, 29 Apr 2017 00:00:29 +0100 Subject: [PATCH 1/2] Add date tooltip to timestamps --- src/components/views/messages/MessageTimestamp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/messages/MessageTimestamp.js b/src/components/views/messages/MessageTimestamp.js index dda87767a6..ab910b05ab 100644 --- a/src/components/views/messages/MessageTimestamp.js +++ b/src/components/views/messages/MessageTimestamp.js @@ -25,7 +25,7 @@ module.exports = React.createClass({ render: function() { var date = new Date(this.props.ts); return ( - + { DateUtils.formatTime(date) } ); From 4a8ad53bd956866dbd413b24f5d820d352a34186 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@googlemail.com> Date: Sun, 30 Apr 2017 13:11:01 +0100 Subject: [PATCH 2/2] Pin filesize ver to fix break upstream https://travis-ci.org/vector-im/riot-web/builds/227340622 avoidwork/filesize.js#87 3.5.7 and 3.5.8 ver released <24h ago and broke stuff for us --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 843b69dc19..a25e17955f 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "draft-js": "^0.8.1", "extract-text-webpack-plugin": "^0.9.1", "favico.js": "^0.3.10", - "filesize": "^3.1.2", + "filesize": "3.5.6", "flux": "~2.0.3", "gfm.css": "^1.1.1", "highlight.js": "^9.0.0",