master/schildichat-desktop
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Upstream 1.11.102

Browse Source
This commit is contained in:
SpiritCroc 2025-06-09 10:02:12 +02:00
parent b601d43d88
commit de2fd61ff8
31 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compound-web

@ -1 +1 @@
Subproject commit 0d6444d4c9f435b91adf61a4627b742297098e4a
Subproject commit 1bdb16230631237b790f54469a5b3f660bd4ad91

2
element-desktop

@ -1 +1 @@
Subproject commit 7f2a3ad03588ca3132ff39285fdfa0e90ce6a797
Subproject commit fe589ce9854a113b1b1d53f9c4948711df766742

2
element-web

@ -1 +1 @@
Subproject commit feeffd4e759026cd766b5dbf656bd0e0a378fac5
Subproject commit 1a26a0373723e5dde7ab53c8bcae792b2c32e1fe

2
matrix-js-sdk

@ -1 +1 @@
Subproject commit 286e00c5007f2e14a04b568e93cc1474d288ca2b
Subproject commit eb9867a5ba25ddbca546ec4840e3135cb0571df4

4
patches/element-desktop/0002-Add-back-schildi-fetch-package.ts-modifications.patch
View File

@ -1,4 +1,4 @@
From fbe03ba5b46a8bce93936f4e9ec752797a39b4fe Mon Sep 17 00:00:00 2001
From cf3b9d993eff8355f024a627bd77c8aa2fbe4f7a Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
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 7282945..4be7ab0 100644
index 72829454..4be7ab0b 100644
--- a/scripts/fetch-package.ts
+++ b/scripts/fetch-package.ts
@@ -54,6 +54,7 @@ async function main(): Promise<number | undefined> {

2
patches/element-web/0002-Change-default-login-background.patch
View File

@ -1,4 +1,4 @@
From 77f12df2aa54e786da4831302f0de7aad3c6b912 Mon Sep 17 00:00:00 2001
From 505f972c50d859f08b0a2129e16117afb75e69f3 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sun, 29 Nov 2020 23:30:59 +0100
Subject: Change default login background

4
patches/element-web/0003-Don-t-welcome-to-Element.patch
View File

@ -1,4 +1,4 @@
From 13ce4b9769c425a4e76867c6ff262ec82aada25e Mon Sep 17 00:00:00 2001
From 006919f688b7bfcd631719836e386553a36c1551 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 27 Oct 2024 19:38:47 +0100
Subject: Don't welcome to Element
@ -8,7 +8,7 @@ Subject: Don't welcome to Element
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/res/welcome.html b/res/welcome.html
index ef2d43bd8f..5b71670f4f 100644
index 9fdd60a7c0..453baab965 100644
--- a/res/welcome.html
+++ b/res/welcome.html
@@ -169,7 +169,7 @@ we don't have an account and should hide them. No account == no guest account ei

2
patches/element-web/0004-Stronger-login-background-to-ensure-contrast-of-our-.patch
View File

@ -1,4 +1,4 @@
From 553a577bb18aef6fd23e23189e6399b3be6f1e49 Mon Sep 17 00:00:00 2001
From 8842bfd9ec37c6f0d9233e48c4cd09cfb9398d93 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 27 Oct 2024 19:55:30 +0100
Subject: Stronger login background to ensure contrast of our icon with our bg

2
patches/element-web/0005-Schildify-login-footer.patch
View File

@ -1,4 +1,4 @@
From 553539edf7c4b50b353fb86b4487fbf904033087 Mon Sep 17 00:00:00 2001
From c44bd08e21bea77363ed5cd670f8f5142a9974d2 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 27 Oct 2024 20:07:30 +0100
Subject: Schildify login footer

2
patches/element-web/0006-Disable-sticky-rooms.patch
View File

@ -1,4 +1,4 @@
From beb53797528a9539658ffa55665048e2fb055fe9 Mon Sep 17 00:00:00 2001
From ff553af97b8a24abecb499bd77804d6b26e13b54 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Tue, 18 Jan 2022 13:28:22 +0100
Subject: Disable sticky rooms

2
patches/element-web/0007-Bring-back-unified-room-list.patch
View File

@ -1,4 +1,4 @@
From 9d2fea504ab94b248930193dfe08dd66e3d95b59 Mon Sep 17 00:00:00 2001
From 7a10ab01bf141e2dc9e59a7418d4c0dd7d0473f3 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 5 May 2024 10:12:17 +0200
Subject: Bring back unified room list

2
patches/element-web/0008-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch
View File

@ -1,4 +1,4 @@
From 96ffbb0a509f1916637245c761f9dfa2dbe8b4a2 Mon Sep 17 00:00:00 2001
From c3c779c69bcbc193ccbf891ccf7063711b1ec03a Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 17 Dec 2023 11:11:58 +0100
Subject: Don't sort muted rooms to bottom, I still want to see them.

2
patches/element-web/0009-Don-t-preview-reactions.patch
View File

@ -1,4 +1,4 @@
From e8ab76d04fbad97adc20e0678acab24ef79340d5 Mon Sep 17 00:00:00 2001
From 3b4ba5b73866c4f373377db59affb0ee693e8b9d Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Thu, 14 Dec 2023 10:32:10 +0100
Subject: Don't preview reactions

2
patches/element-web/0010-Hide-the-mute-notification-state-the-same-way-as-the.patch
View File

@ -1,4 +1,4 @@
From 44c5f7c1d38c93987ffaa4bdd3be575f5103627d Mon Sep 17 00:00:00 2001
From 4b59183283ad70394b2dc8dedf4e5f4d7051b476 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Wed, 17 Nov 2021 12:50:25 +0100
Subject: Hide the "mute" notification state the same way as the other states

2
patches/element-web/0011-Allow-muted-rooms-to-render-as-unread.patch
View File

@ -1,4 +1,4 @@
From e92a08cfdf9d518c2f5a23b5cfdc67a0faa4dfdd Mon Sep 17 00:00:00 2001
From 66ea21f18b5d80bb47bce34e02b7c3eac8896078 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Fri, 10 May 2024 18:58:32 +0200
Subject: Allow muted rooms to render as unread

2
patches/element-web/0012-Increase-default-visible-tiles.patch
View File

@ -1,4 +1,4 @@
From 520670ce0c83b74a28a1992a3a184832ce89dda0 Mon Sep 17 00:00:00 2001
From 8f6cc286db2874e5c41a1205a14c3f203bf41100 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 30 Aug 2020 15:33:01 +0200
Subject: Increase default visible tiles

2
patches/element-web/0013-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch
View File

@ -1,4 +1,4 @@
From 7e65c9ffe978d6e35ad300322f03a2b9fb90bdc8 Mon Sep 17 00:00:00 2001
From 6f8241f062cc1c2c8d519b5a6c3bdd8f6697c723 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sun, 26 May 2024 10:43:36 +0200
Subject: Bring back showSpaceDMBadges setting, force-enabled for now

2
patches/element-web/0014-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch
View File

@ -1,4 +1,4 @@
From 950bcc4a75cf69739772982994d298b1f0ed19d9 Mon Sep 17 00:00:00 2001
From ec29a001b7faad378022e96ac9c2d9d051044074 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Wed, 29 May 2024 19:32:42 +0200
Subject: Squashed: Freeform reactions from tadzik/freeform-reactions-upstream

2
patches/element-web/0015-Allow-reactions-to-take-more-space.patch
View File

@ -1,4 +1,4 @@
From 49ca76277ee11346402a3ebd14220e1a21e53f7c Mon Sep 17 00:00:00 2001
From 5cf81aab2442843799b366cc01dcd82b590b4b64 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sat, 22 Apr 2023 12:15:18 +0200
Subject: Allow reactions to take more space

8
patches/element-web/0016-On-space-switch-don-t-automatically-show-last-opened.patch
View File

@ -1,4 +1,4 @@
From d6cecb5cb16ce466b441c09c2c93e342a3b84a5b Mon Sep 17 00:00:00 2001
From 47078a54aba2471b4fdf25b4ef261cea3a3f4451 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
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 761b7cf0e0..eef747d529 100644
index cc69455a8a..d2208eca84 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -1413,7 +1413,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
@@ -1416,7 +1416,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
if (this.screenAfterLogin && this.screenAfterLogin.screen) {
this.showScreen(this.screenAfterLogin.screen, this.screenAfterLogin.params);
this.screenAfterLogin = undefined;
@ -30,7 +30,7 @@ index 761b7cf0e0..eef747d529 100644
// Before defaulting to directory, show the last viewed room
this.viewLastRoom();
} else {
@@ -1425,6 +1433,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
@@ -1428,6 +1436,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
}
}

