diff --git a/element-desktop b/element-desktop index fe589ce..0c751e1 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit fe589ce9854a113b1b1d53f9c4948711df766742 +Subproject commit 0c751e1a25b3d7ca21830f076161c94887c887a9 diff --git a/element-web b/element-web index 1a26a03..2c3bfff 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 1a26a0373723e5dde7ab53c8bcae792b2c32e1fe +Subproject commit 2c3bfff90d36697892ea7e32404751a896e26cc1 diff --git a/matrix-js-sdk b/matrix-js-sdk index eb9867a..40bc833 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit eb9867a5ba25ddbca546ec4840e3135cb0571df4 +Subproject commit 40bc833bb79a7cfda376d7a7e94e9d6cab6169a7 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 9f83c62..e81541a 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 cf3b9d993eff8355f024a627bd77c8aa2fbe4f7a Mon Sep 17 00:00:00 2001 +From 73f20d371b005b2ceba60c84e040bf246dfb740d 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 @@ -8,7 +8,7 @@ Subject: Add back schildi fetch-package.ts modifications 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/fetch-package.ts b/scripts/fetch-package.ts -index 72829454..4be7ab0b 100644 +index 7282945..4be7ab0 100644 --- a/scripts/fetch-package.ts +++ b/scripts/fetch-package.ts @@ -54,6 +54,7 @@ async function main(): Promise { diff --git a/patches/element-web/0002-Change-default-login-background.patch b/patches/element-web/0002-Change-default-login-background.patch index de89970..d219e91 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 505f972c50d859f08b0a2129e16117afb75e69f3 Mon Sep 17 00:00:00 2001 +From 48bbd49a2be1a527b9521b9f026b0f33a08e1dae 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 2c31271..aa90bfb 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 006919f688b7bfcd631719836e386553a36c1551 Mon Sep 17 00:00:00 2001 +From 6c056866602edd92ccf8237c1fcce3cbaf1303f4 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 3778cb5..05d1112 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 8842bfd9ec37c6f0d9233e48c4cd09cfb9398d93 Mon Sep 17 00:00:00 2001 +From 14f922a37ab1879de4834e0e3734f83ec453f679 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 333b19e..2d82bf7 100644 --- a/patches/element-web/0005-Schildify-login-footer.patch +++ b/patches/element-web/0005-Schildify-login-footer.patch @@ -1,4 +1,4 @@ -From c44bd08e21bea77363ed5cd670f8f5142a9974d2 Mon Sep 17 00:00:00 2001 +From 9474a8c7f96f94c4a19380251121beb3c5a3c925 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 858f280..908a95b 100644 --- a/patches/element-web/0006-Disable-sticky-rooms.patch +++ b/patches/element-web/0006-Disable-sticky-rooms.patch @@ -1,4 +1,4 @@ -From ff553af97b8a24abecb499bd77804d6b26e13b54 Mon Sep 17 00:00:00 2001 +From c2efb5cd9f33a87ef2a900272d7845883fc62f6a 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 1cf652c..5717237 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 7a10ab01bf141e2dc9e59a7418d4c0dd7d0473f3 Mon Sep 17 00:00:00 2001 +From a05aa4750cc2c3e44ec9f9a9e17271b3d6d91f36 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 8ce4f21..765e322 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 c3c779c69bcbc193ccbf891ccf7063711b1ec03a Mon Sep 17 00:00:00 2001 +From 20700378880fc7dff567ed68fd04c83daaa3daa9 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 a81686d..7451b69 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 3b4ba5b73866c4f373377db59affb0ee693e8b9d Mon Sep 17 00:00:00 2001 +From 2ced3032f04e97b57b3b21ff0bde91f95e4a3590 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 561bad5..e290cee 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 4b59183283ad70394b2dc8dedf4e5f4d7051b476 Mon Sep 17 00:00:00 2001 +From 46eb0329f9c66937545a6d55cf025ccb4b3803f5 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 8bc3108..4c01c04 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 66ea21f18b5d80bb47bce34e02b7c3eac8896078 Mon Sep 17 00:00:00 2001 +From 71b7b79b37c7caef3d560057c9abc571da7066bb 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 a04c847..5630503 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 8f6cc286db2874e5c41a1205a14c3f203bf41100 Mon Sep 17 00:00:00 2001 +From 53fb54d47a30cb553776efd5c687f1f3dc4f1423 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 608aedc..a5218cd 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 6f8241f062cc1c2c8d519b5a6c3bdd8f6697c723 Mon Sep 17 00:00:00 2001 +From 49f74194e5a5fd8a21411233d88ad3ce94bd1210 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 0f8e06c..53314d3 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 ec29a001b7faad378022e96ac9c2d9d051044074 Mon Sep 17 00:00:00 2001 +From 51006640c610c9e4f02ffbf42a8674ff17783a05 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 59c4379..c35eb3d 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 5cf81aab2442843799b366cc01dcd82b590b4b64 Mon Sep 17 00:00:00 2001 +From cd61fbeec18a633e7e2ac0595f0d658cf14de3cc 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 ef7dafc..bdc0127 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 47078a54aba2471b4fdf25b4ef261cea3a3f4451 Mon Sep 17 00:00:00 2001 +From 7ab1d126c752ffca96fadc55789f368438768a0b 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 59d5289..91867d5 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 4b71f30da86769b61af5ab2e6082f4ceb0b208d6 Mon Sep 17 00:00:00 2001 +From 563a3f3f70dad3facfe3b7744f8286c5592ea74d 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 f671f66..8b4580d 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 c0b8a2b993cc736e2a16971aa2b7e49802f25a0e Mon Sep 17 00:00:00 2001 +From cdbb2bedc2bb56ca332205ae308314ede303bf2d 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 a7d5b68..38c0673 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 a79fd2213b83e7585bdb1368b9e91e016160eb52 Mon Sep 17 00:00:00 2001 +From f72f3e0413572dfe15cbb1d4e103794f83195a10 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 6c0c10d..c4af0a7 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 681a5c5e673031f69cca656689613a4cb3e6a187 Mon Sep 17 00:00:00 2001 +From e0838fc65638230113af6039f99de5e897e74825 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 6b461f4..e918ff2 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 370e34ff53a52ab9b23888a13b7a61b388da1bf0 Mon Sep 17 00:00:00 2001 +From 551beff1e447a56948a874a336940fc48354d897 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 9d921ac..d5cfbe2 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 2c63a24f188de4c350f8c2f9b731271493d2cf77 Mon Sep 17 00:00:00 2001 +From 66b83eef7b1c212cc808b41fc7f257931c9c9c6a 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 ea55040..6afd62b 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 c6a86fe19296a5b519f9a901fb3833fcdf3593d6 Mon Sep 17 00:00:00 2001 +From b755c4d712f402dd27e0c8631cf30a173c1d4605 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 306d9ed..78b6c4b 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 8ddcac75200d7d065c2cf25a01012e003a4e37d6 Mon Sep 17 00:00:00 2001 +From 7c46305309b087c0d1d26cc77266532541307cb0 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 5c687b2..97a0677 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 9c76a672dc90ca4919a2a6f0fcb53761b598d652 Mon Sep 17 00:00:00 2001 +From 6ae02f585f3334c368b3fac082ffcb25d59ee9bb 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 b82593e..b7b6c8b 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 9e189bf0828f5f4ab0d11f06ed418cbbb6d0f2f1 Mon Sep 17 00:00:00 2001 +From 22a03cfd810b59c11ce61d9774e9929afd271789 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 2d22e4a..0b149cb 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 008d5321830bd0fc28aaa025bd7de1c4d77c285b Mon Sep 17 00:00:00 2001 +From 55c47b4ce8cf3423bfe6a7db2fb7a0120d410f2b 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