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 |
|
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 |
|
Germain
|
51178735c9
|
Merge pull request #6428 from matrix-org/gsouquet/fix-18129
|
2021-07-22 08:44:40 +01: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 |
|
Travis Ralston
|
56290f3d01
|
Force padding overrides to take precedence over MediaBody styles
|
2021-07-21 14:47:27 -06:00 |
|
Travis Ralston
|
87ac2d7cc5
|
Move padding and width to MediaBody styles
|
2021-07-21 14:47:02 -06:00 |
|
Travis Ralston
|
3023fda497
|
Make MFileBody inherit the MediaBody styles
|
2021-07-21 14:46:25 -06:00 |
|
Travis Ralston
|
5386d23008
|
Fix voice message tile taking up a couple extra px at the bottom
... by returning it to the default block shape.
|
2021-07-21 14:43:26 -06:00 |
|
Germain
|
22375e2108
|
Update res/css/views/rooms/_EventBubbleTile.scss
|
2021-07-21 15:11:49 +01:00 |
|
Germain Souquet
|
0fb210cadb
|
Increase hit area for timestamp in message bubbles
|
2021-07-21 15:31:10 +02:00 |
|
Germain Souquet
|
c155382445
|
Improve new layout switcher UI
|
2021-07-21 14:55:30 +02:00 |
|
Germain
|
32e7c58747
|
Merge branch 'develop' into gsouquet/fix-18099
|
2021-07-21 11:57:29 +01:00 |
|
Germain
|
a4ca52255d
|
Merge pull request #6421 from matrix-org/gsouquet/fix-18084
Fix font slider preview for message bubbles
|
2021-07-21 11:56:33 +01:00 |
|
Germain
|
e33163c837
|
Merge pull request #6419 from matrix-org/gsouquet/fix-18125
Add spoiler support for message bubbles
|
2021-07-21 11:54:30 +01:00 |
|
Michael Telatynski
|
d147aaa984
|
delint and fix min-height issue
|
2021-07-21 11:27:36 +01:00 |
|
Michael Telatynski
|
fd64d37305
|
Add iconography to Create Room Dialog dropdown
Remove unused old stale feather-customised/globe.svg
|
2021-07-21 11:20:41 +01:00 |
|
Michael Telatynski
|
390b05617c
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
Conflicts:
src/components/views/dialogs/CreateRoomDialog.tsx
src/components/views/dialogs/RoomUpgradeDialog.tsx
src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
|
2021-07-21 10:46:41 +01:00 |
|
Germain
|
6308dabcfe
|
Remove forgotten code comment
|
2021-07-21 10:43:48 +01:00 |
|
Germain Souquet
|
ef002a2e22
|
Fix replies line clamping
|
2021-07-21 11:41:52 +02:00 |
|
Germain
|
dfa85b00d0
|
Merge pull request #6423 from matrix-org/gsouquet/fix-18077
|
2021-07-21 09:43:15 +01:00 |
|
Germain Souquet
|
a7cd5fc49b
|
Shift thumbnail dislay to use object-fit to preserve aspect-ratio
|
2021-07-21 10:03:10 +02:00 |
|
Germain Souquet
|
6d9ac1de17
|
Fix font slider preview for message bubbles
|
2021-07-21 09:34:30 +02:00 |
|
Germain Souquet
|
fee69884a6
|
Reintroduce grouped events padding on modern layout
|
2021-07-21 08:57:09 +02:00 |
|
Germain Souquet
|
a6308229fb
|
Add spoiler support for message bubbles
|
2021-07-21 08:42:42 +02:00 |
|
Travis Ralston
|
5994111e5d
|
Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download
|
2021-07-20 08:55:53 -06:00 |
|
Šimon Brandner
|
9e5b149291
|
Fix event highlighthing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-20 14:23:28 +02:00 |
|
Šimon Brandner
|
dd6379cf4b
|
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-20 13:15:04 +02:00 |
|
Germain
|
53ae7817bc
|
Merge pull request #6291 from matrix-org/gsouquet/message-bubbles-4635
|
2021-07-20 10:22:41 +01:00 |
|
Germain Souquet
|
06c9a060b4
|
Merge branch 'develop' into gsouquet/message-bubbles-4635
|
2021-07-20 10:16:21 +02:00 |
|
Šimon Brandner
|
5db20d9431
|
Fix placeholder centering
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-20 08:54:32 +02:00 |
|
Michael Telatynski
|
de42a00ca4
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
Conflicts:
src/components/views/avatars/RoomAvatar.tsx
test/stores/SpaceStore-test.ts
test/test-utils.js
|
2021-07-19 16:47:31 +01:00 |
|