2
patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch
View File

@ -1,4 +1,4 @@
From 787190d19f185c011418cd175962fba6b4de719f Mon Sep 17 00:00:00 2001
From 4b71f30da86769b61af5ab2e6082f4ceb0b208d6 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Tue, 9 Aug 2022 09:32:19 +0200
Subject: Exclude spaces from breadcrumbs

4
patches/element-web/0018-Stop-the-search-bar-wobble.patch
View File

@ -1,4 +1,4 @@
From de1b48dfa614375c23d256e693818fb292298304 Mon Sep 17 00:00:00 2001
From c0b8a2b993cc736e2a16971aa2b7e49802f25a0e Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
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 75180013f6..e55eadaaf7 100644
index 3eed8c93c6..caaa0df3b9 100644
--- a/res/css/_common.pcss
+++ b/res/css/_common.pcss
@@ -181,6 +181,7 @@ input[type="search"].mx_textinput_icon {

4
patches/element-web/0019-Import-SC-compound-theme-overrides.patch
View File

@ -1,4 +1,4 @@
From 5f448e590304b0ee06b7fbbfd80891bca813b152 Mon Sep 17 00:00:00 2001
From a79fd2213b83e7585bdb1368b9e91e016160eb52 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
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 e55eadaaf7..21d0f1d83a 100644
index caaa0df3b9..44c83ecd83 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.

2
patches/element-web/0020-No-damn-avatar-background-in-room-list.patch
View File

@ -1,4 +1,4 @@
From 92d6b80e0dac474eee6e68bbed983e461e831ca5 Mon Sep 17 00:00:00 2001
From 681a5c5e673031f69cca656689613a4cb3e6a187 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Tue, 7 Sep 2021 19:41:52 +0200
Subject: No damn avatar background in room list

2
patches/element-web/0021-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch
View File

@ -1,4 +1,4 @@
From 7b10f28aeaabb8a4536c7d9cbca4a59c2f99672a Mon Sep 17 00:00:00 2001
From 370e34ff53a52ab9b23888a13b7a61b388da1bf0 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Tue, 22 Dec 2020 19:16:28 +0100
Subject: No red messages in 1:1 chats Close SchildiChat/schildichat-desktop#13

2
patches/element-web/0022-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch
View File

@ -1,4 +1,4 @@
From 9b372342b6ed5b46c81de8a31f7acd59b73d37be Mon Sep 17 00:00:00 2001
From 2c63a24f188de4c350f8c2f9b731271493d2cf77 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 13 Oct 2024 13:26:16 +0200
Subject: Always apply corner radius to all edges of the bubble

2
patches/element-web/0023-Always-show-timestamps-by-default.patch
View File

@ -1,4 +1,4 @@
From c829676d1bf57cb045a14236572b8052063e7b38 Mon Sep 17 00:00:00 2001
From c6a86fe19296a5b519f9a901fb3833fcdf3593d6 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 13 Oct 2024 13:53:07 +0200
Subject: Always show timestamps by default

2
patches/element-web/0024-Enable-custom-emote-rendering-by-default.patch
View File

@ -1,4 +1,4 @@
From c75d62249708ea59f8ca30f251755578eae9f686 Mon Sep 17 00:00:00 2001
From 8ddcac75200d7d065c2cf25a01012e003a4e37d6 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Thu, 17 Oct 2024 19:40:51 +0200
Subject: Enable custom emote rendering by default

2
patches/element-web/0025-Enable-chat-previews-by-default.patch
View File

@ -1,4 +1,4 @@
From 33c51f4c3cb9d768560a267b98639c6e82b4a357 Mon Sep 17 00:00:00 2001
From 9c76a672dc90ca4919a2a6f0fcb53761b598d652 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 27 Oct 2024 19:24:26 +0100
Subject: Enable chat previews by default

2
patches/element-web/0026-Disable-showing-people-in-spaces-by-default.patch
View File

@ -1,4 +1,4 @@
From 92e50fac82ead9ed33077ab28cd9ef25e839f05b Mon Sep 17 00:00:00 2001
From 9e189bf0828f5f4ab0d11f06ed418cbbb6d0f2f1 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sat, 30 Nov 2024 19:42:44 +0100
Subject: Disable showing people in spaces by default

2
patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch
View File

@ -1,4 +1,4 @@
From 6974c864203cb0ed80c0322356e88ba9feaa8393 Mon Sep 17 00:00:00 2001
From 008d5321830bd0fc28aaa025bd7de1c4d77c285b Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Thu, 31 Oct 2024 13:44:20 -0400
Subject: Improve IRC layout for SchildiChat