github/schildichat-desktop
1
0
Fork 1
mirror of https://github.com/SchildiChat/schildichat-desktop.git synced 2025-06-06 00:47:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Upstream 1.11.101

Browse Source
This commit is contained in:
SpiritCroc 2025-05-26 10:17:10 +02:00
parent 281ef9695e
commit b601d43d88
30 changed files with 23609 additions and 22114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
element-desktop

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

2
element-web

@ -1 +1 @@
Subproject commit ec4c7ffc021d2c8b854270219e45d5a85dc2fb09
Subproject commit feeffd4e759026cd766b5dbf656bd0e0a378fac5

2
matrix-js-sdk

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

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

@ -1,4 +1,4 @@
From 25f863f631bdb06123948ed3ff429aebebdb43b4 Mon Sep 17 00:00:00 2001
From fbe03ba5b46a8bce93936f4e9ec752797a39b4fe 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

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

File diff suppressed because it is too large Load Diff

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

@ -1,4 +1,4 @@
From 4134bca143fa6fe9850bac233966631119a0e202 Mon Sep 17 00:00:00 2001
From 13ce4b9769c425a4e76867c6ff262ec82aada25e 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

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

@ -1,4 +1,4 @@
From 674a1e98c2b211c7ebbb23907abacda0061492fd Mon Sep 17 00:00:00 2001
From 553a577bb18aef6fd23e23189e6399b3be6f1e49 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 e2a25e858d76729cac0aa387cfcfff5b6fcb5598 Mon Sep 17 00:00:00 2001
From 553539edf7c4b50b353fb86b4487fbf904033087 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 5090c320acfb857ca820a832395aa889a3057546 Mon Sep 17 00:00:00 2001
From beb53797528a9539658ffa55665048e2fb055fe9 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 2bf7172de08fbf43090fd95c0fc0938ef6f9a3ee Mon Sep 17 00:00:00 2001
From 9d2fea504ab94b248930193dfe08dd66e3d95b59 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 c2c32d2b5af54a450e7d5b1dea19d322fc3a9ee1 Mon Sep 17 00:00:00 2001
From 96ffbb0a509f1916637245c761f9dfa2dbe8b4a2 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 9ce1fc1e6354cc4303699a2d05feefb15917ff9e Mon Sep 17 00:00:00 2001
From e8ab76d04fbad97adc20e0678acab24ef79340d5 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 ada765e8496359cd78edd74143bd2b4793fff156 Mon Sep 17 00:00:00 2001
From 44c5f7c1d38c93987ffaa4bdd3be575f5103627d 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 a5e258d06ce0a2f478ef5a944d05d3f09558b3f1 Mon Sep 17 00:00:00 2001
From e92a08cfdf9d518c2f5a23b5cfdc67a0faa4dfdd 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 30ce249faa79536d63f578c3ed1e5c942cf251a9 Mon Sep 17 00:00:00 2001
From 520670ce0c83b74a28a1992a3a184832ce89dda0 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

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

@ -1,4 +1,4 @@
From 6933b98e7fcd8682fc98a5bab7493d8adb0be7bc Mon Sep 17 00:00:00 2001
From 7e65c9ffe978d6e35ad300322f03a2b9fb90bdc8 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
@ -28,12 +28,12 @@ index ac88f717d4..7295b716b8 100644
"feature_video_rooms": {
isFeature: true,
diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts
index ac4ffdaf0c..f0f3fb8e18 100644
index 015c9fa0fd..c5c34c4e14 100644
--- a/src/stores/spaces/SpaceStore.ts
+++ b/src/stores/spaces/SpaceStore.ts
@@ -155,9 +155,17 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
@@ -154,9 +154,17 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
private _msc3946ProcessDynamicPredecessor: boolean = SettingsStore.getValue("feature_dynamic_room_predecessors");
private _storeReadyDeferred = defer();
private _storeReadyDeferred = Promise.withResolvers<void>();
+ // SC start
+ private _showSpaceDMBadges = true;
@ -49,7 +49,7 @@ index ac4ffdaf0c..f0f3fb8e18 100644
SettingsStore.monitorSetting("Spaces.allRoomsInHome", null);
SettingsStore.monitorSetting("Spaces.enabledMetaSpaces", null);
SettingsStore.monitorSetting("Spaces.showPeopleInSpace", null);
@@ -215,6 +223,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
@@ -214,6 +222,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
return this._allRoomsInHome;
}
@ -60,7 +60,7 @@ index ac4ffdaf0c..f0f3fb8e18 100644
public setActiveRoomInSpace(space: SpaceKey): void {
if (!isMetaSpace(space) && !this.matrixClient?.getRoom(space)?.isSpaceRoom()) return;
if (space !== this.activeSpace) this.setActiveSpace(space, false);
@@ -735,6 +747,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
@@ -734,6 +746,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
if (room.isSpaceRoom() || !flattenedRoomsForSpace.has(room.roomId)) return false;
@ -71,7 +71,7 @@ index ac4ffdaf0c..f0f3fb8e18 100644
if (dmBadgeSpace && DMRoomMap.shared().getUserIdForRoomId(room.roomId)) {
return s === dmBadgeSpace;
}
@@ -1312,6 +1328,15 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
@@ -1311,6 +1327,15 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
break;
}

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

