Commit Graph

17 Commits (0b7f947d8e81a90c47a69ffb37637df9bc2569f0)

Author SHA1 Message Date
Travis Ralston 65dd2d4db1 Fix PM being AM
Fixes https://github.com/vector-im/riot-web/issues/4043

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-05-26 13:43:01 -06:00
David Baker 40680d55e0 Fix merge fail 2017-05-26 17:55:48 +01:00
David Baker c22978d033 Merge remote-tracking branch 'origin/develop' into dbkr/translations 2017-05-26 17:30:02 +01:00
David Baker c3c2916449 Use array literals 2017-05-25 18:26:42 +01:00
David Baker 5c359e63ab Bulk change counterpart imports
to use languageHandler wrapper func
2017-05-25 11:39:08 +01:00
David Baker d419c42a4f Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801 2017-05-23 15:16:31 +01:00
Kieran Gould 6b32975e0c Add 12 hour class to mx_EventTile 2017-05-19 22:36:13 +01:00
Kieran Gould f9152b205c Add parameter `showTwelveHours` to formatTime 2017-05-19 22:29:49 +01:00
Kieran Gould 5aa1bc4185 Rename twentyFourHour
Pad time
2017-05-19 22:29:49 +01:00
Maxwell Kepler 008cc95e9c Add 12 hour support 2017-05-19 22:29:49 +01:00
Matthew Hodgson f3274426db revert f999aa9 and support full date formats when desired 2017-05-15 00:25:20 +01:00
David Baker 18d4d3392a Fix a bunch of linting errors
eslint --fix and a few manual ones
2017-01-20 14:22:27 +00:00
wmwragg 8e8e6fd5fe formatTime for use with new timestamp format 2016-08-16 15:01:01 +01:00
Matthew Hodgson f999aa94e1 remove YYYY from timestamps to workaround https://github.com/vector-im/vector-web/issues/987 2016-03-19 02:37:18 +00:00
Matthew Hodgson 0772f50fab update copyright for 2016 2016-01-07 04:06:52 +00:00
Matthew Hodgson 640aa45956 fix comedy bug where dates in timestamps were spectacularly wrong 2016-01-03 00:40:05 +00:00
Kegan Dougal 1e694da460 Move MatrixChat and login components to react SDK.
Removed Modulator as it is no longer necessary in this form. ConferenceHandler
is injected in src/vector/index.js
2015-11-30 18:11:04 +00:00