diff --git a/element-desktop b/element-desktop index 47dbe68..e2de1d0 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 47dbe68b2a715af9dbb26ba366a0207f5cfaa227 +Subproject commit e2de1d0bae0b16dd2ad81d71a4e3ce4068ff1c98 diff --git a/element-web b/element-web index f3389d7..7942825 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit f3389d724f9a44b572d740c1633ad0db62f624c7 +Subproject commit 7942825f423c206c35b6b01c5cf59572f6af6c02 diff --git a/matrix-js-sdk b/matrix-js-sdk index 52798a9..400efbe 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 52798a9d777321422353ca88b27249a6fb0473b3 +Subproject commit 400efbe5175939db5e70c54de2c9d42e1932cf16 diff --git a/matrix-react-sdk b/matrix-react-sdk index ed9cc5c..d38faa8 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit ed9cc5c53cea9611099618761ab0646c2508114e +Subproject commit d38faa8f05f2b3a25aea47b18538431fab70efaa 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 462322a..0fdfc8a 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 6c463bac95962effa26e7f95e0d56dd3ea50dc80 Mon Sep 17 00:00:00 2001 +From 14d2d06a2831bf794d643bb91be0f5afc4a159ca Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 2 Dec 2023 12:57:26 +0100 Subject: Add back schildi fetch-package.ts modifications diff --git a/patches/matrix-js-sdk/0001-Add-fields-for-media-caption-support.patch b/patches/matrix-js-sdk/0001-Add-fields-for-media-caption-support.patch index 27a05d9..c8b7a6c 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 52798a9d777321422353ca88b27249a6fb0473b3 Mon Sep 17 00:00:00 2001 +From 400efbe5175939db5e70c54de2c9d42e1932cf16 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/0001-Disable-sticky-rooms.patch b/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch index 2004021..7739b95 100644 --- a/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch +++ b/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch @@ -1,4 +1,4 @@ -From b245cc816714627339aaf229657c8a14c73f96e9 Mon Sep 17 00:00:00 2001 +From 3f02a0d47b3c86f94df8b697e6100ff373a5384f 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/0002-Bring-back-unified-room-list.patch b/patches/matrix-react-sdk/0002-Bring-back-unified-room-list.patch index 41a43aa..772b810 100644 --- a/patches/matrix-react-sdk/0002-Bring-back-unified-room-list.patch +++ b/patches/matrix-react-sdk/0002-Bring-back-unified-room-list.patch @@ -1,4 +1,4 @@ -From 15906208d9d34cb9115e1ffa5ceb76d0d54c4125 Mon Sep 17 00:00:00 2001 +From 89c95ab2ec61fe5c3930480af2a1627f819844ee 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/0003-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch b/patches/matrix-react-sdk/0003-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch index ae8877f..c8d0b26 100644 --- a/patches/matrix-react-sdk/0003-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch +++ b/patches/matrix-react-sdk/0003-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch @@ -1,4 +1,4 @@ -From 70614b5c6e4061ec1c9d90cbf11782e683b17be6 Mon Sep 17 00:00:00 2001 +From d3573889e17f4f4726d129626e5f0597b138daa0 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/0004-Add-support-for-rendering-captions-in-media-messages.patch b/patches/matrix-react-sdk/0004-Add-support-for-rendering-captions-in-media-messages.patch index e28ee51..a46fdf4 100644 --- a/patches/matrix-react-sdk/0004-Add-support-for-rendering-captions-in-media-messages.patch +++ b/patches/matrix-react-sdk/0004-Add-support-for-rendering-captions-in-media-messages.patch @@ -1,4 +1,4 @@ -From 597775e0fb261509b1afecc30c5a5031156c9a66 Mon Sep 17 00:00:00 2001 +From 89bb8eaba1c9fb9d437379daab11b3266c1fc48d Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Tue, 12 Jul 2022 15:34:57 +0300 Subject: Add support for rendering captions in media messages 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 65f077a..6d139a9 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 66ac6916f3b57576711c0a3d71c2a7c133f4432b Mon Sep 17 00:00:00 2001 +From 85ce1e9f141ef9c2bb5295f2190e4e67c2bd2a06 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 040b871..cf18ca6 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 0c4e3c5ee2c74ed1f55f0e1965766e896fe79737 Mon Sep 17 00:00:00 2001 +From 49be0de042ea55ca212b819cd173621c9ae5819a 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 7917d42..3efe62a 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 a4fe784a2fe7847319d0a63498a237be0b12d988 Mon Sep 17 00:00:00 2001 +From 13d874b18dfd58eb4c2bdf71f963c1309478c7c3 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 6a58ead..95cc9b0 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 a323175c5a6f3b2f625b0c1359ff6ad89b663027 Mon Sep 17 00:00:00 2001 +From 00ca0cba6bb076b81992dc7c92f93efc00fdd6ed 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 2443326..8db4678 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 b2b850561bdd6fb7c2b73e63aae7b49fa3fd9c13 Mon Sep 17 00:00:00 2001 +From 08b9bb8fabc9255f17a46d44afd214b1fb8ec4ba 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 f1f2631..90e0089 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 b7e9f92671330c3b8ae387b6810a391d4bf49207 Mon Sep 17 00:00:00 2001 +From e4cb5dc12ebe1159ae843c99e93e7a91e7f4a8de 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 6e8d6f1..a9b2c96 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 378c416883b6870ef453f39199c44de14d162f81 Mon Sep 17 00:00:00 2001 +From d488b944b1577dfd3469532a6652172baf900b58 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 b23198c..3f8ecbe 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 16e186a3cb6d1929e49afe2feb3b486d9bca10a9 Mon Sep 17 00:00:00 2001 +From 63532e2582e0d2cec771cb864b6fe211640c685b 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 8739751..468d7dc 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 6eac7d7c2abaaaa59432bc7ed8c7a7d527fb66ae Mon Sep 17 00:00:00 2001 +From 724b9e916dcdc18fb129f0861871d4eca4d5d053 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 45e461c..a5f07c2 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 a0f93aab26752267e4ef6512d6eccd64a5c8eeb7 Mon Sep 17 00:00:00 2001 +From 10a8e40f96a540a35b253c99f913858cea8db56e 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 136ece8..a55f479 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 553d957b6d9ef9dd4d730c640a75bbb75fd36f88 Mon Sep 17 00:00:00 2001 +From 8eddbc5b580616be6cce626acf67f856e88d217f 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 260eaec..320a70c 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 d37ff20103b5a650f626ba9910e9ce1f6f7d59b9 Mon Sep 17 00:00:00 2001 +From 224976a0eec90876a7226f217c98bc8b846c1584 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/0018-No-red-messages-in-1-1-chats.patch b/patches/matrix-react-sdk/0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch similarity index 82% rename from patches/matrix-react-sdk/0018-No-red-messages-in-1-1-chats.patch rename to patches/matrix-react-sdk/0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch index 85c8dc9..788f4ab 100644 --- a/patches/matrix-react-sdk/0018-No-red-messages-in-1-1-chats.patch +++ b/patches/matrix-react-sdk/0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch @@ -1,8 +1,7 @@ -From b3273f2ce4d14924f2710f0ac94cbee54aeee9c6 Mon Sep 17 00:00:00 2001 +From d4c1653ba04afd5b176b83c6348ae7d9d2580080 Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 22 Dec 2020 19:16:28 +0100 -Subject: =?UTF-8?q?No=20red=20messages=20in=201:1=20chats=0AClose=20Schild?= - =?UTF-8?q?iChat/schildichat-desktop#13?= +Subject: No red messages in 1:1 chats Close SchildiChat/schildichat-desktop#13 --- src/components/views/rooms/EventTile.tsx | 6 ++++++ diff --git a/patches/matrix-react-sdk/0019-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 similarity index 97% rename from patches/matrix-react-sdk/0019-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch rename to patches/matrix-react-sdk/0018-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch index 876cfe3..d7a8e5e 100644 --- a/patches/matrix-react-sdk/0019-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 d8699bf1f31e411b5386554110859e85520957fb Mon Sep 17 00:00:00 2001 +From 0f7bc2e7ba410996da05b1c8f96541a9d77cc587 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/0020-Always-show-timestamps-by-default.patch b/patches/matrix-react-sdk/0019-Always-show-timestamps-by-default.patch similarity index 92% rename from patches/matrix-react-sdk/0020-Always-show-timestamps-by-default.patch rename to patches/matrix-react-sdk/0019-Always-show-timestamps-by-default.patch index e5743cf..18a3880 100644 --- a/patches/matrix-react-sdk/0020-Always-show-timestamps-by-default.patch +++ b/patches/matrix-react-sdk/0019-Always-show-timestamps-by-default.patch @@ -1,4 +1,4 @@ -From ed9cc5c53cea9611099618761ab0646c2508114e Mon Sep 17 00:00:00 2001 +From cd4f60f04eb1eabb3804b27b9a283eb1c971e304 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 13:53:07 +0200 Subject: Always show timestamps by default