diff --git a/element-desktop b/element-desktop index e2de1d0..96aa172 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit e2de1d0bae0b16dd2ad81d71a4e3ce4068ff1c98 +Subproject commit 96aa1725d46fe9858108eff051711838da2d60fc diff --git a/element-web b/element-web index bb236d2..60754c1 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit bb236d239f2fff683c184bf862f5baf964501efa +Subproject commit 60754c17d92a1e8d9790dfb476f703949b60ce47 diff --git a/matrix-js-sdk b/matrix-js-sdk index 400efbe..6390182 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 400efbe5175939db5e70c54de2c9d42e1932cf16 +Subproject commit 63901825c14da3ec6f59017d2696ad98be91d2e0 diff --git a/matrix-react-sdk b/matrix-react-sdk index d38faa8..6ef8e87 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit d38faa8f05f2b3a25aea47b18538431fab70efaa +Subproject commit 6ef8e87317ba60fa6066f7e1b510f8844a576f3c diff --git a/overlay/element-desktop/package.json b/overlay/element-desktop/package.json index d4b78d2..f8d8434 100644 --- a/overlay/element-desktop/package.json +++ b/overlay/element-desktop/package.json @@ -1,6 +1,6 @@ { "name": "schildichat-desktop-alpha", - "productName": "SchildiChat", + "productName": "SchildiChatAlpha", "description": "A Matrix Client based on Element with some changes and tweaks", "author": "SchildiChat", "repository": { 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 0fdfc8a..61764fe 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 14d2d06a2831bf794d643bb91be0f5afc4a159ca Mon Sep 17 00:00:00 2001 +From e326039d1acbc5da0cdd95dc235646202264d3c3 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 c8b7a6c..70aff3f 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 400efbe5175939db5e70c54de2c9d42e1932cf16 Mon Sep 17 00:00:00 2001 +From 63901825c14da3ec6f59017d2696ad98be91d2e0 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 7739b95..f8f0dce 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 3f02a0d47b3c86f94df8b697e6100ff373a5384f Mon Sep 17 00:00:00 2001 +From 913772283fd2b9f682a11a594061a6a1189b7869 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 772b810..81bd614 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 89c95ab2ec61fe5c3930480af2a1627f819844ee Mon Sep 17 00:00:00 2001 +From e2045dd5dcbd82f7b5c4f98d89b258cc304d3e26 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 c8d0b26..2363d5b 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 d3573889e17f4f4726d129626e5f0597b138daa0 Mon Sep 17 00:00:00 2001 +From 1d3847da55e91dfc5e555e69fbadcbc1d033a8d9 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 a46fdf4..f097ae4 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 89bb8eaba1c9fb9d437379daab11b3266c1fc48d Mon Sep 17 00:00:00 2001 +From ac0fb82339fc580da9db60c183a39d72e6fba3ea 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 6d139a9..b935d6e 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 85ce1e9f141ef9c2bb5295f2190e4e67c2bd2a06 Mon Sep 17 00:00:00 2001 +From 0f0f80d270be5c88b0b762b51fe570c11b0bea7f 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 cf18ca6..eafb725 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 49be0de042ea55ca212b819cd173621c9ae5819a Mon Sep 17 00:00:00 2001 +From bc49b8d30cf7e0da038fac992ee2ff04c9dc91aa 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 3efe62a..dd98773 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 13d874b18dfd58eb4c2bdf71f963c1309478c7c3 Mon Sep 17 00:00:00 2001 +From 10b23f715bf5115715dca07676ca467a6433c9c9 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 95cc9b0..e2d8e51 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 00ca0cba6bb076b81992dc7c92f93efc00fdd6ed Mon Sep 17 00:00:00 2001 +From 641cd216c155318e35eabef30761613706e36c87 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 8db4678..7ef1a39 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 08b9bb8fabc9255f17a46d44afd214b1fb8ec4ba Mon Sep 17 00:00:00 2001 +From 2203554625f7c8d924981b3cd03b1389dc6873d9 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 90e0089..a281def 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 e4cb5dc12ebe1159ae843c99e93e7a91e7f4a8de Mon Sep 17 00:00:00 2001 +From 961ee28392810973057a0c8af410e1067a15547a 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 a9b2c96..c9b4019 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 d488b944b1577dfd3469532a6652172baf900b58 Mon Sep 17 00:00:00 2001 +From 794b8d3b7ccfbea95cba180b13de0ed42e7fc6c2 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 3f8ecbe..b224046 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 63532e2582e0d2cec771cb864b6fe211640c685b Mon Sep 17 00:00:00 2001 +From b43bf7e8a183f36e30e9b79e3fc2dcd14afc6823 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 468d7dc..49b0d89 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 724b9e916dcdc18fb129f0861871d4eca4d5d053 Mon Sep 17 00:00:00 2001 +From 3aa2246c56ae3e5b7703003ef785d6e3ad77b844 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 a5f07c2..e4b33fc 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 10a8e40f96a540a35b253c99f913858cea8db56e Mon Sep 17 00:00:00 2001 +From 288aa3cf8e56a4ca60810eac98fb6f692b154f61 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 a55f479..d823f0d 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 8eddbc5b580616be6cce626acf67f856e88d217f Mon Sep 17 00:00:00 2001 +From a4bca41b7371c42499fd8c805482066514a9edc2 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 320a70c..2fa7d3a 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 224976a0eec90876a7226f217c98bc8b846c1584 Mon Sep 17 00:00:00 2001 +From fc577303d8c2d290f1c17e13deaf442822af68a1 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 788f4ab..b81a35b 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 d4c1653ba04afd5b176b83c6348ae7d9d2580080 Mon Sep 17 00:00:00 2001 +From e4a7ea01c2fd9f7d67660402c20bfdc5969f28c4 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 d7a8e5e..76d5935 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 0f7bc2e7ba410996da05b1c8f96541a9d77cc587 Mon Sep 17 00:00:00 2001 +From a37ca889b832578a9201a5b45b059f58eb781bc5 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 18a3880..8abccc6 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 cd4f60f04eb1eabb3804b27b9a283eb1c971e304 Mon Sep 17 00:00:00 2001 +From 57942189da5f80069ee4b03dc2fbeb24ce6b4f7b Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 13:53:07 +0200 Subject: Always show timestamps by default