From c03ef20e5dc0a88cec479c9711d9941aba48ab97 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Wed, 27 Nov 2024 16:58:39 +0100 Subject: [PATCH 01/11] RELEASE.md: Fix wrong make target name --- RELEASE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index 128d761..b4782e7 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -5,7 +5,7 @@ On a Linux machine with podman: ``` -make container-release-linux +make linux-container-release ``` ## Build Windows releases From 40203b4ed728ef7733f6dcd57556534b307592ba Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Fri, 29 Nov 2024 13:28:59 +0100 Subject: [PATCH 02/11] Update IRC improvement patch Includes https://github.com/SchildiChat/element-web/pull/5 --- element-web | 2 +- ...1-Improve-IRC-layout-for-SchildiChat.patch | 31 +++++++++++++------ 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/element-web b/element-web index cacb1a6..1ff5a6c 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit cacb1a60db7dc15ee7cb9827e0bf83d308bc4baa +Subproject commit 1ff5a6c421fd9f49b131d7c7ea4a0e6d7f257d7b diff --git a/patches/element-web/0031-Improve-IRC-layout-for-SchildiChat.patch b/patches/element-web/0031-Improve-IRC-layout-for-SchildiChat.patch index e28c368..29c66a0 100644 --- a/patches/element-web/0031-Improve-IRC-layout-for-SchildiChat.patch +++ b/patches/element-web/0031-Improve-IRC-layout-for-SchildiChat.patch @@ -1,14 +1,25 @@ -From 18578fe4ac6838b2d70a4efb029a75ab24087dab Mon Sep 17 00:00:00 2001 +From a5e5f36ce4117bdb72da63e1ed30b55602bec2d2 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 Signed-off-by: Suguru Hirahara + +Squashed: + +Author: Suguru Hirahara +Date: Thu Nov 28 10:01:43 2024 -0500 + + Improve IRC layout for SchildiChat: fix placement of capital letters inside read receipts + + This is a follow-up to 18578fe4ac6838b2d70a4efb029a75ab24087dab. + + Signed-off-by: Suguru Hirahara --- .../elements/_GenericEventListSummary.pcss | 15 ++ - res/css/views/rooms/_EventTile.pcss | 146 ++++++++++++++++-- + res/css/views/rooms/_EventTile.pcss | 148 ++++++++++++++++-- res/css/views/rooms/_IRCLayout.pcss | 2 + - 3 files changed, 153 insertions(+), 10 deletions(-) + 3 files changed, 155 insertions(+), 10 deletions(-) diff --git a/res/css/views/elements/_GenericEventListSummary.pcss b/res/css/views/elements/_GenericEventListSummary.pcss index c13f819439..4f42040606 100644 @@ -43,7 +54,7 @@ index c13f819439..4f42040606 100644 margin-top: $spacing-8; } diff --git a/res/css/views/rooms/_EventTile.pcss b/res/css/views/rooms/_EventTile.pcss -index 311e059166..501a9210cf 100644 +index 311e059166..ecd1030749 100644 --- a/res/css/views/rooms/_EventTile.pcss +++ b/res/css/views/rooms/_EventTile.pcss @@ -1,5 +1,6 @@ @@ -120,7 +131,7 @@ index 311e059166..501a9210cf 100644 } &:hover { -@@ -343,17 +378,66 @@ $left-gutter: 64px; +@@ -343,17 +378,68 @@ $left-gutter: 64px; display: inline; background-color: $event-selected-color; border-radius: 8px 0 0 8px; @@ -143,6 +154,7 @@ index 311e059166..501a9210cf 100644 + .mx_BaseAvatar > * { + height: $font-14px !important; + width: $font-14px !important; ++ line-height: $font-14px; /* override wildcard; fix alignment of capital letter inside read receipts */ + flex-shrink: 0; /* Prevents the avatar from shrinking (when mx_DisambiguatedProfile_displayName is long) */ + } + @@ -153,6 +165,7 @@ index 311e059166..501a9210cf 100644 + .mx_BaseAvatar > * { + height: $font-16px !important; /* override the value specified above */ + width: $font-16px !important; /* override the value specified above */ ++ line-height: $font-16px; /* override wildcard; fix alignment of capital letter inside read receipts */ + } + } + @@ -189,7 +202,7 @@ index 311e059166..501a9210cf 100644 .mx_EventTile_e2eIcon { padding: 0; flex-grow: 0; -@@ -365,9 +449,8 @@ $left-gutter: 64px; +@@ -365,9 +451,8 @@ $left-gutter: 64px; .mx_TextualEvent, .mx_ViewSourceEvent, .mx_MTextBody { @@ -201,7 +214,7 @@ index 311e059166..501a9210cf 100644 } .mx_EventTile_e2eIcon, -@@ -405,8 +488,36 @@ $left-gutter: 64px; +@@ -405,8 +490,36 @@ $left-gutter: 64px; } } @@ -240,7 +253,7 @@ index 311e059166..501a9210cf 100644 } .mx_MessageTimestamp { -@@ -459,8 +570,14 @@ $left-gutter: 64px; +@@ -459,8 +572,14 @@ $left-gutter: 64px; &.mx_EventTile_emote { .mx_EventTile_avatar { @@ -257,7 +270,7 @@ index 311e059166..501a9210cf 100644 } } -@@ -642,6 +759,15 @@ $left-gutter: 64px; +@@ -642,6 +761,15 @@ $left-gutter: 64px; var(--name-width) + var(--icon-width) + var(--MessageTimestamp-width) + 2 * var(--right-padding) ); } From 459c1f76302253fbc6c7dec96d26df792b9b5c0d Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 30 Nov 2024 19:48:17 +0100 Subject: [PATCH 03/11] Disable showing people in spaces by default --- element-web | 2 +- ...-showing-people-in-spaces-by-default.patch | 39 +++++++++++++++++++ ...-Improve-IRC-layout-for-SchildiChat.patch} | 2 +- 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 patches/element-web/0031-Disable-showing-people-in-spaces-by-default.patch rename patches/element-web/{0031-Improve-IRC-layout-for-SchildiChat.patch => 0032-Improve-IRC-layout-for-SchildiChat.patch} (99%) diff --git a/element-web b/element-web index 1ff5a6c..f335d70 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 1ff5a6c421fd9f49b131d7c7ea4a0e6d7f257d7b +Subproject commit f335d70a269599914d037a9a09b4339f1315d8e8 diff --git a/patches/element-web/0031-Disable-showing-people-in-spaces-by-default.patch b/patches/element-web/0031-Disable-showing-people-in-spaces-by-default.patch new file mode 100644 index 0000000..3d7d35e --- /dev/null +++ b/patches/element-web/0031-Disable-showing-people-in-spaces-by-default.patch @@ -0,0 +1,39 @@ +From f45d0c6db3465497338b4bf87c65b8205af28c42 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 + +--- + src/settings/Settings.tsx | 2 +- + src/stores/room-list/filters/SpaceFilterCondition.ts | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx +index 51404c88d4..c4c8e719f9 100644 +--- a/src/settings/Settings.tsx ++++ b/src/settings/Settings.tsx +@@ -1073,7 +1073,7 @@ export const SETTINGS: { [setting: string]: ISetting } = { + }, + "Spaces.showPeopleInSpace": { + supportedLevels: [SettingLevel.ROOM_ACCOUNT], +- default: true, ++ default: false, + }, + "developerMode": { + displayName: _td("devtools|developer_mode"), +diff --git a/src/stores/room-list/filters/SpaceFilterCondition.ts b/src/stores/room-list/filters/SpaceFilterCondition.ts +index 8f652a35fb..da02328e89 100644 +--- a/src/stores/room-list/filters/SpaceFilterCondition.ts ++++ b/src/stores/room-list/filters/SpaceFilterCondition.ts +@@ -25,7 +25,7 @@ import SettingsStore from "../../../settings/SettingsStore"; + export class SpaceFilterCondition extends EventEmitter implements IFilterCondition, IDestroyable { + private roomIds = new Set(); + private userIds = new Set(); +- private showPeopleInSpace = true; ++ private showPeopleInSpace = false; + private space: SpaceKey = MetaSpace.Home; + + public isVisible(room: Room): boolean { +-- +2.47.0 + diff --git a/patches/element-web/0031-Improve-IRC-layout-for-SchildiChat.patch b/patches/element-web/0032-Improve-IRC-layout-for-SchildiChat.patch similarity index 99% rename from patches/element-web/0031-Improve-IRC-layout-for-SchildiChat.patch rename to patches/element-web/0032-Improve-IRC-layout-for-SchildiChat.patch index 29c66a0..4bc3ace 100644 --- a/patches/element-web/0031-Improve-IRC-layout-for-SchildiChat.patch +++ b/patches/element-web/0032-Improve-IRC-layout-for-SchildiChat.patch @@ -1,4 +1,4 @@ -From a5e5f36ce4117bdb72da63e1ed30b55602bec2d2 Mon Sep 17 00:00:00 2001 +From e2b0f154492779fa8df8abefc12c4bbe273994e4 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 From 10bc489f2b8d70be8ac31b0424363a642d245e4e Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sun, 1 Dec 2024 12:32:57 -0500 Subject: [PATCH 04/11] Replace element-app-logo.png Signed-off-by: Suguru Hirahara --- graphics/icon_gen.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/graphics/icon_gen.sh b/graphics/icon_gen.sh index 780ce7a..32f3a81 100755 --- a/graphics/icon_gen.sh +++ b/graphics/icon_gen.sh @@ -57,6 +57,7 @@ done cp "$mydir/ic_launcher_sc.svg" "$repo_dir/res/themes/element/img/logos/element-logo.svg" +export_square 320 "$mydir/ic_launcher_sc.svg" "$repo_dir/res/themes/element/img/logos/element-app-logo.png" repo_dir="$SCHILDI_ROOT/element-desktop" base_out="$repo_dir/res/img" From f8ecb305f6229db93989e0f63895322f4946a9c2 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 3 Dec 2024 19:52:46 +0100 Subject: [PATCH 05/11] Drop caption fixup patch Has been added upstream in v1.11.87 --- .../0026-Fix-captions-in-bubble-layout.patch | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 patches/element-web/0026-Fix-captions-in-bubble-layout.patch diff --git a/patches/element-web/0026-Fix-captions-in-bubble-layout.patch b/patches/element-web/0026-Fix-captions-in-bubble-layout.patch deleted file mode 100644 index 2e1da09..0000000 --- a/patches/element-web/0026-Fix-captions-in-bubble-layout.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7fb604f189e547daf72cd93ce53f8a76c733c321 Mon Sep 17 00:00:00 2001 -From: SpiritCroc -Date: Thu, 31 Oct 2024 17:33:32 +0100 -Subject: Fix captions in bubble layout - -Image height of 100% combined with overflow-y: hidden was causing -caption to be invisible in bubble layout. ---- - res/css/views/rooms/_EventBubbleTile.pcss | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/res/css/views/rooms/_EventBubbleTile.pcss b/res/css/views/rooms/_EventBubbleTile.pcss -index a5f5480010..fbb1ad2e1b 100644 ---- a/res/css/views/rooms/_EventBubbleTile.pcss -+++ b/res/css/views/rooms/_EventBubbleTile.pcss -@@ -336,7 +336,6 @@ Please see LICENSE files in the repository root for full details. - - .mx_MImageBody { - width: 100%; -- height: 100%; - - .mx_MImageBody_thumbnail.mx_MImageBody_thumbnail--blurhash { - position: unset; --- -2.47.0 - From 59fab598d26ca4af38e0767d879de3070293da10 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 3 Dec 2024 19:56:44 +0100 Subject: [PATCH 06/11] Update to upstream v1.11.87 --- compound-web | 2 +- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- ...back-schildi-fetch-package.ts-modifications.patch | 2 +- .../0002-Change-default-login-background.patch | 2 +- .../element-web/0003-Don-t-welcome-to-Element.patch | 2 +- ...login-background-to-ensure-contrast-of-our-.patch | 2 +- .../element-web/0005-Schildify-login-footer.patch | 6 +++--- patches/element-web/0006-Disable-sticky-rooms.patch | 2 +- .../0007-Bring-back-unified-room-list.patch | 2 +- ...t-muted-rooms-to-bottom-I-still-want-to-see.patch | 2 +- .../element-web/0009-Don-t-preview-reactions.patch | 2 +- ...mute-notification-state-the-same-way-as-the.patch | 2 +- .../0011-Allow-muted-rooms-to-render-as-unread.patch | 2 +- .../0012-Increase-default-visible-tiles.patch | 2 +- ...k-showSpaceDMBadges-setting-force-enabled-f.patch | 2 +- ...Freeform-reactions-from-tadzik-freeform-rea.patch | 10 +++++----- .../0015-Allow-reactions-to-take-more-space.patch | 2 +- ...switch-don-t-automatically-show-last-opened.patch | 8 ++++---- .../0017-Exclude-spaces-from-breadcrumbs.patch | 2 +- .../0018-Stop-the-search-bar-wobble.patch | 2 +- .../0019-Import-SC-compound-theme-overrides.patch | 2 +- ...0020-No-damn-avatar-background-in-room-list.patch | 2 +- ...ssages-in-1-1-chats-Close-SchildiChat-schil.patch | 2 +- ...ply-corner-radius-to-all-edges-of-the-bubbl.patch | 12 ++++++------ .../0023-Always-show-timestamps-by-default.patch | 2 +- ...24-Enable-custom-emote-rendering-by-default.patch | 2 +- .../0025-Enable-chat-previews-by-default.patch | 2 +- ...isable-showing-people-in-spaces-by-default.patch} | 2 +- ...=> 0027-Improve-IRC-layout-for-SchildiChat.patch} | 4 ++-- 31 files changed, 46 insertions(+), 46 deletions(-) rename patches/element-web/{0031-Disable-showing-people-in-spaces-by-default.patch => 0026-Disable-showing-people-in-spaces-by-default.patch} (95%) rename patches/element-web/{0032-Improve-IRC-layout-for-SchildiChat.patch => 0027-Improve-IRC-layout-for-SchildiChat.patch} (99%) diff --git a/compound-web b/compound-web index 141771e..5a67479 160000 --- a/compound-web +++ b/compound-web @@ -1 +1 @@ -Subproject commit 141771eb303d48dc388b2e5a01504359ad47b2c1 +Subproject commit 5a674793b5859c5c8ce9662993592e8d10b26969 diff --git a/element-desktop b/element-desktop index f115ac7..4e3fa16 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit f115ac7ad03f7efa8e0a3e8dca782e455b766277 +Subproject commit 4e3fa16f25ae1c6b1131a3c8a1149f2e4e3ba719 diff --git a/element-web b/element-web index f335d70..812c985 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit f335d70a269599914d037a9a09b4339f1315d8e8 +Subproject commit 812c98535711ff5eba41a9d4b520fe4ccfbbf1a9 diff --git a/matrix-js-sdk b/matrix-js-sdk index cf06547..d3f5526 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit cf065470630197affee1dea84f1c7e95df6c0ddf +Subproject commit d3f5526ec07dcbd0e4677a56b5e53f7d3a4cbcc2 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 8bda598..150eb79 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 1be2423147ba91f51bf2cc0437b3652c5a4e0c00 Mon Sep 17 00:00:00 2001 +From a90a617e3d49a8d14fe59ab992e9a902aeec87b8 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/element-web/0002-Change-default-login-background.patch b/patches/element-web/0002-Change-default-login-background.patch index c8d6033..9429816 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 f279bd0bb4f21f48341a937510535ca30a4216d1 Mon Sep 17 00:00:00 2001 +From 7ef218c37ebb202226f4b6d21a150e75ef1e8e04 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 29 Nov 2020 23:30:59 +0100 Subject: Change default login background 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 13460db..8526d77 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 60fa47ee055ed85728583c12ab4619a7576d260e Mon Sep 17 00:00:00 2001 +From 777d4917cd8e0db3f977804b2ac8428453fc9270 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Oct 2024 19:38:47 +0100 Subject: Don't welcome to Element 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 c300988..4a12a48 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 faaf99c6ce2111faeeaa3100cd076a51b711d95b Mon Sep 17 00:00:00 2001 +From feb223e69bfb0a44d82dd4c0d0c0555ee5bd2be9 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 diff --git a/patches/element-web/0005-Schildify-login-footer.patch b/patches/element-web/0005-Schildify-login-footer.patch index a198bec..225c1f8 100644 --- a/patches/element-web/0005-Schildify-login-footer.patch +++ b/patches/element-web/0005-Schildify-login-footer.patch @@ -1,4 +1,4 @@ -From f469bd05375c6b4c1b419cf07b4a832511a79a4e Mon Sep 17 00:00:00 2001 +From 888ec3387af2ba9d79a7cf0affb44fbb75b13771 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Oct 2024 20:07:30 +0100 Subject: Schildify login footer @@ -8,7 +8,7 @@ Subject: Schildify login footer 1 file changed, 4 insertions(+) diff --git a/src/components/views/auth/AuthFooter.tsx b/src/components/views/auth/AuthFooter.tsx -index 8d27a04c83..b9ff8e8416 100644 +index a792896a88..6ecfd6ae20 100644 --- a/src/components/views/auth/AuthFooter.tsx +++ b/src/components/views/auth/AuthFooter.tsx @@ -15,9 +15,13 @@ import { _t } from "../../../languageHandler"; @@ -17,7 +17,7 @@ index 8d27a04c83..b9ff8e8416 100644 const links = brandingConfig?.get("auth_footer_links") ?? [ + /* { text: "Blog", url: "https://element.io/blog" }, - { text: "Twitter", url: "https://twitter.com/element_hq" }, + { text: "Mastodon", url: "https://mastodon.matrix.org/@Element" }, { text: "GitHub", url: "https://github.com/element-hq/element-web" }, + */ + { text: "About", url: "https://schildi.chat" }, diff --git a/patches/element-web/0006-Disable-sticky-rooms.patch b/patches/element-web/0006-Disable-sticky-rooms.patch index 8b8506b..ca61098 100644 --- a/patches/element-web/0006-Disable-sticky-rooms.patch +++ b/patches/element-web/0006-Disable-sticky-rooms.patch @@ -1,4 +1,4 @@ -From 909d0c76ad56426699d9b8dfaebf818f21c09dd4 Mon Sep 17 00:00:00 2001 +From 72f5f3b18cd813fc3cdc4ff89131558738f8c551 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/element-web/0007-Bring-back-unified-room-list.patch b/patches/element-web/0007-Bring-back-unified-room-list.patch index 6ced274..5ef263e 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 9cf40d600e00770aa7a56cebf5ab3413166e29e6 Mon Sep 17 00:00:00 2001 +From 9b0cba9a234d7f9329f9e6e8ad549a09a6455bf1 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 5 May 2024 10:12:17 +0200 Subject: Bring back unified room list 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 da6ddf3..25914cb 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 9fb400a94a190f910b731e3c5ea2c3ccdd91adce Mon Sep 17 00:00:00 2001 +From e515cfeedb25c3bd8afa7363f677cb885d2acab1 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/element-web/0009-Don-t-preview-reactions.patch b/patches/element-web/0009-Don-t-preview-reactions.patch index b62a38a..f727341 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 96de5eb0667f130de17544eb104647f823b617b0 Mon Sep 17 00:00:00 2001 +From c38e41947b16518d6f74313b23670e630c9a1af6 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/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 0a34a68..0e7357e 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 cc3db444dc3788e6eaca8db3bd77feccc0e2133d Mon Sep 17 00:00:00 2001 +From afc0686a92f5c16a6747d63a5450c0c8c63f9f68 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/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 8d1e7b4..727cacf 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 5b5635a2c649226fccdd47013c576a8e1789af4e Mon Sep 17 00:00:00 2001 +From c490b899efc44fd1de9cb1c7bc4e5cf08916965c 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/element-web/0012-Increase-default-visible-tiles.patch b/patches/element-web/0012-Increase-default-visible-tiles.patch index 078ebf2..2dd36f6 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 532251811dbd3c3ff6ae43050acd6fb5140e20a0 Mon Sep 17 00:00:00 2001 +From 6c5419a256020fda6907fa770ae1fc8c48a96849 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/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 39f838a..7b37316 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 920a48f9ec942635cd6a877f366e6c38abad9b11 Mon Sep 17 00:00:00 2001 +From 5105bf1ceb8cadb26b49ff727461ac2a6e2987b9 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/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 c7d56cf..1acc616 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 8f81368ec09b41f996955b8a8fabcc594c194194 Mon Sep 17 00:00:00 2001 +From 842eb33b63bd69bf5714b10975f9e2fecc72ea66 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 @@ -71,7 +71,7 @@ Date: Tue Aug 17 11:29:22 2021 +0200 2 files changed, 16 insertions(+) diff --git a/src/components/views/emojipicker/EmojiPicker.tsx b/src/components/views/emojipicker/EmojiPicker.tsx -index 4806ad4216..7d4a4353e2 100644 +index e2470d188d..868f9b3d7c 100644 --- a/src/components/views/emojipicker/EmojiPicker.tsx +++ b/src/components/views/emojipicker/EmojiPicker.tsx @@ -17,6 +17,7 @@ import Header from "./Header"; @@ -82,7 +82,7 @@ index 4806ad4216..7d4a4353e2 100644 import Category, { CategoryKey, ICategory } from "./Category"; import { filterBoolean } from "../../../utils/arrays"; import { -@@ -37,6 +38,7 @@ export const EMOJIS_PER_ROW = 8; +@@ -36,6 +37,7 @@ export const EMOJIS_PER_ROW = 8; const ZERO_WIDTH_JOINER = "\u200D"; interface IProps { @@ -90,7 +90,7 @@ index 4806ad4216..7d4a4353e2 100644 selectedEmojis?: Set; onChoose(unicode: string): boolean; onFinished(): void; -@@ -341,6 +343,10 @@ class EmojiPicker extends React.Component { +@@ -337,6 +339,10 @@ class EmojiPicker extends React.Component { } }; @@ -101,7 +101,7 @@ index 4806ad4216..7d4a4353e2 100644 private static categoryHeightForEmojiCount(count: number): number { if (count === 0) { return 0; -@@ -396,6 +402,15 @@ class EmojiPicker extends React.Component { +@@ -392,6 +398,15 @@ class EmojiPicker extends React.Component { return categoryElement; })} 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 50c2486..5e21080 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 4980c7e816e83a3dce4106c8485461044591da26 Mon Sep 17 00:00:00 2001 +From 171a1d7ed3285bc96821986b655785b4a836270c 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/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 5e01a14..2235821 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 b29702cd66f838ebe6af90fbf0b223caab3725b1 Mon Sep 17 00:00:00 2001 +From df5c6698c294e898c375d2f57747cc99be35dfc7 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 80a648b5d5..f917d0bf7f 100644 +index 9f9e225352..85a6400364 100644 --- a/src/components/structures/MatrixChat.tsx +++ b/src/components/structures/MatrixChat.tsx -@@ -1456,7 +1456,15 @@ export default class MatrixChat extends React.PureComponent { +@@ -1454,7 +1454,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 80a648b5d5..f917d0bf7f 100644 // Before defaulting to directory, show the last viewed room this.viewLastRoom(); } else { -@@ -1468,6 +1476,14 @@ export default class MatrixChat extends React.PureComponent { +@@ -1466,6 +1474,14 @@ export default class MatrixChat extends React.PureComponent { } } diff --git a/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch b/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch index 3ca9572..ef158d1 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 7d9fafb12e3bf1768e32b39ecf00b973309e6c1b Mon Sep 17 00:00:00 2001 +From e7747d12316e0d30bc8d152d71e636742c65eb0e 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/element-web/0018-Stop-the-search-bar-wobble.patch b/patches/element-web/0018-Stop-the-search-bar-wobble.patch index 892ae33..e8e2ac8 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 9a1518e041fa2d5364885725b259378952a2b445 Mon Sep 17 00:00:00 2001 +From 1868f42a8185a651ecdb8192c22eb8706707cc6f 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/element-web/0019-Import-SC-compound-theme-overrides.patch b/patches/element-web/0019-Import-SC-compound-theme-overrides.patch index 3aa327b..57b716e 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 e5b9cc85889d539da3d4acff20cf8b3199ae94e3 Mon Sep 17 00:00:00 2001 +From 9638fd0cc8c5a4318d6712bd9cbd9d603bf37fbf 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/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 16407d0..8e069b3 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 124ee073c6de89d111823c94922d7d2eeb596a0b Mon Sep 17 00:00:00 2001 +From 2e304e4e139502133e58346b93dfce0dfdf95092 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/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 1891179..3fa28ba 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 ca4fa33dda5812b259c4391171358a50beb812fd Mon Sep 17 00:00:00 2001 +From 89faafa2c7aff5d5742d41b8231306108a952f46 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/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 e6223c2..ce55fda 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 45fea7a503d58e70e876bf5c94e5731fbed85551 Mon Sep 17 00:00:00 2001 +From 3bad1e4af1e22ac1e2a56cc04b46f2b0cf92390f 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,7 +8,7 @@ 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 3a42cde9bb..a5f5480010 100644 +index 7b1af0c771..fbb1ad2e1b 100644 --- a/res/css/views/rooms/_EventBubbleTile.pcss +++ b/res/css/views/rooms/_EventBubbleTile.pcss @@ -283,6 +283,8 @@ Please see LICENSE files in the repository root for full details. @@ -20,7 +20,7 @@ index 3a42cde9bb..a5f5480010 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 */ -@@ -377,7 +379,7 @@ Please see LICENSE files in the repository root for full details. +@@ -376,7 +378,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 3a42cde9bb..a5f5480010 100644 .mx_MImageBody .mx_MImageBody_thumbnail_container, .mx_MVideoBody .mx_MVideoBody_container, -@@ -385,7 +387,7 @@ Please see LICENSE files in the repository root for full details. +@@ -384,7 +386,7 @@ Please see LICENSE files in the repository root for full details. .mx_MediaBody, .mx_MLocationBody_map, .mx_MBeaconBody { @@ -38,7 +38,7 @@ index 3a42cde9bb..a5f5480010 100644 } } &.mx_EventTile_lastInSection[data-self="false"] .mx_EventTile_line { -@@ -402,7 +404,7 @@ Please see LICENSE files in the repository root for full details. +@@ -401,7 +403,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 3a42cde9bb..a5f5480010 100644 .mx_MImageBody .mx_MImageBody_thumbnail_container, .mx_MVideoBody .mx_MVideoBody_container, -@@ -410,7 +412,7 @@ Please see LICENSE files in the repository root for full details. +@@ -409,7 +411,7 @@ Please see LICENSE files in the repository root for full details. .mx_MediaBody, .mx_MLocationBody_map, .mx_MBeaconBody { 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 169fddd..329c6d2 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 61195cdcca6e390e179b776726bab89cc56e6fca Mon Sep 17 00:00:00 2001 +From 32c6ffd1896f6e4597d57ffbe9a8c599189c9ea4 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/element-web/0024-Enable-custom-emote-rendering-by-default.patch b/patches/element-web/0024-Enable-custom-emote-rendering-by-default.patch index 9379040..7ccf280 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 457d402a9f2d854efceb14cd6bd573db6c09175d Mon Sep 17 00:00:00 2001 +From 5e51ca6eefd49bc140dd8f8d67517460c7bd9dc9 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/element-web/0025-Enable-chat-previews-by-default.patch b/patches/element-web/0025-Enable-chat-previews-by-default.patch index 2d29b27..78dd6e0 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 9f640ce10fd0903be3c33e76ba1842112e659d5f Mon Sep 17 00:00:00 2001 +From 017cdf7e8fd339bb49f023f122136e89dd2bd496 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Oct 2024 19:24:26 +0100 Subject: Enable chat previews by default diff --git a/patches/element-web/0031-Disable-showing-people-in-spaces-by-default.patch b/patches/element-web/0026-Disable-showing-people-in-spaces-by-default.patch similarity index 95% rename from patches/element-web/0031-Disable-showing-people-in-spaces-by-default.patch rename to patches/element-web/0026-Disable-showing-people-in-spaces-by-default.patch index 3d7d35e..d6d0339 100644 --- a/patches/element-web/0031-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 f45d0c6db3465497338b4bf87c65b8205af28c42 Mon Sep 17 00:00:00 2001 +From 0d4814704ac86751ca9022672793e0672466232d 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 diff --git a/patches/element-web/0032-Improve-IRC-layout-for-SchildiChat.patch b/patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch similarity index 99% rename from patches/element-web/0032-Improve-IRC-layout-for-SchildiChat.patch rename to patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch index 4bc3ace..e4a0ed5 100644 --- a/patches/element-web/0032-Improve-IRC-layout-for-SchildiChat.patch +++ b/patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch @@ -1,4 +1,4 @@ -From e2b0f154492779fa8df8abefc12c4bbe273994e4 Mon Sep 17 00:00:00 2001 +From a854e513521055b34200b1ea5f431614a936ea12 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 @@ -54,7 +54,7 @@ index c13f819439..4f42040606 100644 margin-top: $spacing-8; } diff --git a/res/css/views/rooms/_EventTile.pcss b/res/css/views/rooms/_EventTile.pcss -index 311e059166..ecd1030749 100644 +index d405381db1..badc2399fa 100644 --- a/res/css/views/rooms/_EventTile.pcss +++ b/res/css/views/rooms/_EventTile.pcss @@ -1,5 +1,6 @@ From 240975cfe68c75d55d1e08d9856999d7fdea9cee Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 17 Dec 2024 18:10:32 +0100 Subject: [PATCH 07/11] 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 4e3fa16..358844c 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 4e3fa16f25ae1c6b1131a3c8a1149f2e4e3ba719 +Subproject commit 358844c94455397eb886d842a009c238241e130a diff --git a/element-web b/element-web index 812c985..22c56ad 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 d3f5526..bee65ff 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 150eb79..0517f8e 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 9429816..e6ff020 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 8526d77..a0e18bf 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 4a12a48..1299416 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 225c1f8..2b3f2c4 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 ca61098..6c41744 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 5ef263e..2f59109 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 25914cb..0c3ef6f 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 f727341..6735d0c 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 0e7357e..9ca33d3 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 727cacf..3c159a4 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 2dd36f6..ac66344 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 7b37316..0dbb266 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 1acc616..9d6b37a 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 5e21080..3d38f5e 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 2235821..bc2696b 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 ef158d1..ad9d381 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 e8e2ac8..58ad9c6 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 57b716e..e14d05b 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 8e069b3..f87bbe7 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 3fa28ba..9239841 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 ce55fda..38d0cb3 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 329c6d2..f8bb62f 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 7ccf280..843f363 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 78dd6e0..217dd70 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 d6d0339..6bdd581 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 e4a0ed5..43845a1 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 From a1299ffb15e5331ea1d6af4f4cb662d0817bdd04 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 19 Dec 2024 11:00:38 +0100 Subject: [PATCH 08/11] Bump to v1.11.89 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- .../0002-Add-back-schildi-fetch-package.ts-modifications.patch | 2 +- patches/element-web/0002-Change-default-login-background.patch | 2 +- patches/element-web/0003-Don-t-welcome-to-Element.patch | 2 +- ...4-Stronger-login-background-to-ensure-contrast-of-our-.patch | 2 +- patches/element-web/0005-Schildify-login-footer.patch | 2 +- patches/element-web/0006-Disable-sticky-rooms.patch | 2 +- patches/element-web/0007-Bring-back-unified-room-list.patch | 2 +- ...8-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch | 2 +- patches/element-web/0009-Don-t-preview-reactions.patch | 2 +- ...0-Hide-the-mute-notification-state-the-same-way-as-the.patch | 2 +- .../0011-Allow-muted-rooms-to-render-as-unread.patch | 2 +- patches/element-web/0012-Increase-default-visible-tiles.patch | 2 +- ...3-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch | 2 +- ...4-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch | 2 +- .../element-web/0015-Allow-reactions-to-take-more-space.patch | 2 +- ...6-On-space-switch-don-t-automatically-show-last-opened.patch | 2 +- patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch | 2 +- patches/element-web/0018-Stop-the-search-bar-wobble.patch | 2 +- .../element-web/0019-Import-SC-compound-theme-overrides.patch | 2 +- .../0020-No-damn-avatar-background-in-room-list.patch | 2 +- ...1-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch | 2 +- ...2-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch | 2 +- .../element-web/0023-Always-show-timestamps-by-default.patch | 2 +- .../0024-Enable-custom-emote-rendering-by-default.patch | 2 +- patches/element-web/0025-Enable-chat-previews-by-default.patch | 2 +- .../0026-Disable-showing-people-in-spaces-by-default.patch | 2 +- .../element-web/0027-Improve-IRC-layout-for-SchildiChat.patch | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/element-desktop b/element-desktop index 358844c..54ad269 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 358844c94455397eb886d842a009c238241e130a +Subproject commit 54ad269b30d0d4455b75d1ff6fbdac265f7fc652 diff --git a/element-web b/element-web index 22c56ad..a71057b 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 22c56ad460800ca6c485941c22492b064a33b2bf +Subproject commit a71057b9155724d0289791c259281faacc1ee0bc diff --git a/matrix-js-sdk b/matrix-js-sdk index bee65ff..1bf8533 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit bee65ff13f1796a540e493ec00e513949e0f366f +Subproject commit 1bf8533c033c5b462168da2c7f0e25681e9fa67a 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 0517f8e..1290e5a 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 e852e912f049e8de45ba1b8b85940c013cae565c Mon Sep 17 00:00:00 2001 +From ca9ce07f4817af4f81527f4bc19bd10388bd183b 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/element-web/0002-Change-default-login-background.patch b/patches/element-web/0002-Change-default-login-background.patch index e6ff020..ac6957f 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 965beab555a1383ef6c08ce277e412f67309da74 Mon Sep 17 00:00:00 2001 +From 9576252b89b28c8fc07933da92af0bd0a5356dde Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 29 Nov 2020 23:30:59 +0100 Subject: Change default login background 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 a0e18bf..1a1622a 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 cb662054cd3a82edbca312166497f9e7ca16b169 Mon Sep 17 00:00:00 2001 +From 83914e8c9926004d2df7e92481fa09975b35d3a6 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Oct 2024 19:38:47 +0100 Subject: Don't welcome to Element 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 1299416..095aaaf 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 8c292e4b7b99e03ba8000f8282167ef504a29bc9 Mon Sep 17 00:00:00 2001 +From a6f46111e119e941233de3aec8a2de95a07dcb90 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 diff --git a/patches/element-web/0005-Schildify-login-footer.patch b/patches/element-web/0005-Schildify-login-footer.patch index 2b3f2c4..e8a3369 100644 --- a/patches/element-web/0005-Schildify-login-footer.patch +++ b/patches/element-web/0005-Schildify-login-footer.patch @@ -1,4 +1,4 @@ -From d677f1d06e6a79b47cbbf7c892c82b3badf52b24 Mon Sep 17 00:00:00 2001 +From 4e1da585f2305c2e5ed325768759028aa7ecf837 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Oct 2024 20:07:30 +0100 Subject: Schildify login footer diff --git a/patches/element-web/0006-Disable-sticky-rooms.patch b/patches/element-web/0006-Disable-sticky-rooms.patch index 6c41744..b9f302f 100644 --- a/patches/element-web/0006-Disable-sticky-rooms.patch +++ b/patches/element-web/0006-Disable-sticky-rooms.patch @@ -1,4 +1,4 @@ -From cffec34134a4a49f0d3880f6ebcd2f4b570d9bab Mon Sep 17 00:00:00 2001 +From 7184e891326aaea6d1f70492b25f7427e0dd3cdb 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/element-web/0007-Bring-back-unified-room-list.patch b/patches/element-web/0007-Bring-back-unified-room-list.patch index 2f59109..733f45c 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 c92bef580d7ec6e62a6b845dc3f4159288f58777 Mon Sep 17 00:00:00 2001 +From d9a321ecaeb54cb4a0c7ca1ee28aaf6be1643b42 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 5 May 2024 10:12:17 +0200 Subject: Bring back unified room list 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 0c3ef6f..c0eb099 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 aca9fa0e13d5486df9f5a854f8d7c67ed1544868 Mon Sep 17 00:00:00 2001 +From ab77eb4263607e3883a06fee306cb6dacedfe066 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/element-web/0009-Don-t-preview-reactions.patch b/patches/element-web/0009-Don-t-preview-reactions.patch index 6735d0c..914774c 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 4003d95314fdaa2efd1d374d8c04e8f6dd07d965 Mon Sep 17 00:00:00 2001 +From c208ee73713f33642c78a26dece9fd3f144b24a7 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/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 9ca33d3..8b2fc9a 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 ad81f3cdccc9c20e09ab4a816016f2387c6bb6a1 Mon Sep 17 00:00:00 2001 +From c99af69db7b5c3278e30ce9e3dfac277c1696d29 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/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 3c159a4..3ba92b9 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 2ad7d53eb19069b1cc29430b9328b8e7574910a3 Mon Sep 17 00:00:00 2001 +From 9ff9e5f77bd4e40f5ea0a4c38aca772af69fb65a 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/element-web/0012-Increase-default-visible-tiles.patch b/patches/element-web/0012-Increase-default-visible-tiles.patch index ac66344..442f2f5 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 9fbca521ae0e6bc4f2b7012dea3c9c04afde2361 Mon Sep 17 00:00:00 2001 +From 0028933498a0f286187166d637d23c46b441d0b6 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/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 0dbb266..986d9bd 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 f3b655942a115df270927d44caf33a4281bfb787 Mon Sep 17 00:00:00 2001 +From e5bfaebacf3dcf6859f0a0c7fedc5841b164767f 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/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 9d6b37a..5689c4e 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 520fdeb073a8247b2de0812cc4bc5c98ba776145 Mon Sep 17 00:00:00 2001 +From 9b12990f85ba4c358347d12fb502eed68ae5ef66 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/element-web/0015-Allow-reactions-to-take-more-space.patch b/patches/element-web/0015-Allow-reactions-to-take-more-space.patch index 3d38f5e..6b1f46b 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 aee2a2d3082255bcceebab84b2f26ddf30a26c6d Mon Sep 17 00:00:00 2001 +From a782b6ffab3588ef374e52bd68810f8fd236cab5 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/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 bc2696b..e9eb691 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 fd8e3a90d05471eeeab4de9a70feb0ab32276dd0 Mon Sep 17 00:00:00 2001 +From c1fd46c896b37095efb08343ef287bb449a991e9 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/element-web/0017-Exclude-spaces-from-breadcrumbs.patch b/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch index ad9d381..67330e8 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 f2d5cbb7c31fc2a7ebd4a0f83c6e6c76b18c3668 Mon Sep 17 00:00:00 2001 +From fab0b51edab01ef34590c7e1fac4d3c0584eb20b 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/element-web/0018-Stop-the-search-bar-wobble.patch b/patches/element-web/0018-Stop-the-search-bar-wobble.patch index 58ad9c6..bae8a05 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 525ab32b51f86e6b81deaa6dd9048471e4959f97 Mon Sep 17 00:00:00 2001 +From 07d77a65ca5908941c04ccbbf4360c8836483ca9 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/element-web/0019-Import-SC-compound-theme-overrides.patch b/patches/element-web/0019-Import-SC-compound-theme-overrides.patch index e14d05b..7eef980 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 a07dbddd3ccafdc96dbe0e17b442c55c0b08a2d7 Mon Sep 17 00:00:00 2001 +From 75a848673bb41c52950ed4909cd2e417cddb1706 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/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 f87bbe7..5da5b3d 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 2721ac99b3fcbfda270a5727436f8e6923f29b31 Mon Sep 17 00:00:00 2001 +From 15d80dd710850e7b75dba1095bc1d4a97701661f 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/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 9239841..36c0b4d 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 cd9506dd8e2fc7ebafdfde4449221c7e6b4a876f Mon Sep 17 00:00:00 2001 +From 141ca3e01393c75c5990ddbf78ec1a17f51829ae 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/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 38d0cb3..f5e2c43 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 8cf63042cc41cd154f3a7b1080ea5a79eaf16291 Mon Sep 17 00:00:00 2001 +From bd799a3d2bea84efe06c705cad3481a0271abcd4 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/element-web/0023-Always-show-timestamps-by-default.patch b/patches/element-web/0023-Always-show-timestamps-by-default.patch index f8bb62f..feb0981 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 322d9e4993d4fa746f592441c1cc5b237553bc27 Mon Sep 17 00:00:00 2001 +From 514da5ddfcb81ce800573012add6d558d659f56f 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/element-web/0024-Enable-custom-emote-rendering-by-default.patch b/patches/element-web/0024-Enable-custom-emote-rendering-by-default.patch index 843f363..0fa02bc 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 f3c8ecc03ed1922cd9c1e843a699309fb00e9bc1 Mon Sep 17 00:00:00 2001 +From 52ab9a20a207010912292f06466fbd30fedce1ed 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/element-web/0025-Enable-chat-previews-by-default.patch b/patches/element-web/0025-Enable-chat-previews-by-default.patch index 217dd70..b38e7c5 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 717dc4efdc0648b1fa1641f4db097ab0026535ac Mon Sep 17 00:00:00 2001 +From 1ecc64221c0b586830668f101863fbdb95240182 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Oct 2024 19:24:26 +0100 Subject: Enable chat previews by default 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 6bdd581..bfbbd96 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 3a2fff8f1ab3ed231dd4832381af607ba51c46ba Mon Sep 17 00:00:00 2001 +From 64e3e5aeb6a61e44a8892254ed8970d718fcfac5 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 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 43845a1..28f3be5 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 ab84e8553b9343de6c525a4bec8887afd2f0db43 Mon Sep 17 00:00:00 2001 +From e0e03f4f780055951b6e9bbe1f51459e20c81c3c 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 From a9f81d8ebe8fec6217ab7552e5678cba25ce91ef Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 16 Jan 2025 09:00:26 +0100 Subject: [PATCH 09/11] Bump to 1.11.90 --- compound-web | 2 +- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- ...hildi-fetch-package.ts-modifications.patch | 4 ++-- ...0002-Change-default-login-background.patch | 8 ++++---- .../0003-Don-t-welcome-to-Element.patch | 4 ++-- ...ackground-to-ensure-contrast-of-our-.patch | 6 +++--- .../0005-Schildify-login-footer.patch | 6 +++--- .../0006-Disable-sticky-rooms.patch | 6 +++--- .../0007-Bring-back-unified-room-list.patch | 20 +++++++++---------- ...-rooms-to-bottom-I-still-want-to-see.patch | 6 +++--- .../0009-Don-t-preview-reactions.patch | 6 +++--- ...tification-state-the-same-way-as-the.patch | 6 +++--- ...llow-muted-rooms-to-render-as-unread.patch | 6 +++--- .../0012-Increase-default-visible-tiles.patch | 6 +++--- ...paceDMBadges-setting-force-enabled-f.patch | 10 +++++----- ...m-reactions-from-tadzik-freeform-rea.patch | 8 ++++---- ...5-Allow-reactions-to-take-more-space.patch | 6 +++--- ...don-t-automatically-show-last-opened.patch | 16 +++++++-------- ...0017-Exclude-spaces-from-breadcrumbs.patch | 6 +++--- .../0018-Stop-the-search-bar-wobble.patch | 6 +++--- ...9-Import-SC-compound-theme-overrides.patch | 6 +++--- ...-damn-avatar-background-in-room-list.patch | 6 +++--- ...in-1-1-chats-Close-SchildiChat-schil.patch | 6 +++--- ...ner-radius-to-all-edges-of-the-bubbl.patch | 6 +++--- ...23-Always-show-timestamps-by-default.patch | 8 ++++---- ...le-custom-emote-rendering-by-default.patch | 8 ++++---- ...0025-Enable-chat-previews-by-default.patch | 6 +++--- ...-showing-people-in-spaces-by-default.patch | 10 +++++----- ...7-Improve-IRC-layout-for-SchildiChat.patch | 14 ++++++------- 31 files changed, 107 insertions(+), 107 deletions(-) diff --git a/compound-web b/compound-web index 5a67479..2614bf9 160000 --- a/compound-web +++ b/compound-web @@ -1 +1 @@ -Subproject commit 5a674793b5859c5c8ce9662993592e8d10b26969 +Subproject commit 2614bf94edcd71ed910e71ebcb5f61604221399c diff --git a/element-desktop b/element-desktop index 54ad269..e4333e0 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 54ad269b30d0d4455b75d1ff6fbdac265f7fc652 +Subproject commit e4333e09f0040628e50e5606ad35ef27adb0670b diff --git a/element-web b/element-web index a71057b..efecbbe 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit a71057b9155724d0289791c259281faacc1ee0bc +Subproject commit efecbbe9a2d907cd21656631b9ed00627cf0cf1f diff --git a/matrix-js-sdk b/matrix-js-sdk index 1bf8533..72ee550 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 1bf8533c033c5b462168da2c7f0e25681e9fa67a +Subproject commit 72ee5504d5ab39dc40c4ba1a5601a90b7a6b3426 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 1290e5a..44ef630 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 ca9ce07f4817af4f81527f4bc19bd10388bd183b Mon Sep 17 00:00:00 2001 +From feed71908222cd43aaa7f86dfbca809511b3a310 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.1 +2.48.1 diff --git a/patches/element-web/0002-Change-default-login-background.patch b/patches/element-web/0002-Change-default-login-background.patch index ac6957f..4af14ea 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 9576252b89b28c8fc07933da92af0bd0a5356dde Mon Sep 17 00:00:00 2001 +From 52908abcd2599bc1d0d32996b8f3de0a40b33f9b Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 29 Nov 2020 23:30:59 +0100 Subject: Change default login background @@ -22104,7 +22104,7 @@ literal 0 HcmV?d00001 diff --git a/src/components/views/auth/AuthPage.tsx b/src/components/views/auth/AuthPage.tsx -index 2782d0a641..032744413f 100644 +index dd3facaa79..3c7fe2503e 100644 --- a/src/components/views/auth/AuthPage.tsx +++ b/src/components/views/auth/AuthPage.tsx @@ -20,7 +20,7 @@ export default class AuthPage extends React.PureComponent @@ -22130,5 +22130,5 @@ index f19343be20..f36fc9205b 100644 target="_blank" > -- -2.47.1 +2.48.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 1a1622a..2f5b4d5 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 83914e8c9926004d2df7e92481fa09975b35d3a6 Mon Sep 17 00:00:00 2001 +From f9addc874260af436513147a9711e7df3e69e1a1 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.1 +2.48.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 095aaaf..b8edb08 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 a6f46111e119e941233de3aec8a2de95a07dcb90 Mon Sep 17 00:00:00 2001 +From 0ec5e88ed052f645796ca8b258bbcb474ac54ae8 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 @@ -8,7 +8,7 @@ Subject: Stronger login background to ensure contrast of our icon with our bg 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/auth/AuthPage.tsx b/src/components/views/auth/AuthPage.tsx -index 032744413f..71bf8ae6d6 100644 +index 3c7fe2503e..64163e837c 100644 --- a/src/components/views/auth/AuthPage.tsx +++ b/src/components/views/auth/AuthPage.tsx @@ -58,7 +58,7 @@ export default class AuthPage extends React.PureComponent Date: Sun, 27 Oct 2024 20:07:30 +0100 Subject: Schildify login footer @@ -8,7 +8,7 @@ Subject: Schildify login footer 1 file changed, 4 insertions(+) diff --git a/src/components/views/auth/AuthFooter.tsx b/src/components/views/auth/AuthFooter.tsx -index a792896a88..6ecfd6ae20 100644 +index 472ff53f09..9f694aef42 100644 --- a/src/components/views/auth/AuthFooter.tsx +++ b/src/components/views/auth/AuthFooter.tsx @@ -15,9 +15,13 @@ import { _t } from "../../../languageHandler"; @@ -26,5 +26,5 @@ index a792896a88..6ecfd6ae20 100644 const authFooterLinks: JSX.Element[] = []; -- -2.47.1 +2.48.1 diff --git a/patches/element-web/0006-Disable-sticky-rooms.patch b/patches/element-web/0006-Disable-sticky-rooms.patch index b9f302f..b946bb7 100644 --- a/patches/element-web/0006-Disable-sticky-rooms.patch +++ b/patches/element-web/0006-Disable-sticky-rooms.patch @@ -1,4 +1,4 @@ -From 7184e891326aaea6d1f70492b25f7427e0dd3cdb Mon Sep 17 00:00:00 2001 +From 6c8b5594b57b22cb3e195d9e28a6843a0c36611d Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 18 Jan 2022 13:28:22 +0100 Subject: Disable sticky rooms @@ -8,7 +8,7 @@ Subject: Disable sticky rooms 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts -index c3450d70cf..e296676149 100644 +index 2ae3a1ff99..e0f5a17130 100644 --- a/src/stores/room-list/algorithms/Algorithm.ts +++ b/src/stores/room-list/algorithms/Algorithm.ts @@ -159,8 +159,10 @@ export class Algorithm extends EventEmitter { @@ -25,5 +25,5 @@ index c3450d70cf..e296676149 100644 } -- -2.47.1 +2.48.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 733f45c..e83809b 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 d9a321ecaeb54cb4a0c7ca1ee28aaf6be1643b42 Mon Sep 17 00:00:00 2001 +From 4cad8ad554645e437ba9a486734247257d577f43 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 f3bde66af9..f2446d3de8 100644 +index fed1826bbb..ea4d54d5e8 100644 --- a/src/components/views/rooms/RoomList.tsx +++ b/src/components/views/rooms/RoomList.tsx @@ -72,11 +72,13 @@ interface IState { @@ -124,13 +124,13 @@ index f3bde66af9..f2446d3de8 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 6cd5b15a51..4413cc5762 100644 +index 9c4bb76f9f..2431a8d528 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -183,6 +183,14 @@ export interface IFeature extends Omit, "isFeature"> { - export type ISetting = IBaseSetting | IFeature; +@@ -353,6 +353,14 @@ export type FeatureSettingKey = Assignable; + export type BooleanSettingKey = Assignable> | FeatureSettingKey; - export const SETTINGS: { [setting: string]: ISetting } = { + export const SETTINGS: Settings = { + // SC settings start + "unifiedRoomList": { + supportedLevels: LEVELS_ACCOUNT_SETTINGS, @@ -143,7 +143,7 @@ index 6cd5b15a51..4413cc5762 100644 isFeature: true, labsGroup: LabGroup.VoiceAndVideo, diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts -index 53377e0a01..381187b85c 100644 +index 0b179f7db5..6d1def3c87 100644 --- a/src/stores/room-list/RoomListStore.ts +++ b/src/stores/room-list/RoomListStore.ts @@ -500,6 +500,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient implements @@ -180,7 +180,7 @@ index 53377e0a01..381187b85c 100644 } diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts -index e296676149..06147137b3 100644 +index e0f5a17130..5411ad49fc 100644 --- a/src/stores/room-list/algorithms/Algorithm.ts +++ b/src/stores/room-list/algorithms/Algorithm.ts @@ -75,6 +75,7 @@ export class Algorithm extends EventEmitter { @@ -239,7 +239,7 @@ index e296676149..06147137b3 100644 } } diff --git a/src/stores/room-list/models.ts b/src/stores/room-list/models.ts -index 50cecda665..8efc2d040d 100644 +index 78823cbc42..00883e2ad6 100644 --- a/src/stores/room-list/models.ts +++ b/src/stores/room-list/models.ts @@ -13,6 +13,7 @@ export enum DefaultTagID { @@ -259,5 +259,5 @@ index 50cecda665..8efc2d040d 100644 DefaultTagID.Conference, DefaultTagID.Untagged, -- -2.47.1 +2.48.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 c0eb099..1a349bc 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 ab77eb4263607e3883a06fee306cb6dacedfe066 Mon Sep 17 00:00:00 2001 +From 3023a83c05387fd322420f8bea8fa97c1bcef85d 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. @@ -8,7 +8,7 @@ Subject: Don't sort muted rooms to bottom, I still want to see them. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts -index 67ee1ca084..67dcaa3855 100644 +index 5cf7631cfe..81b335e3d2 100644 --- a/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts +++ b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts @@ -38,7 +38,7 @@ export abstract class OrderingAlgorithm { @@ -21,5 +21,5 @@ index 67ee1ca084..67dcaa3855 100644 /** -- -2.47.1 +2.48.1 diff --git a/patches/element-web/0009-Don-t-preview-reactions.patch b/patches/element-web/0009-Don-t-preview-reactions.patch index 914774c..3257f7e 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 c208ee73713f33642c78a26dece9fd3f144b24a7 Mon Sep 17 00:00:00 2001 +From a80b770c4ba54d653ab9249ce7af18908d0c577e Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 14 Dec 2023 10:32:10 +0100 Subject: Don't preview reactions @@ -8,7 +8,7 @@ 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 2577b2ba23..0df13f33a8 100644 +index 3f1614df70..29c71fcc69 100644 --- a/src/stores/room-list/MessagePreviewStore.ts +++ b/src/stores/room-list/MessagePreviewStore.ts @@ -55,10 +55,12 @@ const PREVIEWS: Record< @@ -25,5 +25,5 @@ index 2577b2ba23..0df13f33a8 100644 isState: false, previewer: new PollStartEventPreview(), -- -2.47.1 +2.48.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 8b2fc9a..fabd6a8 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 c99af69db7b5c3278e30ce9e3dfac277c1696d29 Mon Sep 17 00:00:00 2001 +From 79080d4521da718362deb31c1d01b0e0a40124c2 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,7 +11,7 @@ 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 7953c5068d..42f7fabb8e 100644 +index cbeb562077..3d893f5fe0 100644 --- a/src/components/views/rooms/RoomTile.tsx +++ b/src/components/views/rooms/RoomTile.tsx @@ -300,7 +300,9 @@ class RoomTile extends React.PureComponent { @@ -26,5 +26,5 @@ index 7953c5068d..42f7fabb8e 100644 return ( -- -2.47.1 +2.48.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 3ba92b9..a10a2c5 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 9ff9e5f77bd4e40f5ea0a4c38aca772af69fb65a Mon Sep 17 00:00:00 2001 +From 76daaebf1462651e4156e8b73bcaa15d7922ffc3 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 @@ -8,7 +8,7 @@ Subject: Allow muted rooms to render as unread 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RoomNotifs.ts b/src/RoomNotifs.ts -index 7c281d0d2d..f06be85437 100644 +index e6064d2691..37838c79b5 100644 --- a/src/RoomNotifs.ts +++ b/src/RoomNotifs.ts @@ -255,7 +255,7 @@ export function determineUnreadState( @@ -21,5 +21,5 @@ index 7c281d0d2d..f06be85437 100644 } -- -2.47.1 +2.48.1 diff --git a/patches/element-web/0012-Increase-default-visible-tiles.patch b/patches/element-web/0012-Increase-default-visible-tiles.patch index 442f2f5..1414c4b 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 0028933498a0f286187166d637d23c46b441d0b6 Mon Sep 17 00:00:00 2001 +From aa4a0d3e9ce9d4031ebaa38b9568aa434ce9cbe5 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 30 Aug 2020 15:33:01 +0200 Subject: Increase default visible tiles @@ -8,7 +8,7 @@ Subject: Increase default visible tiles 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts -index ff60309e08..275b6d330b 100644 +index e85703fa5f..2792e57f8d 100644 --- a/src/stores/room-list/ListLayout.ts +++ b/src/stores/room-list/ListLayout.ts @@ -74,7 +74,7 @@ export class ListLayout { @@ -21,5 +21,5 @@ index ff60309e08..275b6d330b 100644 public tilesWithPadding(n: number, paddingPx: number): number { -- -2.47.1 +2.48.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 986d9bd..f67dc19 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 e5bfaebacf3dcf6859f0a0c7fedc5841b164767f Mon Sep 17 00:00:00 2001 +From 713dafdaa9935d3a2cb419f6c9b4621b9ebe92d3 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 4413cc5762..3dcb64ced7 100644 +index 2431a8d528..45e1145c0f 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -190,6 +190,11 @@ export const SETTINGS: { [setting: string]: ISetting } = { +@@ -360,6 +360,11 @@ export const SETTINGS: Settings = { default: true, controller: new ReloadOnChangeController(), }, @@ -28,7 +28,7 @@ index 4413cc5762..3dcb64ced7 100644 "feature_video_rooms": { isFeature: true, diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts -index 90358f3310..60df05478a 100644 +index 50aa7748a5..f11cc20b0c 100644 --- a/src/stores/spaces/SpaceStore.ts +++ b/src/stores/spaces/SpaceStore.ts @@ -154,9 +154,17 @@ export class SpaceStoreClass extends AsyncStoreWithClient { @@ -88,5 +88,5 @@ index 90358f3310..60df05478a 100644 const newValue = SettingsStore.getValue("Spaces.enabledMetaSpaces"); const enabledMetaSpaces = metaSpaceOrder.filter((k) => newValue[k]); -- -2.47.1 +2.48.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 5689c4e..3e01ed9 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 9b12990f85ba4c358347d12fb502eed68ae5ef66 Mon Sep 17 00:00:00 2001 +From 34991cb7a32166efbfab4f09f05f2874180751ae 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 @@ -71,7 +71,7 @@ Date: Tue Aug 17 11:29:22 2021 +0200 2 files changed, 16 insertions(+) diff --git a/src/components/views/emojipicker/EmojiPicker.tsx b/src/components/views/emojipicker/EmojiPicker.tsx -index e2470d188d..868f9b3d7c 100644 +index 0c10d778a6..250c8e0fec 100644 --- a/src/components/views/emojipicker/EmojiPicker.tsx +++ b/src/components/views/emojipicker/EmojiPicker.tsx @@ -17,6 +17,7 @@ import Header from "./Header"; @@ -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 bd16634490..d70c3df6ec 100644 +index ea1a502942..e49b7e33cd 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 bd16634490..d70c3df6ec 100644 isEmojiDisabled={this.isEmojiDisabled} onFinished={this.props.onFinished} -- -2.47.1 +2.48.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 6b1f46b..75c0464 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 a782b6ffab3588ef374e52bd68810f8fd236cab5 Mon Sep 17 00:00:00 2001 +From 3749bf8941ea426d395fd0c15742b235b5798e8e 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,7 +8,7 @@ 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 dd9d7ddb47..9ebe95021e 100644 +index 917bcfbb84..75ec572c9e 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. @@ -28,5 +28,5 @@ index dd9d7ddb47..9ebe95021e 100644 white-space: nowrap; text-overflow: ellipsis; -- -2.47.1 +2.48.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 e9eb691..3713b23 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 c1fd46c896b37095efb08343ef287bb449a991e9 Mon Sep 17 00:00:00 2001 +From 51bf3a238471a9c54ae19dd1abe527a60b0d798d 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 548dbff983..6722975ce3 100644 +index f417bd6045..6c6b7e2285 100644 --- a/src/components/structures/MatrixChat.tsx +++ b/src/components/structures/MatrixChat.tsx -@@ -1450,7 +1450,15 @@ export default class MatrixChat extends React.PureComponent { +@@ -1453,7 +1453,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 548dbff983..6722975ce3 100644 // Before defaulting to directory, show the last viewed room this.viewLastRoom(); } else { -@@ -1462,6 +1470,14 @@ export default class MatrixChat extends React.PureComponent { +@@ -1465,6 +1473,14 @@ export default class MatrixChat extends React.PureComponent { } } @@ -46,10 +46,10 @@ index 548dbff983..6722975ce3 100644 dis.dispatch({ action: Action.ViewRoom, diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index 3dcb64ced7..31ad386869 100644 +index 45e1145c0f..dfa65a4917 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -195,6 +195,12 @@ export const SETTINGS: { [setting: string]: ISetting } = { +@@ -365,6 +365,12 @@ export const SETTINGS: Settings = { supportedLevels: LEVELS_ACCOUNT_SETTINGS, default: true, }, @@ -63,7 +63,7 @@ index 3dcb64ced7..31ad386869 100644 "feature_video_rooms": { isFeature: true, diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts -index 60df05478a..0be7ba190a 100644 +index f11cc20b0c..bce2146d4e 100644 --- a/src/stores/spaces/SpaceStore.ts +++ b/src/stores/spaces/SpaceStore.ts @@ -265,6 +265,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient { @@ -75,5 +75,5 @@ index 60df05478a..0be7ba190a 100644 cliSpace?.getMyMembership() !== KnownMembership.Invite && this.matrixClient.getRoom(roomId)?.getMyMembership() === KnownMembership.Join && -- -2.47.1 +2.48.1 diff --git a/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch b/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch index 67330e8..a17176b 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 fab0b51edab01ef34590c7e1fac4d3c0584eb20b Mon Sep 17 00:00:00 2001 +From df60ede5a07c6d13651844cd706ae63671684ffd Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 9 Aug 2022 09:32:19 +0200 Subject: Exclude spaces from breadcrumbs @@ -8,7 +8,7 @@ Subject: Exclude spaces from breadcrumbs 1 file changed, 1 insertion(+) diff --git a/src/stores/BreadcrumbsStore.ts b/src/stores/BreadcrumbsStore.ts -index 9859f24015..957b54286c 100644 +index c02d1181fe..1d9410f8e2 100644 --- a/src/stores/BreadcrumbsStore.ts +++ b/src/stores/BreadcrumbsStore.ts @@ -137,6 +137,7 @@ export class BreadcrumbsStore extends AsyncStoreWithClient { @@ -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.1 +2.48.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 bae8a05..a901a4f 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 07d77a65ca5908941c04ccbbf4360c8836483ca9 Mon Sep 17 00:00:00 2001 +From 4a15440a64bee09928b844c3a8072ff6291c2117 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 74328af39b..f47afd8677 100644 +index ac7c36daa5..a0fafce7cb 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 74328af39b..f47afd8677 100644 /* FIXME THEME - Tint by CSS rather than referencing a duplicate asset */ -- -2.47.1 +2.48.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 7eef980..88664d3 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 75a848673bb41c52950ed4909cd2e417cddb1706 Mon Sep 17 00:00:00 2001 +From 058584a07a6640f9b30785c3c22937c13fedfcbb 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 f47afd8677..d8be5b1fba 100644 +index a0fafce7cb..dd681756c7 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 f47afd8677..d8be5b1fba 100644 @import "./_animations.pcss"; @import "./_spacing.pcss"; -- -2.47.1 +2.48.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 5da5b3d..94fc023 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 15d80dd710850e7b75dba1095bc1d4a97701661f Mon Sep 17 00:00:00 2001 +From e53d0af43fd013525967fad17b0d393df64b6824 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 @@ -8,7 +8,7 @@ Subject: No damn avatar background in room list 1 file changed, 3 insertions(+) diff --git a/src/components/structures/BackdropPanel.tsx b/src/components/structures/BackdropPanel.tsx -index 32c75a936e..f420bdbc7b 100644 +index 64b2ab0fce..d2045bd836 100644 --- a/src/components/structures/BackdropPanel.tsx +++ b/src/components/structures/BackdropPanel.tsx @@ -13,6 +13,9 @@ interface IProps { @@ -22,5 +22,5 @@ index 32c75a936e..f420bdbc7b 100644 const styles: CSSProperties = {}; -- -2.47.1 +2.48.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 36c0b4d..0daa5b9 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 141ca3e01393c75c5990ddbf78ec1a17f51829ae Mon Sep 17 00:00:00 2001 +From 37c21c10eb8d393e5f9724f14cddb94df749c8e3 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 8c755f00bd..172892a2c4 100644 +index 1d2983dd03..83cafe4528 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 8c755f00bd..172892a2c4 100644 } -- -2.47.1 +2.48.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 f5e2c43..964a832 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 bd799a3d2bea84efe06c705cad3481a0271abcd4 Mon Sep 17 00:00:00 2001 +From 08c316edf406d36de71822e0076c82d1e7bfcc84 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,7 +8,7 @@ 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 7b1af0c771..fbb1ad2e1b 100644 +index c25cbfcec4..682ea64890 100644 --- a/res/css/views/rooms/_EventBubbleTile.pcss +++ b/res/css/views/rooms/_EventBubbleTile.pcss @@ -283,6 +283,8 @@ Please see LICENSE files in the repository root for full details. @@ -57,5 +57,5 @@ index 7b1af0c771..fbb1ad2e1b 100644 } &.mx_EventTile_lastInSection[data-self="true"] .mx_EventTile_line { -- -2.47.1 +2.48.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 feb0981..97094e5 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 514da5ddfcb81ce800573012add6d558d659f56f Mon Sep 17 00:00:00 2001 +From f57b5221822b11a962c0ac6464497b640893fde9 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 31ad386869..70bccaa11f 100644 +index dfa65a4917..92585b3f16 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -618,7 +618,7 @@ export const SETTINGS: { [setting: string]: ISetting } = { +@@ -779,7 +779,7 @@ export const SETTINGS: Settings = { "alwaysShowTimestamps": { supportedLevels: LEVELS_ACCOUNT_SETTINGS, displayName: _td("settings|always_show_message_timestamps"), @@ -21,5 +21,5 @@ index 31ad386869..70bccaa11f 100644 "userTimezone": { supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS, -- -2.47.1 +2.48.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 0fa02bc..70eb435 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 52ab9a20a207010912292f06466fbd30fedce1ed Mon Sep 17 00:00:00 2001 +From 2239b6a765a7e0bbeb7373ba06ab444a319a9631 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 70bccaa11f..8ef323e588 100644 +index 92585b3f16..88d0548dc4 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -482,7 +482,7 @@ export const SETTINGS: { [setting: string]: ISetting } = { +@@ -643,7 +643,7 @@ export const SETTINGS: Settings = { description: _td("labs|render_reaction_images_description"), supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED, supportedLevelsAreOrdered: true, @@ -21,5 +21,5 @@ index 70bccaa11f..8ef323e588 100644 /** * With the transition to Compound we are moving to a base font size -- -2.47.1 +2.48.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 b38e7c5..6811154 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 1ecc64221c0b586830668f101863fbdb95240182 Mon Sep 17 00:00:00 2001 +From 906524fb3b12ab3a847379aa3ecd72cec93b0774 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Oct 2024 19:24:26 +0100 Subject: Enable chat previews by default @@ -8,7 +8,7 @@ Subject: Enable chat previews by default 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts -index 275b6d330b..3a188451e7 100644 +index 2792e57f8d..4f9d436bc8 100644 --- a/src/stores/room-list/ListLayout.ts +++ b/src/stores/room-list/ListLayout.ts @@ -18,7 +18,7 @@ interface ISerializedListLayout { @@ -21,5 +21,5 @@ index 275b6d330b..3a188451e7 100644 public constructor(public readonly tagId: TagID) { -- -2.47.1 +2.48.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 bfbbd96..b0d3b96 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 64e3e5aeb6a61e44a8892254ed8970d718fcfac5 Mon Sep 17 00:00:00 2001 +From 8f4ca3a428317d5bfa478ab0ee72074dcb111366 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 8ef323e588..cecc5ebe0b 100644 +index 88d0548dc4..8ad5546afb 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -1047,7 +1047,7 @@ export const SETTINGS: { [setting: string]: ISetting } = { +@@ -1208,7 +1208,7 @@ export const SETTINGS: Settings = { }, "Spaces.showPeopleInSpace": { supportedLevels: [SettingLevel.ROOM_ACCOUNT], @@ -22,7 +22,7 @@ index 8ef323e588..cecc5ebe0b 100644 "developerMode": { displayName: _td("devtools|developer_mode"), diff --git a/src/stores/room-list/filters/SpaceFilterCondition.ts b/src/stores/room-list/filters/SpaceFilterCondition.ts -index 8f652a35fb..da02328e89 100644 +index 7c4316ff21..4ffc0e67bf 100644 --- a/src/stores/room-list/filters/SpaceFilterCondition.ts +++ b/src/stores/room-list/filters/SpaceFilterCondition.ts @@ -25,7 +25,7 @@ import SettingsStore from "../../../settings/SettingsStore"; @@ -35,5 +35,5 @@ index 8f652a35fb..da02328e89 100644 public isVisible(room: Room): boolean { -- -2.47.1 +2.48.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 28f3be5..ba65e8c 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 e0e03f4f780055951b6e9bbe1f51459e20c81c3c Mon Sep 17 00:00:00 2001 +From 3331df28b4d40e94e73c051301261ac298074238 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 @@ -22,7 +22,7 @@ Date: Thu Nov 28 10:01:43 2024 -0500 3 files changed, 155 insertions(+), 10 deletions(-) diff --git a/res/css/views/elements/_GenericEventListSummary.pcss b/res/css/views/elements/_GenericEventListSummary.pcss -index c13f819439..4f42040606 100644 +index f4aa0e6f0f..88bcb88f14 100644 --- a/res/css/views/elements/_GenericEventListSummary.pcss +++ b/res/css/views/elements/_GenericEventListSummary.pcss @@ -1,5 +1,6 @@ @@ -31,7 +31,7 @@ index c13f819439..4f42040606 100644 +Copyright 2024 Suguru Hirahara Copyright 2016 OpenMarket Ltd - SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only + SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial @@ -36,6 +37,20 @@ Please see LICENSE files in the repository root for full details. } } @@ -54,7 +54,7 @@ index c13f819439..4f42040606 100644 margin-top: $spacing-8; } diff --git a/res/css/views/rooms/_EventTile.pcss b/res/css/views/rooms/_EventTile.pcss -index d405381db1..badc2399fa 100644 +index 5b86e3f753..03fbfe1a29 100644 --- a/res/css/views/rooms/_EventTile.pcss +++ b/res/css/views/rooms/_EventTile.pcss @@ -1,5 +1,6 @@ @@ -287,7 +287,7 @@ index d405381db1..badc2399fa 100644 &[data-layout="group"] { diff --git a/res/css/views/rooms/_IRCLayout.pcss b/res/css/views/rooms/_IRCLayout.pcss -index ecf1c25716..de85238ca6 100644 +index 953a0c941f..3326d0c0ff 100644 --- a/res/css/views/rooms/_IRCLayout.pcss +++ b/res/css/views/rooms/_IRCLayout.pcss @@ -1,5 +1,6 @@ @@ -296,7 +296,7 @@ index ecf1c25716..de85238ca6 100644 +Copyright 2024 Suguru Hirahara Copyright 2020 The Matrix.org Foundation C.I.C. - SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only + SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial @@ -15,6 +16,7 @@ Please see LICENSE files in the repository root for full details. --icon-width: 14px; --line-height: var(--irc-line-height); @@ -306,5 +306,5 @@ index ecf1c25716..de85238ca6 100644 line-height: var(--line-height) !important; -- -2.47.1 +2.48.1 From eff14caec34d1dbe11eb68aca9e14f4ac5df6b59 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 15 Mar 2025 16:56:27 +0100 Subject: [PATCH 10/11] Upstream 1.11.95 --- compound-web | 2 +- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- ...hildi-fetch-package.ts-modifications.patch | 2 +- ...0002-Change-default-login-background.patch | 6 +-- .../0003-Don-t-welcome-to-Element.patch | 2 +- ...ackground-to-ensure-contrast-of-our-.patch | 2 +- .../0005-Schildify-login-footer.patch | 4 +- .../0006-Disable-sticky-rooms.patch | 4 +- .../0007-Bring-back-unified-room-list.patch | 54 ++++++++++--------- ...-rooms-to-bottom-I-still-want-to-see.patch | 4 +- .../0009-Don-t-preview-reactions.patch | 6 +-- ...tification-state-the-same-way-as-the.patch | 4 +- ...llow-muted-rooms-to-render-as-unread.patch | 2 +- .../0012-Increase-default-visible-tiles.patch | 4 +- ...paceDMBadges-setting-force-enabled-f.patch | 20 +++---- ...m-reactions-from-tadzik-freeform-rea.patch | 33 ++++++------ ...5-Allow-reactions-to-take-more-space.patch | 2 +- ...don-t-automatically-show-last-opened.patch | 16 +++--- ...0017-Exclude-spaces-from-breadcrumbs.patch | 4 +- .../0018-Stop-the-search-bar-wobble.patch | 4 +- ...9-Import-SC-compound-theme-overrides.patch | 4 +- ...-damn-avatar-background-in-room-list.patch | 4 +- ...in-1-1-chats-Close-SchildiChat-schil.patch | 4 +- ...ner-radius-to-all-edges-of-the-bubbl.patch | 2 +- ...23-Always-show-timestamps-by-default.patch | 6 +-- ...le-custom-emote-rendering-by-default.patch | 10 ++-- ...0025-Enable-chat-previews-by-default.patch | 4 +- ...-showing-people-in-spaces-by-default.patch | 8 +-- ...7-Improve-IRC-layout-for-SchildiChat.patch | 20 +++---- 31 files changed, 124 insertions(+), 119 deletions(-) diff --git a/compound-web b/compound-web index 2614bf9..57ee5bf 160000 --- a/compound-web +++ b/compound-web @@ -1 +1 @@ -Subproject commit 2614bf94edcd71ed910e71ebcb5f61604221399c +Subproject commit 57ee5bfdf13c58ca3bcbc2d0eb2993d7b4a0b89d diff --git a/element-desktop b/element-desktop index e4333e0..7d95337 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit e4333e09f0040628e50e5606ad35ef27adb0670b +Subproject commit 7d95337b9b4847752b4d7ffac8a894c7bdc7d7ac diff --git a/element-web b/element-web index efecbbe..702182d 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit efecbbe9a2d907cd21656631b9ed00627cf0cf1f +Subproject commit 702182d503b5afdb262634384606797dde103a4d diff --git a/matrix-js-sdk b/matrix-js-sdk index 72ee550..5f3f080 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 72ee5504d5ab39dc40c4ba1a5601a90b7a6b3426 +Subproject commit 5f3f08071fbab8bc6af08b0d940189a513f572e2 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 44ef630..a509972 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 feed71908222cd43aaa7f86dfbca809511b3a310 Mon Sep 17 00:00:00 2001 +From 1f589d9bb0c332ccb55d51f824f707385d80fbc0 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/element-web/0002-Change-default-login-background.patch b/patches/element-web/0002-Change-default-login-background.patch index 4af14ea..e2f2135 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 52908abcd2599bc1d0d32996b8f3de0a40b33f9b Mon Sep 17 00:00:00 2001 +From 474c8a5e8b345fe8206b56b880b1421a5189b797 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,10 +22117,10 @@ index dd3facaa79..3c7fe2503e 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 d28c820d20..06cddc2677 100644 +index 5330d74520..1642300bc6 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 +@@ -118,7 +118,7 @@ export default class HelpUserSettingsTab extends React.Component ( Date: Sun, 27 Oct 2024 19:38:47 +0100 Subject: Don't welcome to Element 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 b8edb08..1c37ebe 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 0ec5e88ed052f645796ca8b258bbcb474ac54ae8 Mon Sep 17 00:00:00 2001 +From 61fd7f169e275a27d168d1afe436c5dd34dbc09a 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 diff --git a/patches/element-web/0005-Schildify-login-footer.patch b/patches/element-web/0005-Schildify-login-footer.patch index 7d3d053..b994c3b 100644 --- a/patches/element-web/0005-Schildify-login-footer.patch +++ b/patches/element-web/0005-Schildify-login-footer.patch @@ -1,4 +1,4 @@ -From fc68141219ce4367db44ad05aa89c9367c894856 Mon Sep 17 00:00:00 2001 +From 460db57d64132c244504f2f046f7473b30359e7d Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Oct 2024 20:07:30 +0100 Subject: Schildify login footer @@ -8,7 +8,7 @@ Subject: Schildify login footer 1 file changed, 4 insertions(+) diff --git a/src/components/views/auth/AuthFooter.tsx b/src/components/views/auth/AuthFooter.tsx -index 472ff53f09..9f694aef42 100644 +index f609b4792a..8abcc8fa37 100644 --- a/src/components/views/auth/AuthFooter.tsx +++ b/src/components/views/auth/AuthFooter.tsx @@ -15,9 +15,13 @@ import { _t } from "../../../languageHandler"; diff --git a/patches/element-web/0006-Disable-sticky-rooms.patch b/patches/element-web/0006-Disable-sticky-rooms.patch index b946bb7..f36c9b3 100644 --- a/patches/element-web/0006-Disable-sticky-rooms.patch +++ b/patches/element-web/0006-Disable-sticky-rooms.patch @@ -1,4 +1,4 @@ -From 6c8b5594b57b22cb3e195d9e28a6843a0c36611d Mon Sep 17 00:00:00 2001 +From 12b585464c5d85df4d210862543018a28b815bd0 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 18 Jan 2022 13:28:22 +0100 Subject: Disable sticky rooms @@ -8,7 +8,7 @@ Subject: Disable sticky rooms 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts -index 2ae3a1ff99..e0f5a17130 100644 +index 5419a6e47c..25d6b78fde 100644 --- a/src/stores/room-list/algorithms/Algorithm.ts +++ b/src/stores/room-list/algorithms/Algorithm.ts @@ -159,8 +159,10 @@ export class Algorithm extends EventEmitter { 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 e83809b..b52cd8f 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 4cad8ad554645e437ba9a486734247257d577f43 Mon Sep 17 00:00:00 2001 +From c14f17a15c7a4f22126eba9a92a417732fe3f659 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 5 May 2024 10:12:17 +0200 Subject: Bring back unified room list @@ -8,18 +8,18 @@ Remaining TODO: Co-authored-by: su-ex --- - src/components/views/rooms/RoomList.tsx | 39 +++++++++++++++++++- - src/settings/Settings.tsx | 8 ++++ - src/stores/room-list/RoomListStore.ts | 19 +++++++++- - src/stores/room-list/algorithms/Algorithm.ts | 20 ++++++++-- - src/stores/room-list/models.ts | 2 + + src/components/views/rooms/LegacyRoomList.tsx | 39 ++++++++++++++++++- + src/settings/Settings.tsx | 8 ++++ + src/stores/room-list/RoomListStore.ts | 19 ++++++++- + src/stores/room-list/algorithms/Algorithm.ts | 20 ++++++++-- + src/stores/room-list/models.ts | 2 + 5 files changed, 83 insertions(+), 5 deletions(-) -diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx -index fed1826bbb..ea4d54d5e8 100644 ---- a/src/components/views/rooms/RoomList.tsx -+++ b/src/components/views/rooms/RoomList.tsx -@@ -72,11 +72,13 @@ interface IState { +diff --git a/src/components/views/rooms/LegacyRoomList.tsx b/src/components/views/rooms/LegacyRoomList.tsx +index a940484b16..663f741fed 100644 +--- a/src/components/views/rooms/LegacyRoomList.tsx ++++ b/src/components/views/rooms/LegacyRoomList.tsx +@@ -83,11 +83,13 @@ interface IState { sublists: ITagMap; currentRoomId?: string; suggestedRooms: ISuggestedRoom[]; @@ -33,7 +33,7 @@ index fed1826bbb..ea4d54d5e8 100644 DefaultTagID.DM, DefaultTagID.Untagged, DefaultTagID.Conference, -@@ -89,6 +91,7 @@ export const TAG_ORDER: TagID[] = [ +@@ -100,6 +102,7 @@ export const TAG_ORDER: TagID[] = [ // but we'd have to make sure that rooms you weren't in were hidden. ]; const ALWAYS_VISIBLE_TAGS: TagID[] = [DefaultTagID.DM, DefaultTagID.Untagged]; @@ -41,7 +41,7 @@ index fed1826bbb..ea4d54d5e8 100644 interface ITagAesthetics { sectionLabel: TranslationKey; -@@ -366,6 +369,17 @@ const UntaggedAuxButton: React.FC = ({ tabIndex }) => { +@@ -377,6 +380,17 @@ const UntaggedAuxButton: React.FC = ({ tabIndex }) => { return null; }; @@ -59,7 +59,7 @@ index fed1826bbb..ea4d54d5e8 100644 const TAG_AESTHETICS: TagAestheticsMap = { [DefaultTagID.Invite]: { sectionLabel: _td("action|invites_list"), -@@ -383,6 +397,12 @@ const TAG_AESTHETICS: TagAestheticsMap = { +@@ -394,6 +408,12 @@ const TAG_AESTHETICS: TagAestheticsMap = { defaultHidden: false, AuxButtonComponent: DmAuxButton, }, @@ -72,15 +72,15 @@ index fed1826bbb..ea4d54d5e8 100644 [DefaultTagID.Conference]: { sectionLabel: _td("voip|metaspace_video_rooms|conference_room_section"), isInvite: false, -@@ -421,6 +441,7 @@ const TAG_AESTHETICS: TagAestheticsMap = { +@@ -432,6 +452,7 @@ const TAG_AESTHETICS: TagAestheticsMap = { - export default class RoomList extends React.PureComponent { + export default class LegacyRoomList extends React.PureComponent { private dispatcherRef?: string; + private readonly unifiedRoomListWatcherRef: string; private treeRef = createRef(); public static contextType = MatrixClientContext; -@@ -432,7 +453,14 @@ export default class RoomList extends React.PureComponent { +@@ -443,7 +464,14 @@ export default class LegacyRoomList extends React.PureComponent this.state = { sublists: {}, suggestedRooms: SpaceStore.instance.suggestedRooms, @@ -95,13 +95,17 @@ index fed1826bbb..ea4d54d5e8 100644 } public componentDidMount(): void { -@@ -447,9 +475,16 @@ export default class RoomList extends React.PureComponent { +@@ -459,6 +487,7 @@ export default class LegacyRoomList extends React.PureComponent SpaceStore.instance.off(UPDATE_SUGGESTED_ROOMS, this.updateSuggestedRooms); RoomListStore.instance.off(LISTS_UPDATE_EVENT, this.updateLists); defaultDispatcher.unregister(this.dispatcherRef); + SettingsStore.unwatchSetting(this.unifiedRoomListWatcherRef); SdkContextClass.instance.roomViewStore.off(UPDATE_EVENT, this.onRoomViewStoreUpdate); + LegacyCallHandler.instance.off(LegacyCallHandlerEvent.ProtocolSupport, this.updateProtocolSupport); } +@@ -467,6 +496,12 @@ export default class LegacyRoomList extends React.PureComponent + this.updateLists(); + }; + private onUnifiedRoomListChange = (): void => { + this.setState({ @@ -112,7 +116,7 @@ index fed1826bbb..ea4d54d5e8 100644 private onRoomViewStoreUpdate = (): void => { this.setState({ currentRoomId: SdkContextClass.instance.roomViewStore.getRoomId() ?? undefined, -@@ -590,7 +625,9 @@ export default class RoomList extends React.PureComponent { +@@ -605,7 +640,9 @@ export default class LegacyRoomList extends React.PureComponent const aesthetics = TAG_AESTHETICS[orderedTagId]; if (!aesthetics) throw new Error(`Tag ${orderedTagId} does not have aesthetics`); @@ -124,10 +128,10 @@ index fed1826bbb..ea4d54d5e8 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 9c4bb76f9f..2431a8d528 100644 +index 439b0c112f..5d06388535 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -353,6 +353,14 @@ export type FeatureSettingKey = Assignable; +@@ -351,6 +351,14 @@ export type FeatureSettingKey = Assignable; export type BooleanSettingKey = Assignable> | FeatureSettingKey; export const SETTINGS: Settings = { @@ -143,10 +147,10 @@ index 9c4bb76f9f..2431a8d528 100644 isFeature: true, labsGroup: LabGroup.VoiceAndVideo, diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts -index 0b179f7db5..6d1def3c87 100644 +index e1d2f7b7e8..64c757c377 100644 --- a/src/stores/room-list/RoomListStore.ts +++ b/src/stores/room-list/RoomListStore.ts -@@ -500,6 +500,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient implements +@@ -502,6 +502,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient implem this.setAndPersistListOrder(tag, listOrder); } } @@ -156,7 +160,7 @@ index 0b179f7db5..6d1def3c87 100644 } private onAlgorithmListUpdated = (forceUpdate: boolean): void => { -@@ -613,7 +616,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient implements +@@ -615,7 +618,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient implem */ public getTagsForRoom(room: Room): TagID[] { const algorithmTags = this.algorithm.getTagsForRoom(room); @@ -180,7 +184,7 @@ index 0b179f7db5..6d1def3c87 100644 } diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts -index e0f5a17130..5411ad49fc 100644 +index 25d6b78fde..f3fc3899d0 100644 --- a/src/stores/room-list/algorithms/Algorithm.ts +++ b/src/stores/room-list/algorithms/Algorithm.ts @@ -75,6 +75,7 @@ export class Algorithm extends EventEmitter { 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 1a349bc..8d807ab 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 3023a83c05387fd322420f8bea8fa97c1bcef85d Mon Sep 17 00:00:00 2001 +From 2180196ba74a9526d0a68ad17328631d9b661cd2 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. @@ -8,7 +8,7 @@ Subject: Don't sort muted rooms to bottom, I still want to see them. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts -index 5cf7631cfe..81b335e3d2 100644 +index 0f95fe78c2..2de554c357 100644 --- a/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts +++ b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts @@ -38,7 +38,7 @@ export abstract class OrderingAlgorithm { diff --git a/patches/element-web/0009-Don-t-preview-reactions.patch b/patches/element-web/0009-Don-t-preview-reactions.patch index 3257f7e..a5bb171 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 a80b770c4ba54d653ab9249ce7af18908d0c577e Mon Sep 17 00:00:00 2001 +From 27d4baaaf19f3d80ec7d5617e54bd7621090d6a4 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 3f1614df70..29c71fcc69 100644 +index 51e413940d..7775d1e52a 100644 --- a/src/stores/room-list/MessagePreviewStore.ts +++ b/src/stores/room-list/MessagePreviewStore.ts -@@ -55,10 +55,12 @@ const PREVIEWS: Record< +@@ -63,10 +63,12 @@ const PREVIEWS: Record< isState: false, previewer: new StickerEventPreview(), }, 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 fabd6a8..d897a59 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 79080d4521da718362deb31c1d01b0e0a40124c2 Mon Sep 17 00:00:00 2001 +From db8b600a3695f35e70cb0c2a9f6b3cba99d2bfae 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,7 +11,7 @@ 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 cbeb562077..3d893f5fe0 100644 +index 3eafb671cb..c9dcd00fd0 100644 --- a/src/components/views/rooms/RoomTile.tsx +++ b/src/components/views/rooms/RoomTile.tsx @@ -300,7 +300,9 @@ class RoomTile extends React.PureComponent { 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 a10a2c5..ec42ede 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 76daaebf1462651e4156e8b73bcaa15d7922ffc3 Mon Sep 17 00:00:00 2001 +From 773a15b9d4a880d4fa9ddf06bda99c6d15316bb4 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/element-web/0012-Increase-default-visible-tiles.patch b/patches/element-web/0012-Increase-default-visible-tiles.patch index 1414c4b..23ca8ad 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 aa4a0d3e9ce9d4031ebaa38b9568aa434ce9cbe5 Mon Sep 17 00:00:00 2001 +From 52ee72a4f5ba98cee0eb6ce60aaac29daa2ce119 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 30 Aug 2020 15:33:01 +0200 Subject: Increase default visible tiles @@ -8,7 +8,7 @@ Subject: Increase default visible tiles 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts -index e85703fa5f..2792e57f8d 100644 +index a4468dfffe..a4ae9bbc1d 100644 --- a/src/stores/room-list/ListLayout.ts +++ b/src/stores/room-list/ListLayout.ts @@ -74,7 +74,7 @@ export class ListLayout { 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 f67dc19..190eb9b 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 713dafdaa9935d3a2cb419f6c9b4621b9ebe92d3 Mon Sep 17 00:00:00 2001 +From 75cf379cff65aa966ad3fc1acc5371c96e19c121 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 2431a8d528..45e1145c0f 100644 +index 5d06388535..5ca4cbc3e8 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -360,6 +360,11 @@ export const SETTINGS: Settings = { +@@ -358,6 +358,11 @@ export const SETTINGS: Settings = { default: true, controller: new ReloadOnChangeController(), }, @@ -28,12 +28,12 @@ index 2431a8d528..45e1145c0f 100644 "feature_video_rooms": { isFeature: true, diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts -index 50aa7748a5..f11cc20b0c 100644 +index 690beaa0b7..fcd7ff659b 100644 --- a/src/stores/spaces/SpaceStore.ts +++ b/src/stores/spaces/SpaceStore.ts -@@ -154,9 +154,17 @@ export class SpaceStoreClass extends AsyncStoreWithClient { - /** Whether the feature flag is set for MSC3946 */ +@@ -155,9 +155,17 @@ export class SpaceStoreClass extends AsyncStoreWithClient { private _msc3946ProcessDynamicPredecessor: boolean = SettingsStore.getValue("feature_dynamic_room_predecessors"); + private _storeReadyDeferred = defer(); + // SC start + private _showSpaceDMBadges = true; @@ -49,7 +49,7 @@ index 50aa7748a5..f11cc20b0c 100644 SettingsStore.monitorSetting("Spaces.allRoomsInHome", null); SettingsStore.monitorSetting("Spaces.enabledMetaSpaces", null); SettingsStore.monitorSetting("Spaces.showPeopleInSpace", null); -@@ -192,6 +200,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient { +@@ -215,6 +223,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient { return this._allRoomsInHome; } @@ -60,7 +60,7 @@ index 50aa7748a5..f11cc20b0c 100644 public setActiveRoomInSpace(space: SpaceKey): void { if (!isMetaSpace(space) && !this.matrixClient?.getRoom(space)?.isSpaceRoom()) return; if (space !== this.activeSpace) this.setActiveSpace(space, false); -@@ -701,6 +713,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient { +@@ -724,6 +736,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient { if (room.isSpaceRoom() || !flattenedRoomsForSpace.has(room.roomId)) return false; @@ -71,7 +71,7 @@ index 50aa7748a5..f11cc20b0c 100644 if (dmBadgeSpace && DMRoomMap.shared().getUserIdForRoomId(room.roomId)) { return s === dmBadgeSpace; } -@@ -1277,6 +1293,15 @@ export class SpaceStoreClass extends AsyncStoreWithClient { +@@ -1301,6 +1317,15 @@ export class SpaceStoreClass extends AsyncStoreWithClient { break; } @@ -86,7 +86,7 @@ index 50aa7748a5..f11cc20b0c 100644 + case "Spaces.enabledMetaSpaces": { const newValue = SettingsStore.getValue("Spaces.enabledMetaSpaces"); - const enabledMetaSpaces = metaSpaceOrder.filter((k) => newValue[k]); + const enabledMetaSpaces = this.metaSpaceOrder.filter((k) => newValue[k]); -- 2.48.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 3e01ed9..d155739 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 34991cb7a32166efbfab4f09f05f2874180751ae Mon Sep 17 00:00:00 2001 +From dbd02e7c0b1c63d432adb2d78c4ed5cb701092f7 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 @@ -66,23 +66,24 @@ Date: Tue Aug 17 11:29:22 2021 +0200 Signed-off-by: Tadeusz SoĊ›nierz --- - src/components/views/emojipicker/EmojiPicker.tsx | 15 +++++++++++++++ - .../views/emojipicker/ReactionPicker.tsx | 1 + - 2 files changed, 16 insertions(+) + src/components/views/emojipicker/EmojiPicker.tsx | 16 ++++++++++++++++ + .../views/emojipicker/ReactionPicker.tsx | 1 + + 2 files changed, 17 insertions(+) diff --git a/src/components/views/emojipicker/EmojiPicker.tsx b/src/components/views/emojipicker/EmojiPicker.tsx -index 0c10d778a6..250c8e0fec 100644 +index 71659d579b..4acbfd1fcb 100644 --- a/src/components/views/emojipicker/EmojiPicker.tsx +++ b/src/components/views/emojipicker/EmojiPicker.tsx -@@ -17,6 +17,7 @@ import Header from "./Header"; - import Search from "./Search"; - import Preview from "./Preview"; - import QuickReactions from "./QuickReactions"; +@@ -29,6 +29,8 @@ import { Key } from "../../../Keyboard"; + import { clamp } from "../../../utils/numbers"; + import { type ButtonEvent } from "../elements/AccessibleButton"; + +import AccessibleButton from '../elements/AccessibleButton'; - import Category, { CategoryKey, ICategory } from "./Category"; - import { filterBoolean } from "../../../utils/arrays"; - import { -@@ -36,6 +37,7 @@ export const EMOJIS_PER_ROW = 8; ++ + export const CATEGORY_HEADER_HEIGHT = 20; + export const EMOJI_HEIGHT = 35; + export const EMOJIS_PER_ROW = 8; +@@ -36,6 +38,7 @@ export const EMOJIS_PER_ROW = 8; const ZERO_WIDTH_JOINER = "\u200D"; interface IProps { @@ -90,7 +91,7 @@ index 0c10d778a6..250c8e0fec 100644 selectedEmojis?: Set; onChoose(unicode: string): boolean; onFinished(): void; -@@ -337,6 +339,10 @@ class EmojiPicker extends React.Component { +@@ -337,6 +340,10 @@ class EmojiPicker extends React.Component { } }; @@ -101,7 +102,7 @@ index 0c10d778a6..250c8e0fec 100644 private static categoryHeightForEmojiCount(count: number): number { if (count === 0) { return 0; -@@ -392,6 +398,15 @@ class EmojiPicker extends React.Component { +@@ -392,6 +399,15 @@ class EmojiPicker extends React.Component { return categoryElement; })} @@ -118,7 +119,7 @@ index 0c10d778a6..250c8e0fec 100644 ) : ( diff --git a/src/components/views/emojipicker/ReactionPicker.tsx b/src/components/views/emojipicker/ReactionPicker.tsx -index ea1a502942..e49b7e33cd 100644 +index 8509b4014a..5e9ea0fd60 100644 --- a/src/components/views/emojipicker/ReactionPicker.tsx +++ b/src/components/views/emojipicker/ReactionPicker.tsx @@ -126,6 +126,7 @@ class ReactionPicker extends React.Component { 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 75c0464..da3ce4a 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 3749bf8941ea426d395fd0c15742b235b5798e8e Mon Sep 17 00:00:00 2001 +From fcc37848fb0e949888a77325a4990639a3661d8e 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/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 3713b23..8274488 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 51bf3a238471a9c54ae19dd1abe527a60b0d798d Mon Sep 17 00:00:00 2001 +From e9975388c5e2071240b8e16b122100f532aee10a 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 f417bd6045..6c6b7e2285 100644 +index 3d802d34ad..e90667898b 100644 --- a/src/components/structures/MatrixChat.tsx +++ b/src/components/structures/MatrixChat.tsx -@@ -1453,7 +1453,15 @@ export default class MatrixChat extends React.PureComponent { +@@ -1454,7 +1454,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 f417bd6045..6c6b7e2285 100644 // Before defaulting to directory, show the last viewed room this.viewLastRoom(); } else { -@@ -1465,6 +1473,14 @@ export default class MatrixChat extends React.PureComponent { +@@ -1466,6 +1474,14 @@ export default class MatrixChat extends React.PureComponent { } } @@ -46,10 +46,10 @@ index f417bd6045..6c6b7e2285 100644 dis.dispatch({ action: Action.ViewRoom, diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index 45e1145c0f..dfa65a4917 100644 +index 5ca4cbc3e8..80ada478ba 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -365,6 +365,12 @@ export const SETTINGS: Settings = { +@@ -363,6 +363,12 @@ export const SETTINGS: Settings = { supportedLevels: LEVELS_ACCOUNT_SETTINGS, default: true, }, @@ -63,10 +63,10 @@ index 45e1145c0f..dfa65a4917 100644 "feature_video_rooms": { isFeature: true, diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts -index f11cc20b0c..bce2146d4e 100644 +index fcd7ff659b..33407f74e8 100644 --- a/src/stores/spaces/SpaceStore.ts +++ b/src/stores/spaces/SpaceStore.ts -@@ -265,6 +265,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient { +@@ -288,6 +288,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient { // else if the last viewed room in this space is joined then view that // else view space home or home depending on what is being clicked on if ( diff --git a/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch b/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch index a17176b..e5c3abb 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 df60ede5a07c6d13651844cd706ae63671684ffd Mon Sep 17 00:00:00 2001 +From bfe58ad4c742484429495dda65fdfd26302270c3 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 9 Aug 2022 09:32:19 +0200 Subject: Exclude spaces from breadcrumbs @@ -8,7 +8,7 @@ Subject: Exclude spaces from breadcrumbs 1 file changed, 1 insertion(+) diff --git a/src/stores/BreadcrumbsStore.ts b/src/stores/BreadcrumbsStore.ts -index c02d1181fe..1d9410f8e2 100644 +index e3b01cae0b..02f6c286f2 100644 --- a/src/stores/BreadcrumbsStore.ts +++ b/src/stores/BreadcrumbsStore.ts @@ -137,6 +137,7 @@ export class BreadcrumbsStore extends AsyncStoreWithClient { 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 a901a4f..bd5f65f 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 4a15440a64bee09928b844c3a8072ff6291c2117 Mon Sep 17 00:00:00 2001 +From b97e37b1f5e4ad33cf044f5371e91955cafc4b55 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 ac7c36daa5..a0fafce7cb 100644 +index 75180013f6..e55eadaaf7 100644 --- a/res/css/_common.pcss +++ b/res/css/_common.pcss @@ -181,6 +181,7 @@ input[type="search"].mx_textinput_icon { 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 88664d3..0904851 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 058584a07a6640f9b30785c3c22937c13fedfcbb Mon Sep 17 00:00:00 2001 +From d37ddfc40426f200c9fcaa4298c5cf9921fb9025 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 a0fafce7cb..dd681756c7 100644 +index e55eadaaf7..21d0f1d83a 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. 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 94fc023..7b7a614 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 e53d0af43fd013525967fad17b0d393df64b6824 Mon Sep 17 00:00:00 2001 +From 51cc5b9086927db3a9c3aa21e59a6f0d7e8fc761 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 @@ -8,7 +8,7 @@ Subject: No damn avatar background in room list 1 file changed, 3 insertions(+) diff --git a/src/components/structures/BackdropPanel.tsx b/src/components/structures/BackdropPanel.tsx -index 64b2ab0fce..d2045bd836 100644 +index f3a44521fa..396601ba6e 100644 --- a/src/components/structures/BackdropPanel.tsx +++ b/src/components/structures/BackdropPanel.tsx @@ -13,6 +13,9 @@ interface IProps { 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 0daa5b9..0c22dd2 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 37c21c10eb8d393e5f9724f14cddb94df749c8e3 Mon Sep 17 00:00:00 2001 +From 50e71f22ccf8640b8cef718a3389b878602dd1d4 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 1d2983dd03..83cafe4528 100644 +index 17d09b661d..214514686f 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 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 964a832..8fd5766 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 08c316edf406d36de71822e0076c82d1e7bfcc84 Mon Sep 17 00:00:00 2001 +From df6840270f2b8c6c1c1b5aaf430fa78f016b1a56 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/element-web/0023-Always-show-timestamps-by-default.patch b/patches/element-web/0023-Always-show-timestamps-by-default.patch index 97094e5..38d6928 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 f57b5221822b11a962c0ac6464497b640893fde9 Mon Sep 17 00:00:00 2001 +From 89c6003be2e9510be12640809a316278816f1837 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 dfa65a4917..92585b3f16 100644 +index 80ada478ba..e41c19b750 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -779,7 +779,7 @@ export const SETTINGS: Settings = { +@@ -786,7 +786,7 @@ export const SETTINGS: Settings = { "alwaysShowTimestamps": { supportedLevels: LEVELS_ACCOUNT_SETTINGS, displayName: _td("settings|always_show_message_timestamps"), 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 70eb435..ef742d1 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 2239b6a765a7e0bbeb7373ba06ab444a319a9631 Mon Sep 17 00:00:00 2001 +From 2f4546aaca472f4ac2304fc5b5bdcb36c9a380c6 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,18 +8,18 @@ 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 92585b3f16..88d0548dc4 100644 +index e41c19b750..276d72cf23 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -643,7 +643,7 @@ export const SETTINGS: Settings = { +@@ -641,7 +641,7 @@ export const SETTINGS: Settings = { description: _td("labs|render_reaction_images_description"), supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED, supportedLevelsAreOrdered: true, - default: false, + default: true, }, - /** - * With the transition to Compound we are moving to a base font size + "feature_new_room_list": { + supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED, -- 2.48.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 6811154..f491447 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 906524fb3b12ab3a847379aa3ecd72cec93b0774 Mon Sep 17 00:00:00 2001 +From 9b7345671c0910cf9d6ca3710a4cd9f5126fe186 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Oct 2024 19:24:26 +0100 Subject: Enable chat previews by default @@ -8,7 +8,7 @@ Subject: Enable chat previews by default 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts -index 2792e57f8d..4f9d436bc8 100644 +index a4ae9bbc1d..227c918457 100644 --- a/src/stores/room-list/ListLayout.ts +++ b/src/stores/room-list/ListLayout.ts @@ -18,7 +18,7 @@ interface ISerializedListLayout { 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 b0d3b96..18b1f27 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 8f4ca3a428317d5bfa478ab0ee72074dcb111366 Mon Sep 17 00:00:00 2001 +From 1d3a914d447e6ccae5ad13ac4438aa979610946e 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 88d0548dc4..8ad5546afb 100644 +index 276d72cf23..4de889b562 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -1208,7 +1208,7 @@ export const SETTINGS: Settings = { +@@ -1206,7 +1206,7 @@ export const SETTINGS: Settings = { }, "Spaces.showPeopleInSpace": { supportedLevels: [SettingLevel.ROOM_ACCOUNT], @@ -22,7 +22,7 @@ index 88d0548dc4..8ad5546afb 100644 "developerMode": { displayName: _td("devtools|developer_mode"), diff --git a/src/stores/room-list/filters/SpaceFilterCondition.ts b/src/stores/room-list/filters/SpaceFilterCondition.ts -index 7c4316ff21..4ffc0e67bf 100644 +index 02e20e9103..2b49711c8e 100644 --- a/src/stores/room-list/filters/SpaceFilterCondition.ts +++ b/src/stores/room-list/filters/SpaceFilterCondition.ts @@ -25,7 +25,7 @@ import SettingsStore from "../../../settings/SettingsStore"; 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 ba65e8c..becbca1 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 3331df28b4d40e94e73c051301261ac298074238 Mon Sep 17 00:00:00 2001 +From 1784aaa9b523c5f02b089ed08847bb8d07240570 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 @@ -54,7 +54,7 @@ index f4aa0e6f0f..88bcb88f14 100644 margin-top: $spacing-8; } diff --git a/res/css/views/rooms/_EventTile.pcss b/res/css/views/rooms/_EventTile.pcss -index 5b86e3f753..03fbfe1a29 100644 +index 54f91bd5f4..952f267902 100644 --- a/res/css/views/rooms/_EventTile.pcss +++ b/res/css/views/rooms/_EventTile.pcss @@ -1,5 +1,6 @@ @@ -64,7 +64,7 @@ index 5b86e3f753..03fbfe1a29 100644 Copyright 2020, 2021 The Matrix.org Foundation C.I.C. Copyright 2015, 2016 OpenMarket Ltd -@@ -279,6 +280,10 @@ $left-gutter: 64px; +@@ -273,6 +274,10 @@ $left-gutter: 64px; align-items: flex-start; padding-top: 0; @@ -75,7 +75,7 @@ index 5b86e3f753..03fbfe1a29 100644 > a { text-decoration: none; /* timestamps are links which shouldn't be underlined */ min-width: var(--MessageTimestamp-width); /* ensure space for EventTile without timestamp */ -@@ -286,6 +291,7 @@ $left-gutter: 64px; +@@ -280,6 +285,7 @@ $left-gutter: 64px; > * { margin-right: var(--right-padding); @@ -83,7 +83,7 @@ index 5b86e3f753..03fbfe1a29 100644 } .mx_EventTile_avatar, -@@ -321,17 +327,46 @@ $left-gutter: 64px; +@@ -315,17 +321,46 @@ $left-gutter: 64px; width: var(--name-width); margin-inline-end: 0; /* override mx_EventTile > * */ @@ -131,7 +131,7 @@ index 5b86e3f753..03fbfe1a29 100644 } &:hover { -@@ -343,17 +378,68 @@ $left-gutter: 64px; +@@ -337,17 +372,68 @@ $left-gutter: 64px; display: inline; background-color: $event-selected-color; border-radius: 8px 0 0 8px; @@ -202,7 +202,7 @@ index 5b86e3f753..03fbfe1a29 100644 .mx_EventTile_e2eIcon { padding: 0; flex-grow: 0; -@@ -365,9 +451,8 @@ $left-gutter: 64px; +@@ -359,9 +445,8 @@ $left-gutter: 64px; .mx_TextualEvent, .mx_ViewSourceEvent, .mx_MTextBody { @@ -214,7 +214,7 @@ index 5b86e3f753..03fbfe1a29 100644 } .mx_EventTile_e2eIcon, -@@ -405,8 +490,36 @@ $left-gutter: 64px; +@@ -399,8 +484,36 @@ $left-gutter: 64px; } } @@ -253,7 +253,7 @@ index 5b86e3f753..03fbfe1a29 100644 } .mx_MessageTimestamp { -@@ -459,8 +572,14 @@ $left-gutter: 64px; +@@ -453,8 +566,14 @@ $left-gutter: 64px; &.mx_EventTile_emote { .mx_EventTile_avatar { @@ -270,7 +270,7 @@ index 5b86e3f753..03fbfe1a29 100644 } } -@@ -642,6 +761,15 @@ $left-gutter: 64px; +@@ -636,6 +755,15 @@ $left-gutter: 64px; var(--name-width) + var(--icon-width) + var(--MessageTimestamp-width) + 2 * var(--right-padding) ); } From 4294ce2478bd6dde7569fdd40399c429d3be3a28 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Wed, 16 Apr 2025 20:17:54 +0200 Subject: [PATCH 11/11] Upstream .97 --- compound-web | 2 +- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- ...childi-fetch-package.ts-modifications.patch | 4 ++-- .../0002-Change-default-login-background.patch | 6 +++--- .../0003-Don-t-welcome-to-Element.patch | 4 ++-- ...background-to-ensure-contrast-of-our-.patch | 4 ++-- .../0005-Schildify-login-footer.patch | 6 +++--- .../0006-Disable-sticky-rooms.patch | 4 ++-- .../0007-Bring-back-unified-room-list.patch | 18 +++++++++--------- ...d-rooms-to-bottom-I-still-want-to-see.patch | 4 ++-- .../0009-Don-t-preview-reactions.patch | 4 ++-- ...otification-state-the-same-way-as-the.patch | 4 ++-- ...Allow-muted-rooms-to-render-as-unread.patch | 10 +++++----- .../0012-Increase-default-visible-tiles.patch | 4 ++-- ...SpaceDMBadges-setting-force-enabled-f.patch | 8 ++++---- ...rm-reactions-from-tadzik-freeform-rea.patch | 6 +++--- ...15-Allow-reactions-to-take-more-space.patch | 4 ++-- ...-don-t-automatically-show-last-opened.patch | 14 +++++++------- .../0017-Exclude-spaces-from-breadcrumbs.patch | 4 ++-- .../0018-Stop-the-search-bar-wobble.patch | 4 ++-- ...19-Import-SC-compound-theme-overrides.patch | 4 ++-- ...o-damn-avatar-background-in-room-list.patch | 4 ++-- ...-in-1-1-chats-Close-SchildiChat-schil.patch | 8 ++++---- ...rner-radius-to-all-edges-of-the-bubbl.patch | 4 ++-- ...023-Always-show-timestamps-by-default.patch | 8 ++++---- ...ble-custom-emote-rendering-by-default.patch | 8 ++++---- .../0025-Enable-chat-previews-by-default.patch | 4 ++-- ...e-showing-people-in-spaces-by-default.patch | 8 ++++---- ...27-Improve-IRC-layout-for-SchildiChat.patch | 6 +++--- 31 files changed, 87 insertions(+), 87 deletions(-) diff --git a/compound-web b/compound-web index 57ee5bf..21c9660 160000 --- a/compound-web +++ b/compound-web @@ -1 +1 @@ -Subproject commit 57ee5bfdf13c58ca3bcbc2d0eb2993d7b4a0b89d +Subproject commit 21c96607d1304aebf422bc64510ca4fa9fba520a diff --git a/element-desktop b/element-desktop index 7d95337..6ecb5b9 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 7d95337b9b4847752b4d7ffac8a894c7bdc7d7ac +Subproject commit 6ecb5b93427770117bafd283c072d9169f68e06d diff --git a/element-web b/element-web index 702182d..27bdedd 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 702182d503b5afdb262634384606797dde103a4d +Subproject commit 27bdedd5447d7070b97ecfbfd224d786a7cc4504 diff --git a/matrix-js-sdk b/matrix-js-sdk index 5f3f080..f7bab54 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 5f3f08071fbab8bc6af08b0d940189a513f572e2 +Subproject commit f7bab544a795bd8c0cba919d8b261ea639518f49 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 a509972..dd6638f 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 1f589d9bb0c332ccb55d51f824f707385d80fbc0 Mon Sep 17 00:00:00 2001 +From 23c8be7b910bc0532850d4fe87dd810e8f556ad9 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.48.1 +2.49.0 diff --git a/patches/element-web/0002-Change-default-login-background.patch b/patches/element-web/0002-Change-default-login-background.patch index e2f2135..cc56dec 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 474c8a5e8b345fe8206b56b880b1421a5189b797 Mon Sep 17 00:00:00 2001 +From e1d54c00c828581c54de7db81a3822fe40f0da0f 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 dd3facaa79..3c7fe2503e 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 5330d74520..1642300bc6 100644 +index ef0d6e57fc..bfc0c58a68 100644 --- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx @@ -118,7 +118,7 @@ export default class HelpUserSettingsTab extends React.Component -- -2.48.1 +2.49.0 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 6423dbf..559b6f6 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 c3cf43a61f54bb688b32c881564a181485170013 Mon Sep 17 00:00:00 2001 +From 0d8678e982413d2a76d3e842e314fe173ed70b3c 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.48.1 +2.49.0 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 1c37ebe..61dc861 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 61fd7f169e275a27d168d1afe436c5dd34dbc09a Mon Sep 17 00:00:00 2001 +From 6385be0c76621d18084d54b83089ccb67c096513 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 3c7fe2503e..64163e837c 100644 }; -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0005-Schildify-login-footer.patch b/patches/element-web/0005-Schildify-login-footer.patch index b994c3b..2eb03eb 100644 --- a/patches/element-web/0005-Schildify-login-footer.patch +++ b/patches/element-web/0005-Schildify-login-footer.patch @@ -1,4 +1,4 @@ -From 460db57d64132c244504f2f046f7473b30359e7d Mon Sep 17 00:00:00 2001 +From 4984dc854d97121ba311ae4cc19bbb638f716e9e Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Oct 2024 20:07:30 +0100 Subject: Schildify login footer @@ -8,7 +8,7 @@ Subject: Schildify login footer 1 file changed, 4 insertions(+) diff --git a/src/components/views/auth/AuthFooter.tsx b/src/components/views/auth/AuthFooter.tsx -index f609b4792a..8abcc8fa37 100644 +index 1942bf0431..1054d06f89 100644 --- a/src/components/views/auth/AuthFooter.tsx +++ b/src/components/views/auth/AuthFooter.tsx @@ -15,9 +15,13 @@ import { _t } from "../../../languageHandler"; @@ -26,5 +26,5 @@ index f609b4792a..8abcc8fa37 100644 const authFooterLinks: JSX.Element[] = []; -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0006-Disable-sticky-rooms.patch b/patches/element-web/0006-Disable-sticky-rooms.patch index f36c9b3..d4ed585 100644 --- a/patches/element-web/0006-Disable-sticky-rooms.patch +++ b/patches/element-web/0006-Disable-sticky-rooms.patch @@ -1,4 +1,4 @@ -From 12b585464c5d85df4d210862543018a28b815bd0 Mon Sep 17 00:00:00 2001 +From 70d03387cd78e193b9d37a97f5aacab9e25f926f 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 5419a6e47c..25d6b78fde 100644 } -- -2.48.1 +2.49.0 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 b52cd8f..dd7dc94 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 c14f17a15c7a4f22126eba9a92a417732fe3f659 Mon Sep 17 00:00:00 2001 +From b81d62dc80dc7efdab2996c79662c4626302a8d0 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/LegacyRoomList.tsx b/src/components/views/rooms/LegacyRoomList.tsx -index a940484b16..663f741fed 100644 +index 6be226a172..dbb69d8f62 100644 --- a/src/components/views/rooms/LegacyRoomList.tsx +++ b/src/components/views/rooms/LegacyRoomList.tsx @@ -83,11 +83,13 @@ interface IState { @@ -128,11 +128,11 @@ index a940484b16..663f741fed 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 439b0c112f..5d06388535 100644 +index aee9141c29..7eda4d794b 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -351,6 +351,14 @@ export type FeatureSettingKey = Assignable; - export type BooleanSettingKey = Assignable> | FeatureSettingKey; +@@ -358,6 +358,14 @@ export type BooleanSettingKey = Assignable> | Fe + export type StringSettingKey = Assignable>; export const SETTINGS: Settings = { + // SC settings start @@ -147,10 +147,10 @@ index 439b0c112f..5d06388535 100644 isFeature: true, labsGroup: LabGroup.VoiceAndVideo, diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts -index e1d2f7b7e8..64c757c377 100644 +index 6985e007bd..206ab20037 100644 --- a/src/stores/room-list/RoomListStore.ts +++ b/src/stores/room-list/RoomListStore.ts -@@ -502,6 +502,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient implem +@@ -504,6 +504,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient implem this.setAndPersistListOrder(tag, listOrder); } } @@ -160,7 +160,7 @@ index e1d2f7b7e8..64c757c377 100644 } private onAlgorithmListUpdated = (forceUpdate: boolean): void => { -@@ -615,7 +618,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient implem +@@ -617,7 +620,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient implem */ public getTagsForRoom(room: Room): TagID[] { const algorithmTags = this.algorithm.getTagsForRoom(room); @@ -263,5 +263,5 @@ index 78823cbc42..00883e2ad6 100644 DefaultTagID.Conference, DefaultTagID.Untagged, -- -2.48.1 +2.49.0 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 8d807ab..5503271 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 2180196ba74a9526d0a68ad17328631d9b661cd2 Mon Sep 17 00:00:00 2001 +From 1755079d1f53e5738ef9841607184d1bae0a05af 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 0f95fe78c2..2de554c357 100644 /** -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0009-Don-t-preview-reactions.patch b/patches/element-web/0009-Don-t-preview-reactions.patch index a5bb171..aa3a05d 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 27d4baaaf19f3d80ec7d5617e54bd7621090d6a4 Mon Sep 17 00:00:00 2001 +From db11438720e8798855e72dbe2c41223d7d565d50 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 14 Dec 2023 10:32:10 +0100 Subject: Don't preview reactions @@ -25,5 +25,5 @@ index 51e413940d..7775d1e52a 100644 isState: false, previewer: new PollStartEventPreview(), -- -2.48.1 +2.49.0 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 d897a59..dfe3d46 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 db8b600a3695f35e70cb0c2a9f6b3cba99d2bfae Mon Sep 17 00:00:00 2001 +From 28c8aafc65b222ddb7e663379b9981f005e77ef0 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 @@ -26,5 +26,5 @@ index 3eafb671cb..c9dcd00fd0 100644 return ( -- -2.48.1 +2.49.0 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 ec42ede..86e1d45 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 773a15b9d4a880d4fa9ddf06bda99c6d15316bb4 Mon Sep 17 00:00:00 2001 +From 5042b0693d8f0d5b722ae40169855a28364f95a2 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 @@ -8,18 +8,18 @@ Subject: Allow muted rooms to render as unread 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RoomNotifs.ts b/src/RoomNotifs.ts -index e6064d2691..37838c79b5 100644 +index d5254d523d..9cb1e24d1d 100644 --- a/src/RoomNotifs.ts +++ b/src/RoomNotifs.ts @@ -255,7 +255,7 @@ export function determineUnreadState( - return { symbol: "!", count: 1, level: NotificationLevel.Highlight }; + return { symbol: "!", count: 1, level: NotificationLevel.Highlight, invited: false }; } - if (getRoomNotifsState(room.client, room.roomId) === RoomNotifState.Mute) { + if (false && getRoomNotifsState(room.client, room.roomId) === RoomNotifState.Mute) { - return { symbol: null, count: 0, level: NotificationLevel.None }; + return { symbol: null, count: 0, level: NotificationLevel.None, invited: false }; } -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0012-Increase-default-visible-tiles.patch b/patches/element-web/0012-Increase-default-visible-tiles.patch index 23ca8ad..ec5ec8f 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 52ee72a4f5ba98cee0eb6ce60aaac29daa2ce119 Mon Sep 17 00:00:00 2001 +From f96924008d456dadd8d56a2bb6756a1afbd96431 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 a4468dfffe..a4ae9bbc1d 100644 public tilesWithPadding(n: number, paddingPx: number): number { -- -2.48.1 +2.49.0 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 190eb9b..353c845 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 75cf379cff65aa966ad3fc1acc5371c96e19c121 Mon Sep 17 00:00:00 2001 +From d52e8bb4d370dd0ba42a94e20dfc7f900a33f508 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 5d06388535..5ca4cbc3e8 100644 +index 7eda4d794b..b6cde99d81 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -358,6 +358,11 @@ export const SETTINGS: Settings = { +@@ -365,6 +365,11 @@ export const SETTINGS: Settings = { default: true, controller: new ReloadOnChangeController(), }, @@ -88,5 +88,5 @@ index 690beaa0b7..fcd7ff659b 100644 const newValue = SettingsStore.getValue("Spaces.enabledMetaSpaces"); const enabledMetaSpaces = this.metaSpaceOrder.filter((k) => newValue[k]); -- -2.48.1 +2.49.0 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 d155739..603877b 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 dbd02e7c0b1c63d432adb2d78c4ed5cb701092f7 Mon Sep 17 00:00:00 2001 +From 2a5b9f5f25b4b5fdfb60c21b4edcd9dd20dbda5d 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 @@ -119,7 +119,7 @@ index 71659d579b..4acbfd1fcb 100644 ) : ( diff --git a/src/components/views/emojipicker/ReactionPicker.tsx b/src/components/views/emojipicker/ReactionPicker.tsx -index 8509b4014a..5e9ea0fd60 100644 +index 11b3d9468a..7d369945fe 100644 --- a/src/components/views/emojipicker/ReactionPicker.tsx +++ b/src/components/views/emojipicker/ReactionPicker.tsx @@ -126,6 +126,7 @@ class ReactionPicker extends React.Component { @@ -131,5 +131,5 @@ index 8509b4014a..5e9ea0fd60 100644 isEmojiDisabled={this.isEmojiDisabled} onFinished={this.props.onFinished} -- -2.48.1 +2.49.0 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 da3ce4a..36baeb9 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 fcc37848fb0e949888a77325a4990639a3661d8e Mon Sep 17 00:00:00 2001 +From eae491a0a6a3f8bfa47785e21467ca56d50dd437 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 917bcfbb84..75ec572c9e 100644 white-space: nowrap; text-overflow: ellipsis; -- -2.48.1 +2.49.0 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 8274488..f0d7519 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 e9975388c5e2071240b8e16b122100f532aee10a Mon Sep 17 00:00:00 2001 +From 0e919ce4854c5f66870f4465b8e1c4b793960025 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 3d802d34ad..e90667898b 100644 +index 0f722ae53d..47f09400d7 100644 --- a/src/components/structures/MatrixChat.tsx +++ b/src/components/structures/MatrixChat.tsx -@@ -1454,7 +1454,15 @@ export default class MatrixChat extends React.PureComponent { +@@ -1456,7 +1456,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 3d802d34ad..e90667898b 100644 // Before defaulting to directory, show the last viewed room this.viewLastRoom(); } else { -@@ -1466,6 +1474,14 @@ export default class MatrixChat extends React.PureComponent { +@@ -1468,6 +1476,14 @@ export default class MatrixChat extends React.PureComponent { } } @@ -46,10 +46,10 @@ index 3d802d34ad..e90667898b 100644 dis.dispatch({ action: Action.ViewRoom, diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index 5ca4cbc3e8..80ada478ba 100644 +index b6cde99d81..61a17d09ae 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -363,6 +363,12 @@ export const SETTINGS: Settings = { +@@ -370,6 +370,12 @@ export const SETTINGS: Settings = { supportedLevels: LEVELS_ACCOUNT_SETTINGS, default: true, }, @@ -75,5 +75,5 @@ index fcd7ff659b..33407f74e8 100644 cliSpace?.getMyMembership() !== KnownMembership.Invite && this.matrixClient.getRoom(roomId)?.getMyMembership() === KnownMembership.Join && -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch b/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch index e5c3abb..e435081 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 bfe58ad4c742484429495dda65fdfd26302270c3 Mon Sep 17 00:00:00 2001 +From 27ba28c7b3840b5b458bd98599183728e681c885 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 e3b01cae0b..02f6c286f2 100644 const rooms = (this.state.rooms || []).slice(); // cheap clone const msc3946ProcessDynamicPredecessor = SettingsStore.getValue("feature_dynamic_room_predecessors"); -- -2.48.1 +2.49.0 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 bd5f65f..bbe4996 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 b97e37b1f5e4ad33cf044f5371e91955cafc4b55 Mon Sep 17 00:00:00 2001 +From 2611dc55c8c915f19ad3b06c3d406101bce24b67 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Mon, 19 Aug 2024 20:27:33 +0200 Subject: Stop the search bar wobble @@ -20,5 +20,5 @@ index 75180013f6..e55eadaaf7 100644 /* FIXME THEME - Tint by CSS rather than referencing a duplicate asset */ -- -2.48.1 +2.49.0 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 0904851..cd39903 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 d37ddfc40426f200c9fcaa4298c5cf9921fb9025 Mon Sep 17 00:00:00 2001 +From 453eae3dc1a21fd18c28dca91498efbbadfb4e50 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 11:23:54 +0200 Subject: Import SC compound theme overrides @@ -20,5 +20,5 @@ index e55eadaaf7..21d0f1d83a 100644 @import "./_animations.pcss"; @import "./_spacing.pcss"; -- -2.48.1 +2.49.0 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 7b7a614..05540d9 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 51cc5b9086927db3a9c3aa21e59a6f0d7e8fc761 Mon Sep 17 00:00:00 2001 +From f1cac8ba3ffcd3cc0b7ab6d014d6e40d8dec4451 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 f3a44521fa..396601ba6e 100644 const styles: CSSProperties = {}; -- -2.48.1 +2.49.0 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 0c22dd2..6a28b49 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 50e71f22ccf8640b8cef718a3389b878602dd1d4 Mon Sep 17 00:00:00 2001 +From c5ae977ed90c680d9055460295f60f4945f0c98a 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 17d09b661d..214514686f 100644 +index 7baa127f16..4da70f5ecb 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; } @@ -25,5 +25,5 @@ index 17d09b661d..214514686f 100644 } -- -2.48.1 +2.49.0 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 8fd5766..fad7eab 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 df6840270f2b8c6c1c1b5aaf430fa78f016b1a56 Mon Sep 17 00:00:00 2001 +From efe6a8611871296b277adbf5201fec0826b837fe 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 c25cbfcec4..682ea64890 100644 } &.mx_EventTile_lastInSection[data-self="true"] .mx_EventTile_line { -- -2.48.1 +2.49.0 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 38d6928..f78680d 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 89c6003be2e9510be12640809a316278816f1837 Mon Sep 17 00:00:00 2001 +From 4c1b8a37c564d086ef37049cf5b0c4ac6376e8a9 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 80ada478ba..e41c19b750 100644 +index 61a17d09ae..4ca441dc47 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -786,7 +786,7 @@ export const SETTINGS: Settings = { +@@ -795,7 +795,7 @@ export const SETTINGS: Settings = { "alwaysShowTimestamps": { supportedLevels: LEVELS_ACCOUNT_SETTINGS, displayName: _td("settings|always_show_message_timestamps"), @@ -21,5 +21,5 @@ index 80ada478ba..e41c19b750 100644 "userTimezone": { supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS, -- -2.48.1 +2.49.0 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 ef742d1..620145e 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 2f4546aaca472f4ac2304fc5b5bdcb36c9a380c6 Mon Sep 17 00:00:00 2001 +From 9fcbc30485a80dcfa7321fa3599d16ce5e7308e6 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 e41c19b750..276d72cf23 100644 +index 4ca441dc47..aa74245519 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -641,7 +641,7 @@ export const SETTINGS: Settings = { +@@ -650,7 +650,7 @@ export const SETTINGS: Settings = { description: _td("labs|render_reaction_images_description"), supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED, supportedLevelsAreOrdered: true, @@ -21,5 +21,5 @@ index e41c19b750..276d72cf23 100644 "feature_new_room_list": { supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED, -- -2.48.1 +2.49.0 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 f491447..9d5b0d2 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 9b7345671c0910cf9d6ca3710a4cd9f5126fe186 Mon Sep 17 00:00:00 2001 +From e84deb43f138f16131d67aa46c1d5a47e298e776 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 a4ae9bbc1d..227c918457 100644 public constructor(public readonly tagId: TagID) { -- -2.48.1 +2.49.0 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 18b1f27..59902b1 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 1d3a914d447e6ccae5ad13ac4438aa979610946e Mon Sep 17 00:00:00 2001 +From 8354faea210da07d2948ca60dd6eaf3e7a668f86 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 276d72cf23..4de889b562 100644 +index aa74245519..07227b02dc 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -1206,7 +1206,7 @@ export const SETTINGS: Settings = { +@@ -1233,7 +1233,7 @@ export const SETTINGS: Settings = { }, "Spaces.showPeopleInSpace": { supportedLevels: [SettingLevel.ROOM_ACCOUNT], @@ -35,5 +35,5 @@ index 02e20e9103..2b49711c8e 100644 public isVisible(room: Room): boolean { -- -2.48.1 +2.49.0 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 becbca1..7be1af5 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 1784aaa9b523c5f02b089ed08847bb8d07240570 Mon Sep 17 00:00:00 2001 +From 345e3cce61ff9afa68d8b17dde379fce269faa56 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 @@ -54,7 +54,7 @@ index f4aa0e6f0f..88bcb88f14 100644 margin-top: $spacing-8; } diff --git a/res/css/views/rooms/_EventTile.pcss b/res/css/views/rooms/_EventTile.pcss -index 54f91bd5f4..952f267902 100644 +index b4172fc003..c8538a6c32 100644 --- a/res/css/views/rooms/_EventTile.pcss +++ b/res/css/views/rooms/_EventTile.pcss @@ -1,5 +1,6 @@ @@ -306,5 +306,5 @@ index 953a0c941f..3326d0c0ff 100644 line-height: var(--line-height) !important; -- -2.48.1 +2.49.0