Commit graph

35772 commits

Author SHA1 Message Date
Travis Ralston
ca1a1e488a Take out the jump when recording a voice message 2021-07-21 14:47:42 -06:00
Travis Ralston
56290f3d01 Force padding overrides to take precedence over MediaBody styles 2021-07-21 14:47:27 -06:00
Travis Ralston
87ac2d7cc5 Move padding and width to MediaBody styles 2021-07-21 14:47:02 -06:00
Travis Ralston
3023fda497 Make MFileBody inherit the MediaBody styles 2021-07-21 14:46:25 -06:00
Travis Ralston
5386d23008 Fix voice message tile taking up a couple extra px at the bottom
... by returning it to the default block shape.
2021-07-21 14:43:26 -06:00
Šimon Brandner
c2aada6aa7
Clearer avatar sizing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 21:27:07 +02:00
Travis Ralston
e430381abc Update colour scheme for message panels
Fixes https://github.com/vector-im/element-web/issues/18113
2021-07-21 13:11:11 -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
Šimon Brandner
34f3e62f72
Types!
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 20:48:50 +02:00
Šimon Brandner
d243f7bad8
Move some CSS to a more correct place
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 18:30:25 +02:00
Šimon Brandner
9891eddcbd
Rename to toast
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 18:28:44 +02:00
Šimon Brandner
ddd4b4bc12
Show a "Your camera is turned off" toast
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 18:22:47 +02: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
Šimon Brandner
3fac4adfc7
Fix feed sizing issues
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 18:14:21 +02: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
Šimon Brandner
dc7f6d8286
Show sidebar in PiP mode
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 17:45:21 +02: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
Šimon Brandner
0a8067506f
Adjust hiding local feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 17:12:27 +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
Šimon Brandner
337664a1b4
Update sidebar behaviour
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 16:34:21 +02:00
Šimon Brandner
74649f1f92
Correct feed ordering
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 16:21:52 +02:00
Šimon Brandner
2014517173
Always show screensharing feed as primary
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 16:20:09 +02: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
22375e2108
Update res/css/views/rooms/_EventBubbleTile.scss 2021-07-21 15:11:49 +01:00
Germain Souquet
e5bc5a933e Use cached value to read member count 2021-07-21 16:10:18 +02:00
Šimon Brandner
51cf426179
Update the toast
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 16:08: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
Šimon Brandner
be52eba027
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-07-21 15:56:08 +02: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
0fb210cadb Increase hit area for timestamp in message bubbles 2021-07-21 15:31:10 +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