github/schildichat-desktop
1
0
Fork 1
mirror of https://github.com/SchildiChat/schildichat-desktop.git synced 2025-03-26 10:07:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to upstream v1.11.87

Browse Source
This commit is contained in:
SpiritCroc 2024-12-03 19:56:44 +01:00
parent f8ecb305f6
commit 59fab598d2
31 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compound-web

@ -1 +1 @@
Subproject commit 141771eb303d48dc388b2e5a01504359ad47b2c1
Subproject commit 5a674793b5859c5c8ce9662993592e8d10b26969

2
element-desktop

@ -1 +1 @@
Subproject commit f115ac7ad03f7efa8e0a3e8dca782e455b766277
Subproject commit 4e3fa16f25ae1c6b1131a3c8a1149f2e4e3ba719

2
element-web

@ -1 +1 @@
Subproject commit f335d70a269599914d037a9a09b4339f1315d8e8
Subproject commit 812c98535711ff5eba41a9d4b520fe4ccfbbf1a9

2
matrix-js-sdk

@ -1 +1 @@
Subproject commit cf065470630197affee1dea84f1c7e95df6c0ddf
Subproject commit d3f5526ec07dcbd0e4677a56b5e53f7d3a4cbcc2

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

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

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

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

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

@ -1,4 +1,4 @@
From 60fa47ee055ed85728583c12ab4619a7576d260e Mon Sep 17 00:00:00 2001
From 777d4917cd8e0db3f977804b2ac8428453fc9270 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 faaf99c6ce2111faeeaa3100cd076a51b711d95b Mon Sep 17 00:00:00 2001
From feb223e69bfb0a44d82dd4c0d0c0555ee5bd2be9 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

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

