From 240975cfe68c75d55d1e08d9856999d7fdea9cee Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 17 Dec 2024 18:10:32 +0100 Subject: [PATCH] Update to Element v1.11.88 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- ...ck-schildi-fetch-package.ts-modifications.patch | 4 ++-- .../0002-Change-default-login-background.patch | 6 +++--- .../0003-Don-t-welcome-to-Element.patch | 4 ++-- ...gin-background-to-ensure-contrast-of-our-.patch | 4 ++-- .../element-web/0005-Schildify-login-footer.patch | 4 ++-- .../element-web/0006-Disable-sticky-rooms.patch | 4 ++-- .../0007-Bring-back-unified-room-list.patch | 10 +++++----- ...muted-rooms-to-bottom-I-still-want-to-see.patch | 4 ++-- .../element-web/0009-Don-t-preview-reactions.patch | 8 ++++---- ...te-notification-state-the-same-way-as-the.patch | 8 ++++---- ...011-Allow-muted-rooms-to-render-as-unread.patch | 4 ++-- .../0012-Increase-default-visible-tiles.patch | 4 ++-- ...showSpaceDMBadges-setting-force-enabled-f.patch | 8 ++++---- ...eeform-reactions-from-tadzik-freeform-rea.patch | 6 +++--- .../0015-Allow-reactions-to-take-more-space.patch | 4 ++-- ...itch-don-t-automatically-show-last-opened.patch | 14 +++++++------- .../0017-Exclude-spaces-from-breadcrumbs.patch | 4 ++-- .../0018-Stop-the-search-bar-wobble.patch | 6 +++--- .../0019-Import-SC-compound-theme-overrides.patch | 6 +++--- ...20-No-damn-avatar-background-in-room-list.patch | 4 ++-- ...ages-in-1-1-chats-Close-SchildiChat-schil.patch | 6 +++--- ...y-corner-radius-to-all-edges-of-the-bubbl.patch | 4 ++-- .../0023-Always-show-timestamps-by-default.patch | 8 ++++---- ...-Enable-custom-emote-rendering-by-default.patch | 8 ++++---- .../0025-Enable-chat-previews-by-default.patch | 4 ++-- ...sable-showing-people-in-spaces-by-default.patch | 8 ++++---- .../0027-Improve-IRC-layout-for-SchildiChat.patch | 4 ++-- 30 files changed, 82 insertions(+), 82 deletions(-) diff --git a/element-desktop b/element-desktop index 4e3fa16f..358844c9 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 4e3fa16f25ae1c6b1131a3c8a1149f2e4e3ba719 +Subproject commit 358844c94455397eb886d842a009c238241e130a diff --git a/element-web b/element-web index 812c9853..22c56ad4 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 812c98535711ff5eba41a9d4b520fe4ccfbbf1a9 +Subproject commit 22c56ad460800ca6c485941c22492b064a33b2bf diff --git a/matrix-js-sdk b/matrix-js-sdk index d3f5526e..bee65ff1 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit d3f5526ec07dcbd0e4677a56b5e53f7d3a4cbcc2 +Subproject commit bee65ff13f1796a540e493ec00e513949e0f366f 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 150eb796..0517f8e4 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 a90a617e3d49a8d14fe59ab992e9a902aeec87b8 Mon Sep 17 00:00:00 2001 +From e852e912f049e8de45ba1b8b85940c013cae565c 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 @@ -58,5 +58,5 @@ index 7282945..4be7ab0 100644 if (!haveDeploy) { const outPath = path.join(pkgDir, filename); -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0002-Change-default-login-background.patch b/patches/element-web/0002-Change-default-login-background.patch index 9429816f..e6ff020a 100644 --- a/patches/element-web/0002-Change-default-login-background.patch +++ b/patches/element-web/0002-Change-default-login-background.patch @@ -1,4 +1,4 @@ -From 7ef218c37ebb202226f4b6d21a150e75ef1e8e04 Mon Sep 17 00:00:00 2001 +From 965beab555a1383ef6c08ce277e412f67309da74 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 29 Nov 2020 23:30:59 +0100 Subject: Change default login background @@ -22117,7 +22117,7 @@ index 2782d0a641..032744413f 100644 const configuredUrl = brandingConfig?.get("welcome_background_url"); if (configuredUrl) { diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx -index 7866131a01..4f57acb3d0 100644 +index f19343be20..f36fc9205b 100644 --- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx @@ -119,7 +119,7 @@ export default class HelpUserSettingsTab extends React.Component @@ -22130,5 +22130,5 @@ index 7866131a01..4f57acb3d0 100644 target="_blank" > -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0003-Don-t-welcome-to-Element.patch b/patches/element-web/0003-Don-t-welcome-to-Element.patch index 8526d771..a0e18bfd 100644 --- a/patches/element-web/0003-Don-t-welcome-to-Element.patch +++ b/patches/element-web/0003-Don-t-welcome-to-Element.patch @@ -1,4 +1,4 @@ -From 777d4917cd8e0db3f977804b2ac8428453fc9270 Mon Sep 17 00:00:00 2001 +From cb662054cd3a82edbca312166497f9e7ca16b169 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Oct 2024 19:38:47 +0100 Subject: Don't welcome to Element @@ -21,5 +21,5 @@ index ef2d43bd8f..5b71670f4f 100644

_t("powered_by_matrix_with_logo")

-- -2.47.0 +2.47.1 diff --git a/patches/element-web/0004-Stronger-login-background-to-ensure-contrast-of-our-.patch b/patches/element-web/0004-Stronger-login-background-to-ensure-contrast-of-our-.patch index 4a12a480..12994169 100644 --- a/patches/element-web/0004-Stronger-login-background-to-ensure-contrast-of-our-.patch +++ b/patches/element-web/0004-Stronger-login-background-to-ensure-contrast-of-our-.patch @@ -1,4 +1,4 @@ -From feb223e69bfb0a44d82dd4c0d0c0555ee5bd2be9 Mon Sep 17 00:00:00 2001 +From 8c292e4b7b99e03ba8000f8282167ef504a29bc9 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Oct 2024 19:55:30 +0100 Subject: Stronger login background to ensure contrast of our icon with our bg @@ -21,5 +21,5 @@ index 032744413f..71bf8ae6d6 100644 }; -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0005-Schildify-login-footer.patch b/patches/element-web/0005-Schildify-login-footer.patch index 225c1f86..2b3f2c47 100644 --- a/patches/element-web/0005-Schildify-login-footer.patch +++ b/patches/element-web/0005-Schildify-login-footer.patch @@ -1,4 +1,4 @@ -From 888ec3387af2ba9d79a7cf0affb44fbb75b13771 Mon Sep 17 00:00:00 2001 +From d677f1d06e6a79b47cbbf7c892c82b3badf52b24 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Oct 2024 20:07:30 +0100 Subject: Schildify login footer @@ -26,5 +26,5 @@ index a792896a88..6ecfd6ae20 100644 const authFooterLinks: JSX.Element[] = []; -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0006-Disable-sticky-rooms.patch b/patches/element-web/0006-Disable-sticky-rooms.patch index ca610982..6c417444 100644 --- a/patches/element-web/0006-Disable-sticky-rooms.patch +++ b/patches/element-web/0006-Disable-sticky-rooms.patch @@ -1,4 +1,4 @@ -From 72f5f3b18cd813fc3cdc4ff89131558738f8c551 Mon Sep 17 00:00:00 2001 +From cffec34134a4a49f0d3880f6ebcd2f4b570d9bab Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 18 Jan 2022 13:28:22 +0100 Subject: Disable sticky rooms @@ -25,5 +25,5 @@ index c3450d70cf..e296676149 100644 } -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0007-Bring-back-unified-room-list.patch b/patches/element-web/0007-Bring-back-unified-room-list.patch index 5ef263e2..2f591091 100644 --- a/patches/element-web/0007-Bring-back-unified-room-list.patch +++ b/patches/element-web/0007-Bring-back-unified-room-list.patch @@ -1,4 +1,4 @@ -From 9b0cba9a234d7f9329f9e6e8ad549a09a6455bf1 Mon Sep 17 00:00:00 2001 +From c92bef580d7ec6e62a6b845dc3f4159288f58777 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 5 May 2024 10:12:17 +0200 Subject: Bring back unified room list @@ -16,7 +16,7 @@ Co-authored-by: su-ex 5 files changed, 83 insertions(+), 5 deletions(-) diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx -index 853bebc4fe..5af0c642bc 100644 +index f3bde66af9..f2446d3de8 100644 --- a/src/components/views/rooms/RoomList.tsx +++ b/src/components/views/rooms/RoomList.tsx @@ -72,11 +72,13 @@ interface IState { @@ -124,10 +124,10 @@ index 853bebc4fe..5af0c642bc 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 1c27f03e88..ae4b0ea644 100644 +index 6cd5b15a51..4413cc5762 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -192,6 +192,14 @@ export interface IFeature extends Omit, "isFeature"> { +@@ -183,6 +183,14 @@ export interface IFeature extends Omit, "isFeature"> { export type ISetting = IBaseSetting | IFeature; export const SETTINGS: { [setting: string]: ISetting } = { @@ -259,5 +259,5 @@ index 50cecda665..8efc2d040d 100644 DefaultTagID.Conference, DefaultTagID.Untagged, -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0008-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch b/patches/element-web/0008-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch index 25914cb5..0c3ef6fe 100644 --- a/patches/element-web/0008-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch +++ b/patches/element-web/0008-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch @@ -1,4 +1,4 @@ -From e515cfeedb25c3bd8afa7363f677cb885d2acab1 Mon Sep 17 00:00:00 2001 +From aca9fa0e13d5486df9f5a854f8d7c67ed1544868 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. @@ -21,5 +21,5 @@ index 67ee1ca084..67dcaa3855 100644 /** -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0009-Don-t-preview-reactions.patch b/patches/element-web/0009-Don-t-preview-reactions.patch index f7273419..6735d0ce 100644 --- a/patches/element-web/0009-Don-t-preview-reactions.patch +++ b/patches/element-web/0009-Don-t-preview-reactions.patch @@ -1,4 +1,4 @@ -From c38e41947b16518d6f74313b23670e630c9a1af6 Mon Sep 17 00:00:00 2001 +From 4003d95314fdaa2efd1d374d8c04e8f6dd07d965 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 14 Dec 2023 10:32:10 +0100 Subject: Don't preview reactions @@ -8,10 +8,10 @@ Subject: Don't preview reactions 1 file changed, 2 insertions(+) diff --git a/src/stores/room-list/MessagePreviewStore.ts b/src/stores/room-list/MessagePreviewStore.ts -index e0e06ec980..7ee27f8402 100644 +index 2577b2ba23..0df13f33a8 100644 --- a/src/stores/room-list/MessagePreviewStore.ts +++ b/src/stores/room-list/MessagePreviewStore.ts -@@ -57,10 +57,12 @@ const PREVIEWS: Record< +@@ -55,10 +55,12 @@ const PREVIEWS: Record< isState: false, previewer: new StickerEventPreview(), }, @@ -25,5 +25,5 @@ index e0e06ec980..7ee27f8402 100644 isState: false, previewer: new PollStartEventPreview(), -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0010-Hide-the-mute-notification-state-the-same-way-as-the.patch b/patches/element-web/0010-Hide-the-mute-notification-state-the-same-way-as-the.patch index 0e7357e5..9ca33d3c 100644 --- a/patches/element-web/0010-Hide-the-mute-notification-state-the-same-way-as-the.patch +++ b/patches/element-web/0010-Hide-the-mute-notification-state-the-same-way-as-the.patch @@ -1,4 +1,4 @@ -From afc0686a92f5c16a6747d63a5450c0c8c63f9f68 Mon Sep 17 00:00:00 2001 +From ad81f3cdccc9c20e09ab4a816016f2387c6bb6a1 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 @@ -11,10 +11,10 @@ way. 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx -index 8351c176ff..a12fb141b9 100644 +index 7953c5068d..42f7fabb8e 100644 --- a/src/components/views/rooms/RoomTile.tsx +++ b/src/components/views/rooms/RoomTile.tsx -@@ -305,7 +305,9 @@ export class RoomTile extends React.PureComponent { +@@ -300,7 +300,9 @@ class RoomTile extends React.PureComponent { // Only show the icon by default if the room is overridden to muted. // TODO: [FTUE Notifications] Probably need to detect global mute state @@ -26,5 +26,5 @@ index 8351c176ff..a12fb141b9 100644 return ( -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0011-Allow-muted-rooms-to-render-as-unread.patch b/patches/element-web/0011-Allow-muted-rooms-to-render-as-unread.patch index 727cacfa..3c159a4a 100644 --- a/patches/element-web/0011-Allow-muted-rooms-to-render-as-unread.patch +++ b/patches/element-web/0011-Allow-muted-rooms-to-render-as-unread.patch @@ -1,4 +1,4 @@ -From c490b899efc44fd1de9cb1c7bc4e5cf08916965c Mon Sep 17 00:00:00 2001 +From 2ad7d53eb19069b1cc29430b9328b8e7574910a3 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 @@ -21,5 +21,5 @@ index 7c281d0d2d..f06be85437 100644 } -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0012-Increase-default-visible-tiles.patch b/patches/element-web/0012-Increase-default-visible-tiles.patch index 2dd36f64..ac663445 100644 --- a/patches/element-web/0012-Increase-default-visible-tiles.patch +++ b/patches/element-web/0012-Increase-default-visible-tiles.patch @@ -1,4 +1,4 @@ -From 6c5419a256020fda6907fa770ae1fc8c48a96849 Mon Sep 17 00:00:00 2001 +From 9fbca521ae0e6bc4f2b7012dea3c9c04afde2361 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 30 Aug 2020 15:33:01 +0200 Subject: Increase default visible tiles @@ -21,5 +21,5 @@ index ff60309e08..275b6d330b 100644 public tilesWithPadding(n: number, paddingPx: number): number { -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0013-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch b/patches/element-web/0013-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch index 7b37316e..0dbb266b 100644 --- a/patches/element-web/0013-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch +++ b/patches/element-web/0013-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch @@ -1,4 +1,4 @@ -From 5105bf1ceb8cadb26b49ff727461ac2a6e2987b9 Mon Sep 17 00:00:00 2001 +From f3b655942a115df270927d44caf33a4281bfb787 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 ae4b0ea644..12d9965cf1 100644 +index 4413cc5762..3dcb64ced7 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -199,6 +199,11 @@ export const SETTINGS: { [setting: string]: ISetting } = { +@@ -190,6 +190,11 @@ export const SETTINGS: { [setting: string]: ISetting } = { default: true, controller: new ReloadOnChangeController(), }, @@ -88,5 +88,5 @@ index 90358f3310..60df05478a 100644 const newValue = SettingsStore.getValue("Spaces.enabledMetaSpaces"); const enabledMetaSpaces = metaSpaceOrder.filter((k) => newValue[k]); -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0014-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch b/patches/element-web/0014-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch index 1acc616e..9d6b37a9 100644 --- a/patches/element-web/0014-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch +++ b/patches/element-web/0014-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch @@ -1,4 +1,4 @@ -From 842eb33b63bd69bf5714b10975f9e2fecc72ea66 Mon Sep 17 00:00:00 2001 +From 520fdeb073a8247b2de0812cc4bc5c98ba776145 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 @@ -118,7 +118,7 @@ index e2470d188d..868f9b3d7c 100644 ) : ( diff --git a/src/components/views/emojipicker/ReactionPicker.tsx b/src/components/views/emojipicker/ReactionPicker.tsx -index b62df99e25..8291a38dc9 100644 +index bd16634490..d70c3df6ec 100644 --- a/src/components/views/emojipicker/ReactionPicker.tsx +++ b/src/components/views/emojipicker/ReactionPicker.tsx @@ -126,6 +126,7 @@ class ReactionPicker extends React.Component { @@ -130,5 +130,5 @@ index b62df99e25..8291a38dc9 100644 isEmojiDisabled={this.isEmojiDisabled} onFinished={this.props.onFinished} -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0015-Allow-reactions-to-take-more-space.patch b/patches/element-web/0015-Allow-reactions-to-take-more-space.patch index 5e210807..3d38f5e2 100644 --- a/patches/element-web/0015-Allow-reactions-to-take-more-space.patch +++ b/patches/element-web/0015-Allow-reactions-to-take-more-space.patch @@ -1,4 +1,4 @@ -From 171a1d7ed3285bc96821986b655785b4a836270c Mon Sep 17 00:00:00 2001 +From aee2a2d3082255bcceebab84b2f26ddf30a26c6d 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 @@ -28,5 +28,5 @@ index dd9d7ddb47..9ebe95021e 100644 white-space: nowrap; text-overflow: ellipsis; -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0016-On-space-switch-don-t-automatically-show-last-opened.patch b/patches/element-web/0016-On-space-switch-don-t-automatically-show-last-opened.patch index 2235821b..bc2696bc 100644 --- a/patches/element-web/0016-On-space-switch-don-t-automatically-show-last-opened.patch +++ b/patches/element-web/0016-On-space-switch-don-t-automatically-show-last-opened.patch @@ -1,4 +1,4 @@ -From df5c6698c294e898c375d2f57747cc99be35dfc7 Mon Sep 17 00:00:00 2001 +From fd8e3a90d05471eeeab4de9a70feb0ab32276dd0 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 9f9e225352..85a6400364 100644 +index 548dbff983..6722975ce3 100644 --- a/src/components/structures/MatrixChat.tsx +++ b/src/components/structures/MatrixChat.tsx -@@ -1454,7 +1454,15 @@ export default class MatrixChat extends React.PureComponent { +@@ -1450,7 +1450,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 9f9e225352..85a6400364 100644 // Before defaulting to directory, show the last viewed room this.viewLastRoom(); } else { -@@ -1466,6 +1474,14 @@ export default class MatrixChat extends React.PureComponent { +@@ -1462,6 +1470,14 @@ export default class MatrixChat extends React.PureComponent { } } @@ -46,10 +46,10 @@ index 9f9e225352..85a6400364 100644 dis.dispatch({ action: Action.ViewRoom, diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index 12d9965cf1..3e9fb95799 100644 +index 3dcb64ced7..31ad386869 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -204,6 +204,12 @@ export const SETTINGS: { [setting: string]: ISetting } = { +@@ -195,6 +195,12 @@ export const SETTINGS: { [setting: string]: ISetting } = { supportedLevels: LEVELS_ACCOUNT_SETTINGS, default: true, }, @@ -75,5 +75,5 @@ index 60df05478a..0be7ba190a 100644 cliSpace?.getMyMembership() !== KnownMembership.Invite && this.matrixClient.getRoom(roomId)?.getMyMembership() === KnownMembership.Join && -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch b/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch index ef158d1e..ad9d3819 100644 --- a/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch +++ b/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch @@ -1,4 +1,4 @@ -From e7747d12316e0d30bc8d152d71e636742c65eb0e Mon Sep 17 00:00:00 2001 +From f2d5cbb7c31fc2a7ebd4a0f83c6e6c76b18c3668 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 9 Aug 2022 09:32:19 +0200 Subject: Exclude spaces from breadcrumbs @@ -20,5 +20,5 @@ index 9859f24015..957b54286c 100644 const rooms = (this.state.rooms || []).slice(); // cheap clone const msc3946ProcessDynamicPredecessor = SettingsStore.getValue("feature_dynamic_room_predecessors"); -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0018-Stop-the-search-bar-wobble.patch b/patches/element-web/0018-Stop-the-search-bar-wobble.patch index e8e2ac8a..58ad9c6a 100644 --- a/patches/element-web/0018-Stop-the-search-bar-wobble.patch +++ b/patches/element-web/0018-Stop-the-search-bar-wobble.patch @@ -1,4 +1,4 @@ -From 1868f42a8185a651ecdb8192c22eb8706707cc6f Mon Sep 17 00:00:00 2001 +From 525ab32b51f86e6b81deaa6dd9048471e4959f97 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 15ba02b6b8..f9bcd695ca 100644 +index 74328af39b..f47afd8677 100644 --- a/res/css/_common.pcss +++ b/res/css/_common.pcss @@ -181,6 +181,7 @@ input[type="search"].mx_textinput_icon { @@ -20,5 +20,5 @@ index 15ba02b6b8..f9bcd695ca 100644 /* FIXME THEME - Tint by CSS rather than referencing a duplicate asset */ -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0019-Import-SC-compound-theme-overrides.patch b/patches/element-web/0019-Import-SC-compound-theme-overrides.patch index 57b716e0..e14d05b7 100644 --- a/patches/element-web/0019-Import-SC-compound-theme-overrides.patch +++ b/patches/element-web/0019-Import-SC-compound-theme-overrides.patch @@ -1,4 +1,4 @@ -From 9638fd0cc8c5a4318d6712bd9cbd9d603bf37fbf Mon Sep 17 00:00:00 2001 +From a07dbddd3ccafdc96dbe0e17b442c55c0b08a2d7 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 11:23:54 +0200 Subject: Import SC compound theme overrides @@ -8,7 +8,7 @@ Subject: Import SC compound theme overrides 1 file changed, 1 insertion(+) diff --git a/res/css/_common.pcss b/res/css/_common.pcss -index f9bcd695ca..ad7c298820 100644 +index f47afd8677..d8be5b1fba 100644 --- a/res/css/_common.pcss +++ b/res/css/_common.pcss @@ -11,6 +11,7 @@ Please see LICENSE files in the repository root for full details. @@ -20,5 +20,5 @@ index f9bcd695ca..ad7c298820 100644 @import "./_animations.pcss"; @import "./_spacing.pcss"; -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0020-No-damn-avatar-background-in-room-list.patch b/patches/element-web/0020-No-damn-avatar-background-in-room-list.patch index 8e069b36..f87bbe71 100644 --- a/patches/element-web/0020-No-damn-avatar-background-in-room-list.patch +++ b/patches/element-web/0020-No-damn-avatar-background-in-room-list.patch @@ -1,4 +1,4 @@ -From 2e304e4e139502133e58346b93dfce0dfdf95092 Mon Sep 17 00:00:00 2001 +From 2721ac99b3fcbfda270a5727436f8e6923f29b31 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 @@ -22,5 +22,5 @@ index 32c75a936e..f420bdbc7b 100644 const styles: CSSProperties = {}; -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0021-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch b/patches/element-web/0021-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch index 3fa28ba3..9239841a 100644 --- a/patches/element-web/0021-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch +++ b/patches/element-web/0021-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch @@ -1,4 +1,4 @@ -From 89faafa2c7aff5d5742d41b8231306108a952f46 Mon Sep 17 00:00:00 2001 +From cd9506dd8e2fc7ebafdfde4449221c7e6b4a876f 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,7 +8,7 @@ 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 22da73bef7..455a57e33d 100644 +index 8c755f00bd..172892a2c4 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 @@ -25,5 +25,5 @@ index 22da73bef7..455a57e33d 100644 } -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0022-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch b/patches/element-web/0022-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch index ce55fdaf..38d0cb3c 100644 --- a/patches/element-web/0022-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch +++ b/patches/element-web/0022-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch @@ -1,4 +1,4 @@ -From 3bad1e4af1e22ac1e2a56cc04b46f2b0cf92390f Mon Sep 17 00:00:00 2001 +From 8cf63042cc41cd154f3a7b1080ea5a79eaf16291 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 @@ -57,5 +57,5 @@ index 7b1af0c771..fbb1ad2e1b 100644 } &.mx_EventTile_lastInSection[data-self="true"] .mx_EventTile_line { -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0023-Always-show-timestamps-by-default.patch b/patches/element-web/0023-Always-show-timestamps-by-default.patch index 329c6d28..f8bb62f6 100644 --- a/patches/element-web/0023-Always-show-timestamps-by-default.patch +++ b/patches/element-web/0023-Always-show-timestamps-by-default.patch @@ -1,4 +1,4 @@ -From 32c6ffd1896f6e4597d57ffbe9a8c599189c9ea4 Mon Sep 17 00:00:00 2001 +From 322d9e4993d4fa746f592441c1cc5b237553bc27 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 3e9fb95799..b76ec5feb2 100644 +index 31ad386869..70bccaa11f 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -644,7 +644,7 @@ export const SETTINGS: { [setting: string]: ISetting } = { +@@ -618,7 +618,7 @@ export const SETTINGS: { [setting: string]: ISetting } = { "alwaysShowTimestamps": { supportedLevels: LEVELS_ACCOUNT_SETTINGS, displayName: _td("settings|always_show_message_timestamps"), @@ -21,5 +21,5 @@ index 3e9fb95799..b76ec5feb2 100644 "userTimezone": { supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS, -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0024-Enable-custom-emote-rendering-by-default.patch b/patches/element-web/0024-Enable-custom-emote-rendering-by-default.patch index 7ccf2803..843f3637 100644 --- a/patches/element-web/0024-Enable-custom-emote-rendering-by-default.patch +++ b/patches/element-web/0024-Enable-custom-emote-rendering-by-default.patch @@ -1,4 +1,4 @@ -From 5e51ca6eefd49bc140dd8f8d67517460c7bd9dc9 Mon Sep 17 00:00:00 2001 +From f3c8ecc03ed1922cd9c1e843a699309fb00e9bc1 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 b76ec5feb2..51404c88d4 100644 +index 70bccaa11f..8ef323e588 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -508,7 +508,7 @@ export const SETTINGS: { [setting: string]: ISetting } = { +@@ -482,7 +482,7 @@ export const SETTINGS: { [setting: string]: ISetting } = { description: _td("labs|render_reaction_images_description"), supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED, supportedLevelsAreOrdered: true, @@ -21,5 +21,5 @@ index b76ec5feb2..51404c88d4 100644 /** * With the transition to Compound we are moving to a base font size -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0025-Enable-chat-previews-by-default.patch b/patches/element-web/0025-Enable-chat-previews-by-default.patch index 78dd6e08..217dd704 100644 --- a/patches/element-web/0025-Enable-chat-previews-by-default.patch +++ b/patches/element-web/0025-Enable-chat-previews-by-default.patch @@ -1,4 +1,4 @@ -From 017cdf7e8fd339bb49f023f122136e89dd2bd496 Mon Sep 17 00:00:00 2001 +From 717dc4efdc0648b1fa1641f4db097ab0026535ac Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Oct 2024 19:24:26 +0100 Subject: Enable chat previews by default @@ -21,5 +21,5 @@ index 275b6d330b..3a188451e7 100644 public constructor(public readonly tagId: TagID) { -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0026-Disable-showing-people-in-spaces-by-default.patch b/patches/element-web/0026-Disable-showing-people-in-spaces-by-default.patch index d6d03397..6bdd5814 100644 --- a/patches/element-web/0026-Disable-showing-people-in-spaces-by-default.patch +++ b/patches/element-web/0026-Disable-showing-people-in-spaces-by-default.patch @@ -1,4 +1,4 @@ -From 0d4814704ac86751ca9022672793e0672466232d Mon Sep 17 00:00:00 2001 +From 3a2fff8f1ab3ed231dd4832381af607ba51c46ba Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 30 Nov 2024 19:42:44 +0100 Subject: Disable showing people in spaces by default @@ -9,10 +9,10 @@ Subject: Disable showing people in spaces by default 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index 51404c88d4..c4c8e719f9 100644 +index 8ef323e588..cecc5ebe0b 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -1073,7 +1073,7 @@ export const SETTINGS: { [setting: string]: ISetting } = { +@@ -1047,7 +1047,7 @@ export const SETTINGS: { [setting: string]: ISetting } = { }, "Spaces.showPeopleInSpace": { supportedLevels: [SettingLevel.ROOM_ACCOUNT], @@ -35,5 +35,5 @@ index 8f652a35fb..da02328e89 100644 public isVisible(room: Room): boolean { -- -2.47.0 +2.47.1 diff --git a/patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch b/patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch index e4a0ed5e..43845a14 100644 --- a/patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch +++ b/patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch @@ -1,4 +1,4 @@ -From a854e513521055b34200b1ea5f431614a936ea12 Mon Sep 17 00:00:00 2001 +From ab84e8553b9343de6c525a4bec8887afd2f0db43 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 31 Oct 2024 13:44:20 -0400 Subject: Improve IRC layout for SchildiChat @@ -306,5 +306,5 @@ index ecf1c25716..de85238ca6 100644 line-height: var(--line-height) !important; -- -2.47.0 +2.47.1