diff --git a/element-desktop b/element-desktop index 94e8c78..3000a9f 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 94e8c782473cd794accb077d5c66a187f14d958a +Subproject commit 3000a9fafe155bd0f3fc3c15a692597de4aeb396 diff --git a/element-web b/element-web index 4290ab5..0ba8354 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 4290ab5db91968c183402ef260f9b20b2670bcc3 +Subproject commit 0ba8354eedf0bd6855f161a0bd35f4b0f7ea2032 diff --git a/matrix-js-sdk b/matrix-js-sdk index 0c21e5e..385dbd3 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 0c21e5e6a8ef45ff6e92fa66a0eb52ddae2999bc +Subproject commit 385dbd386c7417f95dbd2f48b1494bf49a62438c diff --git a/matrix-react-sdk b/matrix-react-sdk index 62c1cc4..0c042df 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 62c1cc4f19b287e34b4c09767765f48ef44bf715 +Subproject commit 0c042df7e4ccc549719eada69985985940c836f7 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 87498d3..9c33a29 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 65ddd258e4617866712a09dd7f419d1d039e91c9 Mon Sep 17 00:00:00 2001 +From 643b50c598174d1f968e09b69b72a2747d04b713 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/0004-Change-default-login-background.patch b/patches/element-web/0001-Change-default-login-background.patch similarity index 99% rename from patches/element-web/0004-Change-default-login-background.patch rename to patches/element-web/0001-Change-default-login-background.patch index 324b013..157a326 100644 --- a/patches/element-web/0004-Change-default-login-background.patch +++ b/patches/element-web/0001-Change-default-login-background.patch @@ -1,4 +1,4 @@ -From 83c570e9658b0105f061a07049f4bc6267409e7f Mon Sep 17 00:00:00 2001 +From df9cbf4de43a3f8a5d4a539ab21c63230af629ea 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/0005-Don-t-welcome-to-Element.patch b/patches/element-web/0002-Don-t-welcome-to-Element.patch similarity index 93% rename from patches/element-web/0005-Don-t-welcome-to-Element.patch rename to patches/element-web/0002-Don-t-welcome-to-Element.patch index 18d4841..63b4350 100644 --- a/patches/element-web/0005-Don-t-welcome-to-Element.patch +++ b/patches/element-web/0002-Don-t-welcome-to-Element.patch @@ -1,4 +1,4 @@ -From 7eea3425a4a9d27359dc2801e6f486f5a51138c6 Mon Sep 17 00:00:00 2001 +From 7b6f836434f75fbb7d21277f4dd31c1f3166d315 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/0006-Stronger-login-background-to-ensure-contrast-of-our-.patch b/patches/element-web/0003-Stronger-login-background-to-ensure-contrast-of-our-.patch similarity index 93% rename from patches/element-web/0006-Stronger-login-background-to-ensure-contrast-of-our-.patch rename to patches/element-web/0003-Stronger-login-background-to-ensure-contrast-of-our-.patch index ca8e6d7..64783af 100644 --- a/patches/element-web/0006-Stronger-login-background-to-ensure-contrast-of-our-.patch +++ b/patches/element-web/0003-Stronger-login-background-to-ensure-contrast-of-our-.patch @@ -1,4 +1,4 @@ -From dfafd2ac8a2b1a5614b0432560c67c2d1a1b6164 Mon Sep 17 00:00:00 2001 +From ffaaeb91e6d35ff59ac020680fdfa3fdadaa7de6 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/0007-Schildify-login-footer.patch b/patches/element-web/0004-Schildify-login-footer.patch similarity index 95% rename from patches/element-web/0007-Schildify-login-footer.patch rename to patches/element-web/0004-Schildify-login-footer.patch index 1360754..2727b0b 100644 --- a/patches/element-web/0007-Schildify-login-footer.patch +++ b/patches/element-web/0004-Schildify-login-footer.patch @@ -1,4 +1,4 @@ -From 4290ab5db91968c183402ef260f9b20b2670bcc3 Mon Sep 17 00:00:00 2001 +From 177e652388fbeef0113d3fa07f00de09f24f70dd 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/matrix-js-sdk/0001-Add-fields-for-media-caption-support.patch b/patches/matrix-js-sdk/0001-Add-fields-for-media-caption-support.patch index 55b97d6..42628e8 100644 --- a/patches/matrix-js-sdk/0001-Add-fields-for-media-caption-support.patch +++ b/patches/matrix-js-sdk/0001-Add-fields-for-media-caption-support.patch @@ -1,4 +1,4 @@ -From 0c21e5e6a8ef45ff6e92fa66a0eb52ddae2999bc Mon Sep 17 00:00:00 2001 +From 385dbd386c7417f95dbd2f48b1494bf49a62438c Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 9 May 2024 09:21:21 +0200 Subject: Add fields for media caption support diff --git a/patches/matrix-react-sdk/0002-Disable-sticky-rooms.patch b/patches/matrix-react-sdk/0002-Disable-sticky-rooms.patch index 15ea4c3..0fa3542 100644 --- a/patches/matrix-react-sdk/0002-Disable-sticky-rooms.patch +++ b/patches/matrix-react-sdk/0002-Disable-sticky-rooms.patch @@ -1,4 +1,4 @@ -From 0d84bebb43a20742e3be44dc29f6e1f395e3a4d9 Mon Sep 17 00:00:00 2001 +From 8ec9250d0c49983e45a72f314305710642c64c53 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 18 Jan 2022 13:28:22 +0100 Subject: Disable sticky rooms diff --git a/patches/matrix-react-sdk/0003-Bring-back-unified-room-list.patch b/patches/matrix-react-sdk/0003-Bring-back-unified-room-list.patch index c9f19f9..0aab2a3 100644 --- a/patches/matrix-react-sdk/0003-Bring-back-unified-room-list.patch +++ b/patches/matrix-react-sdk/0003-Bring-back-unified-room-list.patch @@ -1,4 +1,4 @@ -From aab25c92172e8aeeb468581be814319f7c760c6b Mon Sep 17 00:00:00 2001 +From aefc9db0e98069b535461e34c62fddc5e202af8f 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/matrix-react-sdk/0004-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch b/patches/matrix-react-sdk/0004-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch index fd26219..5430b55 100644 --- a/patches/matrix-react-sdk/0004-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch +++ b/patches/matrix-react-sdk/0004-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch @@ -1,4 +1,4 @@ -From 9b43ea505d5d35a560e550be29ed78df5e59b005 Mon Sep 17 00:00:00 2001 +From 5b185275d1ced63047c580a2f702f2bab01da6ac Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 17 Dec 2023 11:11:58 +0100 Subject: Don't sort muted rooms to bottom, I still want to see them. diff --git a/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch b/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch index be3b843..15315c2 100644 --- a/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch +++ b/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch @@ -1,4 +1,4 @@ -From 206b43611c36433474e01fff03da926ca65cd130 Mon Sep 17 00:00:00 2001 +From f351e4cf95fca2d48abe5187126af4ded44d7f96 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 14 Dec 2023 10:32:10 +0100 Subject: Don't preview reactions diff --git a/patches/matrix-react-sdk/0006-Hide-the-mute-notification-state-the-same-way-as-the.patch b/patches/matrix-react-sdk/0006-Hide-the-mute-notification-state-the-same-way-as-the.patch index 52125e4..33f8abb 100644 --- a/patches/matrix-react-sdk/0006-Hide-the-mute-notification-state-the-same-way-as-the.patch +++ b/patches/matrix-react-sdk/0006-Hide-the-mute-notification-state-the-same-way-as-the.patch @@ -1,4 +1,4 @@ -From efe6ba679e319a4d148c056a4171eade6c8894a4 Mon Sep 17 00:00:00 2001 +From 06bd8ded3fd97417563a6b4f908f9fe9c55d4748 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Wed, 17 Nov 2021 12:50:25 +0100 Subject: Hide the "mute" notification state the same way as the other states diff --git a/patches/matrix-react-sdk/0007-Allow-muted-rooms-to-render-as-unread.patch b/patches/matrix-react-sdk/0007-Allow-muted-rooms-to-render-as-unread.patch index 4455ba7..8876f7e 100644 --- a/patches/matrix-react-sdk/0007-Allow-muted-rooms-to-render-as-unread.patch +++ b/patches/matrix-react-sdk/0007-Allow-muted-rooms-to-render-as-unread.patch @@ -1,4 +1,4 @@ -From abb8d035c60a8f682a17afb7f1bd15c162a60a83 Mon Sep 17 00:00:00 2001 +From d91b5c4562a35251927f52faac41ae5214f2d452 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Fri, 10 May 2024 18:58:32 +0200 Subject: Allow muted rooms to render as unread diff --git a/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch b/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch index f0c8bc0..1124900 100644 --- a/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch +++ b/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch @@ -1,4 +1,4 @@ -From ccb1860d1941513a22991e977d85696ad8ba86f0 Mon Sep 17 00:00:00 2001 +From e2ae548bbeb5e9e00c012b3e368f6adc071ba20e Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 30 Aug 2020 15:33:01 +0200 Subject: Increase default visible tiles diff --git a/patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch b/patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch index 2aa2e56..ea289af 100644 --- a/patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch +++ b/patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch @@ -1,4 +1,4 @@ -From 888087f8c9a2af0d88f0dfd5cb24bd79c43c9e59 Mon Sep 17 00:00:00 2001 +From e5431bd8f8beec8fae6233fdfeeb795c06ce522c Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 26 May 2024 10:43:36 +0200 Subject: Bring back showSpaceDMBadges setting, force-enabled for now diff --git a/patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch b/patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch index 43f64ed..99dcb91 100644 --- a/patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch +++ b/patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch @@ -1,4 +1,4 @@ -From 07238815122ab37f0825989f74851ec4e2503e1e Mon Sep 17 00:00:00 2001 +From 84466b80a06ac2ac4e9d85241613a01c5cc071a8 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Wed, 29 May 2024 19:32:42 +0200 Subject: Squashed: Freeform reactions from tadzik/freeform-reactions-upstream diff --git a/patches/matrix-react-sdk/0011-Allow-reactions-to-take-more-space.patch b/patches/matrix-react-sdk/0011-Allow-reactions-to-take-more-space.patch index a970057..19b2173 100644 --- a/patches/matrix-react-sdk/0011-Allow-reactions-to-take-more-space.patch +++ b/patches/matrix-react-sdk/0011-Allow-reactions-to-take-more-space.patch @@ -1,4 +1,4 @@ -From 0c7a756780d65112a178ebb37654884c17492155 Mon Sep 17 00:00:00 2001 +From 38c09908626f1d16c26d09ea7fa96920554e825d Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 22 Apr 2023 12:15:18 +0200 Subject: Allow reactions to take more space diff --git a/patches/matrix-react-sdk/0012-On-space-switch-don-t-automatically-show-last-opened.patch b/patches/matrix-react-sdk/0012-On-space-switch-don-t-automatically-show-last-opened.patch index c1cfddc..5d77404 100644 --- a/patches/matrix-react-sdk/0012-On-space-switch-don-t-automatically-show-last-opened.patch +++ b/patches/matrix-react-sdk/0012-On-space-switch-don-t-automatically-show-last-opened.patch @@ -1,4 +1,4 @@ -From c26aff178520aaf4006029aa47d115a03d03f54b Mon Sep 17 00:00:00 2001 +From 6ac6ee31dbd41bef928b6ab6976e0a081f0a057a Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 30 May 2024 14:35:16 +0200 Subject: On space switch don't automatically show last opened room diff --git a/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch b/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch index 6d2ba14..c588197 100644 --- a/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch +++ b/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch @@ -1,4 +1,4 @@ -From ab8fa2fed1a287f476f59494237087f44af97ba5 Mon Sep 17 00:00:00 2001 +From 2a4c64e09f43e000a6e5a76ae5f151ca5302ea72 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 9 Aug 2022 09:32:19 +0200 Subject: Exclude spaces from breadcrumbs diff --git a/patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch b/patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch index d01d624..76953d1 100644 --- a/patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch +++ b/patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch @@ -1,4 +1,4 @@ -From 10fda258cff3874c9c7ec39e0d5026ba4597d9ac Mon Sep 17 00:00:00 2001 +From 0d64b639e1f2f1fd2e3dd9455b1d4269d1bf0c7a Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Mon, 19 Aug 2024 20:27:33 +0200 Subject: Stop the search bar wobble diff --git a/patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch b/patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch index bd341e4..39595fe 100644 --- a/patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch +++ b/patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch @@ -1,4 +1,4 @@ -From 12dc7ab431739b28e27c916142d2f473a14bd035 Mon Sep 17 00:00:00 2001 +From 0cff07ac21260e5364303112713a659331b13dfb 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/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch b/patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch index c6467b5..5fa9b38 100644 --- a/patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch +++ b/patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch @@ -1,4 +1,4 @@ -From 135eded4cfb5aacd1f9ecad073493f4bb5a2e296 Mon Sep 17 00:00:00 2001 +From 191cc01929de4d7f9727cbc1a8149bfea1d356b5 Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 7 Sep 2021 19:41:52 +0200 Subject: No damn avatar background in room list diff --git a/patches/matrix-react-sdk/0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch b/patches/matrix-react-sdk/0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch index 468f97e..21fd758 100644 --- a/patches/matrix-react-sdk/0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch +++ b/patches/matrix-react-sdk/0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch @@ -1,4 +1,4 @@ -From 2aa6e55c831780562c636b564ee22ecc1ab5c01c Mon Sep 17 00:00:00 2001 +From 6ea45c757519594ec9a08100368455ce409926f7 Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 22 Dec 2020 19:16:28 +0100 Subject: No red messages in 1:1 chats Close SchildiChat/schildichat-desktop#13 diff --git a/patches/matrix-react-sdk/0018-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch b/patches/matrix-react-sdk/0018-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch index 8fac044..ea64029 100644 --- a/patches/matrix-react-sdk/0018-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch +++ b/patches/matrix-react-sdk/0018-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch @@ -1,4 +1,4 @@ -From ccd8649aaa86d98a4b9d09ea16b10c8c29dc9ea5 Mon Sep 17 00:00:00 2001 +From 6911e311321ab23f04fee5d7a694ec1ec0024094 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 13:26:16 +0200 Subject: Always apply corner radius to all edges of the bubble diff --git a/patches/matrix-react-sdk/0019-Always-show-timestamps-by-default.patch b/patches/matrix-react-sdk/0019-Always-show-timestamps-by-default.patch index cda1b93..0f57e23 100644 --- a/patches/matrix-react-sdk/0019-Always-show-timestamps-by-default.patch +++ b/patches/matrix-react-sdk/0019-Always-show-timestamps-by-default.patch @@ -1,4 +1,4 @@ -From 241a1e84444cb0c75c2901e203919cc07e59f585 Mon Sep 17 00:00:00 2001 +From 4d504e8ff814cd1f3452d35c74033313b5db61ee Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 13:53:07 +0200 Subject: Always show timestamps by default diff --git a/patches/matrix-react-sdk/0020-Enable-custom-emote-rendering-by-default.patch b/patches/matrix-react-sdk/0020-Enable-custom-emote-rendering-by-default.patch index 7de5599..52e2c17 100644 --- a/patches/matrix-react-sdk/0020-Enable-custom-emote-rendering-by-default.patch +++ b/patches/matrix-react-sdk/0020-Enable-custom-emote-rendering-by-default.patch @@ -1,4 +1,4 @@ -From 83772b941fc3ab9c88bee3e5ecfdee6dd5505ee9 Mon Sep 17 00:00:00 2001 +From 27eea6fe0d24d89675c88f35925dc83ad6bdab69 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 17 Oct 2024 19:40:51 +0200 Subject: Enable custom emote rendering by default diff --git a/patches/matrix-react-sdk/0022-Enable-chat-previews-by-default.patch b/patches/matrix-react-sdk/0021-Enable-chat-previews-by-default.patch similarity index 91% rename from patches/matrix-react-sdk/0022-Enable-chat-previews-by-default.patch rename to patches/matrix-react-sdk/0021-Enable-chat-previews-by-default.patch index 4410ea7..37d21da 100644 --- a/patches/matrix-react-sdk/0022-Enable-chat-previews-by-default.patch +++ b/patches/matrix-react-sdk/0021-Enable-chat-previews-by-default.patch @@ -1,4 +1,4 @@ -From 62c1cc4f19b287e34b4c09767765f48ef44bf715 Mon Sep 17 00:00:00 2001 +From 528bc546808c6d572e547a439825eb68e8f90f96 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Oct 2024 19:24:26 +0100 Subject: Enable chat previews by default