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 |
|
David Baker
|
a7a84df49c
|
Merge pull request #6505 from matrix-org/fix/release-grecaptcha-regression
Fix/release grecaptcha regression
|
2021-07-29 14:19:09 +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 |
|
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 |
|
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
|
7f6cf29766
|
Fix grecaptcha regression
|
2021-07-29 12:45:29 +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
|
9fb1c8e4cd
|
Iterate PR
|
2021-07-28 19:33:07 +01:00 |
|
Michael Telatynski
|
ac800ad94d
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093
|
2021-07-28 19:24:26 +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 |
|
Michael Telatynski
|
67ef263940
|
Refactor SpaceButton to be more reusable and add context menu to Home button
|
2021-07-28 17:40:33 +01:00 |
|
Michael Telatynski
|
b3a28bde89
|
Factor out useEventEmitterState hook
|
2021-07-28 17:39:56 +01:00 |
|
Michael Telatynski
|
cdf0d98c3f
|
Fix IconizedContextMenuCheckbox layout
|
2021-07-28 17:39:02 +01:00 |
|
Michael Telatynski
|
07b9d6b30b
|
Fix styling of setting flag descriptions in preferences
and add description to spaces all/home setting
and make it an account setting rather than device one
and hide it from the Beta card
|
2021-07-28 14:39:19 +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 Souquet
|
ab7d38717c
|
Restore padding for single person state events
|
2021-07-28 10:43:32 +02: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 |
|
Michael Telatynski
|
11e75ee852
|
Merge pull request #6493 from matrix-org/t3chguy/cp/6492
[Release] Fix CreateRoomDialog exploding when making public room outside of a space
|
2021-07-28 09:19:57 +01: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
|
f8106ef39b
|
Fix CreateRoomDialog exploding when making public room outside of a space
|
2021-07-28 08:42:09 +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 |
|
Michael Telatynski
|
776435f620
|
Switch all-rooms toggle for spaces to non-feature settings key
|
2021-07-27 21:17:24 +01:00 |
|
Michael Telatynski
|
0a9d3302ba
|
Fix home vs all rooms requiring app reload and change default to `home`
Consolidate ALL_ROOMS and HOME_SPACE storage
Fix behaviour when recalled room is no longer part of the target space
Improve tests
|
2021-07-27 21:11:47 +01:00 |