Commit graph

35816 commits

Author SHA1 Message Date
Michael Telatynski
a3ca2abae3 i18n 2021-07-30 11:11:21 +01:00
Michael Telatynski
f4ed9aeef1 Add pagination mechanism to SpaceHierarchy based on IntersectionObserver 2021-07-30 11:02:22 +01:00
Michael Telatynski
259627fba2 Clean up SpaceHierarchy 2021-07-30 11:01:49 +01:00
Michael Telatynski
d459dbe700 Refactor Space Hierarchy stuff in preparation for pagination 2021-07-29 17:35:15 +01:00
Michael Telatynski
56cd0e1c4f Merge branch 't3chguy/fix/18091' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089
 Conflicts:
	src/components/structures/SpaceRoomDirectory.tsx
2021-07-29 12:52:01 +01:00
Michael Telatynski
6f37e8b223 Use getChildren instead of getSpaceSummary as MSC2946 has moved on 2021-07-29 12:16:59 +01: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
Michael Telatynski
67b8c0a811 remove unused import 2021-07-28 19:33:54 +01:00
Michael Telatynski
40493634ae Iterate PR 2021-07-28 19:23:33 +01:00
Michael Telatynski
ed950875e7 Fix space hierarchy not updating when user mutates it 2021-07-28 19:08:59 +01:00
Michael Telatynski
5d9e421de0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091 2021-07-28 17:58:34 +01: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