Commit graph

5618 commits

Author SHA1 Message Date
lukebarnard
95c45362d5 Fix horizontal scrollbar under certain circumstances
specifically when trailing whitespace is not wrapped onto the next
line of the block.

Fixes #6077
2018-02-07 12:02:00 +00:00
Luke Barnard
680a0191be
Merge pull request #6067 from vector-im/t3chguy/fix_usercontent_pointer
Split MImageBody into MFileBody to match JS Classes.
2018-02-05 14:27:57 +00:00
Michael Telatynski
3abf1458fb
Add cursor:pointer so that calculated CSS includes it for iframe style
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-05 13:25:43 +00:00
Michael Telatynski
00b7cc512b
Split MImageBody into MImageBody,MFileBody to match react-sdk
and having the classnames match their components.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-05 13:25:09 +00:00
David Baker
456aebe240
Merge pull request #6040 from sim6/sim6_catalan
Add Catalan
2018-02-01 10:47:01 +00:00
David Baker
66e20298a7
Merge pull request #5777 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
2018-02-01 10:45:56 +00:00
Weblate
a6155c98ec Merge branch 'develop' of https://github.com/vector-im/riot-web into develop
Conflicts:
	src/i18n/strings/eo.json
2018-02-01 10:24:21 +00:00
Марко М. Костић
a26473b722 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-02-01 09:48:47 +00:00
Xose M
ed5162ef4e Translated using Weblate (Galician)
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/gl/
2018-02-01 09:48:46 +00:00
Tong Hui
930deaea9d Translated using Weblate (Chinese (Simplified))
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_Hans/
2018-02-01 09:48:45 +00:00
Simó Albert i Beltran
b80be62bb7 Translated using Weblate (Catalan)
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/ca/
2018-02-01 09:48:45 +00:00
Osoitz
11806f2aa2 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-02-01 09:48:45 +00:00
David Baker
0d229f015b
Merge pull request #5718 from vector-im/t3chguy/devtools-118247
make FilteredList controlled, such that it can externally persist filter
2018-02-01 09:48:40 +00:00
Walter
078d156824 Translated using Weblate (Ukrainian)
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/uk/
2018-01-29 17:06:45 +00:00
Iru Cai (vimacs)
88c4cb6eba Translated using Weblate (Chinese (Simplified))
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_Hans/
2018-01-27 16:55:15 +00:00
Xose M
bc4f8c4c2a Translated using Weblate (Galician)
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/gl/
2018-01-26 14:26:24 +00:00
d1d4c
7ee205a447 Translated using Weblate (Catalan)
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/ca/
2018-01-26 13:06:57 +00:00
Ramon Vilar
f6c49a2472 Translated using Weblate (Catalan)
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/ca/
2018-01-26 02:25:21 +00:00
Michael Telatynski
200124569b
Merge remote-tracking branch 'origin/t3chguy/devtools-118247' into t3chguy/devtools-118247 2018-01-25 21:07:10 +00:00
Michael Telatynski
662a6297e7
FilteredList, now being a controlled component does not need state
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-25 21:06:35 +00:00
Michael Telatynski
04bca93e0d
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/devtools-118247 2018-01-25 20:59:31 +00:00
Simó Albert i Beltran
e56b16f7d1 Add Catalan 2018-01-25 18:25:46 +01:00
d1d4c
5c6a265b86 Translated using Weblate (Catalan)
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/ca/
2018-01-24 17:53:36 +00:00
David Baker
b0a3bd6591
Merge pull request #6017 from vector-im/t3chguy/rich_quoting_linear
Linear Rich Quoting
2018-01-24 18:53:33 +01:00
d1d4c
8b7a941a6e Translated using Weblate (Catalan)
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/ca/
2018-01-24 08:55:16 +00:00
Luke Barnard
394d4cf856
Merge pull request #5995 from vector-im/t3chguy/highlight_things
Highlight ViewSource and Devtools ViewSource
2018-01-24 08:55:12 +00:00
Michael Telatynski
22b7298542 add comments
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-23 20:28:39 +00:00
Michael Telatynski
9d1a3c9011 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/highlight_things 2018-01-23 20:19:27 +00:00
Michael Telatynski
c2aa8137bb sort components scss
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-23 20:02:47 +00:00
d1d4c
4d0b02c683 Translated using Weblate (Catalan)
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/ca/
2018-01-23 19:46:06 +00:00
Michael Telatynski
c7146e62a0
Merge pull request #6022 from 4nd3r/README_cross_origin_renderer_url
Update README.md with correct example use of config.cross_origin_renderer_url
2018-01-23 11:00:45 +00:00
Ander Punnar
d9409232f9 default url, not domain
https://github.com/matrix-org/matrix-react-sdk/blob/master/src/components/views/messages/MFileBody.js#L116

Signed-off-by: Ander Punnar <ander@kvlt.ee>
2018-01-23 12:15:08 +02:00
Peter Vágner
0df6f85843 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-22 22:21:55 +00:00
A.G
13dd8e2c76 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-22 22:21:55 +00:00
Luke Barnard
9d387c32a5
Merge pull request #5929 from vector-im/t3chguy/num_members_tooltip
T3chguy/num members tooltip
2018-01-22 22:21:50 +00:00
Michael Telatynski
f5fc86258f s/Highlight/SyntaxHighlight/
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-22 18:59:18 +00:00
Michael Telatynski
321f16d8a3 rename variable as it was horrible to read camelCased
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-22 18:54:22 +00:00
Michael Telatynski
d57a10e0b2
Merge branches 'develop' and 't3chguy/rich_quoting_linear' of github.com:vector-im/riot-web into t3chguy/rich_quoting_linear 2018-01-22 16:53:51 +00:00
Michael Telatynski
202f0e2163
Add EventTile_quote styling for less margin-right when in QuotePreview
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-22 16:42:08 +00:00
pincopallopino
77d8fe3ef1 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 23:00:26 +00:00
A.G
3e5833e9f2 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:59:29 +00:00
pincopallopino
2b26be73f6 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:59:22 +00:00
A.G
ce6338b853 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:59:12 +00:00
vricci
52c5293a12 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:59:04 +00:00
A.G
568e1f4f90 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:58:48 +00:00
vricci
29f05c09d6 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:58:18 +00:00
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