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

Bump to 1.11.90

Browse Source
This commit is contained in:
SpiritCroc 2025-01-16 09:00:26 +01:00
parent a1299ffb15
commit a9f81d8ebe
31 changed files with 107 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compound-web

@ -1 +1 @@
Subproject commit 5a674793b5859c5c8ce9662993592e8d10b26969
Subproject commit 2614bf94edcd71ed910e71ebcb5f61604221399c

2
element-desktop

@ -1 +1 @@
Subproject commit 54ad269b30d0d4455b75d1ff6fbdac265f7fc652
Subproject commit e4333e09f0040628e50e5606ad35ef27adb0670b

2
element-web

@ -1 +1 @@
Subproject commit a71057b9155724d0289791c259281faacc1ee0bc
Subproject commit efecbbe9a2d907cd21656631b9ed00627cf0cf1f

2
matrix-js-sdk

@ -1 +1 @@
Subproject commit 1bf8533c033c5b462168da2c7f0e25681e9fa67a
Subproject commit 72ee5504d5ab39dc40c4ba1a5601a90b7a6b3426

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

@ -1,4 +1,4 @@
From ca9ce07f4817af4f81527f4bc19bd10388bd183b Mon Sep 17 00:00:00 2001
From feed71908222cd43aaa7f86dfbca809511b3a310 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
@ -58,5 +58,5 @@ index 7282945..4be7ab0 100644
if (!haveDeploy) {
const outPath = path.join(pkgDir, filename);
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From 9576252b89b28c8fc07933da92af0bd0a5356dde Mon Sep 17 00:00:00 2001
From 52908abcd2599bc1d0d32996b8f3de0a40b33f9b 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
@ -22104,7 +22104,7 @@ literal 0
HcmV?d00001
diff --git a/src/components/views/auth/AuthPage.tsx b/src/components/views/auth/AuthPage.tsx
index 2782d0a641..032744413f 100644
index dd3facaa79..3c7fe2503e 100644
--- a/src/components/views/auth/AuthPage.tsx
+++ b/src/components/views/auth/AuthPage.tsx
@@ -20,7 +20,7 @@ export default class AuthPage extends React.PureComponent<React.PropsWithChildre
@ -22117,7 +22117,7 @@ index 2782d0a641..032744413f 100644
const configuredUrl = brandingConfig?.get("welcome_background_url");
if (configuredUrl) {
diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
index f19343be20..f36fc9205b 100644
index d28c820d20..06cddc2677 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
@@ -119,7 +119,7 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
@ -22130,5 +22130,5 @@ index f19343be20..f36fc9205b 100644
target="_blank"
>
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From 83914e8c9926004d2df7e92481fa09975b35d3a6 Mon Sep 17 00:00:00 2001
From f9addc874260af436513147a9711e7df3e69e1a1 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
@ -21,5 +21,5 @@ index ef2d43bd8f..5b71670f4f 100644
<h4 class="mx_Header_subtitle">_t("powered_by_matrix_with_logo")</h4>
<div class="mx_ButtonGroup">
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From a6f46111e119e941233de3aec8a2de95a07dcb90 Mon Sep 17 00:00:00 2001
From 0ec5e88ed052f645796ca8b258bbcb474ac54ae8 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
@ -8,7 +8,7 @@ Subject: Stronger login background to ensure contrast of our icon with our bg
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/views/auth/AuthPage.tsx b/src/components/views/auth/AuthPage.tsx
index 032744413f..71bf8ae6d6 100644
index 3c7fe2503e..64163e837c 100644
--- a/src/components/views/auth/AuthPage.tsx
+++ b/src/components/views/auth/AuthPage.tsx
@@ -58,7 +58,7 @@ export default class AuthPage extends React.PureComponent<React.PropsWithChildre
@ -21,5 +21,5 @@ index 032744413f..71bf8ae6d6 100644
};
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From 4e1da585f2305c2e5ed325768759028aa7ecf837 Mon Sep 17 00:00:00 2001
From fc68141219ce4367db44ad05aa89c9367c894856 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 a792896a88..6ecfd6ae20 100644
index 472ff53f09..9f694aef42 100644
--- a/src/components/views/auth/AuthFooter.tsx
+++ b/src/components/views/auth/AuthFooter.tsx
@@ -15,9 +15,13 @@ import { _t } from "../../../languageHandler";
@ -26,5 +26,5 @@ index a792896a88..6ecfd6ae20 100644
const authFooterLinks: JSX.Element[] = [];
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From 7184e891326aaea6d1f70492b25f7427e0dd3cdb Mon Sep 17 00:00:00 2001
From 6c8b5594b57b22cb3e195d9e28a6843a0c36611d 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
@ -8,7 +8,7 @@ Subject: Disable sticky rooms
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts
index c3450d70cf..e296676149 100644
index 2ae3a1ff99..e0f5a17130 100644
--- a/src/stores/room-list/algorithms/Algorithm.ts
+++ b/src/stores/room-list/algorithms/Algorithm.ts
@@ -159,8 +159,10 @@ export class Algorithm extends EventEmitter {
@ -25,5 +25,5 @@ index c3450d70cf..e296676149 100644
}
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From d9a321ecaeb54cb4a0c7ca1ee28aaf6be1643b42 Mon Sep 17 00:00:00 2001
From 4cad8ad554645e437ba9a486734247257d577f43 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
@ -16,7 +16,7 @@ Co-authored-by: su-ex <codeworks@supercable.onl>
5 files changed, 83 insertions(+), 5 deletions(-)
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index f3bde66af9..f2446d3de8 100644
index fed1826bbb..ea4d54d5e8 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -72,11 +72,13 @@ interface IState {
@ -124,13 +124,13 @@ index f3bde66af9..f2446d3de8 100644
(this.props.activeSpace === MetaSpace.Favourites && orderedTagId !== DefaultTagID.Favourite) ||
(this.props.activeSpace === MetaSpace.People && orderedTagId !== DefaultTagID.DM) ||
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index 6cd5b15a51..4413cc5762 100644
index 9c4bb76f9f..2431a8d528 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -183,6 +183,14 @@ export interface IFeature extends Omit<IBaseSetting<boolean>, "isFeature"> {
export type ISetting = IBaseSetting | IFeature;
@@ -353,6 +353,14 @@ export type FeatureSettingKey = Assignable<Settings, IFeature>;
export type BooleanSettingKey = Assignable<Settings, IBaseSetting<boolean>> | FeatureSettingKey;
export const SETTINGS: { [setting: string]: ISetting } = {
export const SETTINGS: Settings = {
+ // SC settings start
+ "unifiedRoomList": {
+ supportedLevels: LEVELS_ACCOUNT_SETTINGS,
@ -143,7 +143,7 @@ index 6cd5b15a51..4413cc5762 100644
isFeature: true,
labsGroup: LabGroup.VoiceAndVideo,
diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts
index 53377e0a01..381187b85c 100644
index 0b179f7db5..6d1def3c87 100644
--- a/src/stores/room-list/RoomListStore.ts
+++ b/src/stores/room-list/RoomListStore.ts
@@ -500,6 +500,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> implements
@ -180,7 +180,7 @@ index 53377e0a01..381187b85c 100644
}
diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts
index e296676149..06147137b3 100644
index e0f5a17130..5411ad49fc 100644
--- a/src/stores/room-list/algorithms/Algorithm.ts
+++ b/src/stores/room-list/algorithms/Algorithm.ts
@@ -75,6 +75,7 @@ export class Algorithm extends EventEmitter {
@ -239,7 +239,7 @@ index e296676149..06147137b3 100644
}
}
diff --git a/src/stores/room-list/models.ts b/src/stores/room-list/models.ts
index 50cecda665..8efc2d040d 100644
index 78823cbc42..00883e2ad6 100644
--- a/src/stores/room-list/models.ts
+++ b/src/stores/room-list/models.ts
@@ -13,6 +13,7 @@ export enum DefaultTagID {
@ -259,5 +259,5 @@ index 50cecda665..8efc2d040d 100644
DefaultTagID.Conference,
DefaultTagID.Untagged,
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From ab77eb4263607e3883a06fee306cb6dacedfe066 Mon Sep 17 00:00:00 2001
From 3023a83c05387fd322420f8bea8fa97c1bcef85d 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.
@ -8,7 +8,7 @@ Subject: Don't sort muted rooms to bottom, I still want to see them.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts
index 67ee1ca084..67dcaa3855 100644
index 5cf7631cfe..81b335e3d2 100644
--- a/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts
@@ -38,7 +38,7 @@ export abstract class OrderingAlgorithm {
@ -21,5 +21,5 @@ index 67ee1ca084..67dcaa3855 100644
/**
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From c208ee73713f33642c78a26dece9fd3f144b24a7 Mon Sep 17 00:00:00 2001
From a80b770c4ba54d653ab9249ce7af18908d0c577e 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
@ -8,7 +8,7 @@ Subject: Don't preview reactions
1 file changed, 2 insertions(+)
diff --git a/src/stores/room-list/MessagePreviewStore.ts b/src/stores/room-list/MessagePreviewStore.ts
index 2577b2ba23..0df13f33a8 100644
index 3f1614df70..29c71fcc69 100644
--- a/src/stores/room-list/MessagePreviewStore.ts
+++ b/src/stores/room-list/MessagePreviewStore.ts
@@ -55,10 +55,12 @@ const PREVIEWS: Record<
@ -25,5 +25,5 @@ index 2577b2ba23..0df13f33a8 100644
isState: false,
previewer: new PollStartEventPreview(),
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From c99af69db7b5c3278e30ce9e3dfac277c1696d29 Mon Sep 17 00:00:00 2001
From 79080d4521da718362deb31c1d01b0e0a40124c2 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
@ -11,7 +11,7 @@ way.
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx
index 7953c5068d..42f7fabb8e 100644
index cbeb562077..3d893f5fe0 100644
--- a/src/components/views/rooms/RoomTile.tsx
+++ b/src/components/views/rooms/RoomTile.tsx
@@ -300,7 +300,9 @@ class RoomTile extends React.PureComponent<Props, State> {
@ -26,5 +26,5 @@ index 7953c5068d..42f7fabb8e 100644
return (
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From 9ff9e5f77bd4e40f5ea0a4c38aca772af69fb65a Mon Sep 17 00:00:00 2001
From 76daaebf1462651e4156e8b73bcaa15d7922ffc3 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
@ -8,7 +8,7 @@ Subject: Allow muted rooms to render as unread
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/RoomNotifs.ts b/src/RoomNotifs.ts
index 7c281d0d2d..f06be85437 100644
index e6064d2691..37838c79b5 100644
--- a/src/RoomNotifs.ts
+++ b/src/RoomNotifs.ts
@@ -255,7 +255,7 @@ export function determineUnreadState(
@ -21,5 +21,5 @@ index 7c281d0d2d..f06be85437 100644
}
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From 0028933498a0f286187166d637d23c46b441d0b6 Mon Sep 17 00:00:00 2001
From aa4a0d3e9ce9d4031ebaa38b9568aa434ce9cbe5 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
@ -8,7 +8,7 @@ Subject: Increase default visible tiles
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts
index ff60309e08..275b6d330b 100644
index e85703fa5f..2792e57f8d 100644
--- a/src/stores/room-list/ListLayout.ts
+++ b/src/stores/room-list/ListLayout.ts
@@ -74,7 +74,7 @@ export class ListLayout {
@ -21,5 +21,5 @@ index ff60309e08..275b6d330b 100644
public tilesWithPadding(n: number, paddingPx: number): number {
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From e5bfaebacf3dcf6859f0a0c7fedc5841b164767f Mon Sep 17 00:00:00 2001
From 713dafdaa9935d3a2cb419f6c9b4621b9ebe92d3 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
@ -12,10 +12,10 @@ Co-authored-by: SpiritCroc <dev@spiritcroc.de>
2 files changed, 30 insertions(+)
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index 4413cc5762..3dcb64ced7 100644
index 2431a8d528..45e1145c0f 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -190,6 +190,11 @@ export const SETTINGS: { [setting: string]: ISetting } = {
@@ -360,6 +360,11 @@ export const SETTINGS: Settings = {
default: true,
controller: new ReloadOnChangeController(),
},
@ -28,7 +28,7 @@ index 4413cc5762..3dcb64ced7 100644
"feature_video_rooms": {
isFeature: true,
diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts
index 90358f3310..60df05478a 100644
index 50aa7748a5..f11cc20b0c 100644
--- a/src/stores/spaces/SpaceStore.ts
+++ b/src/stores/spaces/SpaceStore.ts
@@ -154,9 +154,17 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
@ -88,5 +88,5 @@ index 90358f3310..60df05478a 100644
const newValue = SettingsStore.getValue("Spaces.enabledMetaSpaces");
const enabledMetaSpaces = metaSpaceOrder.filter((k) => newValue[k]);
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From 9b12990f85ba4c358347d12fb502eed68ae5ef66 Mon Sep 17 00:00:00 2001
From 34991cb7a32166efbfab4f09f05f2874180751ae 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 e2470d188d..868f9b3d7c 100644
index 0c10d778a6..250c8e0fec 100644
--- a/src/components/views/emojipicker/EmojiPicker.tsx
+++ b/src/components/views/emojipicker/EmojiPicker.tsx
@@ -17,6 +17,7 @@ import Header from "./Header";
@ -118,7 +118,7 @@ index e2470d188d..868f9b3d7c 100644
<Preview emoji={this.state.previewEmoji} />
) : (
diff --git a/src/components/views/emojipicker/ReactionPicker.tsx b/src/components/views/emojipicker/ReactionPicker.tsx
index bd16634490..d70c3df6ec 100644
index ea1a502942..e49b7e33cd 100644
--- a/src/components/views/emojipicker/ReactionPicker.tsx
+++ b/src/components/views/emojipicker/ReactionPicker.tsx
@@ -126,6 +126,7 @@ class ReactionPicker extends React.Component<IProps, IState> {
@ -130,5 +130,5 @@ index bd16634490..d70c3df6ec 100644
isEmojiDisabled={this.isEmojiDisabled}
onFinished={this.props.onFinished}
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From a782b6ffab3588ef374e52bd68810f8fd236cab5 Mon Sep 17 00:00:00 2001
From 3749bf8941ea426d395fd0c15742b235b5798e8e 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,7 +8,7 @@ Subject: Allow reactions to take more space
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/res/css/views/messages/_ReactionsRowButton.pcss b/res/css/views/messages/_ReactionsRowButton.pcss
index dd9d7ddb47..9ebe95021e 100644
index 917bcfbb84..75ec572c9e 100644
--- a/res/css/views/messages/_ReactionsRowButton.pcss
+++ b/res/css/views/messages/_ReactionsRowButton.pcss
@@ -14,6 +14,7 @@ Please see LICENSE files in the repository root for full details.
@ -28,5 +28,5 @@ index dd9d7ddb47..9ebe95021e 100644
white-space: nowrap;
text-overflow: ellipsis;
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From c1fd46c896b37095efb08343ef287bb449a991e9 Mon Sep 17 00:00:00 2001
From 51bf3a238471a9c54ae19dd1abe527a60b0d798d 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 548dbff983..6722975ce3 100644
index f417bd6045..6c6b7e2285 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -1450,7 +1450,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
@@ -1453,7 +1453,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 548dbff983..6722975ce3 100644
// Before defaulting to directory, show the last viewed room
this.viewLastRoom();
} else {
@@ -1462,6 +1470,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
@@ -1465,6 +1473,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
}
}
@ -46,10 +46,10 @@ index 548dbff983..6722975ce3 100644
dis.dispatch<ViewRoomPayload>({
action: Action.ViewRoom,
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index 3dcb64ced7..31ad386869 100644
index 45e1145c0f..dfa65a4917 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -195,6 +195,12 @@ export const SETTINGS: { [setting: string]: ISetting } = {
@@ -365,6 +365,12 @@ export const SETTINGS: Settings = {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
default: true,
},
@ -63,7 +63,7 @@ index 3dcb64ced7..31ad386869 100644
"feature_video_rooms": {
isFeature: true,
diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts
index 60df05478a..0be7ba190a 100644
index f11cc20b0c..bce2146d4e 100644
--- a/src/stores/spaces/SpaceStore.ts
+++ b/src/stores/spaces/SpaceStore.ts
@@ -265,6 +265,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
@ -75,5 +75,5 @@ index 60df05478a..0be7ba190a 100644
cliSpace?.getMyMembership() !== KnownMembership.Invite &&
this.matrixClient.getRoom(roomId)?.getMyMembership() === KnownMembership.Join &&
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From fab0b51edab01ef34590c7e1fac4d3c0584eb20b Mon Sep 17 00:00:00 2001
From df60ede5a07c6d13651844cd706ae63671684ffd 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
@ -8,7 +8,7 @@ Subject: Exclude spaces from breadcrumbs
1 file changed, 1 insertion(+)
diff --git a/src/stores/BreadcrumbsStore.ts b/src/stores/BreadcrumbsStore.ts
index 9859f24015..957b54286c 100644
index c02d1181fe..1d9410f8e2 100644
--- a/src/stores/BreadcrumbsStore.ts
+++ b/src/stores/BreadcrumbsStore.ts
@@ -137,6 +137,7 @@ export class BreadcrumbsStore extends AsyncStoreWithClient<IState> {
@ -20,5 +20,5 @@ index 9859f24015..957b54286c 100644
const rooms = (this.state.rooms || []).slice(); // cheap clone
const msc3946ProcessDynamicPredecessor = SettingsStore.getValue("feature_dynamic_room_predecessors");
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From 07d77a65ca5908941c04ccbbf4360c8836483ca9 Mon Sep 17 00:00:00 2001
From 4a15440a64bee09928b844c3a8072ff6291c2117 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 74328af39b..f47afd8677 100644
index ac7c36daa5..a0fafce7cb 100644
--- a/res/css/_common.pcss
+++ b/res/css/_common.pcss
@@ -181,6 +181,7 @@ input[type="search"].mx_textinput_icon {
@ -20,5 +20,5 @@ index 74328af39b..f47afd8677 100644
/* FIXME THEME - Tint by CSS rather than referencing a duplicate asset */
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From 75a848673bb41c52950ed4909cd2e417cddb1706 Mon Sep 17 00:00:00 2001
From 058584a07a6640f9b30785c3c22937c13fedfcbb 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 f47afd8677..d8be5b1fba 100644
index a0fafce7cb..dd681756c7 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.
@ -20,5 +20,5 @@ index f47afd8677..d8be5b1fba 100644
@import "./_animations.pcss";
@import "./_spacing.pcss";
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From 15d80dd710850e7b75dba1095bc1d4a97701661f Mon Sep 17 00:00:00 2001
From e53d0af43fd013525967fad17b0d393df64b6824 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
@ -8,7 +8,7 @@ Subject: No damn avatar background in room list
1 file changed, 3 insertions(+)
diff --git a/src/components/structures/BackdropPanel.tsx b/src/components/structures/BackdropPanel.tsx
index 32c75a936e..f420bdbc7b 100644
index 64b2ab0fce..d2045bd836 100644
--- a/src/components/structures/BackdropPanel.tsx
+++ b/src/components/structures/BackdropPanel.tsx
@@ -13,6 +13,9 @@ interface IProps {
@ -22,5 +22,5 @@ index 32c75a936e..f420bdbc7b 100644
const styles: CSSProperties = {};
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From 141ca3e01393c75c5990ddbf78ec1a17f51829ae Mon Sep 17 00:00:00 2001
From 37c21c10eb8d393e5f9724f14cddb94df749c8e3 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
@ -8,7 +8,7 @@ Subject: No red messages in 1:1 chats Close SchildiChat/schildichat-desktop#13
1 file changed, 6 insertions(+)
diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
index 8c755f00bd..172892a2c4 100644
index 1d2983dd03..83cafe4528 100644
--- a/src/components/views/rooms/EventTile.tsx
+++ b/src/components/views/rooms/EventTile.tsx
@@ -685,6 +685,12 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
@ -25,5 +25,5 @@ index 8c755f00bd..172892a2c4 100644
}
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From bd799a3d2bea84efe06c705cad3481a0271abcd4 Mon Sep 17 00:00:00 2001
From 08c316edf406d36de71822e0076c82d1e7bfcc84 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 7b1af0c771..fbb1ad2e1b 100644
index c25cbfcec4..682ea64890 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.
@ -57,5 +57,5 @@ index 7b1af0c771..fbb1ad2e1b 100644
}
&.mx_EventTile_lastInSection[data-self="true"] .mx_EventTile_line {
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From 514da5ddfcb81ce800573012add6d558d659f56f Mon Sep 17 00:00:00 2001
From f57b5221822b11a962c0ac6464497b640893fde9 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
@ -8,10 +8,10 @@ Subject: Always show timestamps by default
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index 31ad386869..70bccaa11f 100644
index dfa65a4917..92585b3f16 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -618,7 +618,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
@@ -779,7 +779,7 @@ export const SETTINGS: Settings = {
"alwaysShowTimestamps": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td("settings|always_show_message_timestamps"),
@ -21,5 +21,5 @@ index 31ad386869..70bccaa11f 100644
"userTimezone": {
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From 52ab9a20a207010912292f06466fbd30fedce1ed Mon Sep 17 00:00:00 2001
From 2239b6a765a7e0bbeb7373ba06ab444a319a9631 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
@ -8,10 +8,10 @@ Subject: Enable custom emote rendering by default
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index 70bccaa11f..8ef323e588 100644
index 92585b3f16..88d0548dc4 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -482,7 +482,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
@@ -643,7 +643,7 @@ export const SETTINGS: Settings = {
description: _td("labs|render_reaction_images_description"),
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED,
supportedLevelsAreOrdered: true,
@ -21,5 +21,5 @@ index 70bccaa11f..8ef323e588 100644
/**
* With the transition to Compound we are moving to a base font size
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From 1ecc64221c0b586830668f101863fbdb95240182 Mon Sep 17 00:00:00 2001
From 906524fb3b12ab3a847379aa3ecd72cec93b0774 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
@ -8,7 +8,7 @@ Subject: Enable chat previews by default
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts
index 275b6d330b..3a188451e7 100644
index 2792e57f8d..4f9d436bc8 100644
--- a/src/stores/room-list/ListLayout.ts
+++ b/src/stores/room-list/ListLayout.ts
@@ -18,7 +18,7 @@ interface ISerializedListLayout {
@ -21,5 +21,5 @@ index 275b6d330b..3a188451e7 100644
public constructor(public readonly tagId: TagID) {
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From 64e3e5aeb6a61e44a8892254ed8970d718fcfac5 Mon Sep 17 00:00:00 2001
From 8f4ca3a428317d5bfa478ab0ee72074dcb111366 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
@ -9,10 +9,10 @@ Subject: Disable showing people in spaces by default
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index 8ef323e588..cecc5ebe0b 100644
index 88d0548dc4..8ad5546afb 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -1047,7 +1047,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
@@ -1208,7 +1208,7 @@ export const SETTINGS: Settings = {
},
"Spaces.showPeopleInSpace": {
supportedLevels: [SettingLevel.ROOM_ACCOUNT],
@ -22,7 +22,7 @@ index 8ef323e588..cecc5ebe0b 100644
"developerMode": {
displayName: _td("devtools|developer_mode"),
diff --git a/src/stores/room-list/filters/SpaceFilterCondition.ts b/src/stores/room-list/filters/SpaceFilterCondition.ts
index 8f652a35fb..da02328e89 100644
index 7c4316ff21..4ffc0e67bf 100644
--- a/src/stores/room-list/filters/SpaceFilterCondition.ts
+++ b/src/stores/room-list/filters/SpaceFilterCondition.ts
@@ -25,7 +25,7 @@ import SettingsStore from "../../../settings/SettingsStore";
@ -35,5 +35,5 @@ index 8f652a35fb..da02328e89 100644
public isVisible(room: Room): boolean {
--
2.47.1
2.48.1

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

@ -1,4 +1,4 @@
From e0e03f4f780055951b6e9bbe1f51459e20c81c3c Mon Sep 17 00:00:00 2001
From 3331df28b4d40e94e73c051301261ac298074238 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
@ -22,7 +22,7 @@ Date: Thu Nov 28 10:01:43 2024 -0500
3 files changed, 155 insertions(+), 10 deletions(-)
diff --git a/res/css/views/elements/_GenericEventListSummary.pcss b/res/css/views/elements/_GenericEventListSummary.pcss
index c13f819439..4f42040606 100644
index f4aa0e6f0f..88bcb88f14 100644
--- a/res/css/views/elements/_GenericEventListSummary.pcss
+++ b/res/css/views/elements/_GenericEventListSummary.pcss
@@ -1,5 +1,6 @@
@ -31,7 +31,7 @@ index c13f819439..4f42040606 100644
+Copyright 2024 Suguru Hirahara
Copyright 2016 OpenMarket Ltd
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
@@ -36,6 +37,20 @@ Please see LICENSE files in the repository root for full details.
}
}
@ -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 d405381db1..badc2399fa 100644
index 5b86e3f753..03fbfe1a29 100644
--- a/res/css/views/rooms/_EventTile.pcss
+++ b/res/css/views/rooms/_EventTile.pcss
@@ -1,5 +1,6 @@
@ -287,7 +287,7 @@ index d405381db1..badc2399fa 100644
&[data-layout="group"] {
diff --git a/res/css/views/rooms/_IRCLayout.pcss b/res/css/views/rooms/_IRCLayout.pcss
index ecf1c25716..de85238ca6 100644
index 953a0c941f..3326d0c0ff 100644
--- a/res/css/views/rooms/_IRCLayout.pcss
+++ b/res/css/views/rooms/_IRCLayout.pcss
@@ -1,5 +1,6 @@
@ -296,7 +296,7 @@ index ecf1c25716..de85238ca6 100644
+Copyright 2024 Suguru Hirahara
Copyright 2020 The Matrix.org Foundation C.I.C.
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
@@ -15,6 +16,7 @@ Please see LICENSE files in the repository root for full details.
--icon-width: 14px;
--line-height: var(--irc-line-height);
@ -306,5 +306,5 @@ index ecf1c25716..de85238ca6 100644
line-height: var(--line-height) !important;
--
2.47.1
2.48.1