Commit graph

3565 commits

Author SHA1 Message Date
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
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
88bd22ded3 Make new reply UI clickable 2021-07-26 13:50:04 +02: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
4aa8d8ff21
Add missed call icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:36:41 +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
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
Michael Telatynski
358a4e5d3f
Merge pull request #6212 from matrix-org/t3chguy/fix/17686 2021-07-23 09:09:17 +01:00
Germain
ffcc9631df
Merge pull request #6449 from matrix-org/gsouquet/fix-18153
Add event selected state for message bubbles
2021-07-23 08:10:50 +01:00
Michael Telatynski
d8d0a21e47
Merge pull request #6450 from SimonBrandner/fix/url-scroll/18028 2021-07-23 06:12:02 +01:00
Šimon Brandner
bd46275ec6
Don't show scrollbar for url previews
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 17:48:17 +02:00
Germain
248a758ad6
Merge pull request #6439 from matrix-org/gsouquet/fix-18142
Fix avatar obstructing membership and state changes
2021-07-22 16:16:33 +01:00
Šimon Brandner
2841383e82
rethemendex
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 17:10:57 +02:00
Germain Souquet
224a9db3ec Add event selected state for message bubbles 2021-07-22 16:48:55 +02:00
Germain
09186f8ee9
Merge pull request #6446 from matrix-org/gsouquet/fix-18145
Always display the Sender in the reply tile
2021-07-22 15:12:09 +01:00
Germain Souquet
02b08888b5 Use modern layout in file and notification panel 2021-07-22 16:00:41 +02:00
Germain
78ae4ebc1e
Merge pull request #6444 from matrix-org/gsouquet/fix-18121
Add right padding for event replies
2021-07-22 14:28:13 +01:00
Germain Souquet
229d139568 Always display the Sender in the reply tile 2021-07-22 15:23:08 +02:00
Germain Souquet
8a9d89ae85 Fix event tile cut off in share preview 2021-07-22 15:05:44 +02:00
Germain Souquet
2e173d7810 Add right padding for event replies 2021-07-22 14:38:57 +02:00
Michael Telatynski
18bb4bce35 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/stores/SpaceStore.tsx
2021-07-22 12:44:27 +01:00