Commit graph

35804 commits

Author SHA1 Message Date
Dariusz Niemczyk
f9f9aebef6
Merge pull request #6503 from matrix-org/fix/grecaptcha-regression
Fix grecaptcha regression
2021-07-29 13:05:38 +02:00
Dariusz Niemczyk
7baa3284e3
Fix grecaptcha regression 2021-07-29 12:39:32 +02:00
Germain
ef8d2e8257
Merge pull request #6477 from matrix-org/gsouquet/fix-18132 2021-07-29 09:51:13 +01:00
Germain Souquet
e140dd6ba1 Merge branch 'develop' into gsouquet/fix-18132 2021-07-29 10:27:00 +02:00
Travis Ralston
b8781b7552
Merge pull request #6455 from matrix-org/travis/widget-customisation
Add customisation point for declaring widget variables
2021-07-28 07:15:45 -06:00
Michael Telatynski
f91a20cb02
Merge pull request #6484 from matrix-org/t3chguy/fix/18095 2021-07-28 13:51:45 +01:00
Germain
771dda0341
Merge pull request #6472 from SimonBrandner/fix/call-view/18221 2021-07-28 11:10:37 +01:00
Germain
2a5577810f
Merge pull request #6485 from matrix-org/gsouquet/fix-18264 2021-07-28 09:41:36 +01:00
Germain Souquet
a4cf147d72 Merge branch 'develop' into gsouquet/fix-18264 2021-07-28 10:30:29 +02:00
Germain
77a3d2ec18
Merge pull request #6491 from robintown/align-reactions
Realign reactions row with messages in modern layout
2021-07-28 09:16:04 +01:00
Michael Telatynski
98f3a5120c
Merge pull request #6492 from matrix-org/t3chguy/fix/18275.1 2021-07-28 09:10:00 +01:00
Michael Telatynski
52e50863f8 Fix CreateRoomDialog exploding when making public room outside of a space 2021-07-28 08:39:59 +01:00
Robin Townsend
3694006d05 Realign reactions row with messages in modern layout
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-27 23:48:51 -04:00
Travis Ralston
9707797d45
Merge pull request #6272 from SimonBrandner/fix/explicit-font/14163
Don't set `font-family` explicitly
2021-07-27 11:04:23 -06:00
Germain
f82744db97
Merge pull request #6487 from matrix-org/gsouquet/fix-18265 2021-07-27 17:20:02 +01:00
Germain
7e453d7745
Typo
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-27 17:14:39 +01:00
Michael Telatynski
e7151ebf2d
Merge pull request #6488 from SimonBrandner/fix/call-crash/18270 2021-07-27 17:12:01 +01:00
Šimon Brandner
36607fa8a2
Fix call crashing because element was undefined
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 18:05:50 +02:00
Germain Souquet
30ce7b5eab Make link within replies clickable 2021-07-27 17:57:46 +02:00
Šimon Brandner
6f77d3bbab
Correctly hide the dialpad
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 17:52:13 +02:00
Šimon Brandner
8294d324e3
Merge remote-tracking branch 'upstream/develop' into fix/call-view/18221 2021-07-27 16:55:59 +02:00
David Baker
3e7aee3a87
Merge pull request #5992 from SimonBrandner/fix/12652/screen-share
Add support for screen sharing in 1:1 calls
2021-07-27 15:34:27 +01:00
Šimon Brandner
b9e305daae
Delete mistake line
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 16:26:46 +02:00
Šimon Brandner
24f0c760ce
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 16:25:38 +02:00
Germain Souquet
3037be11c4 Restore padding for single person state events 2021-07-27 16:24:05 +02:00
Travis Ralston
93f42182c0
Merge pull request #6479 from matrix-org/travis/voice-messages/fix-placeholder-ui
Fix timing of voice message recording UI appearing
2021-07-27 08:05:28 -06:00
Michael Telatynski
353c70ad75 i18n 2021-07-27 14:45:36 +01:00
David Baker
5ead53b36a
Merge pull request #6483 from SimonBrandner/fix/dont-anim-resize/18261
Fix PiP resize issues
2021-07-27 14:42:04 +01:00
Michael Telatynski
755007cbee Conclude labs flags and write more tests 2021-07-27 14:39:14 +01:00
Šimon Brandner
f532c302b6
Don't animate when resizing and move when the PiP changes size
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 15:31:54 +02:00
Šimon Brandner
001490f70d
Fix unused resize listener
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 15:30:44 +02:00
David Baker
f7d0419cee
Merge pull request #6482 from RiotTranslateBot/weblate-element-web-matrix-react-sdk
Translations update from Weblate
2021-07-27 14:10:50 +01:00
David Baker
148571828b
Merge pull request #6474 from matrix-org/gsouquet/fix-18017
Make new reply UI clickable
2021-07-27 13:57:41 +01:00
David Baker
7733ee2578
Merge pull request #6478 from matrix-org/dbkr/scrollpanel_loop_breaker
Fix infinite pagination loop when offline
2021-07-27 13:54:30 +01:00
Weblate
543312c0cc Merge branch 'origin/develop' into Weblate. 2021-07-27 12:40:31 +00:00
waclaw66
f2ed147cae Translated using Weblate (Czech)
Currently translated at 100.0% (3080 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2021-07-27 12:40:31 +00:00
jelv
1f7e668bb2 Translated using Weblate (Dutch)
Currently translated at 100.0% (3080 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-07-27 12:40:28 +00:00
David Baker
72becb73e1
Merge pull request #6473 from matrix-org/gsouquet/fix-18208
Fix deleted message left offset in the timeline
2021-07-27 13:40:20 +01:00
Weblate
e405fcc125 Merge branch 'origin/develop' into Weblate. 2021-07-27 12:19:12 +00:00
jelv
d01a30b06b Translated using Weblate (Dutch)
Currently translated at 99.6% (3069 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-07-27 12:19:12 +00:00
Michael Telatynski
59e9704ee8
Merge pull request #6481 from matrix-org/t3chguy/fix/18250
Fix broken layout of the space hierarchy view
2021-07-27 13:19:04 +01:00
Weblate
95ccf0cd1d Merge branch 'origin/develop' into Weblate. 2021-07-27 12:15:15 +00:00
random
c111b027a9 Translated using Weblate (Italian)
Currently translated at 99.9% (3079 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
2021-07-27 12:15:15 +00:00
jelv
9244090de8 Translated using Weblate (Dutch)
Currently translated at 99.4% (3062 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-07-27 12:15:12 +00:00
Germain
50aee28bf0
Merge pull request #6480 from matrix-org/gsouquet/fix-18137
Add data-layout to MELS for better CSS structure
2021-07-27 13:15:02 +01:00
Michael Telatynski
0c79aec19d Fix broken layout of the space hierarchy view
Not sure what this min-height was trying to achieve but removing it prevents the grid layout collapsing on itself
2021-07-27 13:09:43 +01:00
Germain Souquet
8104ba936c Add data-layout to MELS for better CSS structure 2021-07-27 11:30:25 +02:00
Weblate
d19eee3697 Merge branch 'origin/develop' into Weblate. 2021-07-27 08:48:24 +00:00
Germain
80bf7d1675
Merge pull request #6468 from SimonBrandner/fix/quotes/18199 2021-07-27 09:48:19 +01:00
David Baker
e5d538412b
Typo
Co-authored-by: Germain <germain@souquet.com>
2021-07-27 09:29:32 +01:00