diff --git a/element-desktop b/element-desktop index 96aa172..a8a8ec0 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 96aa1725d46fe9858108eff051711838da2d60fc +Subproject commit a8a8ec0fbbdccffa17c273a825c4b60895c6cf1d diff --git a/element-web b/element-web index 60754c1..6c2c401 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 60754c17d92a1e8d9790dfb476f703949b60ce47 +Subproject commit 6c2c4015b9bdf9986b82c71dd67465cc12ae4b77 diff --git a/matrix-js-sdk b/matrix-js-sdk index 6390182..0c21e5e 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 63901825c14da3ec6f59017d2696ad98be91d2e0 +Subproject commit 0c21e5e6a8ef45ff6e92fa66a0eb52ddae2999bc diff --git a/matrix-react-sdk b/matrix-react-sdk index 16fe0fe..2f6683c 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 16fe0fe8d0068e4c5da3fa5516c5578d2ffaabc7 +Subproject commit 2f6683c60ef03eee12adfc8c44d198f8438d8756 diff --git a/patches/element-desktop/0002-Add-back-schildi-fetch-package.ts-modifications.patch b/patches/element-desktop/0002-Add-back-schildi-fetch-package.ts-modifications.patch index ea1912b..87498d3 100644 --- a/patches/element-desktop/0002-Add-back-schildi-fetch-package.ts-modifications.patch +++ b/patches/element-desktop/0002-Add-back-schildi-fetch-package.ts-modifications.patch @@ -1,4 +1,4 @@ -From bb7b8491326df4774f073840a96e28770c070250 Mon Sep 17 00:00:00 2001 +From 65ddd258e4617866712a09dd7f419d1d039e91c9 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 2 Dec 2023 12:57:26 +0100 Subject: Add back schildi fetch-package.ts modifications diff --git a/patches/matrix-js-sdk/0001-Add-fields-for-media-caption-support.patch b/patches/matrix-js-sdk/0001-Add-fields-for-media-caption-support.patch index 704dfd8..55b97d6 100644 --- a/patches/matrix-js-sdk/0001-Add-fields-for-media-caption-support.patch +++ b/patches/matrix-js-sdk/0001-Add-fields-for-media-caption-support.patch @@ -1,4 +1,4 @@ -From ac44e234f8f51ff21da56482c16621ece878e821 Mon Sep 17 00:00:00 2001 +From 0c21e5e6a8ef45ff6e92fa66a0eb52ddae2999bc Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 9 May 2024 09:21:21 +0200 Subject: Add fields for media caption support diff --git a/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch b/patches/matrix-react-sdk/0002-Disable-sticky-rooms.patch similarity index 93% rename from patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch rename to patches/matrix-react-sdk/0002-Disable-sticky-rooms.patch index f8f0dce..603696c 100644 --- a/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch +++ b/patches/matrix-react-sdk/0002-Disable-sticky-rooms.patch @@ -1,4 +1,4 @@ -From 913772283fd2b9f682a11a594061a6a1189b7869 Mon Sep 17 00:00:00 2001 +From 5330229d442d90df01b78e0a216e92543cec6d0b Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 18 Jan 2022 13:28:22 +0100 Subject: Disable sticky rooms diff --git a/patches/matrix-react-sdk/0002-Bring-back-unified-room-list.patch b/patches/matrix-react-sdk/0003-Bring-back-unified-room-list.patch similarity index 98% rename from patches/matrix-react-sdk/0002-Bring-back-unified-room-list.patch rename to patches/matrix-react-sdk/0003-Bring-back-unified-room-list.patch index 81bd614..8a17ba6 100644 --- a/patches/matrix-react-sdk/0002-Bring-back-unified-room-list.patch +++ b/patches/matrix-react-sdk/0003-Bring-back-unified-room-list.patch @@ -1,4 +1,4 @@ -From e2045dd5dcbd82f7b5c4f98d89b258cc304d3e26 Mon Sep 17 00:00:00 2001 +From bdfe28c9c30139e45ea71d7969a9cb11db525413 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 5 May 2024 10:12:17 +0200 Subject: Bring back unified room list @@ -124,10 +124,10 @@ index e27b2ca03f..311a54d9d8 100644 (this.props.activeSpace === MetaSpace.Favourites && orderedTagId !== DefaultTagID.Favourite) || (this.props.activeSpace === MetaSpace.People && orderedTagId !== DefaultTagID.DM) || diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index 76bb109cac..7aea53ceea 100644 +index 4f788ee224..2e475871fa 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -191,6 +191,14 @@ export interface IFeature extends Omit, "isFeature"> { +@@ -192,6 +192,14 @@ export interface IFeature extends Omit, "isFeature"> { export type ISetting = IBaseSetting | IFeature; export const SETTINGS: { [setting: string]: ISetting } = { diff --git a/patches/matrix-react-sdk/0003-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch b/patches/matrix-react-sdk/0004-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch similarity index 93% rename from patches/matrix-react-sdk/0003-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch rename to patches/matrix-react-sdk/0004-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch index 2363d5b..7be06a0 100644 --- a/patches/matrix-react-sdk/0003-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch +++ b/patches/matrix-react-sdk/0004-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch @@ -1,4 +1,4 @@ -From 1d3847da55e91dfc5e555e69fbadcbc1d033a8d9 Mon Sep 17 00:00:00 2001 +From 3978dc98c0bc2272a20a083a767f93da6a98a8b2 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 17 Dec 2023 11:11:58 +0100 Subject: Don't sort muted rooms to bottom, I still want to see them. diff --git a/patches/matrix-react-sdk/0004-Don-t-preview-reactions.patch b/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch similarity index 92% rename from patches/matrix-react-sdk/0004-Don-t-preview-reactions.patch rename to patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch index 68cb7f2..abef044 100644 --- a/patches/matrix-react-sdk/0004-Don-t-preview-reactions.patch +++ b/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch @@ -1,4 +1,4 @@ -From 9b7e89b38c49ffdb2811a3241cf077d8ca5ff1c7 Mon Sep 17 00:00:00 2001 +From f63086180b877d00d60c45e72e932cdfa6560823 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 14 Dec 2023 10:32:10 +0100 Subject: Don't preview reactions diff --git a/patches/matrix-react-sdk/0005-Hide-the-mute-notification-state-the-same-way-as-the.patch b/patches/matrix-react-sdk/0006-Hide-the-mute-notification-state-the-same-way-as-the.patch similarity index 95% rename from patches/matrix-react-sdk/0005-Hide-the-mute-notification-state-the-same-way-as-the.patch rename to patches/matrix-react-sdk/0006-Hide-the-mute-notification-state-the-same-way-as-the.patch index 5287d09..0e3abb3 100644 --- a/patches/matrix-react-sdk/0005-Hide-the-mute-notification-state-the-same-way-as-the.patch +++ b/patches/matrix-react-sdk/0006-Hide-the-mute-notification-state-the-same-way-as-the.patch @@ -1,4 +1,4 @@ -From 63244240b0a168b7f871aab50373805fc22601ec Mon Sep 17 00:00:00 2001 +From 86b04ca7ac01e6d45eca5812079cbb95b336fc4d Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Wed, 17 Nov 2021 12:50:25 +0100 Subject: Hide the "mute" notification state the same way as the other states diff --git a/patches/matrix-react-sdk/0006-Allow-muted-rooms-to-render-as-unread.patch b/patches/matrix-react-sdk/0007-Allow-muted-rooms-to-render-as-unread.patch similarity index 92% rename from patches/matrix-react-sdk/0006-Allow-muted-rooms-to-render-as-unread.patch rename to patches/matrix-react-sdk/0007-Allow-muted-rooms-to-render-as-unread.patch index 2f9630e..dd0d64f 100644 --- a/patches/matrix-react-sdk/0006-Allow-muted-rooms-to-render-as-unread.patch +++ b/patches/matrix-react-sdk/0007-Allow-muted-rooms-to-render-as-unread.patch @@ -1,4 +1,4 @@ -From 3dd434f6a79a40db10cae4e97081fa4025030f3d Mon Sep 17 00:00:00 2001 +From 3bd11332c72a9a42c86af65a0a3569ff12a06f38 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Fri, 10 May 2024 18:58:32 +0200 Subject: Allow muted rooms to render as unread diff --git a/patches/matrix-react-sdk/0007-Increase-default-visible-tiles.patch b/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch similarity index 91% rename from patches/matrix-react-sdk/0007-Increase-default-visible-tiles.patch rename to patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch index d8f92c8..fef0f72 100644 --- a/patches/matrix-react-sdk/0007-Increase-default-visible-tiles.patch +++ b/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch @@ -1,4 +1,4 @@ -From 29edc707c494b2d3ead55331fc5ba3358c88bd88 Mon Sep 17 00:00:00 2001 +From 1513534630832a3e64ed658436cc0867067f74c5 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 30 Aug 2020 15:33:01 +0200 Subject: Increase default visible tiles diff --git a/patches/matrix-react-sdk/0008-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch b/patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch similarity index 95% rename from patches/matrix-react-sdk/0008-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch rename to patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch index 98a55b6..8852d7e 100644 --- a/patches/matrix-react-sdk/0008-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch +++ b/patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch @@ -1,4 +1,4 @@ -From cdcce7746aa7ade1bb7785c03c94b49b27fa6f36 Mon Sep 17 00:00:00 2001 +From fc40f03afa3382f712bf6e826391930838e463bc Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 26 May 2024 10:43:36 +0200 Subject: Bring back showSpaceDMBadges setting, force-enabled for now @@ -12,10 +12,10 @@ Co-authored-by: SpiritCroc 2 files changed, 30 insertions(+) diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index 7aea53ceea..b668c65dfd 100644 +index 2e475871fa..43eb44fa3a 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -198,6 +198,11 @@ export const SETTINGS: { [setting: string]: ISetting } = { +@@ -199,6 +199,11 @@ export const SETTINGS: { [setting: string]: ISetting } = { default: true, controller: new ReloadOnChangeController(), }, diff --git a/patches/matrix-react-sdk/0009-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch b/patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch similarity index 98% rename from patches/matrix-react-sdk/0009-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch rename to patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch index a480531..709bfad 100644 --- a/patches/matrix-react-sdk/0009-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch +++ b/patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch @@ -1,4 +1,4 @@ -From 1cec65f97867b8c29b596f7ca4a171d01d3cb04c Mon Sep 17 00:00:00 2001 +From 2c57b9864b2d86dfa4cc89098c4cda965fcb2401 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Wed, 29 May 2024 19:32:42 +0200 Subject: Squashed: Freeform reactions from tadzik/freeform-reactions-upstream diff --git a/patches/matrix-react-sdk/0010-Allow-reactions-to-take-more-space.patch b/patches/matrix-react-sdk/0011-Allow-reactions-to-take-more-space.patch similarity index 73% rename from patches/matrix-react-sdk/0010-Allow-reactions-to-take-more-space.patch rename to patches/matrix-react-sdk/0011-Allow-reactions-to-take-more-space.patch index 2dcaa43..6f0c46d 100644 --- a/patches/matrix-react-sdk/0010-Allow-reactions-to-take-more-space.patch +++ b/patches/matrix-react-sdk/0011-Allow-reactions-to-take-more-space.patch @@ -1,4 +1,4 @@ -From 82a7324a26d4c3925fd984a6fd06817ecb94397b Mon Sep 17 00:00:00 2001 +From 5c3b02f8c82c6eb581ee771b4de4058dab7220b6 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 22 Apr 2023 12:15:18 +0200 Subject: Allow reactions to take more space @@ -8,18 +8,18 @@ Subject: Allow reactions to take more space 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/views/messages/_ReactionsRowButton.pcss b/res/css/views/messages/_ReactionsRowButton.pcss -index f2e3885de4..2a8bb9224e 100644 +index dd9d7ddb47..9ebe95021e 100644 --- a/res/css/views/messages/_ReactionsRowButton.pcss +++ b/res/css/views/messages/_ReactionsRowButton.pcss @@ -14,6 +14,7 @@ Please see LICENSE files in the repository root for full details. - background-color: $secondary-hairline-color; + background-color: var(--cpd-color-gray-200); user-select: none; align-items: center; + max-width: calc(100% - 40px);; - &:hover { - border-color: $quinary-content; -@@ -29,7 +30,6 @@ Please see LICENSE files in the repository root for full details. + &.mx_ReactionsRowButton_selected { + background-color: $accent-300; +@@ -25,7 +26,6 @@ Please see LICENSE files in the repository root for full details. } .mx_ReactionsRowButton_content { diff --git a/patches/matrix-react-sdk/0011-On-space-switch-don-t-automatically-show-last-opened.patch b/patches/matrix-react-sdk/0012-On-space-switch-don-t-automatically-show-last-opened.patch similarity index 90% rename from patches/matrix-react-sdk/0011-On-space-switch-don-t-automatically-show-last-opened.patch rename to patches/matrix-react-sdk/0012-On-space-switch-don-t-automatically-show-last-opened.patch index 4e69d96..be13b52 100644 --- a/patches/matrix-react-sdk/0011-On-space-switch-don-t-automatically-show-last-opened.patch +++ b/patches/matrix-react-sdk/0012-On-space-switch-don-t-automatically-show-last-opened.patch @@ -1,4 +1,4 @@ -From 1986abb52e47004f03db04fb167757e5ed666e07 Mon Sep 17 00:00:00 2001 +From a90c65a2ca9223d4d2a8fbeb657b3f0ec5d6ed51 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 30 May 2024 14:35:16 +0200 Subject: On space switch don't automatically show last opened room @@ -10,10 +10,10 @@ Subject: On space switch don't automatically show last opened room 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx -index 1726c8462d..150f29d0b8 100644 +index 0e5ec04d33..24185623d3 100644 --- a/src/components/structures/MatrixChat.tsx +++ b/src/components/structures/MatrixChat.tsx -@@ -1448,7 +1448,15 @@ export default class MatrixChat extends React.PureComponent { +@@ -1458,7 +1458,15 @@ export default class MatrixChat extends React.PureComponent { if (this.screenAfterLogin && this.screenAfterLogin.screen) { this.showScreen(this.screenAfterLogin.screen, this.screenAfterLogin.params); this.screenAfterLogin = undefined; @@ -30,7 +30,7 @@ index 1726c8462d..150f29d0b8 100644 // Before defaulting to directory, show the last viewed room this.viewLastRoom(); } else { -@@ -1460,6 +1468,14 @@ export default class MatrixChat extends React.PureComponent { +@@ -1470,6 +1478,14 @@ export default class MatrixChat extends React.PureComponent { } } @@ -46,10 +46,10 @@ index 1726c8462d..150f29d0b8 100644 dis.dispatch({ action: Action.ViewRoom, diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index b668c65dfd..be4433e1bc 100644 +index 43eb44fa3a..d354b67d3d 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -203,6 +203,12 @@ export const SETTINGS: { [setting: string]: ISetting } = { +@@ -204,6 +204,12 @@ export const SETTINGS: { [setting: string]: ISetting } = { supportedLevels: LEVELS_ACCOUNT_SETTINGS, default: true, }, diff --git a/patches/matrix-react-sdk/0012-Exclude-spaces-from-breadcrumbs.patch b/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch similarity index 92% rename from patches/matrix-react-sdk/0012-Exclude-spaces-from-breadcrumbs.patch rename to patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch index 113eb49..8b4bce8 100644 --- a/patches/matrix-react-sdk/0012-Exclude-spaces-from-breadcrumbs.patch +++ b/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch @@ -1,4 +1,4 @@ -From c2b459a7b0bd38b7b3c5151d002032dec3f25da7 Mon Sep 17 00:00:00 2001 +From 89defddc48625f66e760b8aaa21b0045c8831f25 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 9 Aug 2022 09:32:19 +0200 Subject: Exclude spaces from breadcrumbs diff --git a/patches/matrix-react-sdk/0013-Stop-the-search-bar-wobble.patch b/patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch similarity index 90% rename from patches/matrix-react-sdk/0013-Stop-the-search-bar-wobble.patch rename to patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch index ec13745..4e79917 100644 --- a/patches/matrix-react-sdk/0013-Stop-the-search-bar-wobble.patch +++ b/patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch @@ -1,4 +1,4 @@ -From 6233f7e038d6f78025ea2961467a0a22fbeee8a1 Mon Sep 17 00:00:00 2001 +From 1ccc65fc580392537fab12b40f4b007cf0616e1c Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Mon, 19 Aug 2024 20:27:33 +0200 Subject: Stop the search bar wobble diff --git a/patches/matrix-react-sdk/0014-Import-SC-compound-theme-overrides.patch b/patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch similarity index 93% rename from patches/matrix-react-sdk/0014-Import-SC-compound-theme-overrides.patch rename to patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch index acf7360..4d95c9f 100644 --- a/patches/matrix-react-sdk/0014-Import-SC-compound-theme-overrides.patch +++ b/patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch @@ -1,4 +1,4 @@ -From e87c6764f4abc734cdd05be97782e1b8e4e9df1c Mon Sep 17 00:00:00 2001 +From e9b0c9d989d6ac8ff0a08020151f73fefa465ffb Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 11:23:54 +0200 Subject: Import SC compound theme overrides diff --git a/patches/matrix-react-sdk/0015-No-damn-avatar-background-in-room-list.patch b/patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch similarity index 92% rename from patches/matrix-react-sdk/0015-No-damn-avatar-background-in-room-list.patch rename to patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch index 0eaa38b..4691b7e 100644 --- a/patches/matrix-react-sdk/0015-No-damn-avatar-background-in-room-list.patch +++ b/patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch @@ -1,4 +1,4 @@ -From 6c4f7dc233b9946bf1dd883516b9d89fb7bede05 Mon Sep 17 00:00:00 2001 +From a60b2c3988e20d10ec873fc0cfb241220dc02b86 Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 7 Sep 2021 19:41:52 +0200 Subject: No damn avatar background in room list diff --git a/patches/matrix-react-sdk/0016-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch b/patches/matrix-react-sdk/0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch similarity index 83% rename from patches/matrix-react-sdk/0016-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch rename to patches/matrix-react-sdk/0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch index b481fc0..ba35810 100644 --- a/patches/matrix-react-sdk/0016-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch +++ b/patches/matrix-react-sdk/0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch @@ -1,4 +1,4 @@ -From 31b4da04ee9d8fefa0a26182dcd02d5b597b15ec Mon Sep 17 00:00:00 2001 +From 37649905fb9c57d233f14d4de2dc1d3bc5eecd84 Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 22 Dec 2020 19:16:28 +0100 Subject: No red messages in 1:1 chats Close SchildiChat/schildichat-desktop#13 @@ -8,10 +8,10 @@ Subject: No red messages in 1:1 chats Close SchildiChat/schildichat-desktop#13 1 file changed, 6 insertions(+) diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx -index 746cceabd8..3e5879f7ad 100644 +index 813e5de40c..4b7118eb9a 100644 --- a/src/components/views/rooms/EventTile.tsx +++ b/src/components/views/rooms/EventTile.tsx -@@ -685,6 +685,12 @@ export class UnwrappedEventTile extends React.Component +@@ -679,6 +679,12 @@ export class UnwrappedEventTile extends React.Component return false; } diff --git a/patches/matrix-react-sdk/0017-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch b/patches/matrix-react-sdk/0018-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch similarity index 83% rename from patches/matrix-react-sdk/0017-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch rename to patches/matrix-react-sdk/0018-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch index 69f7b05..ca94ab2 100644 --- a/patches/matrix-react-sdk/0017-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch +++ b/patches/matrix-react-sdk/0018-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch @@ -1,4 +1,4 @@ -From dd837c682f2aaf1d730a1e3f5b68b1cd03179e12 Mon Sep 17 00:00:00 2001 +From a765c5b0eabd4ba249157a0a3562f76b5d235d82 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 13:26:16 +0200 Subject: Always apply corner radius to all edges of the bubble @@ -8,10 +8,10 @@ Subject: Always apply corner radius to all edges of the bubble 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/res/css/views/rooms/_EventBubbleTile.pcss b/res/css/views/rooms/_EventBubbleTile.pcss -index ec443c44de..8e0f3cf1b6 100644 +index 3a42cde9bb..a5f5480010 100644 --- a/res/css/views/rooms/_EventBubbleTile.pcss +++ b/res/css/views/rooms/_EventBubbleTile.pcss -@@ -277,6 +277,8 @@ Please see LICENSE files in the repository root for full details. +@@ -283,6 +283,8 @@ Please see LICENSE files in the repository root for full details. margin-inline: var(--EventTile_bubble_line-margin-inline-start) var(--EventTile_bubble_line-margin-inline-end); border-top-left-radius: var(--cornerRadius); border-top-right-radius: var(--cornerRadius); @@ -20,7 +20,7 @@ index ec443c44de..8e0f3cf1b6 100644 /* the selector here is quite weird because timestamps can appear linked & unlinked and in different places */ /* in the DOM depending on the specific rendering context */ -@@ -371,7 +373,7 @@ Please see LICENSE files in the repository root for full details. +@@ -377,7 +379,7 @@ Please see LICENSE files in the repository root for full details. } &.mx_EventTile_continuation[data-self="false"] .mx_EventTile_line { @@ -29,7 +29,7 @@ index ec443c44de..8e0f3cf1b6 100644 .mx_MImageBody .mx_MImageBody_thumbnail_container, .mx_MVideoBody .mx_MVideoBody_container, -@@ -379,7 +381,7 @@ Please see LICENSE files in the repository root for full details. +@@ -385,7 +387,7 @@ Please see LICENSE files in the repository root for full details. .mx_MediaBody, .mx_MLocationBody_map, .mx_MBeaconBody { @@ -38,7 +38,7 @@ index ec443c44de..8e0f3cf1b6 100644 } } &.mx_EventTile_lastInSection[data-self="false"] .mx_EventTile_line { -@@ -396,7 +398,7 @@ Please see LICENSE files in the repository root for full details. +@@ -402,7 +404,7 @@ Please see LICENSE files in the repository root for full details. } &.mx_EventTile_continuation[data-self="true"] .mx_EventTile_line { @@ -47,7 +47,7 @@ index ec443c44de..8e0f3cf1b6 100644 .mx_MImageBody .mx_MImageBody_thumbnail_container, .mx_MVideoBody .mx_MVideoBody_container, -@@ -404,7 +406,7 @@ Please see LICENSE files in the repository root for full details. +@@ -410,7 +412,7 @@ Please see LICENSE files in the repository root for full details. .mx_MediaBody, .mx_MLocationBody_map, .mx_MBeaconBody { diff --git a/patches/matrix-react-sdk/0018-Always-show-timestamps-by-default.patch b/patches/matrix-react-sdk/0019-Always-show-timestamps-by-default.patch similarity index 80% rename from patches/matrix-react-sdk/0018-Always-show-timestamps-by-default.patch rename to patches/matrix-react-sdk/0019-Always-show-timestamps-by-default.patch index 6e735c5..d9b02d6 100644 --- a/patches/matrix-react-sdk/0018-Always-show-timestamps-by-default.patch +++ b/patches/matrix-react-sdk/0019-Always-show-timestamps-by-default.patch @@ -1,4 +1,4 @@ -From c4567d013ea39a71a37f9356f847b8555a8173e7 Mon Sep 17 00:00:00 2001 +From f8bdf88fd81872e997e8ba61b4997d059ac9747e Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 13:53:07 +0200 Subject: Always show timestamps by default @@ -8,10 +8,10 @@ Subject: Always show timestamps by default 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index be4433e1bc..1052bca0c9 100644 +index d354b67d3d..925f104bb0 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -662,7 +662,7 @@ export const SETTINGS: { [setting: string]: ISetting } = { +@@ -643,7 +643,7 @@ export const SETTINGS: { [setting: string]: ISetting } = { "alwaysShowTimestamps": { supportedLevels: LEVELS_ACCOUNT_SETTINGS, displayName: _td("settings|always_show_message_timestamps"), diff --git a/patches/matrix-react-sdk/0019-Enable-custom-emote-rendering-by-default.patch b/patches/matrix-react-sdk/0020-Enable-custom-emote-rendering-by-default.patch similarity index 81% rename from patches/matrix-react-sdk/0019-Enable-custom-emote-rendering-by-default.patch rename to patches/matrix-react-sdk/0020-Enable-custom-emote-rendering-by-default.patch index 830e5b4..d3eb448 100644 --- a/patches/matrix-react-sdk/0019-Enable-custom-emote-rendering-by-default.patch +++ b/patches/matrix-react-sdk/0020-Enable-custom-emote-rendering-by-default.patch @@ -1,4 +1,4 @@ -From 09d134d0c975c430a894028b50ea460511fa2489 Mon Sep 17 00:00:00 2001 +From 91513e88358321b3e3a742969aaf9ff44c7356f1 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 17 Oct 2024 19:40:51 +0200 Subject: Enable custom emote rendering by default @@ -8,10 +8,10 @@ Subject: Enable custom emote rendering by default 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index 1052bca0c9..f5fcb5d7a5 100644 +index 925f104bb0..1c8d82e30f 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -514,7 +514,7 @@ export const SETTINGS: { [setting: string]: ISetting } = { +@@ -507,7 +507,7 @@ export const SETTINGS: { [setting: string]: ISetting } = { description: _td("labs|render_reaction_images_description"), supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED, supportedLevelsAreOrdered: true,