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 |
|
Šimon Brandner
|
f16b1d46b7
|
Fix sizing issue of the screen picker
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-28 20:58:24 +02: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
|
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 |
|
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 |
|
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 |
|
Šimon Brandner
|
7ed5dee74b
|
Make colors a bit clearer
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-26 13:17:06 +02:00 |
|
Šimon Brandner
|
277fdf1711
|
voipcall-plinth-color -> quinary-content-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-26 12:42:18 +02:00 |
|
Šimon Brandner
|
40947a2a68
|
Simplifie toast handling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-26 12:21:58 +02: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 |
|
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
|
f2204aa1ff
|
Remove nonsense comment
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-24 21:12:29 +02:00 |
|
Šimon Brandner
|
1f9cd79bcf
|
Fix some spacing and other tiny things
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-24 20:59:15 +02:00 |
|
Šimon Brandner
|
396fd2d012
|
Move silence button
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-24 20:39:44 +02:00 |
|
Šimon Brandner
|
064544369a
|
Add call type icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-24 19:30:37 +02:00 |
|
Šimon Brandner
|
25d62983de
|
Add button icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-24 19:12:12 +02:00 |
|
Šimon Brandner
|
a6f10a4aaa
|
Move around some CSS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-24 18:59:54 +02:00 |
|
Šimon Brandner
|
dd800549d7
|
Fix the silence icon color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-24 14:06:52 +02:00 |
|
Šimon Brandner
|
24e6fc96f6
|
Reorganize content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-24 14:04:22 +02:00 |
|
Šimon Brandner
|
c00174aacc
|
Correct button sizes
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-24 13:46:28 +02:00 |
|
Šimon Brandner
|
af22588682
|
Don't use a spacer
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-24 13:46:28 +02:00 |
|
Šimon Brandner
|
410928745f
|
IncomingCallBox -> IncomingCallToast
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-24 13:46:22 +02:00 |
|
Michael Telatynski
|
1ba601ba22
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
Conflicts:
src/components/structures/SpaceRoomView.tsx
src/components/views/dialogs/BetaFeedbackDialog.tsx
|
2021-07-23 18:28:21 +01: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
|
dec2c48155
|
remove unused import and revert removing some needed css
|
2021-07-23 15:56:00 +01:00 |
|
Michael Telatynski
|
7ccc429bea
|
Change spaces beta feedback to not be so beta-centric
|
2021-07-23 15:47:11 +01:00 |
|
Germain Souquet
|
43f809ccc8
|
Fix call events layout for message bubble
|
2021-07-23 15:15:44 +02: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 |
|
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 |
|
Michael Telatynski
|
010baabfe6
|
Improve subspaces and some utilities around room/space creation
|
2021-07-23 08:46:20 +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 |
|
Germain Souquet
|
0768f03097
|
Migrate ViewSourceEvent to TypeScript
|
2021-07-22 17:11:23 +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
|
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 |
|
Michael Telatynski
|
88884bbaad
|
Merge pull request #6441 from SimonBrandner/feature/smaller-quotes
|
2021-07-22 12:20:27 +01:00 |
|
Germain
|
951ceb194c
|
Merge pull request #6438 from matrix-org/gsouquet/fix-18074
Prevent action bar to overlap the event content
|
2021-07-22 12:14:29 +01:00 |
|
Šimon Brandner
|
6ae320831a
|
Make quotes thinner
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-22 13:10:25 +02:00 |
|
Travis Ralston
|
c4b08d7eca
|
Merge pull request #6440 from SimonBrandner/fix/codeblocks
Revert 100% on codeblocks
|
2021-07-22 03:49:11 -06:00 |
|
Šimon Brandner
|
85e08d5074
|
Revert 100%
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-22 11:43:29 +02:00 |
|
Travis Ralston
|
b9b37f59f1
|
Merge pull request #6432 from matrix-org/travis/voice-messages/colours
Clean up visual style of files and voice messages
|
2021-07-22 03:39:29 -06:00 |
|
Germain Souquet
|
8da2d0fe72
|
Fix avatar obstructing membership and state changes
|
2021-07-22 11:31:46 +02:00 |
|
Germain Souquet
|
9180d478eb
|
Prevent action bar to overlap the event content
|
2021-07-22 11:00:34 +02:00 |
|
Šimon Brandner
|
8695beb7ca
|
Fix overflow issues
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-22 10:03:22 +02:00 |
|
Šimon Brandner
|
2873bf6c3c
|
Make feeds bit a smaller
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-22 09:50:56 +02:00 |
|
Šimon Brandner
|
72948b9167
|
Keep aspect ratio for voice feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-22 09:45:33 +02:00 |
|
Germain
|
51178735c9
|
Merge pull request #6428 from matrix-org/gsouquet/fix-18129
|
2021-07-22 08:44:40 +01:00 |
|
Šimon Brandner
|
7ad62a8b1a
|
Reorganize some CSS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-22 09:06:20 +02:00 |
|
Travis Ralston
|
fd9241a854
|
Merge pull request #6355 from SimonBrandner/fix/diff-colors
Make diff colors in codeblocks more pleasant
|
2021-07-21 20:02:03 -06:00 |
|
Travis Ralston
|
ca1a1e488a
|
Take out the jump when recording a voice message
|
2021-07-21 14:47:42 -06:00 |
|