Upstream v1.11.106
This commit is contained in:
parent
2029ad5729
commit
6edf34e948
@ -1 +1 @@
|
|||||||
Subproject commit 3ad52cef754fb2529bc315c36d0b23db521c0a9f
|
Subproject commit b1bf981accd059258f538f94979154cfba003c6c
|
||||||
@ -1 +1 @@
|
|||||||
Subproject commit 1c6f7d2ffe8c690af933304e89b85eb41aebb839
|
Subproject commit b13633897d2ffc8aa1ec4d3cccc4679775a7ac75
|
||||||
@ -1 +1 @@
|
|||||||
Subproject commit b095aa600d86b6a9cfa6ac23727f7a9ea90bbdf3
|
Subproject commit 946cf4f359c62983df103fb84fc5e52413c3f482
|
||||||
@ -1,4 +1,4 @@
|
|||||||
From b39ae00380dddc7e263b27807c0366f314f45c63 Mon Sep 17 00:00:00 2001
|
From 4630dea960fd9fbe01733aea8000d7d00cae8935 Mon Sep 17 00:00:00 2001
|
||||||
From: SpiritCroc <dev@spiritcroc.de>
|
From: SpiritCroc <dev@spiritcroc.de>
|
||||||
Date: Sat, 2 Dec 2023 12:57:26 +0100
|
Date: Sat, 2 Dec 2023 12:57:26 +0100
|
||||||
Subject: Add back schildi fetch-package.ts modifications
|
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(-)
|
1 file changed, 10 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
diff --git a/scripts/fetch-package.ts b/scripts/fetch-package.ts
|
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
|
--- a/scripts/fetch-package.ts
|
||||||
+++ b/scripts/fetch-package.ts
|
+++ b/scripts/fetch-package.ts
|
||||||
@@ -54,6 +54,7 @@ async function main(): Promise<number | undefined> {
|
@@ -54,6 +54,7 @@ async function main(): Promise<number | undefined> {
|
||||||
@ -58,5 +58,5 @@ index 7282945..4be7ab0 100644
|
|||||||
if (!haveDeploy) {
|
if (!haveDeploy) {
|
||||||
const outPath = path.join(pkgDir, filename);
|
const outPath = path.join(pkgDir, filename);
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From 824b310a739bf1695728935dc97400db08434ed2 Mon Sep 17 00:00:00 2001
|
From a6323663be1e9773306a0074b4cd298bca3cf916 Mon Sep 17 00:00:00 2001
|
||||||
From: su-ex <codeworks@supercable.onl>
|
From: su-ex <codeworks@supercable.onl>
|
||||||
Date: Sun, 29 Nov 2020 23:30:59 +0100
|
Date: Sun, 29 Nov 2020 23:30:59 +0100
|
||||||
Subject: Change default login background
|
Subject: Change default login background
|
||||||
@ -23625,5 +23625,5 @@ index ef0d6e57fc..bfc0c58a68 100644
|
|||||||
target="_blank"
|
target="_blank"
|
||||||
>
|
>
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From b7900f6a3124368f650275f9779c4a7fdde682af Mon Sep 17 00:00:00 2001
|
From 53eae63a7d9ccb983f23b6d3fb7ee09c65341d03 Mon Sep 17 00:00:00 2001
|
||||||
From: SpiritCroc <dev@spiritcroc.de>
|
From: SpiritCroc <dev@spiritcroc.de>
|
||||||
Date: Sun, 27 Oct 2024 19:38:47 +0100
|
Date: Sun, 27 Oct 2024 19:38:47 +0100
|
||||||
Subject: Don't welcome to Element
|
Subject: Don't welcome to Element
|
||||||
@ -21,5 +21,5 @@ index 9fdd60a7c0..453baab965 100644
|
|||||||
<h4 class="mx_Header_subtitle">_t("powered_by_matrix_with_logo")</h4>
|
<h4 class="mx_Header_subtitle">_t("powered_by_matrix_with_logo")</h4>
|
||||||
<div class="mx_ButtonGroup">
|
<div class="mx_ButtonGroup">
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From 86879650c5a50bb7f927c7db854a0eba348b46bf Mon Sep 17 00:00:00 2001
|
From ff2e7206b20a2e97813d44936c57bca0a960128b Mon Sep 17 00:00:00 2001
|
||||||
From: SpiritCroc <dev@spiritcroc.de>
|
From: SpiritCroc <dev@spiritcroc.de>
|
||||||
Date: Sun, 27 Oct 2024 19:55:30 +0100
|
Date: Sun, 27 Oct 2024 19:55:30 +0100
|
||||||
Subject: Stronger login background to ensure contrast of our icon with our bg
|
Subject: Stronger login background to ensure contrast of our icon with our bg
|
||||||
@ -21,5 +21,5 @@ index 3c7fe2503e..64163e837c 100644
|
|||||||
};
|
};
|
||||||
|
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From dde1fa58e2e7f5ac59338dbd30d7ca72523aa317 Mon Sep 17 00:00:00 2001
|
From f968c6333a69c930b76aae12d83c6ea9058bb23c Mon Sep 17 00:00:00 2001
|
||||||
From: SpiritCroc <dev@spiritcroc.de>
|
From: SpiritCroc <dev@spiritcroc.de>
|
||||||
Date: Sun, 27 Oct 2024 20:07:30 +0100
|
Date: Sun, 27 Oct 2024 20:07:30 +0100
|
||||||
Subject: Schildify login footer
|
Subject: Schildify login footer
|
||||||
@ -26,5 +26,5 @@ index 1942bf0431..1054d06f89 100644
|
|||||||
|
|
||||||
const authFooterLinks: JSX.Element[] = [];
|
const authFooterLinks: JSX.Element[] = [];
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From 54a268f01a49bcfb14841141a3cabadb7ef39bbf Mon Sep 17 00:00:00 2001
|
From ede0ee4474c3631d69203d5da38c5690030aa5ba Mon Sep 17 00:00:00 2001
|
||||||
From: SpiritCroc <dev@spiritcroc.de>
|
From: SpiritCroc <dev@spiritcroc.de>
|
||||||
Date: Tue, 18 Jan 2022 13:28:22 +0100
|
Date: Tue, 18 Jan 2022 13:28:22 +0100
|
||||||
Subject: Disable sticky rooms
|
Subject: Disable sticky rooms
|
||||||
@ -25,5 +25,5 @@ index 5419a6e47c..25d6b78fde 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From 94a2d8bd966955b0a9a8a8acf1d2f80c5533a622 Mon Sep 17 00:00:00 2001
|
From a960e7bad0b67b584e429f2f15b6fe938503215d Mon Sep 17 00:00:00 2001
|
||||||
From: SpiritCroc <dev@spiritcroc.de>
|
From: SpiritCroc <dev@spiritcroc.de>
|
||||||
Date: Sun, 5 May 2024 10:12:17 +0200
|
Date: Sun, 5 May 2024 10:12:17 +0200
|
||||||
Subject: Bring back unified room list
|
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.Favourites && orderedTagId !== DefaultTagID.Favourite) ||
|
||||||
(this.props.activeSpace === MetaSpace.People && orderedTagId !== DefaultTagID.DM) ||
|
(this.props.activeSpace === MetaSpace.People && orderedTagId !== DefaultTagID.DM) ||
|
||||||
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
|
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
|
||||||
index 3ca7503cd1..07f0e8ac5b 100644
|
index 1140d24ed8..292f5f94ae 100644
|
||||||
--- a/src/settings/Settings.tsx
|
--- a/src/settings/Settings.tsx
|
||||||
+++ b/src/settings/Settings.tsx
|
+++ b/src/settings/Settings.tsx
|
||||||
@@ -363,6 +363,14 @@ export type BooleanSettingKey = Assignable<Settings, IBaseSetting<boolean>> | Fe
|
@@ -368,6 +368,14 @@ export type BooleanSettingKey = Assignable<Settings, IBaseSetting<boolean>> | Fe
|
||||||
export type StringSettingKey = Assignable<Settings, IBaseSetting<string>>;
|
export type StringSettingKey = Assignable<Settings, IBaseSetting<string>>;
|
||||||
|
|
||||||
export const SETTINGS: Settings = {
|
export const SETTINGS: Settings = {
|
||||||
@ -263,5 +263,5 @@ index 78823cbc42..00883e2ad6 100644
|
|||||||
DefaultTagID.Conference,
|
DefaultTagID.Conference,
|
||||||
DefaultTagID.Untagged,
|
DefaultTagID.Untagged,
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From 73967c3ba484e15687c575a6b3d06e6ae9cb88a5 Mon Sep 17 00:00:00 2001
|
From 41e7138e303d5a6f4dfe4c4f01f290af45010605 Mon Sep 17 00:00:00 2001
|
||||||
From: SpiritCroc <dev@spiritcroc.de>
|
From: SpiritCroc <dev@spiritcroc.de>
|
||||||
Date: Sun, 17 Dec 2023 11:11:58 +0100
|
Date: Sun, 17 Dec 2023 11:11:58 +0100
|
||||||
Subject: Don't sort muted rooms to bottom, I still want to see them.
|
Subject: Don't sort muted rooms to bottom, I still want to see them.
|
||||||
@ -21,5 +21,5 @@ index 0f95fe78c2..2de554c357 100644
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From 48a433efbaba29e958872dbd3577b02afb4d89bd Mon Sep 17 00:00:00 2001
|
From d35750f75257a8efdc634dd8dfcd499d742e2d82 Mon Sep 17 00:00:00 2001
|
||||||
From: SpiritCroc <dev@spiritcroc.de>
|
From: SpiritCroc <dev@spiritcroc.de>
|
||||||
Date: Thu, 14 Dec 2023 10:32:10 +0100
|
Date: Thu, 14 Dec 2023 10:32:10 +0100
|
||||||
Subject: Don't preview reactions
|
Subject: Don't preview reactions
|
||||||
@ -25,5 +25,5 @@ index 51e413940d..7775d1e52a 100644
|
|||||||
isState: false,
|
isState: false,
|
||||||
previewer: new PollStartEventPreview(),
|
previewer: new PollStartEventPreview(),
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From 449154bbf6276155e0a06d1aca9042090e8fad75 Mon Sep 17 00:00:00 2001
|
From beb693c77dffe12a2202fd0b24836fb8be0003b7 Mon Sep 17 00:00:00 2001
|
||||||
From: SpiritCroc <dev@spiritcroc.de>
|
From: SpiritCroc <dev@spiritcroc.de>
|
||||||
Date: Wed, 17 Nov 2021 12:50:25 +0100
|
Date: Wed, 17 Nov 2021 12:50:25 +0100
|
||||||
Subject: Hide the "mute" notification state the same way as the other states
|
Subject: Hide the "mute" notification state the same way as the other states
|
||||||
@ -26,5 +26,5 @@ index 3eafb671cb..c9dcd00fd0 100644
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From a91b3b854403f80d32962ce2713859a48e8192a3 Mon Sep 17 00:00:00 2001
|
From 99eb74e1ce7b2d7480e5ff1916bcb5ccf8a76668 Mon Sep 17 00:00:00 2001
|
||||||
From: SpiritCroc <dev@spiritcroc.de>
|
From: SpiritCroc <dev@spiritcroc.de>
|
||||||
Date: Fri, 10 May 2024 18:58:32 +0200
|
Date: Fri, 10 May 2024 18:58:32 +0200
|
||||||
Subject: Allow muted rooms to render as unread
|
Subject: Allow muted rooms to render as unread
|
||||||
@ -21,5 +21,5 @@ index d5254d523d..9cb1e24d1d 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From 4a6f7d7b462b763d453f9678610d7b971e9bce03 Mon Sep 17 00:00:00 2001
|
From 45998edb970b79d310d87fe9b3f129630b046b3c Mon Sep 17 00:00:00 2001
|
||||||
From: SpiritCroc <dev@spiritcroc.de>
|
From: SpiritCroc <dev@spiritcroc.de>
|
||||||
Date: Sun, 30 Aug 2020 15:33:01 +0200
|
Date: Sun, 30 Aug 2020 15:33:01 +0200
|
||||||
Subject: Increase default visible tiles
|
Subject: Increase default visible tiles
|
||||||
@ -21,5 +21,5 @@ index a4468dfffe..a4ae9bbc1d 100644
|
|||||||
|
|
||||||
public tilesWithPadding(n: number, paddingPx: number): number {
|
public tilesWithPadding(n: number, paddingPx: number): number {
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From 551ba0bbbc34451110d0dd8dc4dd6a4bcf5273c3 Mon Sep 17 00:00:00 2001
|
From 67fd602783db6f427d413bff1795994d3138f447 Mon Sep 17 00:00:00 2001
|
||||||
From: su-ex <codeworks@supercable.onl>
|
From: su-ex <codeworks@supercable.onl>
|
||||||
Date: Sun, 26 May 2024 10:43:36 +0200
|
Date: Sun, 26 May 2024 10:43:36 +0200
|
||||||
Subject: Bring back showSpaceDMBadges setting, force-enabled for now
|
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(+)
|
2 files changed, 30 insertions(+)
|
||||||
|
|
||||||
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
|
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
|
||||||
index 07f0e8ac5b..6b4b8691e4 100644
|
index 292f5f94ae..f44bf9e128 100644
|
||||||
--- a/src/settings/Settings.tsx
|
--- a/src/settings/Settings.tsx
|
||||||
+++ b/src/settings/Settings.tsx
|
+++ b/src/settings/Settings.tsx
|
||||||
@@ -370,6 +370,11 @@ export const SETTINGS: Settings = {
|
@@ -375,6 +375,11 @@ export const SETTINGS: Settings = {
|
||||||
default: true,
|
default: true,
|
||||||
controller: new ReloadOnChangeController(),
|
controller: new ReloadOnChangeController(),
|
||||||
},
|
},
|
||||||
@ -88,5 +88,5 @@ index 2945d486c2..f004ce149f 100644
|
|||||||
const newValue = SettingsStore.getValue("Spaces.enabledMetaSpaces");
|
const newValue = SettingsStore.getValue("Spaces.enabledMetaSpaces");
|
||||||
const enabledMetaSpaces = this.metaSpaceOrder.filter((k) => newValue[k]);
|
const enabledMetaSpaces = this.metaSpaceOrder.filter((k) => newValue[k]);
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From 435b91ac19f73e8a6eba4ff26ef8e2f6a44de992 Mon Sep 17 00:00:00 2001
|
From 32c4454cbadd06745854a32029ef360291f9b9a8 Mon Sep 17 00:00:00 2001
|
||||||
From: SpiritCroc <dev@spiritcroc.de>
|
From: SpiritCroc <dev@spiritcroc.de>
|
||||||
Date: Wed, 29 May 2024 19:32:42 +0200
|
Date: Wed, 29 May 2024 19:32:42 +0200
|
||||||
Subject: Squashed: Freeform reactions from tadzik/freeform-reactions-upstream
|
Subject: Squashed: Freeform reactions from tadzik/freeform-reactions-upstream
|
||||||
@ -131,5 +131,5 @@ index 11b3d9468a..7d369945fe 100644
|
|||||||
isEmojiDisabled={this.isEmojiDisabled}
|
isEmojiDisabled={this.isEmojiDisabled}
|
||||||
onFinished={this.props.onFinished}
|
onFinished={this.props.onFinished}
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From 43cffa56c585c68a807d85c143da8a8ca46fd91d Mon Sep 17 00:00:00 2001
|
From 502b9ab30d343a91773d4879310ce6451a573fbc Mon Sep 17 00:00:00 2001
|
||||||
From: su-ex <codeworks@supercable.onl>
|
From: su-ex <codeworks@supercable.onl>
|
||||||
Date: Sat, 22 Apr 2023 12:15:18 +0200
|
Date: Sat, 22 Apr 2023 12:15:18 +0200
|
||||||
Subject: Allow reactions to take more space
|
Subject: Allow reactions to take more space
|
||||||
@ -28,5 +28,5 @@ index 917bcfbb84..75ec572c9e 100644
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From 1e93c84b9db5c7d562420f39ac1c7f1304ab4f48 Mon Sep 17 00:00:00 2001
|
From ac5f8d46751df6c1e5fdecfff8e576314b679812 Mon Sep 17 00:00:00 2001
|
||||||
From: su-ex <codeworks@supercable.onl>
|
From: su-ex <codeworks@supercable.onl>
|
||||||
Date: Thu, 30 May 2024 14:35:16 +0200
|
Date: Thu, 30 May 2024 14:35:16 +0200
|
||||||
Subject: On space switch don't automatically show last opened room
|
Subject: On space switch don't automatically show last opened room
|
||||||
@ -46,10 +46,10 @@ index e61713ca69..c7342758fb 100644
|
|||||||
dis.dispatch<ViewRoomPayload>({
|
dis.dispatch<ViewRoomPayload>({
|
||||||
action: Action.ViewRoom,
|
action: Action.ViewRoom,
|
||||||
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
|
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
|
||||||
index 6b4b8691e4..660078e587 100644
|
index f44bf9e128..57fa5be09e 100644
|
||||||
--- a/src/settings/Settings.tsx
|
--- a/src/settings/Settings.tsx
|
||||||
+++ b/src/settings/Settings.tsx
|
+++ b/src/settings/Settings.tsx
|
||||||
@@ -375,6 +375,12 @@ export const SETTINGS: Settings = {
|
@@ -380,6 +380,12 @@ export const SETTINGS: Settings = {
|
||||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||||
default: true,
|
default: true,
|
||||||
},
|
},
|
||||||
@ -75,5 +75,5 @@ index f004ce149f..23b55c234f 100644
|
|||||||
cliSpace?.getMyMembership() !== KnownMembership.Invite &&
|
cliSpace?.getMyMembership() !== KnownMembership.Invite &&
|
||||||
this.matrixClient.getRoom(roomId)?.getMyMembership() === KnownMembership.Join &&
|
this.matrixClient.getRoom(roomId)?.getMyMembership() === KnownMembership.Join &&
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From b0ecf3a47581d9966c59834d7e8f8d6fe245c8b7 Mon Sep 17 00:00:00 2001
|
From 0be412012f2de35bb5ddcc5a9f436a47e1867433 Mon Sep 17 00:00:00 2001
|
||||||
From: SpiritCroc <dev@spiritcroc.de>
|
From: SpiritCroc <dev@spiritcroc.de>
|
||||||
Date: Tue, 9 Aug 2022 09:32:19 +0200
|
Date: Tue, 9 Aug 2022 09:32:19 +0200
|
||||||
Subject: Exclude spaces from breadcrumbs
|
Subject: Exclude spaces from breadcrumbs
|
||||||
@ -20,5 +20,5 @@ index e3b01cae0b..02f6c286f2 100644
|
|||||||
const rooms = (this.state.rooms || []).slice(); // cheap clone
|
const rooms = (this.state.rooms || []).slice(); // cheap clone
|
||||||
const msc3946ProcessDynamicPredecessor = SettingsStore.getValue("feature_dynamic_room_predecessors");
|
const msc3946ProcessDynamicPredecessor = SettingsStore.getValue("feature_dynamic_room_predecessors");
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From 4b9ee7630078e3996f68c2b75043db1db5503be6 Mon Sep 17 00:00:00 2001
|
From e7717222414370b3fa0a01324d5877810b524cda Mon Sep 17 00:00:00 2001
|
||||||
From: SpiritCroc <dev@spiritcroc.de>
|
From: SpiritCroc <dev@spiritcroc.de>
|
||||||
Date: Mon, 19 Aug 2024 20:27:33 +0200
|
Date: Mon, 19 Aug 2024 20:27:33 +0200
|
||||||
Subject: Stop the search bar wobble
|
Subject: Stop the search bar wobble
|
||||||
@ -20,5 +20,5 @@ index 3eed8c93c6..caaa0df3b9 100644
|
|||||||
|
|
||||||
/* FIXME THEME - Tint by CSS rather than referencing a duplicate asset */
|
/* FIXME THEME - Tint by CSS rather than referencing a duplicate asset */
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From a71857a0c2b2569748ef948730a4a74596679bbe Mon Sep 17 00:00:00 2001
|
From 962c27befa9b65905640794bd9bd2b8341974526 Mon Sep 17 00:00:00 2001
|
||||||
From: SpiritCroc <dev@spiritcroc.de>
|
From: SpiritCroc <dev@spiritcroc.de>
|
||||||
Date: Sun, 13 Oct 2024 11:23:54 +0200
|
Date: Sun, 13 Oct 2024 11:23:54 +0200
|
||||||
Subject: Import SC compound theme overrides
|
Subject: Import SC compound theme overrides
|
||||||
@ -20,5 +20,5 @@ index caaa0df3b9..44c83ecd83 100644
|
|||||||
@import "./_animations.pcss";
|
@import "./_animations.pcss";
|
||||||
@import "./_spacing.pcss";
|
@import "./_spacing.pcss";
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From 50a311a5ed35b91313ce54d0949443fb454a9db4 Mon Sep 17 00:00:00 2001
|
From 4dd1cdf5b95902121fec05adfb390f05d1554746 Mon Sep 17 00:00:00 2001
|
||||||
From: su-ex <codeworks@supercable.onl>
|
From: su-ex <codeworks@supercable.onl>
|
||||||
Date: Tue, 7 Sep 2021 19:41:52 +0200
|
Date: Tue, 7 Sep 2021 19:41:52 +0200
|
||||||
Subject: No damn avatar background in room list
|
Subject: No damn avatar background in room list
|
||||||
@ -22,5 +22,5 @@ index f3a44521fa..396601ba6e 100644
|
|||||||
|
|
||||||
const styles: CSSProperties = {};
|
const styles: CSSProperties = {};
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From c6c32debf2e4c90047784002aab3786d63156270 Mon Sep 17 00:00:00 2001
|
From 9febc8bbf6d5507fef2c20aac87da7c8a3c78422 Mon Sep 17 00:00:00 2001
|
||||||
From: su-ex <codeworks@supercable.onl>
|
From: su-ex <codeworks@supercable.onl>
|
||||||
Date: Tue, 22 Dec 2020 19:16:28 +0100
|
Date: Tue, 22 Dec 2020 19:16:28 +0100
|
||||||
Subject: No red messages in 1:1 chats Close SchildiChat/schildichat-desktop#13
|
Subject: No red messages in 1:1 chats Close SchildiChat/schildichat-desktop#13
|
||||||
@ -25,5 +25,5 @@ index 2c10d0afd9..d46320e8c3 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From cd5783811ba06c356fa99cbeef1a9af940278020 Mon Sep 17 00:00:00 2001
|
From 3b9ab389b18797e29253a926fbd6ebac2dd76d70 Mon Sep 17 00:00:00 2001
|
||||||
From: SpiritCroc <dev@spiritcroc.de>
|
From: SpiritCroc <dev@spiritcroc.de>
|
||||||
Date: Sun, 13 Oct 2024 13:26:16 +0200
|
Date: Sun, 13 Oct 2024 13:26:16 +0200
|
||||||
Subject: Always apply corner radius to all edges of the bubble
|
Subject: Always apply corner radius to all edges of the bubble
|
||||||
@ -57,5 +57,5 @@ index 1607c45924..aa69fbf07f 100644
|
|||||||
}
|
}
|
||||||
&.mx_EventTile_lastInSection[data-self="true"] .mx_EventTile_line {
|
&.mx_EventTile_lastInSection[data-self="true"] .mx_EventTile_line {
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From 94132b499902370367def8220cf29d0be3a3edda Mon Sep 17 00:00:00 2001
|
From dd6dd6d9e5b29fa4450c8be9527feec0ff0fe550 Mon Sep 17 00:00:00 2001
|
||||||
From: SpiritCroc <dev@spiritcroc.de>
|
From: SpiritCroc <dev@spiritcroc.de>
|
||||||
Date: Sun, 13 Oct 2024 13:53:07 +0200
|
Date: Sun, 13 Oct 2024 13:53:07 +0200
|
||||||
Subject: Always show timestamps by default
|
Subject: Always show timestamps by default
|
||||||
@ -8,10 +8,10 @@ Subject: Always show timestamps by default
|
|||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
|
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
|
||||||
index 660078e587..0e8ea4fc8a 100644
|
index 57fa5be09e..7de36fd0f7 100644
|
||||||
--- a/src/settings/Settings.tsx
|
--- a/src/settings/Settings.tsx
|
||||||
+++ b/src/settings/Settings.tsx
|
+++ b/src/settings/Settings.tsx
|
||||||
@@ -810,7 +810,7 @@ export const SETTINGS: Settings = {
|
@@ -821,7 +821,7 @@ export const SETTINGS: Settings = {
|
||||||
"alwaysShowTimestamps": {
|
"alwaysShowTimestamps": {
|
||||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||||
displayName: _td("settings|always_show_message_timestamps"),
|
displayName: _td("settings|always_show_message_timestamps"),
|
||||||
@ -21,5 +21,5 @@ index 660078e587..0e8ea4fc8a 100644
|
|||||||
"userTimezone": {
|
"userTimezone": {
|
||||||
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
|
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From dcb90ec522541c6c451d5e1daa509c01cc5cc537 Mon Sep 17 00:00:00 2001
|
From 30e6c40f446bc5a2f345c7decc950b30a3d9e745 Mon Sep 17 00:00:00 2001
|
||||||
From: SpiritCroc <dev@spiritcroc.de>
|
From: SpiritCroc <dev@spiritcroc.de>
|
||||||
Date: Thu, 17 Oct 2024 19:40:51 +0200
|
Date: Thu, 17 Oct 2024 19:40:51 +0200
|
||||||
Subject: Enable custom emote rendering by default
|
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(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
|
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
|
||||||
index 0e8ea4fc8a..a5614769ef 100644
|
index 7de36fd0f7..1045712545 100644
|
||||||
--- a/src/settings/Settings.tsx
|
--- a/src/settings/Settings.tsx
|
||||||
+++ b/src/settings/Settings.tsx
|
+++ b/src/settings/Settings.tsx
|
||||||
@@ -665,7 +665,7 @@ export const SETTINGS: Settings = {
|
@@ -676,7 +676,7 @@ export const SETTINGS: Settings = {
|
||||||
description: _td("labs|render_reaction_images_description"),
|
description: _td("labs|render_reaction_images_description"),
|
||||||
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED,
|
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED,
|
||||||
supportedLevelsAreOrdered: true,
|
supportedLevelsAreOrdered: true,
|
||||||
@ -21,5 +21,5 @@ index 0e8ea4fc8a..a5614769ef 100644
|
|||||||
"feature_new_room_list": {
|
"feature_new_room_list": {
|
||||||
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED,
|
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED,
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From 1c6bfc621590fff6896acc3cc84dba5d66db27b5 Mon Sep 17 00:00:00 2001
|
From 57175ea3478bca55b6a754635b9a45cf0dfd9959 Mon Sep 17 00:00:00 2001
|
||||||
From: SpiritCroc <dev@spiritcroc.de>
|
From: SpiritCroc <dev@spiritcroc.de>
|
||||||
Date: Sun, 27 Oct 2024 19:24:26 +0100
|
Date: Sun, 27 Oct 2024 19:24:26 +0100
|
||||||
Subject: Enable chat previews by default
|
Subject: Enable chat previews by default
|
||||||
@ -21,5 +21,5 @@ index a4ae9bbc1d..227c918457 100644
|
|||||||
|
|
||||||
public constructor(public readonly tagId: TagID) {
|
public constructor(public readonly tagId: TagID) {
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From 658b6228d8c86881e17f012b923aaa1a6035b9fa Mon Sep 17 00:00:00 2001
|
From 846cc02812bebf579ba8610739a53f4ebf2e3bff Mon Sep 17 00:00:00 2001
|
||||||
From: SpiritCroc <dev@spiritcroc.de>
|
From: SpiritCroc <dev@spiritcroc.de>
|
||||||
Date: Sat, 30 Nov 2024 19:42:44 +0100
|
Date: Sat, 30 Nov 2024 19:42:44 +0100
|
||||||
Subject: Disable showing people in spaces by default
|
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(-)
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
|
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
|
||||||
index a5614769ef..5191a5de3c 100644
|
index 1045712545..b53b3534bc 100644
|
||||||
--- a/src/settings/Settings.tsx
|
--- a/src/settings/Settings.tsx
|
||||||
+++ b/src/settings/Settings.tsx
|
+++ b/src/settings/Settings.tsx
|
||||||
@@ -1239,7 +1239,7 @@ export const SETTINGS: Settings = {
|
@@ -1273,7 +1273,7 @@ export const SETTINGS: Settings = {
|
||||||
},
|
},
|
||||||
"Spaces.showPeopleInSpace": {
|
"Spaces.showPeopleInSpace": {
|
||||||
supportedLevels: [SettingLevel.ROOM_ACCOUNT],
|
supportedLevels: [SettingLevel.ROOM_ACCOUNT],
|
||||||
@ -35,5 +35,5 @@ index 02e20e9103..2b49711c8e 100644
|
|||||||
|
|
||||||
public isVisible(room: Room): boolean {
|
public isVisible(room: Room): boolean {
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From e009f8f0707de178a0b095b07a5d0d9bec4c707c Mon Sep 17 00:00:00 2001
|
From f3ab4f94006e32f4701e6604cb893994536afba6 Mon Sep 17 00:00:00 2001
|
||||||
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
|
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
|
||||||
Date: Thu, 31 Oct 2024 13:44:20 -0400
|
Date: Thu, 31 Oct 2024 13:44:20 -0400
|
||||||
Subject: Improve IRC layout for SchildiChat
|
Subject: Improve IRC layout for SchildiChat
|
||||||
@ -306,5 +306,5 @@ index 953a0c941f..3326d0c0ff 100644
|
|||||||
line-height: var(--line-height) !important;
|
line-height: var(--line-height) !important;
|
||||||
|
|
||||||
--
|
--
|
||||||
2.50.0
|
2.50.1
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user