@ -1,4 +1,4 @@
From 8834d66d2feccbbd31a4a2b7e86023171817922f Mon Sep 17 00:00:00 2001
From 950bcc4a75cf69739772982994d298b1f0ed19d9 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 4f7108249af0e238a2afbc50b5b27378d83ac55a Mon Sep 17 00:00:00 2001
From 49ca76277ee11346402a3ebd14220e1a21e53f7c 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

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

@ -1,4 +1,4 @@
From 35a85500c61821e49ce788d327a0d3882c27dd19 Mon Sep 17 00:00:00 2001
From d6cecb5cb16ce466b441c09c2c93e342a3b84a5b 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 83d6f5f54c..885c5f7daa 100644
index 761b7cf0e0..eef747d529 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -1412,7 +1412,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
@@ -1413,7 +1413,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 83d6f5f54c..885c5f7daa 100644
// Before defaulting to directory, show the last viewed room
this.viewLastRoom();
} else {
@@ -1424,6 +1432,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
@@ -1425,6 +1433,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
}
}
@ -63,10 +63,10 @@ index 7295b716b8..cab6622f9a 100644
"feature_video_rooms": {
isFeature: true,
diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts
index f0f3fb8e18..fa43d5a222 100644
index c5c34c4e14..9c0090d9cc 100644
--- a/src/stores/spaces/SpaceStore.ts
+++ b/src/stores/spaces/SpaceStore.ts
@@ -288,6 +288,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
@@ -287,6 +287,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
// else if the last viewed room in this space is joined then view that
// else view space home or home depending on what is being clicked on
if (

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

@ -1,4 +1,4 @@
From 348f8248496ac84713cc2843e22e870600dc5498 Mon Sep 17 00:00:00 2001
From 787190d19f185c011418cd175962fba6b4de719f 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

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

@ -1,4 +1,4 @@
From 4317b8be5bc8a35e2953276992f36050fcd8779d Mon Sep 17 00:00:00 2001
From de1b48dfa614375c23d256e693818fb292298304 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

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

@ -1,4 +1,4 @@
From c06a3c94e097db2644290e24af3e127945947cfa Mon Sep 17 00:00:00 2001
From 5f448e590304b0ee06b7fbbfd80891bca813b152 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

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

@ -1,4 +1,4 @@
From 4144251994b10279d788d8b1b8dc940a3cba5789 Mon Sep 17 00:00:00 2001
From 92d6b80e0dac474eee6e68bbed983e461e831ca5 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 ecfa04046d5d1ace0a08c048c0c705f9b500b1f9 Mon Sep 17 00:00:00 2001
From 7b10f28aeaabb8a4536c7d9cbca4a59c2f99672a 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 8fdb8bfa00fd4b510de8580eea03afdb044407be Mon Sep 17 00:00:00 2001
From 9b372342b6ed5b46c81de8a31f7acd59b73d37be 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 d06ae4fb3ff1663f18b48dc01ead318a26d2eb9d Mon Sep 17 00:00:00 2001
From c829676d1bf57cb045a14236572b8052063e7b38 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 b4c4f14bcf35ad345d1338b639072c5614037456 Mon Sep 17 00:00:00 2001
From c75d62249708ea59f8ca30f251755578eae9f686 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 915c020294bf7a8e3dcc0201953baa811e85e466 Mon Sep 17 00:00:00 2001
From 33c51f4c3cb9d768560a267b98639c6e82b4a357 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 d8f33db58f94f18439cff55474da3144fa2aeb13 Mon Sep 17 00:00:00 2001
From 92e50fac82ead9ed33077ab28cd9ef25e839f05b 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 7288f51395c723c294ed6505c9999da06360340b Mon Sep 17 00:00:00 2001
From 6974c864203cb0ed80c0322356e88ba9feaa8393 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