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 |
|
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 |
|
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 |
|
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
|
c7bbb497f9
|
Merge branch 'develop' into gsouquet/fix-18128
|
2021-07-26 07:41:42 +01:00 |
|
Germain
|
93ae5c20d6
|
Merge pull request #6464 from matrix-org/gsouquet/fix-18172
Fix reactions row pushing content on IRC layout
|
2021-07-26 07:40:49 +01:00 |
|
Šimon Brandner
|
3ef20174f3
|
Fix issues with the controls disappearing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-25 18:11:29 +02:00 |
|
Šimon Brandner
|
03a8308ae8
|
Fix call type icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-25 17:24:18 +02:00 |
|
Šimon Brandner
|
aedd535c92
|
Correct iconography for missed calls
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-25 08:37:25 +02:00 |
|
Šimon Brandner
|
b762303102
|
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-25 08:10:01 +02:00 |
|
Šimon Brandner
|
d206a0b8d3
|
Merge remote-tracking branch 'upstream/develop' into fix/quotes/18199
|
2021-07-23 18:39:42 +02:00 |
|
Šimon Brandner
|
c6df7e4e41
|
Style markdown quotes
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-23 17:46:49 +02:00 |
|
Michael Telatynski
|
4fe0e216d6
|
Use div instead of span for mx_MImageBody to not violate spec
|
2021-07-23 16:22:35 +01:00 |
|
Michael Telatynski
|
5f2582395f
|
Fix blurhash rounded corners missing regression
|
2021-07-23 16:21:59 +01:00 |
|
Michael Telatynski
|
b89434fcbc
|
avoid abusing spans because you're too lazy to give things a class
|
2021-07-23 16:03:15 +01:00 |
|
Michael Telatynski
|
c7a24746f5
|
Merge pull request #6462 from matrix-org/t3chguy/fix/18182
|
2021-07-23 14:52:56 +01:00 |
|
Germain Souquet
|
3ce6fcc64b
|
Fix reactions row pushing content on IRC layout
|
2021-07-23 14:58:27 +02:00 |
|
Germain Souquet
|
42b213ba8c
|
Fix clipped avatar in room list
|
2021-07-23 14:17:26 +02:00 |
|
Michael Telatynski
|
2b133deb63
|
fix scroll behaviour to match that of prior to the spinner fix
|
2021-07-23 12:19:54 +01:00 |
|
Michael Telatynski
|
4a4ec596bd
|
Fix position of the space hierarchy spinner
|
2021-07-23 11:27:00 +01:00 |
|
Germain Souquet
|
dcfd5d4793
|
Overlay avatar on top of bubbles
|
2021-07-23 12:12:52 +02:00 |
|
Germain Souquet
|
1ba5f19f2e
|
Put avatar is right place when sender isnt displayed in message bubbles
|
2021-07-23 12:10:34 +02:00 |
|
Germain Souquet
|
f99c0fad3e
|
Make inline events feel less claustrophobic in bubble layout
|
2021-07-23 11:40:34 +02:00 |