diff --git a/patches/element-desktop/0001-Add-back-schildi-fetch-package.ts-modifications.patch b/patches/element-desktop/0001-Add-back-schildi-fetch-package.ts-modifications.patch index 36e3ab7..2ceda12 100644 --- a/patches/element-desktop/0001-Add-back-schildi-fetch-package.ts-modifications.patch +++ b/patches/element-desktop/0001-Add-back-schildi-fetch-package.ts-modifications.patch @@ -1,4 +1,4 @@ -From 9afc676a319a686dfb58490c5fa4e28124d72149 Mon Sep 17 00:00:00 2001 +From 00009e6d27ccc63b0e1e32888a79a3dda12537db 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 aef97d2..8ec1e73 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 0fe8387af0500390a3f17df263d95a22a2d8c9e0 Mon Sep 17 00:00:00 2001 +From 3e11b1c51c4b0f0e673c4b22864f97be7098b888 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 @@ -8,7 +8,7 @@ Subject: Add fields for media caption support 1 file changed, 12 insertions(+) diff --git a/src/@types/media.ts b/src/@types/media.ts -index 20e5ca6c6..920d77667 100644 +index ef23668b0..9b4ff3b97 100644 --- a/src/@types/media.ts +++ b/src/@types/media.ts @@ -180,6 +180,9 @@ export interface FileContent extends BaseContent { diff --git a/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch b/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch index 7f0ac96..bf35661 100644 --- a/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch +++ b/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch @@ -1,4 +1,4 @@ -From 3e53e887c82ee5664ab447a3cd69df59fceaefde Mon Sep 17 00:00:00 2001 +From 6e30626e23f9bd3eed4bb62ce91d86678b6e2023 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/0002-Bring-back-unified-room-list.patch index a767a2a..2642465 100644 --- a/patches/matrix-react-sdk/0002-Bring-back-unified-room-list.patch +++ b/patches/matrix-react-sdk/0002-Bring-back-unified-room-list.patch @@ -1,4 +1,4 @@ -From 8ce90622ede79277b901e147b3943cc5fee6a5cc Mon Sep 17 00:00:00 2001 +From 60b5acaf9615e189667a594bb1477ea6c0feb457 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,7 +124,7 @@ index 7d47748de8..cec95bcf6d 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 476818a138..35cefb3f28 100644 +index 7cd58c9355..9709fcd83b 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx @@ -197,6 +197,14 @@ export interface IFeature extends Omit, "isFeature"> { 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/0003-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch index d56f17b..dc063fc 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/0003-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch @@ -1,4 +1,4 @@ -From 1b346c3db9355aa2da0beb543a430e469fd17ec5 Mon Sep 17 00:00:00 2001 +From b0c7839b0ea5d707120df607eeba7c535b16da3a 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-Add-support-for-rendering-captions-in-media-messages.patch b/patches/matrix-react-sdk/0004-Add-support-for-rendering-captions-in-media-messages.patch index ede7221..89973e9 100644 --- a/patches/matrix-react-sdk/0004-Add-support-for-rendering-captions-in-media-messages.patch +++ b/patches/matrix-react-sdk/0004-Add-support-for-rendering-captions-in-media-messages.patch @@ -1,4 +1,4 @@ -From b5b2d8d9bca50d4ad43cd01a2c8f0ea8c3de9bcc Mon Sep 17 00:00:00 2001 +From bc56cc58fbb23b3e19740e202fe2231240fbc0c9 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Tue, 12 Jul 2022 15:34:57 +0300 Subject: Add support for rendering captions in media messages diff --git a/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch b/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch index 9f08b8a..2e7366c 100644 --- a/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch +++ b/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch @@ -1,4 +1,4 @@ -From c53dd25c7ddd402ccb774a99fb0436c5c3694e98 Mon Sep 17 00:00:00 2001 +From 9a88dd5e3f1a03a4eecfe11515a502ef89d7d6b3 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/0006-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 index 5f06f07..7e99a27 100644 --- a/patches/matrix-react-sdk/0006-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 d4c665355efa4c385cac9777476882d1fccdfad1 Mon Sep 17 00:00:00 2001 +From b8da294b5d544da9760299037dd2830989298510 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/0007-Allow-muted-rooms-to-render-as-unread.patch b/patches/matrix-react-sdk/0007-Allow-muted-rooms-to-render-as-unread.patch index 4cbf369..10bee6c 100644 --- a/patches/matrix-react-sdk/0007-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 48250ea097e6034d25c6b55666e33496062ad197 Mon Sep 17 00:00:00 2001 +From e8d9cca6e0838659a02373bf922f5aceb16ee015 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/0008-Increase-default-visible-tiles.patch b/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch index b885fe4..f1fdb94 100644 --- a/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch +++ b/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch @@ -1,4 +1,4 @@ -From 9c91bdbdf95bb8969bf31d9b38b15ad4cfe5b736 Mon Sep 17 00:00:00 2001 +From de95a495964ac0b8a91c3a30268fa362e3cc5373 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/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch b/patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch index 12c32e0..b0902f2 100644 --- a/patches/matrix-react-sdk/0009-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 8f46bb8a3a76a3fc43be9ad1646a535507c8675a Mon Sep 17 00:00:00 2001 +From 54ff718e21a20c653721ffd6ec30c6d91cb67900 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,7 +12,7 @@ Co-authored-by: SpiritCroc 2 files changed, 30 insertions(+) diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index 35cefb3f28..e5624b33b3 100644 +index 9709fcd83b..7b402ef8cf 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx @@ -204,6 +204,11 @@ export const SETTINGS: { [setting: string]: ISetting } = { diff --git a/patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch b/patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch index d25b087..9430d17 100644 --- a/patches/matrix-react-sdk/0010-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 486cc7ef0c6cc0e6e1e5df593a4bb2cecd2bb9f0 Mon Sep 17 00:00:00 2001 +From bbc655c919fe9283a38e6e3c86bedb8c348776a7 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/0011-Allow-reactions-to-take-more-space.patch b/patches/matrix-react-sdk/0011-Allow-reactions-to-take-more-space.patch index 652bc50..e1ee37c 100644 --- a/patches/matrix-react-sdk/0011-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 d72f4c25cc5fb819298adeb0874ad1e825ba2731 Mon Sep 17 00:00:00 2001 +From 998bd83ecf2c8a3f58445cc5bf62b305546627dd 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 diff --git a/patches/matrix-react-sdk/0012-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 index e115542..8ac51e2 100644 --- a/patches/matrix-react-sdk/0012-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 4dc009cab3b625ec5509cf774ea98dc44ba04c77 Mon Sep 17 00:00:00 2001 +From c9fd9e3448066ede633e8e2d388c9e6a040f3956 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 8335b0e3f6..fdaec88357 100644 +index 53514ab817..73068d3090 100644 --- a/src/components/structures/MatrixChat.tsx +++ b/src/components/structures/MatrixChat.tsx -@@ -1437,7 +1437,15 @@ export default class MatrixChat extends React.PureComponent { +@@ -1438,7 +1438,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 8335b0e3f6..fdaec88357 100644 // Before defaulting to directory, show the last viewed room this.viewLastRoom(); } else { -@@ -1449,6 +1457,14 @@ export default class MatrixChat extends React.PureComponent { +@@ -1450,6 +1458,14 @@ export default class MatrixChat extends React.PureComponent { } } @@ -46,7 +46,7 @@ index 8335b0e3f6..fdaec88357 100644 dis.dispatch({ action: Action.ViewRoom, diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index e5624b33b3..73bb2938f7 100644 +index 7b402ef8cf..cfaeb9ac29 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx @@ -209,6 +209,12 @@ export const SETTINGS: { [setting: string]: ISetting } = { diff --git a/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch b/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch index 4e67635..fa1fbc2 100644 --- a/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch +++ b/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch @@ -1,4 +1,4 @@ -From f60cd86c579382085e9ad5d2a29f107b155d335a Mon Sep 17 00:00:00 2001 +From 5e5285a00c60802d7ef74fe6881601a3c4f20746 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/0014-Stop-the-search-bar-wobble.patch b/patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch index 5984651..f62a0d7 100644 --- a/patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch +++ b/patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch @@ -1,4 +1,4 @@ -From 98916e3cfbca37369c5a11eb4a6cd3fb0dcd8dda Mon Sep 17 00:00:00 2001 +From c6a550e2c3f9020730c8bd603514e9ce7cf69064 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Mon, 19 Aug 2024 20:27:33 +0200 Subject: Stop the search bar wobble @@ -8,7 +8,7 @@ Subject: Stop the search bar wobble 1 file changed, 1 insertion(+) diff --git a/res/css/_common.pcss b/res/css/_common.pcss -index de698e2324..18e28dbb2d 100644 +index 605ad41b81..d1f55282f6 100644 --- a/res/css/_common.pcss +++ b/res/css/_common.pcss @@ -189,6 +189,7 @@ input[type="search"].mx_textinput_icon {