From f9686103b76ed36aed19242d79dc256aea73f764 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 22 Oct 2024 18:56:14 +0200 Subject: [PATCH] Remove caption patch that upstream merged, and squash SC CSS patches --- FEATURES.md | 1 - ...hildi-fetch-package.ts-modifications.patch | 2 +- ...Add-fields-for-media-caption-support.patch | 2 +- ...rendering-captions-in-media-messages.patch | 104 ------------------ ...tch => 0004-Don-t-preview-reactions.patch} | 2 +- ...ification-state-the-same-way-as-the.patch} | 2 +- ...low-muted-rooms-to-render-as-unread.patch} | 2 +- ...0007-Increase-default-visible-tiles.patch} | 2 +- ...aceDMBadges-setting-force-enabled-f.patch} | 2 +- ...-reactions-from-tadzik-freeform-rea.patch} | 2 +- ...-Allow-reactions-to-take-more-space.patch} | 2 +- ...on-t-automatically-show-last-opened.patch} | 2 +- ...012-Exclude-spaces-from-breadcrumbs.patch} | 2 +- ... => 0013-Stop-the-search-bar-wobble.patch} | 2 +- ...-Import-SC-compound-theme-overrides.patch} | 27 ++--- ...damn-avatar-background-in-room-list.patch} | 2 +- ...n-1-1-chats-Close-SchildiChat-schil.patch} | 2 +- ...er-radius-to-all-edges-of-the-bubbl.patch} | 2 +- ...8-Always-show-timestamps-by-default.patch} | 2 +- ...e-custom-emote-rendering-by-default.patch} | 2 +- ...link-css-to-fix-Windows-native-build.patch | 32 ------ 21 files changed, 31 insertions(+), 167 deletions(-) delete mode 100644 patches/matrix-react-sdk/0004-Add-support-for-rendering-captions-in-media-messages.patch rename patches/matrix-react-sdk/{0005-Don-t-preview-reactions.patch => 0004-Don-t-preview-reactions.patch} (92%) rename patches/matrix-react-sdk/{0006-Hide-the-mute-notification-state-the-same-way-as-the.patch => 0005-Hide-the-mute-notification-state-the-same-way-as-the.patch} (95%) rename patches/matrix-react-sdk/{0007-Allow-muted-rooms-to-render-as-unread.patch => 0006-Allow-muted-rooms-to-render-as-unread.patch} (92%) rename patches/matrix-react-sdk/{0008-Increase-default-visible-tiles.patch => 0007-Increase-default-visible-tiles.patch} (91%) rename patches/matrix-react-sdk/{0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch => 0008-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch} (98%) rename patches/matrix-react-sdk/{0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch => 0009-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch} (98%) rename patches/matrix-react-sdk/{0011-Allow-reactions-to-take-more-space.patch => 0010-Allow-reactions-to-take-more-space.patch} (94%) rename patches/matrix-react-sdk/{0012-On-space-switch-don-t-automatically-show-last-opened.patch => 0011-On-space-switch-don-t-automatically-show-last-opened.patch} (98%) rename patches/matrix-react-sdk/{0013-Exclude-spaces-from-breadcrumbs.patch => 0012-Exclude-spaces-from-breadcrumbs.patch} (92%) rename patches/matrix-react-sdk/{0014-Stop-the-search-bar-wobble.patch => 0013-Stop-the-search-bar-wobble.patch} (90%) rename patches/matrix-react-sdk/{0015-Import-SC-compound-theme-overrides.patch => 0014-Import-SC-compound-theme-overrides.patch} (58%) rename patches/matrix-react-sdk/{0016-No-damn-avatar-background-in-room-list.patch => 0015-No-damn-avatar-background-in-room-list.patch} (92%) rename patches/matrix-react-sdk/{0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch => 0016-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch} (93%) rename patches/matrix-react-sdk/{0018-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch => 0017-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch} (97%) rename patches/matrix-react-sdk/{0019-Always-show-timestamps-by-default.patch => 0018-Always-show-timestamps-by-default.patch} (92%) rename patches/matrix-react-sdk/{0021-Enable-custom-emote-rendering-by-default.patch => 0019-Enable-custom-emote-rendering-by-default.patch} (92%) delete mode 100644 patches/matrix-react-sdk/0022-Don-t-symlink-css-to-fix-Windows-native-build.patch diff --git a/FEATURES.md b/FEATURES.md index 0b1171a..92061d7 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -23,6 +23,5 @@ Note that this list may be incomplete or outdated. ## Conversation screen -- Render captions - Allow sending freeform reactions - Less restrictive width limit for rendering text reactions 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 61764fe..ea1912b 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 e326039d1acbc5da0cdd95dc235646202264d3c3 Mon Sep 17 00:00:00 2001 +From bb7b8491326df4774f073840a96e28770c070250 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 70aff3f..704dfd8 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 63901825c14da3ec6f59017d2696ad98be91d2e0 Mon Sep 17 00:00:00 2001 +From ac44e234f8f51ff21da56482c16621ece878e821 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/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 deleted file mode 100644 index f097ae4..0000000 --- a/patches/matrix-react-sdk/0004-Add-support-for-rendering-captions-in-media-messages.patch +++ /dev/null @@ -1,104 +0,0 @@ -From ac0fb82339fc580da9db60c183a39d72e6fba3ea 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 - ---- - src/components/views/messages/IBodyProps.ts | 2 ++ - src/components/views/messages/MessageEvent.tsx | 15 +++++++++++++++ - src/components/views/messages/TextualBody.tsx | 11 +++++++++++ - src/utils/FileUtils.ts | 4 +++- - 4 files changed, 31 insertions(+), 1 deletion(-) - -diff --git a/src/components/views/messages/IBodyProps.ts b/src/components/views/messages/IBodyProps.ts -index e48ba96b56..3caeff225c 100644 ---- a/src/components/views/messages/IBodyProps.ts -+++ b/src/components/views/messages/IBodyProps.ts -@@ -51,4 +51,6 @@ export interface IBodyProps { - // Set to `true` to disable interactions (e.g. video controls) and to remove controls from the tab order. - // This may be useful when displaying a preview of the event. - inhibitInteraction?: boolean; -+ -+ OrigBodyType?: React.ComponentType>; - } -diff --git a/src/components/views/messages/MessageEvent.tsx b/src/components/views/messages/MessageEvent.tsx -index 1a5d09e415..bfe908aacc 100644 ---- a/src/components/views/messages/MessageEvent.tsx -+++ b/src/components/views/messages/MessageEvent.tsx -@@ -175,6 +175,15 @@ export default class MessageEvent extends React.Component implements IMe - } - } - -+ // @ts-ignore -+ const hasCaption = [MsgType.Image, MsgType.File, MsgType.Audio, MsgType.Video].includes(msgtype) -+ && content.filename && content.filename !== content.body; -+ let OrigBodyType; -+ if (hasCaption) { -+ OrigBodyType = BodyType -+ BodyType = CaptionBody -+ } -+ - if (SettingsStore.getValue("feature_mjolnir")) { - const key = `mx_mjolnir_render_${this.props.mxEvent.getRoomId()}__${this.props.mxEvent.getId()}`; - const allowRender = localStorage.getItem(key) === "true"; -@@ -208,7 +217,13 @@ export default class MessageEvent extends React.Component implements IMe - getRelationsForEvent={this.props.getRelationsForEvent} - isSeeingThroughMessageHiddenForModeration={this.props.isSeeingThroughMessageHiddenForModeration} - inhibitInteraction={this.props.inhibitInteraction} -+ OrigBodyType={OrigBodyType} - /> - ) : null; - } - } -+ -+const CaptionBody: React.FunctionComponent>}> = ({OrigBodyType, ...props}) => (
-+ -+ -+
) -diff --git a/src/components/views/messages/TextualBody.tsx b/src/components/views/messages/TextualBody.tsx -index 8b7bfb9a5a..a8890303f8 100644 ---- a/src/components/views/messages/TextualBody.tsx -+++ b/src/components/views/messages/TextualBody.tsx -@@ -557,6 +557,9 @@ export default class TextualBody extends React.Component { - const isNotice = content.msgtype === MsgType.Notice; - const isEmote = content.msgtype === MsgType.Emote; - -+ // @ts-ignore -+ const isCaption = [MsgType.Image, MsgType.File, MsgType.Audio, MsgType.Video].includes(content.msgtype); -+ - const willHaveWrapper = - this.props.replacingEventId || this.props.isSeeingThroughMessageHiddenForModeration || isEmote; - -@@ -635,6 +638,14 @@ export default class TextualBody extends React.Component { - - ); - } -+ if (isCaption) { -+ return ( -+
-+ { body } -+ { widgets } -+
-+ ); -+ } - return ( -
- {body} -diff --git a/src/utils/FileUtils.ts b/src/utils/FileUtils.ts -index 194cb31d20..0c0aec2138 100644 ---- a/src/utils/FileUtils.ts -+++ b/src/utils/FileUtils.ts -@@ -38,7 +38,9 @@ export function presentableTextForFile( - shortened = false, - ): string { - let text = fallbackText; -- if (content.body?.length) { -+ if (content.filename?.length) { -+ text = content.filename -+ } else if (content.body?.length) { - // The content body should be the name of the file including a - // file extension. - text = content.body; --- -2.47.0 - diff --git a/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch b/patches/matrix-react-sdk/0004-Don-t-preview-reactions.patch similarity index 92% rename from patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch rename to patches/matrix-react-sdk/0004-Don-t-preview-reactions.patch index b935d6e..68cb7f2 100644 --- a/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch +++ b/patches/matrix-react-sdk/0004-Don-t-preview-reactions.patch @@ -1,4 +1,4 @@ -From 0f0f80d270be5c88b0b762b51fe570c11b0bea7f Mon Sep 17 00:00:00 2001 +From 9b7e89b38c49ffdb2811a3241cf077d8ca5ff1c7 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/0005-Hide-the-mute-notification-state-the-same-way-as-the.patch similarity index 95% rename from patches/matrix-react-sdk/0006-Hide-the-mute-notification-state-the-same-way-as-the.patch rename to patches/matrix-react-sdk/0005-Hide-the-mute-notification-state-the-same-way-as-the.patch index eafb725..5287d09 100644 --- a/patches/matrix-react-sdk/0006-Hide-the-mute-notification-state-the-same-way-as-the.patch +++ b/patches/matrix-react-sdk/0005-Hide-the-mute-notification-state-the-same-way-as-the.patch @@ -1,4 +1,4 @@ -From bc49b8d30cf7e0da038fac992ee2ff04c9dc91aa Mon Sep 17 00:00:00 2001 +From 63244240b0a168b7f871aab50373805fc22601ec 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/0006-Allow-muted-rooms-to-render-as-unread.patch similarity index 92% rename from patches/matrix-react-sdk/0007-Allow-muted-rooms-to-render-as-unread.patch rename to patches/matrix-react-sdk/0006-Allow-muted-rooms-to-render-as-unread.patch index dd98773..2f9630e 100644 --- a/patches/matrix-react-sdk/0007-Allow-muted-rooms-to-render-as-unread.patch +++ b/patches/matrix-react-sdk/0006-Allow-muted-rooms-to-render-as-unread.patch @@ -1,4 +1,4 @@ -From 10b23f715bf5115715dca07676ca467a6433c9c9 Mon Sep 17 00:00:00 2001 +From 3dd434f6a79a40db10cae4e97081fa4025030f3d 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/0007-Increase-default-visible-tiles.patch similarity index 91% rename from patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch rename to patches/matrix-react-sdk/0007-Increase-default-visible-tiles.patch index e2d8e51..d8f92c8 100644 --- a/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch +++ b/patches/matrix-react-sdk/0007-Increase-default-visible-tiles.patch @@ -1,4 +1,4 @@ -From 641cd216c155318e35eabef30761613706e36c87 Mon Sep 17 00:00:00 2001 +From 29edc707c494b2d3ead55331fc5ba3358c88bd88 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/0008-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch similarity index 98% rename from patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch rename to patches/matrix-react-sdk/0008-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch index 7ef1a39..98a55b6 100644 --- a/patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch +++ b/patches/matrix-react-sdk/0008-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch @@ -1,4 +1,4 @@ -From 2203554625f7c8d924981b3cd03b1389dc6873d9 Mon Sep 17 00:00:00 2001 +From cdcce7746aa7ade1bb7785c03c94b49b27fa6f36 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 diff --git a/patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch b/patches/matrix-react-sdk/0009-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch similarity index 98% rename from patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch rename to patches/matrix-react-sdk/0009-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch index a281def..a480531 100644 --- a/patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch +++ b/patches/matrix-react-sdk/0009-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch @@ -1,4 +1,4 @@ -From 961ee28392810973057a0c8af410e1067a15547a Mon Sep 17 00:00:00 2001 +From 1cec65f97867b8c29b596f7ca4a171d01d3cb04c 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/0010-Allow-reactions-to-take-more-space.patch similarity index 94% rename from patches/matrix-react-sdk/0011-Allow-reactions-to-take-more-space.patch rename to patches/matrix-react-sdk/0010-Allow-reactions-to-take-more-space.patch index c9b4019..2dcaa43 100644 --- a/patches/matrix-react-sdk/0011-Allow-reactions-to-take-more-space.patch +++ b/patches/matrix-react-sdk/0010-Allow-reactions-to-take-more-space.patch @@ -1,4 +1,4 @@ -From 794b8d3b7ccfbea95cba180b13de0ed42e7fc6c2 Mon Sep 17 00:00:00 2001 +From 82a7324a26d4c3925fd984a6fd06817ecb94397b 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/0011-On-space-switch-don-t-automatically-show-last-opened.patch similarity index 98% rename from patches/matrix-react-sdk/0012-On-space-switch-don-t-automatically-show-last-opened.patch rename to patches/matrix-react-sdk/0011-On-space-switch-don-t-automatically-show-last-opened.patch index b224046..4e69d96 100644 --- a/patches/matrix-react-sdk/0012-On-space-switch-don-t-automatically-show-last-opened.patch +++ b/patches/matrix-react-sdk/0011-On-space-switch-don-t-automatically-show-last-opened.patch @@ -1,4 +1,4 @@ -From b43bf7e8a183f36e30e9b79e3fc2dcd14afc6823 Mon Sep 17 00:00:00 2001 +From 1986abb52e47004f03db04fb167757e5ed666e07 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 diff --git a/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch b/patches/matrix-react-sdk/0012-Exclude-spaces-from-breadcrumbs.patch similarity index 92% rename from patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch rename to patches/matrix-react-sdk/0012-Exclude-spaces-from-breadcrumbs.patch index 49b0d89..113eb49 100644 --- a/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch +++ b/patches/matrix-react-sdk/0012-Exclude-spaces-from-breadcrumbs.patch @@ -1,4 +1,4 @@ -From 3aa2246c56ae3e5b7703003ef785d6e3ad77b844 Mon Sep 17 00:00:00 2001 +From c2b459a7b0bd38b7b3c5151d002032dec3f25da7 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/0013-Stop-the-search-bar-wobble.patch similarity index 90% rename from patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch rename to patches/matrix-react-sdk/0013-Stop-the-search-bar-wobble.patch index e4b33fc..ec13745 100644 --- a/patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch +++ b/patches/matrix-react-sdk/0013-Stop-the-search-bar-wobble.patch @@ -1,4 +1,4 @@ -From 288aa3cf8e56a4ca60810eac98fb6f692b154f61 Mon Sep 17 00:00:00 2001 +From 6233f7e038d6f78025ea2961467a0a22fbeee8a1 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/0015-Import-SC-compound-theme-overrides.patch b/patches/matrix-react-sdk/0014-Import-SC-compound-theme-overrides.patch similarity index 58% rename from patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch rename to patches/matrix-react-sdk/0014-Import-SC-compound-theme-overrides.patch index d823f0d..acf7360 100644 --- a/patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch +++ b/patches/matrix-react-sdk/0014-Import-SC-compound-theme-overrides.patch @@ -1,14 +1,23 @@ -From a4bca41b7371c42499fd8c805482066514a9edc2 Mon Sep 17 00:00:00 2001 +From e87c6764f4abc734cdd05be97782e1b8e4e9df1c Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 11:23:54 +0200 Subject: Import SC compound theme overrides --- - res/css/_common.pcss | 1 + - res/css/sc-cpd-overrides.css | 1 + - 2 files changed, 2 insertions(+) - create mode 120000 res/css/sc-cpd-overrides.css + .gitignore | 2 ++ + res/css/_common.pcss | 1 + + 2 files changed, 3 insertions(+) +diff --git a/.gitignore b/.gitignore +index 3137cd555b..5345301b97 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -1,3 +1,5 @@ ++res/css/sc-*.css ++ + /.npmrc + /*.log + package-lock.json diff --git a/res/css/_common.pcss b/res/css/_common.pcss index 7861af6381..f7a660a339 100644 --- a/res/css/_common.pcss @@ -21,14 +30,6 @@ index 7861af6381..f7a660a339 100644 @import "./_font-sizes.pcss"; @import "./_animations.pcss"; @import "./_spacing.pcss"; -diff --git a/res/css/sc-cpd-overrides.css b/res/css/sc-cpd-overrides.css -new file mode 120000 -index 0000000000..532e96fddc ---- /dev/null -+++ b/res/css/sc-cpd-overrides.css -@@ -0,0 +1 @@ -+../../../res/css/sc-cpd-overrides.css -\ No newline at end of file -- 2.47.0 diff --git a/patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch b/patches/matrix-react-sdk/0015-No-damn-avatar-background-in-room-list.patch similarity index 92% rename from patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch rename to patches/matrix-react-sdk/0015-No-damn-avatar-background-in-room-list.patch index 2fa7d3a..0eaa38b 100644 --- a/patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch +++ b/patches/matrix-react-sdk/0015-No-damn-avatar-background-in-room-list.patch @@ -1,4 +1,4 @@ -From fc577303d8c2d290f1c17e13deaf442822af68a1 Mon Sep 17 00:00:00 2001 +From 6c4f7dc233b9946bf1dd883516b9d89fb7bede05 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/0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch b/patches/matrix-react-sdk/0016-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch similarity index 93% rename from patches/matrix-react-sdk/0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch rename to patches/matrix-react-sdk/0016-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch index b81a35b..b481fc0 100644 --- a/patches/matrix-react-sdk/0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch +++ b/patches/matrix-react-sdk/0016-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch @@ -1,4 +1,4 @@ -From e4a7ea01c2fd9f7d67660402c20bfdc5969f28c4 Mon Sep 17 00:00:00 2001 +From 31b4da04ee9d8fefa0a26182dcd02d5b597b15ec 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 diff --git a/patches/matrix-react-sdk/0018-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch b/patches/matrix-react-sdk/0017-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch similarity index 97% rename from patches/matrix-react-sdk/0018-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch rename to patches/matrix-react-sdk/0017-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch index 76d5935..69f7b05 100644 --- a/patches/matrix-react-sdk/0018-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch +++ b/patches/matrix-react-sdk/0017-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch @@ -1,4 +1,4 @@ -From a37ca889b832578a9201a5b45b059f58eb781bc5 Mon Sep 17 00:00:00 2001 +From dd837c682f2aaf1d730a1e3f5b68b1cd03179e12 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 diff --git a/patches/matrix-react-sdk/0019-Always-show-timestamps-by-default.patch b/patches/matrix-react-sdk/0018-Always-show-timestamps-by-default.patch similarity index 92% rename from patches/matrix-react-sdk/0019-Always-show-timestamps-by-default.patch rename to patches/matrix-react-sdk/0018-Always-show-timestamps-by-default.patch index 8abccc6..6e735c5 100644 --- a/patches/matrix-react-sdk/0019-Always-show-timestamps-by-default.patch +++ b/patches/matrix-react-sdk/0018-Always-show-timestamps-by-default.patch @@ -1,4 +1,4 @@ -From 57942189da5f80069ee4b03dc2fbeb24ce6b4f7b Mon Sep 17 00:00:00 2001 +From c4567d013ea39a71a37f9356f847b8555a8173e7 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 13:53:07 +0200 Subject: Always show timestamps by default diff --git a/patches/matrix-react-sdk/0021-Enable-custom-emote-rendering-by-default.patch b/patches/matrix-react-sdk/0019-Enable-custom-emote-rendering-by-default.patch similarity index 92% rename from patches/matrix-react-sdk/0021-Enable-custom-emote-rendering-by-default.patch rename to patches/matrix-react-sdk/0019-Enable-custom-emote-rendering-by-default.patch index 2db22df..830e5b4 100644 --- a/patches/matrix-react-sdk/0021-Enable-custom-emote-rendering-by-default.patch +++ b/patches/matrix-react-sdk/0019-Enable-custom-emote-rendering-by-default.patch @@ -1,4 +1,4 @@ -From 47bcb08e971256fe94a0b07fb553b75400e648ed Mon Sep 17 00:00:00 2001 +From 09d134d0c975c430a894028b50ea460511fa2489 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 diff --git a/patches/matrix-react-sdk/0022-Don-t-symlink-css-to-fix-Windows-native-build.patch b/patches/matrix-react-sdk/0022-Don-t-symlink-css-to-fix-Windows-native-build.patch deleted file mode 100644 index 124a69c..0000000 --- a/patches/matrix-react-sdk/0022-Don-t-symlink-css-to-fix-Windows-native-build.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 16fe0fe8d0068e4c5da3fa5516c5578d2ffaabc7 Mon Sep 17 00:00:00 2001 -From: SpiritCroc -Date: Sun, 20 Oct 2024 17:00:19 +0200 -Subject: Don't symlink css to fix Windows-native build - ---- - .gitignore | 2 ++ - res/css/sc-cpd-overrides.css | 1 - - 2 files changed, 2 insertions(+), 1 deletion(-) - delete mode 120000 res/css/sc-cpd-overrides.css - -diff --git a/.gitignore b/.gitignore -index 3137cd555b..5345301b97 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -1,3 +1,5 @@ -+res/css/sc-*.css -+ - /.npmrc - /*.log - package-lock.json -diff --git a/res/css/sc-cpd-overrides.css b/res/css/sc-cpd-overrides.css -deleted file mode 120000 -index 532e96fddc..0000000000 ---- a/res/css/sc-cpd-overrides.css -+++ /dev/null -@@ -1 +0,0 @@ --../../../res/css/sc-cpd-overrides.css -\ No newline at end of file --- -2.47.0 -