Michael Telatynski
9eb0986353
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089
...
Conflicts:
src/i18n/strings/en_EN.json
2021-07-30 11:34:52 +01:00
Michael Telatynski
a3ca2abae3
i18n
2021-07-30 11:11:21 +01:00
Dariusz Niemczyk
7c9df71a57
Merge pull request #6514 from matrix-org/palid/fix/image-placeholders-incorrect-height
...
Fix incorrect height for encoded placeholder images
2021-07-30 12:03:19 +02: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
Dariusz Niemczyk
7b6536c297
Fix incorrect height for encoded placeholder images
2021-07-30 11:53:56 +02:00
Germain
8509096fc4
Merge pull request #6465 from matrix-org/gsouquet/fix-18144
2021-07-30 09:07:52 +01:00
Germain Souquet
11322b8999
Appease linter
2021-07-30 09:19:34 +02:00
Germain
375f7b670a
Merge branch 'develop' into gsouquet/fix-18144
2021-07-30 08:10:15 +01:00
Andrew Morgan
a7c15b2ac0
Fix DialPad and Call Menu buttons not working when a call is fullscreened. ( #6496 )
...
This PR:
* Moves the dialpad and hold/transfer menu buttons into the part of the DOM that's included when a call is fullscreen'd.
* Tweaks `ContextMenu` to allow menu content to be mount as a child of the current component, rather than at the root of the DOM (which was not included in the full-screen'd content).
<!-- Please read https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md before submitting your pull request -->
<!-- Include a Sign-Off as described in https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md#sign-off -->
`Signed-off-by: Andrew Morgan <andrewm@element.io>`
2021-07-29 17:51:27 +01:00
Michael Telatynski
d459dbe700
Refactor Space Hierarchy stuff in preparation for pagination
2021-07-29 17:35:15 +01:00
Michael Telatynski
94af6db201
Merge pull request #6424 from matrix-org/t3chguy/fix/18071
2021-07-29 15:57:26 +01:00
Michael Telatynski
d587ae44af
Merge pull request #6466 from matrix-org/t3chguy/fix/18096
2021-07-29 15:53:57 +01:00
Michael Telatynski
3ee8f607c0
Switch dropdown out for radio interaction when leaving space
2021-07-29 15:50:18 +01:00
David Baker
0b9c422d47
Merge pull request #6508 from SimonBrandner/fix/pill-click/18283
...
Fix clicking pills inside replies
2021-07-29 15:40:27 +01:00
Michael Telatynski
251b6eb04e
update copy
2021-07-29 15:30:49 +01:00
Šimon Brandner
f0f2d3621e
Fix clicking pills inside replies
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-29 16:30:07 +02:00
Michael Telatynski
af851f7f44
fix merge conflict resolution issue
2021-07-29 15:24:42 +01:00
Michael Telatynski
493cd01ed3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071
...
Conflicts:
res/css/views/dialogs/_AddExistingToSpaceDialog.scss
src/utils/space.tsx
2021-07-29 15:22:52 +01:00
Michael Telatynski
efd8a2f9b0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
...
Conflicts:
src/components/structures/SpaceRoomView.tsx
src/components/views/spaces/SpaceCreateMenu.tsx
src/i18n/strings/en_EN.json
2021-07-29 15:16:53 +01:00
Michael Telatynski
f69b4549dd
Re-add top border stroke in space create menu
2021-07-29 15:13:02 +01:00
Germain
dac3eda9e3
Merge pull request #6499 from matrix-org/gsouquet/fix-18195
...
Prevent timeline flickering on hover
2021-07-29 14:33:34 +01:00
Michael Telatynski
ab56a16907
Merge pull request #6458 from matrix-org/t3chguy/fix/18091
2021-07-29 13:20:19 +01:00
Michael Telatynski
08c883ed07
Update all copy of subspace to space
2021-07-29 13:02:07 +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
Germain
3bd393f16b
Merge pull request #6501 from matrix-org/gsouquet/fix-18249
...
Restore pointer cursor for SenderProfile in message bubbles
2021-07-29 12:20:56 +01:00
Germain
44bab05b47
Merge pull request #6500 from matrix-org/gsouquet/fix-18143
...
Align event list summary read receipts when using message bubbles
2021-07-29 12:20:37 +01:00
Michael Telatynski
6f37e8b223
Use getChildren instead of getSpaceSummary as MSC2946 has moved on
2021-07-29 12:16:59 +01:00
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 Souquet
6c68f779ec
Restore pointer cursor for SenderProfile in message bubbles
2021-07-29 11:58:32 +02:00
Germain Souquet
9c4101fa89
Align event list summary read receipts when using message bubbles
2021-07-29 11:48:22 +02:00
Germain Souquet
78a9117598
Prevent timeline flickering on hover
2021-07-29 11:12:07 +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
Germain Souquet
ee7f3c000d
Merge branch 'develop' into gsouquet/fix-18144
2021-07-29 10:04:47 +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
Michael Telatynski
a5606c72de
Update feedback prompt to match designs
2021-07-28 17:56:57 +01:00
Michael Telatynski
6123ccb2eb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
2021-07-28 17:45:15 +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