@ -1,4 +1,4 @@
From f469bd05375c6b4c1b419cf07b4a832511a79a4e Mon Sep 17 00:00:00 2001
From 888ec3387af2ba9d79a7cf0affb44fbb75b13771 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
@ -8,7 +8,7 @@ Subject: Schildify login footer
1 file changed, 4 insertions(+)
diff --git a/src/components/views/auth/AuthFooter.tsx b/src/components/views/auth/AuthFooter.tsx
index 8d27a04c83..b9ff8e8416 100644
index a792896a88..6ecfd6ae20 100644
--- a/src/components/views/auth/AuthFooter.tsx
+++ b/src/components/views/auth/AuthFooter.tsx
@@ -15,9 +15,13 @@ import { _t } from "../../../languageHandler";
@ -17,7 +17,7 @@ index 8d27a04c83..b9ff8e8416 100644
const links = brandingConfig?.get("auth_footer_links") ?? [
+ /*
{ text: "Blog", url: "https://element.io/blog" },
{ text: "Twitter", url: "https://twitter.com/element_hq" },
{ text: "Mastodon", url: "https://mastodon.matrix.org/@Element" },
{ text: "GitHub", url: "https://github.com/element-hq/element-web" },
+ */
+ { text: "About", url: "https://schildi.chat" },

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

@ -1,4 +1,4 @@
From 909d0c76ad56426699d9b8dfaebf818f21c09dd4 Mon Sep 17 00:00:00 2001
From 72f5f3b18cd813fc3cdc4ff89131558738f8c551 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 9cf40d600e00770aa7a56cebf5ab3413166e29e6 Mon Sep 17 00:00:00 2001
From 9b0cba9a234d7f9329f9e6e8ad549a09a6455bf1 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 9fb400a94a190f910b731e3c5ea2c3ccdd91adce Mon Sep 17 00:00:00 2001
From e515cfeedb25c3bd8afa7363f677cb885d2acab1 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 96de5eb0667f130de17544eb104647f823b617b0 Mon Sep 17 00:00:00 2001
From c38e41947b16518d6f74313b23670e630c9a1af6 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 cc3db444dc3788e6eaca8db3bd77feccc0e2133d Mon Sep 17 00:00:00 2001
From afc0686a92f5c16a6747d63a5450c0c8c63f9f68 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 5b5635a2c649226fccdd47013c576a8e1789af4e Mon Sep 17 00:00:00 2001
From c490b899efc44fd1de9cb1c7bc4e5cf08916965c 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 532251811dbd3c3ff6ae43050acd6fb5140e20a0 Mon Sep 17 00:00:00 2001
From 6c5419a256020fda6907fa770ae1fc8c48a96849 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 920a48f9ec942635cd6a877f366e6c38abad9b11 Mon Sep 17 00:00:00 2001
From 5105bf1ceb8cadb26b49ff727461ac2a6e2987b9 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

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

@ -1,4 +1,4 @@
From 8f81368ec09b41f996955b8a8fabcc594c194194 Mon Sep 17 00:00:00 2001
From 842eb33b63bd69bf5714b10975f9e2fecc72ea66 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
@ -71,7 +71,7 @@ Date: Tue Aug 17 11:29:22 2021 +0200
2 files changed, 16 insertions(+)
diff --git a/src/components/views/emojipicker/EmojiPicker.tsx b/src/components/views/emojipicker/EmojiPicker.tsx
index 4806ad4216..7d4a4353e2 100644
index e2470d188d..868f9b3d7c 100644
--- a/src/components/views/emojipicker/EmojiPicker.tsx
+++ b/src/components/views/emojipicker/EmojiPicker.tsx
@@ -17,6 +17,7 @@ import Header from "./Header";
@ -82,7 +82,7 @@ index 4806ad4216..7d4a4353e2 100644
import Category, { CategoryKey, ICategory } from "./Category";
import { filterBoolean } from "../../../utils/arrays";
import {
@@ -37,6 +38,7 @@ export const EMOJIS_PER_ROW = 8;
@@ -36,6 +37,7 @@ export const EMOJIS_PER_ROW = 8;
const ZERO_WIDTH_JOINER = "\u200D";
interface IProps {
@ -90,7 +90,7 @@ index 4806ad4216..7d4a4353e2 100644
selectedEmojis?: Set<string>;
onChoose(unicode: string): boolean;
onFinished(): void;
@@ -341,6 +343,10 @@ class EmojiPicker extends React.Component<IProps, IState> {
@@ -337,6 +339,10 @@ class EmojiPicker extends React.Component<IProps, IState> {
}
};
@ -101,7 +101,7 @@ index 4806ad4216..7d4a4353e2 100644
private static categoryHeightForEmojiCount(count: number): number {
if (count === 0) {
return 0;
@@ -396,6 +402,15 @@ class EmojiPicker extends React.Component<IProps, IState> {
@@ -392,6 +398,15 @@ class EmojiPicker extends React.Component<IProps, IState> {
return categoryElement;
})}
</AutoHideScrollbar>

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

@ -1,4 +1,4 @@
From 4980c7e816e83a3dce4106c8485461044591da26 Mon Sep 17 00:00:00 2001
From 171a1d7ed3285bc96821986b655785b4a836270c 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 b29702cd66f838ebe6af90fbf0b223caab3725b1 Mon Sep 17 00:00:00 2001
From df5c6698c294e898c375d2f57747cc99be35dfc7 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 80a648b5d5..f917d0bf7f 100644
index 9f9e225352..85a6400364 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -1456,7 +1456,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
@@ -1454,7 +1454,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 80a648b5d5..f917d0bf7f 100644
// Before defaulting to directory, show the last viewed room
this.viewLastRoom();
} else {
@@ -1468,6 +1476,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
@@ -1466,6 +1474,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 7d9fafb12e3bf1768e32b39ecf00b973309e6c1b Mon Sep 17 00:00:00 2001
From e7747d12316e0d30bc8d152d71e636742c65eb0e 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 9a1518e041fa2d5364885725b259378952a2b445 Mon Sep 17 00:00:00 2001
From 1868f42a8185a651ecdb8192c22eb8706707cc6f 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 e5b9cc85889d539da3d4acff20cf8b3199ae94e3 Mon Sep 17 00:00:00 2001
From 9638fd0cc8c5a4318d6712bd9cbd9d603bf37fbf 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 124ee073c6de89d111823c94922d7d2eeb596a0b Mon Sep 17 00:00:00 2001
From 2e304e4e139502133e58346b93dfce0dfdf95092 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 ca4fa33dda5812b259c4391171358a50beb812fd Mon Sep 17 00:00:00 2001
From 89faafa2c7aff5d5742d41b8231306108a952f46 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

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

@ -1,4 +1,4 @@
From 45fea7a503d58e70e876bf5c94e5731fbed85551 Mon Sep 17 00:00:00 2001
From 3bad1e4af1e22ac1e2a56cc04b46f2b0cf92390f 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
@ -8,7 +8,7 @@ Subject: Always apply corner radius to all edges of the bubble
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/res/css/views/rooms/_EventBubbleTile.pcss b/res/css/views/rooms/_EventBubbleTile.pcss
index 3a42cde9bb..a5f5480010 100644
index 7b1af0c771..fbb1ad2e1b 100644
--- a/res/css/views/rooms/_EventBubbleTile.pcss
+++ b/res/css/views/rooms/_EventBubbleTile.pcss
@@ -283,6 +283,8 @@ Please see LICENSE files in the repository root for full details.
@ -20,7 +20,7 @@ index 3a42cde9bb..a5f5480010 100644
/* the selector here is quite weird because timestamps can appear linked & unlinked and in different places */
/* in the DOM depending on the specific rendering context */
@@ -377,7 +379,7 @@ Please see LICENSE files in the repository root for full details.
@@ -376,7 +378,7 @@ Please see LICENSE files in the repository root for full details.
}
&.mx_EventTile_continuation[data-self="false"] .mx_EventTile_line {
@ -29,7 +29,7 @@ index 3a42cde9bb..a5f5480010 100644
.mx_MImageBody .mx_MImageBody_thumbnail_container,
.mx_MVideoBody .mx_MVideoBody_container,
@@ -385,7 +387,7 @@ Please see LICENSE files in the repository root for full details.
@@ -384,7 +386,7 @@ Please see LICENSE files in the repository root for full details.
.mx_MediaBody,
.mx_MLocationBody_map,
.mx_MBeaconBody {
@ -38,7 +38,7 @@ index 3a42cde9bb..a5f5480010 100644
}
}
&.mx_EventTile_lastInSection[data-self="false"] .mx_EventTile_line {
@@ -402,7 +404,7 @@ Please see LICENSE files in the repository root for full details.
@@ -401,7 +403,7 @@ Please see LICENSE files in the repository root for full details.
}
&.mx_EventTile_continuation[data-self="true"] .mx_EventTile_line {
@ -47,7 +47,7 @@ index 3a42cde9bb..a5f5480010 100644
.mx_MImageBody .mx_MImageBody_thumbnail_container,
.mx_MVideoBody .mx_MVideoBody_container,
@@ -410,7 +412,7 @@ Please see LICENSE files in the repository root for full details.
@@ -409,7 +411,7 @@ Please see LICENSE files in the repository root for full details.
.mx_MediaBody,
.mx_MLocationBody_map,
.mx_MBeaconBody {

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

@ -1,4 +1,4 @@
From 61195cdcca6e390e179b776726bab89cc56e6fca Mon Sep 17 00:00:00 2001
From 32c6ffd1896f6e4597d57ffbe9a8c599189c9ea4 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 457d402a9f2d854efceb14cd6bd573db6c09175d Mon Sep 17 00:00:00 2001
From 5e51ca6eefd49bc140dd8f8d67517460c7bd9dc9 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 9f640ce10fd0903be3c33e76ba1842112e659d5f Mon Sep 17 00:00:00 2001
From 017cdf7e8fd339bb49f023f122136e89dd2bd496 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/0031-Disable-showing-people-in-spaces-by-default.patch → patches/element-web/0026-Disable-showing-people-in-spaces-by-default.patch
View File

@ -1,4 +1,4 @@
From f45d0c6db3465497338b4bf87c65b8205af28c42 Mon Sep 17 00:00:00 2001
From 0d4814704ac86751ca9022672793e0672466232d 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

4
patches/element-web/0032-Improve-IRC-layout-for-SchildiChat.patch → patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch
View File

@ -1,4 +1,4 @@
From e2b0f154492779fa8df8abefc12c4bbe273994e4 Mon Sep 17 00:00:00 2001
From a854e513521055b34200b1ea5f431614a936ea12 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
@ -54,7 +54,7 @@ index c13f819439..4f42040606 100644
margin-top: $spacing-8;
}
diff --git a/res/css/views/rooms/_EventTile.pcss b/res/css/views/rooms/_EventTile.pcss
index 311e059166..ecd1030749 100644
index d405381db1..badc2399fa 100644
--- a/res/css/views/rooms/_EventTile.pcss
+++ b/res/css/views/rooms/_EventTile.pcss
@@ -1,5 +1,6 @@