Merge 1.11.100

This commit is contained in:
SpiritCroc 2025-05-10 07:38:14 +02:00
parent c2837f86c5
commit 281ef9695e
31 changed files with 56 additions and 56 deletions

@ -1 +1 @@
Subproject commit 21c96607d1304aebf422bc64510ca4fa9fba520a
Subproject commit 0d6444d4c9f435b91adf61a4627b742297098e4a

@ -1 +1 @@
Subproject commit 6ecb5b93427770117bafd283c072d9169f68e06d
Subproject commit e24376aabe1eedb03cff94e342a54c5ea089febe

@ -1 +1 @@
Subproject commit 27bdedd5447d7070b97ecfbfd224d786a7cc4504
Subproject commit ec4c7ffc021d2c8b854270219e45d5a85dc2fb09

@ -1 +1 @@
Subproject commit f7bab544a795bd8c0cba919d8b261ea639518f49
Subproject commit a29b8736f36e442013d64ca62d6e85d6b98dfc93

View File

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

View File

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

View File

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

View File

@ -1,4 +1,4 @@
From 6385be0c76621d18084d54b83089ccb67c096513 Mon Sep 17 00:00:00 2001
From 674a1e98c2b211c7ebbb23907abacda0061492fd 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

View File

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

View File

@ -1,4 +1,4 @@
From 70d03387cd78e193b9d37a97f5aacab9e25f926f Mon Sep 17 00:00:00 2001
From 5090c320acfb857ca820a832395aa889a3057546 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

View File

