Skip to content

Commit

Permalink
Upstream v1.11.82
Browse files Browse the repository at this point in the history
  • Loading branch information
SpiritCroc committed Oct 22, 2024
1 parent f968610 commit ba6fe48
Show file tree
Hide file tree
Showing 25 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion matrix-react-sdk
Submodule matrix-react-sdk updated 758 files
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From bb7b8491326df4774f073840a96e28770c070250 Mon Sep 17 00:00:00 2001
From 65ddd258e4617866712a09dd7f419d1d039e91c9 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ac44e234f8f51ff21da56482c16621ece878e821 Mon Sep 17 00:00:00 2001
From 0c21e5e6a8ef45ff6e92fa66a0eb52ddae2999bc Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Thu, 9 May 2024 09:21:21 +0200
Subject: Add fields for media caption support
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 913772283fd2b9f682a11a594061a6a1189b7869 Mon Sep 17 00:00:00 2001
From 5330229d442d90df01b78e0a216e92543cec6d0b 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From e2045dd5dcbd82f7b5c4f98d89b258cc304d3e26 Mon Sep 17 00:00:00 2001
From bdfe28c9c30139e45ea71d7969a9cb11db525413 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
Expand Down Expand Up @@ -124,10 +124,10 @@ index e27b2ca03f..311a54d9d8 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 76bb109cac..7aea53ceea 100644
index 4f788ee224..2e475871fa 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -191,6 +191,14 @@ export interface IFeature extends Omit<IBaseSetting<boolean>, "isFeature"> {
@@ -192,6 +192,14 @@ export interface IFeature extends Omit<IBaseSetting<boolean>, "isFeature"> {
export type ISetting = IBaseSetting | IFeature;

export const SETTINGS: { [setting: string]: ISetting } = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 1d3847da55e91dfc5e555e69fbadcbc1d033a8d9 Mon Sep 17 00:00:00 2001
From 3978dc98c0bc2272a20a083a767f93da6a98a8b2 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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 9b7e89b38c49ffdb2811a3241cf077d8ca5ff1c7 Mon Sep 17 00:00:00 2001
From f63086180b877d00d60c45e72e932cdfa6560823 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 63244240b0a168b7f871aab50373805fc22601ec Mon Sep 17 00:00:00 2001
From 86b04ca7ac01e6d45eca5812079cbb95b336fc4d 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 3dd434f6a79a40db10cae4e97081fa4025030f3d Mon Sep 17 00:00:00 2001
From 3bd11332c72a9a42c86af65a0a3569ff12a06f38 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 29edc707c494b2d3ead55331fc5ba3358c88bd88 Mon Sep 17 00:00:00 2001
From 1513534630832a3e64ed658436cc0867067f74c5 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From cdcce7746aa7ade1bb7785c03c94b49b27fa6f36 Mon Sep 17 00:00:00 2001
From fc40f03afa3382f712bf6e826391930838e463bc 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
Expand All @@ -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 7aea53ceea..b668c65dfd 100644
index 2e475871fa..43eb44fa3a 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -198,6 +198,11 @@ export const SETTINGS: { [setting: string]: ISetting } = {
@@ -199,6 +199,11 @@ export const SETTINGS: { [setting: string]: ISetting } = {
default: true,
controller: new ReloadOnChangeController(),
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 1cec65f97867b8c29b596f7ca4a171d01d3cb04c Mon Sep 17 00:00:00 2001
From 2c57b9864b2d86dfa4cc89098c4cda965fcb2401 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 82a7324a26d4c3925fd984a6fd06817ecb94397b Mon Sep 17 00:00:00 2001
From 5c3b02f8c82c6eb581ee771b4de4058dab7220b6 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
Expand All @@ -8,18 +8,18 @@ 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 f2e3885de4..2a8bb9224e 100644
index dd9d7ddb47..9ebe95021e 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.
background-color: $secondary-hairline-color;
background-color: var(--cpd-color-gray-200);
user-select: none;
align-items: center;
+ max-width: calc(100% - 40px);;

&:hover {
border-color: $quinary-content;
@@ -29,7 +30,6 @@ Please see LICENSE files in the repository root for full details.
&.mx_ReactionsRowButton_selected {
background-color: $accent-300;
@@ -25,7 +26,6 @@ Please see LICENSE files in the repository root for full details.
}

.mx_ReactionsRowButton_content {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 1986abb52e47004f03db04fb167757e5ed666e07 Mon Sep 17 00:00:00 2001
From a90c65a2ca9223d4d2a8fbeb657b3f0ec5d6ed51 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
Expand All @@ -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 1726c8462d..150f29d0b8 100644
index 0e5ec04d33..24185623d3 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -1448,7 +1448,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
@@ -1458,7 +1458,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;
Expand All @@ -30,7 +30,7 @@ index 1726c8462d..150f29d0b8 100644
// Before defaulting to directory, show the last viewed room
this.viewLastRoom();
} else {
@@ -1460,6 +1468,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
@@ -1470,6 +1478,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
}
}

Expand All @@ -46,10 +46,10 @@ index 1726c8462d..150f29d0b8 100644
dis.dispatch<ViewRoomPayload>({
action: Action.ViewRoom,
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index b668c65dfd..be4433e1bc 100644
index 43eb44fa3a..d354b67d3d 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -203,6 +203,12 @@ export const SETTINGS: { [setting: string]: ISetting } = {
@@ -204,6 +204,12 @@ export const SETTINGS: { [setting: string]: ISetting } = {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
default: true,
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c2b459a7b0bd38b7b3c5151d002032dec3f25da7 Mon Sep 17 00:00:00 2001
From 89defddc48625f66e760b8aaa21b0045c8831f25 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6233f7e038d6f78025ea2961467a0a22fbeee8a1 Mon Sep 17 00:00:00 2001
From 1ccc65fc580392537fab12b40f4b007cf0616e1c 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From e87c6764f4abc734cdd05be97782e1b8e4e9df1c Mon Sep 17 00:00:00 2001
From e9b0c9d989d6ac8ff0a08020151f73fefa465ffb 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6c4f7dc233b9946bf1dd883516b9d89fb7bede05 Mon Sep 17 00:00:00 2001
From a60b2c3988e20d10ec873fc0cfb241220dc02b86 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 31b4da04ee9d8fefa0a26182dcd02d5b597b15ec Mon Sep 17 00:00:00 2001
From 37649905fb9c57d233f14d4de2dc1d3bc5eecd84 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
Expand All @@ -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 746cceabd8..3e5879f7ad 100644
index 813e5de40c..4b7118eb9a 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>
@@ -679,6 +679,12 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
return false;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From dd837c682f2aaf1d730a1e3f5b68b1cd03179e12 Mon Sep 17 00:00:00 2001
From a765c5b0eabd4ba249157a0a3562f76b5d235d82 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
Expand All @@ -8,10 +8,10 @@ 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 ec443c44de..8e0f3cf1b6 100644
index 3a42cde9bb..a5f5480010 100644
--- a/res/css/views/rooms/_EventBubbleTile.pcss
+++ b/res/css/views/rooms/_EventBubbleTile.pcss
@@ -277,6 +277,8 @@ Please see LICENSE files in the repository root for full details.
@@ -283,6 +283,8 @@ Please see LICENSE files in the repository root for full details.
margin-inline: var(--EventTile_bubble_line-margin-inline-start) var(--EventTile_bubble_line-margin-inline-end);
border-top-left-radius: var(--cornerRadius);
border-top-right-radius: var(--cornerRadius);
Expand All @@ -20,7 +20,7 @@ index ec443c44de..8e0f3cf1b6 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 */
@@ -371,7 +373,7 @@ Please see LICENSE files in the repository root for full details.
@@ -377,7 +379,7 @@ Please see LICENSE files in the repository root for full details.
}

&.mx_EventTile_continuation[data-self="false"] .mx_EventTile_line {
Expand All @@ -29,7 +29,7 @@ index ec443c44de..8e0f3cf1b6 100644

.mx_MImageBody .mx_MImageBody_thumbnail_container,
.mx_MVideoBody .mx_MVideoBody_container,
@@ -379,7 +381,7 @@ Please see LICENSE files in the repository root for full details.
@@ -385,7 +387,7 @@ Please see LICENSE files in the repository root for full details.
.mx_MediaBody,
.mx_MLocationBody_map,
.mx_MBeaconBody {
Expand All @@ -38,7 +38,7 @@ index ec443c44de..8e0f3cf1b6 100644
}
}
&.mx_EventTile_lastInSection[data-self="false"] .mx_EventTile_line {
@@ -396,7 +398,7 @@ Please see LICENSE files in the repository root for full details.
@@ -402,7 +404,7 @@ Please see LICENSE files in the repository root for full details.
}

&.mx_EventTile_continuation[data-self="true"] .mx_EventTile_line {
Expand All @@ -47,7 +47,7 @@ index ec443c44de..8e0f3cf1b6 100644

.mx_MImageBody .mx_MImageBody_thumbnail_container,
.mx_MVideoBody .mx_MVideoBody_container,
@@ -404,7 +406,7 @@ Please see LICENSE files in the repository root for full details.
@@ -410,7 +412,7 @@ Please see LICENSE files in the repository root for full details.
.mx_MediaBody,
.mx_MLocationBody_map,
.mx_MBeaconBody {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c4567d013ea39a71a37f9356f847b8555a8173e7 Mon Sep 17 00:00:00 2001
From f8bdf88fd81872e997e8ba61b4997d059ac9747e 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
Expand All @@ -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 be4433e1bc..1052bca0c9 100644
index d354b67d3d..925f104bb0 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -662,7 +662,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
@@ -643,7 +643,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
"alwaysShowTimestamps": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td("settings|always_show_message_timestamps"),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 09d134d0c975c430a894028b50ea460511fa2489 Mon Sep 17 00:00:00 2001
From 91513e88358321b3e3a742969aaf9ff44c7356f1 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
Expand All @@ -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 1052bca0c9..f5fcb5d7a5 100644
index 925f104bb0..1c8d82e30f 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -514,7 +514,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
@@ -507,7 +507,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
description: _td("labs|render_reaction_images_description"),
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED,
supportedLevelsAreOrdered: true,
Expand Down

0 comments on commit ba6fe48

Please sign in to comment.