Commit graph

35419 commits

Author SHA1 Message Date
XoseM
c36e135506 Translated using Weblate (Galician)
Currently translated at 100.0% (3048 of 3048 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
2021-07-22 04:19:02 +00:00
Weblate
6e655b3d16 Merge branch 'origin/develop' into Weblate. 2021-07-22 02:38:53 +00:00
Jeff Huang
2bb80a2793 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (3048 of 3048 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2021-07-22 02:38:53 +00:00
Travis Ralston
05353d0fe5
Merge pull request #6388 from aaronraimist/matrix-url-permitted
Add matrix: to the list of permitted URL schemes
2021-07-21 20:38:45 -06:00
Weblate
77ca27dd3a Merge branch 'origin/develop' into Weblate. 2021-07-22 02:02:07 +00:00
Travis Ralston
fd9241a854
Merge pull request #6355 from SimonBrandner/fix/diff-colors
Make diff colors in codeblocks more pleasant
2021-07-21 20:02:03 -06:00
Weblate
cfe267a186 Merge branch 'origin/develop' into Weblate. 2021-07-22 01:44:09 +00:00
Travis Ralston
c384575375
Merge pull request #6261 from robintown/watch-show-timestamps
Add alwaysShowTimestamps and others to RoomView setting watchers
2021-07-21 19:44:04 -06:00
Weblate
ddea1461a7 Merge branch 'origin/develop' into Weblate. 2021-07-21 19:07:28 +00:00
Travis Ralston
b590b1d263
Merge pull request #6431 from matrix-org/travis/notifs/restore-name
Restore 'use default' naming on room notifications
2021-07-21 13:07:24 -06:00
Travis Ralston
36d4eb85e1 Restore 'use default' naming on room notifications
Fixes https://github.com/vector-im/element-web/issues/18139
Following https://github.com/matrix-org/matrix-react-sdk/pull/6352
2021-07-21 13:01:19 -06:00
Weblate
36c66fe279 Merge branch 'origin/develop' into Weblate. 2021-07-21 16:17:55 +00:00
Germain
0d8309c8fc
Merge pull request #6429 from matrix-org/gsouquet/fix-18146 2021-07-21 17:17:51 +01:00
Weblate
20edfc9c25 Merge branch 'origin/develop' into Weblate. 2021-07-21 15:59:28 +00:00
David Baker
6afa3fa3ab
Merge pull request #6430 from matrix-org/dbkr/yarn_upgrade_210721
yarn upgrade
2021-07-21 16:59:24 +01:00
David Baker
a6c432d66f fix types
in varyingly hacky ways
2021-07-21 16:39:41 +01:00
Germain Souquet
26ca41f699 Cache room member count on the messagePanel 2021-07-21 17:26:41 +02:00
Germain Souquet
43d62aa8c1 Use more performant getMembersCount to decide to hide or show sender 2021-07-21 16:43:57 +02:00
David Baker
35e74db25e yarn upgrade 2021-07-21 15:41:16 +01:00
Weblate
0a064b89e5 Merge branch 'origin/develop' into Weblate. 2021-07-21 14:12:02 +00:00
Germain
80e64601a9
Merge pull request #6427 from matrix-org/gsouquet/fix-18120
Improve new layout switcher UI
2021-07-21 15:11:58 +01:00
Germain Souquet
e5bc5a933e Use cached value to read member count 2021-07-21 16:10:18 +02:00
Weblate
0ccde3dfbb Merge branch 'origin/develop' into Weblate. 2021-07-21 13:58:52 +00:00
Travis Ralston
34b8870a95
Merge pull request #6417 from matrix-org/travis/voice-messages/play-1
Play only one audio file at a time
2021-07-21 07:58:46 -06:00
Weblate
77e095c10a Merge branch 'origin/develop' into Weblate. 2021-07-21 13:38:56 +00:00
jelv
2c370325b7 Translated using Weblate (Dutch)
Currently translated at 100.0% (3045 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-07-21 13:38:55 +00:00
Michael Telatynski
cdac3f9f5d
Merge pull request #6404 from SimonBrandner/fix/file-label-behaviour 2021-07-21 14:38:47 +01:00
Šimon Brandner
e8760736ba
Merge remote-tracking branch 'upstream/develop' into fix/file-label-behaviour
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 15:33:06 +02:00
Germain Souquet
c155382445 Improve new layout switcher UI 2021-07-21 14:55:30 +02:00
Weblate
4f7d6d0b5b Merge branch 'origin/develop' into Weblate. 2021-07-21 11:02:58 +00:00
Germain
e4c6833085
Merge pull request #6425 from matrix-org/gsouquet/fix-18099 2021-07-21 12:02:51 +01:00
Germain
32e7c58747
Merge branch 'develop' into gsouquet/fix-18099 2021-07-21 11:57:29 +01:00
Weblate
67f24b55c9 Merge branch 'origin/develop' into Weblate. 2021-07-21 10:56:47 +00:00
Germain
45967c80f3
Merge pull request #6426 from matrix-org/gsouquet/event-tile-null-guard
Add null guard for room prop in EventTile
2021-07-21 11:56:43 +01:00
Weblate
bd9c038626 Merge branch 'origin/develop' into Weblate. 2021-07-21 10:56:37 +00:00
Germain
a4ca52255d
Merge pull request #6421 from matrix-org/gsouquet/fix-18084
Fix font slider preview for message bubbles
2021-07-21 11:56:33 +01:00
Weblate
b92d470627 Merge branch 'origin/develop' into Weblate. 2021-07-21 10:54:38 +00:00
libexus
3292374ac0 Translated using Weblate (German)
Currently translated at 98.9% (3013 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-07-21 10:54:38 +00:00
Germain
e33163c837
Merge pull request #6419 from matrix-org/gsouquet/fix-18125
Add spoiler support for message bubbles
2021-07-21 11:54:30 +01:00
Germain Souquet
ae51653348 Add null guard for room prop in EventTile 2021-07-21 12:41:02 +02:00
Weblate
99bc204669 Merge branch 'origin/develop' into Weblate. 2021-07-21 10:30:26 +00:00
Besnik Bleta
4c82f161c3 Translated using Weblate (Albanian)
Currently translated at 99.7% (3038 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
2021-07-21 10:30:26 +00:00
Michael Telatynski
5a7fe60d0e
Merge pull request #6416 from robintown/non-emoji-reactions 2021-07-21 11:30:15 +01:00
Germain
6308dabcfe
Remove forgotten code comment 2021-07-21 10:43:48 +01:00
Germain Souquet
ef002a2e22 Fix replies line clamping 2021-07-21 11:41:52 +02:00
Weblate
2706e29579 Merge branch 'origin/develop' into Weblate. 2021-07-21 08:43:20 +00:00
Germain
dfa85b00d0
Merge pull request #6423 from matrix-org/gsouquet/fix-18077 2021-07-21 09:43:15 +01:00
Weblate
900b5ebb8c Merge branch 'origin/develop' into Weblate. 2021-07-21 08:14:11 +00:00
Germain
8e01080711
Merge pull request #6420 from matrix-org/gsouquet/fix-18079
Reintroduce grouped events padding on modern layout
2021-07-21 09:14:07 +01:00
Germain
b31b8f1b41
Remove old container sizing comment
Co-authored-by: James Salter <jamess@element.io>
2021-07-21 09:13:12 +01:00