@ -1,4 +1,4 @@
From b81d62dc80dc7efdab2996c79662c4626302a8d0 Mon Sep 17 00:00:00 2001
From 2bf7172de08fbf43090fd95c0fc0938ef6f9a3ee 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
@ -128,10 +128,10 @@ index 6be226a172..dbb69d8f62 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 aee9141c29..7eda4d794b 100644
index 36030713ec..ac88f717d4 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -358,6 +358,14 @@ export type BooleanSettingKey = Assignable<Settings, IBaseSetting<boolean>> | Fe
@@ -359,6 +359,14 @@ export type BooleanSettingKey = Assignable<Settings, IBaseSetting<boolean>> | Fe
export type StringSettingKey = Assignable<Settings, IBaseSetting<string>>;
export const SETTINGS: Settings = {
@ -147,10 +147,10 @@ index aee9141c29..7eda4d794b 100644
isFeature: true,
labsGroup: LabGroup.VoiceAndVideo,
diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts
index 6985e007bd..206ab20037 100644
index 2fc396b8b3..0739857b0b 100644
--- a/src/stores/room-list/RoomListStore.ts
+++ b/src/stores/room-list/RoomListStore.ts
@@ -504,6 +504,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient<EmptyObject> implem
@@ -494,6 +494,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient<EmptyObject> implem
this.setAndPersistListOrder(tag, listOrder);
}
}
@ -160,7 +160,7 @@ index 6985e007bd..206ab20037 100644
}
private onAlgorithmListUpdated = (forceUpdate: boolean): void => {
@@ -617,7 +620,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient<EmptyObject> implem
@@ -607,7 +610,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient<EmptyObject> implem
*/
public getTagsForRoom(room: Room): TagID[] {
const algorithmTags = this.algorithm.getTagsForRoom(room);

View File

@ -1,4 +1,4 @@
From 1755079d1f53e5738ef9841607184d1bae0a05af Mon Sep 17 00:00:00 2001
From c2c32d2b5af54a450e7d5b1dea19d322fc3a9ee1 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.

View File

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

View File

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

View File

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

View File

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

View File

@ -1,4 +1,4 @@
From d52e8bb4d370dd0ba42a94e20dfc7f900a33f508 Mon Sep 17 00:00:00 2001
From 6933b98e7fcd8682fc98a5bab7493d8adb0be7bc 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 7eda4d794b..b6cde99d81 100644
index ac88f717d4..7295b716b8 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -365,6 +365,11 @@ export const SETTINGS: Settings = {
@@ -366,6 +366,11 @@ export const SETTINGS: Settings = {
default: true,
controller: new ReloadOnChangeController(),
},
@ -28,7 +28,7 @@ index 7eda4d794b..b6cde99d81 100644
"feature_video_rooms": {
isFeature: true,
diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts
index 690beaa0b7..fcd7ff659b 100644
index ac4ffdaf0c..f0f3fb8e18 100644
--- a/src/stores/spaces/SpaceStore.ts
+++ b/src/stores/spaces/SpaceStore.ts
@@ -155,9 +155,17 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
@ -60,7 +60,7 @@ index 690beaa0b7..fcd7ff659b 100644
public setActiveRoomInSpace(space: SpaceKey): void {
if (!isMetaSpace(space) && !this.matrixClient?.getRoom(space)?.isSpaceRoom()) return;
if (space !== this.activeSpace) this.setActiveSpace(space, false);
@@ -724,6 +736,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
@@ -735,6 +747,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
if (room.isSpaceRoom() || !flattenedRoomsForSpace.has(room.roomId)) return false;
@ -71,7 +71,7 @@ index 690beaa0b7..fcd7ff659b 100644
if (dmBadgeSpace && DMRoomMap.shared().getUserIdForRoomId(room.roomId)) {
return s === dmBadgeSpace;
}
@@ -1301,6 +1317,15 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
@@ -1312,6 +1328,15 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
break;
}

View File

@ -1,4 +1,4 @@
From 2a5b9f5f25b4b5fdfb60c21b4edcd9dd20dbda5d Mon Sep 17 00:00:00 2001
From 8834d66d2feccbbd31a4a2b7e86023171817922f 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

View File

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

View File

@ -1,4 +1,4 @@
From 0e919ce4854c5f66870f4465b8e1c4b793960025 Mon Sep 17 00:00:00 2001
From 35a85500c61821e49ce788d327a0d3882c27dd19 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 0f722ae53d..47f09400d7 100644
index 83d6f5f54c..885c5f7daa 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> {
@@ -1412,7 +1412,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 0f722ae53d..47f09400d7 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> {
@@ -1424,6 +1432,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
}
}
@ -46,10 +46,10 @@ index 0f722ae53d..47f09400d7 100644
dis.dispatch<ViewRoomPayload>({
action: Action.ViewRoom,
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index b6cde99d81..61a17d09ae 100644
index 7295b716b8..cab6622f9a 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -370,6 +370,12 @@ export const SETTINGS: Settings = {
@@ -371,6 +371,12 @@ export const SETTINGS: Settings = {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
default: true,
},
@ -63,7 +63,7 @@ index b6cde99d81..61a17d09ae 100644
"feature_video_rooms": {
isFeature: true,
diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts
index fcd7ff659b..33407f74e8 100644
index f0f3fb8e18..fa43d5a222 100644
--- a/src/stores/spaces/SpaceStore.ts
+++ b/src/stores/spaces/SpaceStore.ts
@@ -288,6 +288,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {

View File

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

View File

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

View File

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

View File

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

View File

@ -1,4 +1,4 @@
From c5ae977ed90c680d9055460295f60f4945f0c98a Mon Sep 17 00:00:00 2001
From ecfa04046d5d1ace0a08c048c0c705f9b500b1f9 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,10 +8,10 @@ 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 7baa127f16..4da70f5ecb 100644
index 2c10d0afd9..d46320e8c3 100644
--- a/src/components/views/rooms/EventTile.tsx
+++ b/src/components/views/rooms/EventTile.tsx
@@ -679,6 +679,12 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
@@ -681,6 +681,12 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
return false;
}

View File

@ -1,4 +1,4 @@
From efe6a8611871296b277adbf5201fec0826b837fe Mon Sep 17 00:00:00 2001
From 8fdb8bfa00fd4b510de8580eea03afdb044407be 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 c25cbfcec4..682ea64890 100644
index 1607c45924..aa69fbf07f 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.

View File

@ -1,4 +1,4 @@
From 4c1b8a37c564d086ef37049cf5b0c4ac6376e8a9 Mon Sep 17 00:00:00 2001
From d06ae4fb3ff1663f18b48dc01ead318a26d2eb9d 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 61a17d09ae..4ca441dc47 100644
index cab6622f9a..01cb113acb 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -795,7 +795,7 @@ export const SETTINGS: Settings = {
@@ -801,7 +801,7 @@ export const SETTINGS: Settings = {
"alwaysShowTimestamps": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td("settings|always_show_message_timestamps"),

View File

@ -1,4 +1,4 @@
From 9fcbc30485a80dcfa7321fa3599d16ce5e7308e6 Mon Sep 17 00:00:00 2001
From b4c4f14bcf35ad345d1338b639072c5614037456 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 4ca441dc47..aa74245519 100644
index 01cb113acb..cd946a7eb5 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -650,7 +650,7 @@ export const SETTINGS: Settings = {
@@ -656,7 +656,7 @@ export const SETTINGS: Settings = {
description: _td("labs|render_reaction_images_description"),
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED,
supportedLevelsAreOrdered: true,

View File

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

View File

@ -1,4 +1,4 @@
From 8354faea210da07d2948ca60dd6eaf3e7a668f86 Mon Sep 17 00:00:00 2001
From d8f33db58f94f18439cff55474da3144fa2aeb13 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 aa74245519..07227b02dc 100644
index cd946a7eb5..fa840e88ca 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -1233,7 +1233,7 @@ export const SETTINGS: Settings = {
@@ -1229,7 +1229,7 @@ export const SETTINGS: Settings = {
},
"Spaces.showPeopleInSpace": {
supportedLevels: [SettingLevel.ROOM_ACCOUNT],

View File

@ -1,4 +1,4 @@
From 345e3cce61ff9afa68d8b17dde379fce269faa56 Mon Sep 17 00:00:00 2001
From 7288f51395c723c294ed6505c9999da06360340b 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