Michael Telatynski
|
42d6afd4b1
|
Merge pull request #6497 from matrix-org/t3chguy/fix/18093
|
2021-07-30 12:25:44 +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 |
|
Michael Telatynski
|
02dbdc5c0a
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093
Conflicts:
src/components/views/spaces/SpaceTreeLevel.tsx
src/dispatcher/actions.ts
src/i18n/strings/en_EN.json
|
2021-07-29 16:11:16 +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
|
3ee8f607c0
|
Switch dropdown out for radio interaction when leaving space
|
2021-07-29 15:50:18 +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 |
|
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 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 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
|
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
|
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
|
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 |
|
Germain
|
771dda0341
|
Merge pull request #6472 from SimonBrandner/fix/call-view/18221
|
2021-07-28 11:10:37 +01:00 |
|
Germain Souquet
|
a4cf147d72
|
Merge branch 'develop' into gsouquet/fix-18264
|
2021-07-28 10:30:29 +02: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 |
|
Šimon Brandner
|
8294d324e3
|
Merge remote-tracking branch 'upstream/develop' into fix/call-view/18221
|
2021-07-27 16:55:59 +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 |
|
Michael Telatynski
|
39d9ec3ced
|
Merge branch 'develop' into t3chguy/fix/18071
|
2021-07-27 15:02:59 +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
|
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 |
|
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 |
|
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 |
|
Germain
|
80bf7d1675
|
Merge pull request #6468 from SimonBrandner/fix/quotes/18199
|
2021-07-27 09:48:19 +01:00 |
|
Germain
|
788abac74d
|
Merge pull request #6471 from SimonBrandner/fix/voip-event-tiles/18216
Fix VoIP event tile issues
|
2021-07-27 08:17:31 +01:00 |
|
Germain Souquet
|
e2688cd5e0
|
Left align unbubbled events
|
2021-07-26 16:53:37 +02:00 |
|
Germain Souquet
|
486d576b23
|
Merge branch 'develop' into gsouquet/fix-18132
|
2021-07-26 15:49:55 +02:00 |
|
Germain Souquet
|
88bd22ded3
|
Make new reply UI clickable
|
2021-07-26 13:50:04 +02:00 |
|
Michael Telatynski
|
2114e854f9
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091
Conflicts:
src/components/structures/SpaceRoomView.tsx
|
2021-07-26 12:36:00 +01:00 |
|
Germain Souquet
|
46a370a818
|
Fix deleted message left offset in the timeline
|
2021-07-26 11:01:37 +02:00 |
|
Germain Souquet
|
2577211855
|
Make CallEvent tiles the same width all the time
|
2021-07-26 09:42:17 +02:00 |
|
Germain Souquet
|
468887415a
|
Merge branch 'develop' into gsouquet/fix-18144
|
2021-07-26 09:25:31 +02:00 |
|
Germain
|
774e743741
|
Update res/css/views/rooms/_EventBubbleTile.scss
|
2021-07-26 08:16:13 +01:00 |
|