Commit graph

5872 commits

Author SHA1 Message Date
A.G
888a77b4bb Translated using Weblate (Italian)
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
2018-01-20 22:57:00 +00:00
pebles
4eeb7989f6 Translated using Weblate (Spanish)
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
2018-01-20 16:34:07 +00:00
Michael Telatynski
3764a5d4b7 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/highlight_things 2018-01-20 13:55:52 +00:00
Michael Telatynski
1f3321fb37 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/devtools-118247 2018-01-20 13:55:31 +00:00
Peter Vágner
189b7236af Translated using Weblate (Slovak)
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/
2018-01-20 11:54:14 +00:00
Matthew Hodgson
37b5de2251 update triaging a bit 2018-01-19 16:52:55 +00:00
Matthew Hodgson
8855cc294e converge on 'noisy' to mean noisy notifs 2018-01-19 16:52:54 +00:00
Weblate
935b85afe7 Merge remote-tracking branch 'origin/develop' into develop 2018-01-19 14:49:58 +00:00
Luke Barnard
a819add7b0
Merge pull request #6008 from vector-im/luke/roomlist-beautiful-dnd
Swap RoomList to react-beautiful-dnd
2018-01-19 14:49:53 +00:00
lukebarnard
883ee4ec75 Remove react-dnd 2018-01-19 13:35:11 +00:00
lukebarnard
4504ff954a Add sudo: required to travis config 2018-01-19 10:10:13 +00:00
Марко М. Костић
68f19f9558 Translated using Weblate (Serbian)
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sr/
2018-01-18 21:05:10 +00:00
lukebarnard
d55d3658f0 Use classNames instead of inline style
Theres no benefit to using inline styles
2018-01-18 18:08:18 +00:00
lukebarnard
3481283af8 Swap RoomList to react-beautiful-dnd
Includes themeing

See matrix-org/matrix-react-sdk#1711
2018-01-18 17:54:39 +00:00
Michael Telatynski
5586a02b34 Merge branches 'develop' and 't3chguy/devtools-118247' of github.com:vector-im/riot-web into t3chguy/devtools-118247 2018-01-16 18:05:15 +00:00
Michael Telatynski
670f02acf8 Merge branches 'develop' and 't3chguy/highlight_things' of github.com:vector-im/riot-web into t3chguy/highlight_things 2018-01-16 18:04:08 +00:00
Weblate
ff70af3f34 Merge remote-tracking branch 'origin/develop' into develop 2018-01-16 13:05:37 +00:00
Xose M
6f47a9b8c3 Translated using Weblate (Galician)
Currently translated at 99.5% (219 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/
2018-01-16 13:05:36 +00:00
Luke Barnard
a94208e230
Merge pull request #5992 from vector-im/luke/tag-panel-beautiful-dnd
CSS required as part of moving TagPanel from react-dnd to react-beautiful-dnd
2018-01-16 13:05:31 +00:00
Michael Telatynski
4386d45a97
remove 'use strict' 2018-01-16 10:27:47 +00:00
lukebarnard
c269abd434 CSS required as part of moving TagPanel from react-dnd to react-beautiful-dnd 2018-01-16 09:40:15 +00:00
Weblate
152f28bf2a Merge remote-tracking branch 'origin/develop' into develop 2018-01-15 13:45:20 +00:00
David Baker
f940dfdd79
Merge pull request #5984 from vector-im/t3chguy/datesep
fix&refactor DateSeparator and MessageTimestamp
2018-01-15 13:45:14 +00:00
Weblate
cf00ac34d9 Merge remote-tracking branch 'origin/develop' into develop 2018-01-15 10:06:12 +00:00
toriko
a50e9d2b6b Translated using Weblate (Japanese)
Currently translated at 33.1% (73 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/
2018-01-15 10:06:11 +00:00
Jeff Huang
e2ef885aa6 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
2018-01-15 10:06:10 +00:00
David Baker
fc844567a6
Merge pull request #5978 from vector-im/t3chguy/nvl/rich_quoting
Iterative fixes on Rich Quoting
2018-01-15 10:06:05 +00:00
Michael Telatynski
f97395f40f change exports to default to retain compatibility with existing imports
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-14 18:41:44 +00:00
Michael Telatynski
b65fdf6ab0 refactor MessageTimestamp, as it was missing a PropTypes def for ts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-14 18:35:53 +00:00
Michael Telatynski
22c024cc94 Refactor DateSep, use new Dateutils.formatFullDateNoTime
as it is not desired for it to include the time.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-14 18:34:38 +00:00
Neo_Chen
b99e87ba0a Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
2018-01-13 00:44:59 +00:00
Weblate
e82a95a0b5 Merge remote-tracking branch 'origin/develop' into develop 2018-01-12 09:32:21 +00:00
Klaus Marx
b023cc790b Translated using Weblate (German)
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2018-01-12 09:32:20 +00:00
David Baker
d3811e3287
Merge pull request #5653 from vector-im/t3chguy/analytics_info
move piwik whitelists to conf and add piwik config.json info to readme
2018-01-12 09:32:15 +00:00
Michael Telatynski
5aec6840bf
Add cursor:pointer so that it actually looks clickable
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-11 19:33:21 +00:00
Michael Telatynski
17c4839029
only show reply button on REAL (not pending) m.room.message events
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-11 19:21:02 +00:00
Osoitz
26f377decf Translated using Weblate (Basque)
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/
2018-01-11 12:55:14 +00:00
Szimszon
004ccc47b3 Translated using Weblate (Hungarian)
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
2018-01-11 12:34:32 +00:00
Andrey
fbd7860a9b Translated using Weblate (Russian)
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2018-01-11 10:47:32 +00:00
Kévin C
586533d6ea Translated using Weblate (French)
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2018-01-11 10:36:52 +00:00
Bamstam
c8bd89ce4c Translated using Weblate (German)
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2018-01-11 10:36:29 +00:00
Weblate
1a9b86b27f Merge remote-tracking branch 'origin/develop' into develop 2018-01-11 10:34:48 +00:00
David Baker
56300f9578
Merge pull request #5804 from vector-im/t3chguy/nvl/rich_quoting
Implement Rich Quoting/Replies
2018-01-11 10:34:43 +00:00
Michael Telatynski
77e2ceba9e
switch to new ES6 DateUtils imports
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-10 21:50:32 +00:00
Weblate
89c5be39d1 Merge remote-tracking branch 'origin/develop' into develop 2018-01-08 21:33:27 +00:00
Matthew Hodgson
c8e87cb5a2
Merge pull request #5950 from vector-im/t3chguy-patch-1
Change author
2018-01-08 21:33:22 +00:00
Michael Telatynski
627ebb848d
Change author 2018-01-08 21:32:25 +00:00
Weblate
54cafec57a Merge remote-tracking branch 'origin/develop' into develop 2018-01-08 15:18:08 +00:00
David Baker
1405859d2c
Merge pull request #5944 from vector-im/revert-3046-patch-1
Revert "Add a &nbsp; after timestamp"
2018-01-08 15:18:03 +00:00
David Baker
24e16e5c18
Revert "Add a &nbsp; after timestamp" 2018-01-08 15:17:05 +00:00