-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
491ad5a
commit ba3cf70
Showing
29 changed files
with
93 additions
and
79 deletions.
There are no files selected for viewing
Submodule element-desktop
updated
68 files
Submodule element-web
updated
328 files
Submodule matrix-js-sdk
updated
92 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 113e92563afce88425b4b0aaa6434533a34d2d76 Mon Sep 17 00:00:00 2001 | ||
From 1be2423147ba91f51bf2cc0437b3652c5a4e0c00 Mon Sep 17 00:00:00 2001 | ||
From: SpiritCroc <[email protected]> | ||
Date: Sat, 2 Dec 2023 12:57:26 +0100 | ||
Subject: Add back schildi fetch-package.ts modifications | ||
|
@@ -8,18 +8,18 @@ Subject: Add back schildi fetch-package.ts modifications | |
1 file changed, 10 insertions(+), 4 deletions(-) | ||
|
||
diff --git a/scripts/fetch-package.ts b/scripts/fetch-package.ts | ||
index e32dcbb..5ed781f 100644 | ||
index 7282945..4be7ab0 100644 | ||
--- a/scripts/fetch-package.ts | ||
+++ b/scripts/fetch-package.ts | ||
@@ -55,6 +55,7 @@ async function main(): Promise<number | undefined> { | ||
@@ -54,6 +54,7 @@ async function main(): Promise<number | undefined> { | ||
let filename: string | undefined; | ||
let url: string | undefined; | ||
let setVersion = false; | ||
+ const sc = true; | ||
|
||
while (process.argv.length > 2) { | ||
switch (process.argv[2]) { | ||
@@ -83,7 +84,9 @@ async function main(): Promise<number | undefined> { | ||
@@ -82,7 +83,9 @@ async function main(): Promise<number | undefined> { | ||
process.argv.shift(); | ||
} | ||
|
||
|
@@ -30,7 +30,7 @@ index e32dcbb..5ed781f 100644 | |
targetVersion = "v" + riotDesktopPackageJson.version; | ||
} else if (targetVersion !== "develop") { | ||
setVersion = true; // version was specified | ||
@@ -93,7 +96,7 @@ async function main(): Promise<number | undefined> { | ||
@@ -92,7 +95,7 @@ async function main(): Promise<number | undefined> { | ||
filename = "develop.tar.gz"; | ||
url = DEVELOP_TGZ_URL; | ||
verify = false; // develop builds aren't signed | ||
|
@@ -39,7 +39,7 @@ index e32dcbb..5ed781f 100644 | |
filename = targetVersion.substring(targetVersion.lastIndexOf("/") + 1); | ||
url = targetVersion; | ||
verify = false; // manually verified | ||
@@ -145,12 +148,15 @@ async function main(): Promise<number | undefined> { | ||
@@ -146,12 +149,15 @@ async function main(): Promise<number | undefined> { | ||
} | ||
|
||
let haveDeploy = false; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,14 @@ | ||
From b5f628c25a4e559173dc908cb843bd95cc4ab387 Mon Sep 17 00:00:00 2001 | ||
From f279bd0bb4f21f48341a937510535ca30a4216d1 Mon Sep 17 00:00:00 2001 | ||
From: su-ex <[email protected]> | ||
Date: Sun, 29 Nov 2020 23:30:59 +0100 | ||
Subject: Change default login background | ||
|
||
--- | ||
res/themes/element/img/backgrounds/lake.jpg | Bin 610431 -> 0 bytes | ||
res/themes/element/img/backgrounds/ocean.jpg | Bin 0 -> 563501 bytes | ||
src/components/views/auth/VectorAuthPage.tsx | 2 +- | ||
3 files changed, 1 insertion(+), 1 deletion(-) | ||
res/themes/element/img/backgrounds/lake.jpg | Bin 610431 -> 0 bytes | ||
res/themes/element/img/backgrounds/ocean.jpg | Bin 0 -> 563501 bytes | ||
src/components/views/auth/AuthPage.tsx | 2 +- | ||
.../settings/tabs/user/HelpUserSettingsTab.tsx | 2 +- | ||
4 files changed, 2 insertions(+), 2 deletions(-) | ||
delete mode 100644 res/themes/element/img/backgrounds/lake.jpg | ||
create mode 100644 res/themes/element/img/backgrounds/ocean.jpg | ||
|
||
|
@@ -22102,19 +22103,32 @@ PCd5KF940_!M)?2Pq`XeS | |
literal 0 | ||
HcmV?d00001 | ||
|
||
diff --git a/src/components/views/auth/VectorAuthPage.tsx b/src/components/views/auth/VectorAuthPage.tsx | ||
index 969cc560a3..4636cfe808 100644 | ||
--- a/src/components/views/auth/VectorAuthPage.tsx | ||
+++ b/src/components/views/auth/VectorAuthPage.tsx | ||
@@ -18,7 +18,7 @@ export default class VectorAuthPage extends React.PureComponent<React.PropsWithC | ||
if (VectorAuthPage.welcomeBackgroundUrl) return VectorAuthPage.welcomeBackgroundUrl; | ||
diff --git a/src/components/views/auth/AuthPage.tsx b/src/components/views/auth/AuthPage.tsx | ||
index 2782d0a641..032744413f 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 | ||
if (AuthPage.welcomeBackgroundUrl) return AuthPage.welcomeBackgroundUrl; | ||
|
||
const brandingConfig = SdkConfig.getObject("branding"); | ||
- VectorAuthPage.welcomeBackgroundUrl = "themes/element/img/backgrounds/lake.jpg"; | ||
+ VectorAuthPage.welcomeBackgroundUrl = "themes/element/img/backgrounds/ocean.jpg"; | ||
- AuthPage.welcomeBackgroundUrl = "themes/element/img/backgrounds/lake.jpg"; | ||
+ AuthPage.welcomeBackgroundUrl = "themes/element/img/backgrounds/ocean.jpg"; | ||
|
||
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 7866131a01..4f57acb3d0 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> | ||
{ | ||
photo: (sub) => ( | ||
<ExternalLink | ||
- href="themes/element/img/backgrounds/lake.jpg" | ||
+ href="themes/element/img/backgrounds/ocean.jpg" | ||
rel="noreferrer noopener" | ||
target="_blank" | ||
> | ||
-- | ||
2.47.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From b5810ea474868e9059c5a87eb4dd4e4441588240 Mon Sep 17 00:00:00 2001 | ||
From 60fa47ee055ed85728583c12ab4619a7576d260e Mon Sep 17 00:00:00 2001 | ||
From: SpiritCroc <[email protected]> | ||
Date: Sun, 27 Oct 2024 19:38:47 +0100 | ||
Subject: Don't welcome to Element | ||
|
14 changes: 7 additions & 7 deletions
14
patches/element-web/0004-Stronger-login-background-to-ensure-contrast-of-our-.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,17 @@ | ||
From 7ec0394f9adabfd60d0bb94bcb05681870d78226 Mon Sep 17 00:00:00 2001 | ||
From faaf99c6ce2111faeeaa3100cd076a51b711d95b Mon Sep 17 00:00:00 2001 | ||
From: SpiritCroc <[email protected]> | ||
Date: Sun, 27 Oct 2024 19:55:30 +0100 | ||
Subject: Stronger login background to ensure contrast of our icon with our bg | ||
|
||
--- | ||
src/components/views/auth/VectorAuthPage.tsx | 2 +- | ||
src/components/views/auth/AuthPage.tsx | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/src/components/views/auth/VectorAuthPage.tsx b/src/components/views/auth/VectorAuthPage.tsx | ||
index 4636cfe808..05dcdbbbf7 100644 | ||
--- a/src/components/views/auth/VectorAuthPage.tsx | ||
+++ b/src/components/views/auth/VectorAuthPage.tsx | ||
@@ -56,7 +56,7 @@ export default class VectorAuthPage extends React.PureComponent<React.PropsWithC | ||
diff --git a/src/components/views/auth/AuthPage.tsx b/src/components/views/auth/AuthPage.tsx | ||
index 032744413f..71bf8ae6d6 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 | ||
const modalContentStyle: React.CSSProperties = { | ||
display: "flex", | ||
zIndex: 1, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,25 @@ | ||
From 29f48d9d9c07f0ad9b46a235b7b47240a6763a84 Mon Sep 17 00:00:00 2001 | ||
From f469bd05375c6b4c1b419cf07b4a832511a79a4e Mon Sep 17 00:00:00 2001 | ||
From: SpiritCroc <[email protected]> | ||
Date: Sun, 27 Oct 2024 20:07:30 +0100 | ||
Subject: Schildify login footer | ||
|
||
--- | ||
src/components/views/auth/VectorAuthFooter.tsx | 7 ++++--- | ||
1 file changed, 4 insertions(+), 3 deletions(-) | ||
src/components/views/auth/AuthFooter.tsx | 4 ++++ | ||
1 file changed, 4 insertions(+) | ||
|
||
diff --git a/src/components/views/auth/VectorAuthFooter.tsx b/src/components/views/auth/VectorAuthFooter.tsx | ||
index 234c6b127b..44d41004a0 100644 | ||
--- a/src/components/views/auth/VectorAuthFooter.tsx | ||
+++ b/src/components/views/auth/VectorAuthFooter.tsx | ||
@@ -14,9 +14,10 @@ import { _t } from "../../../languageHandler"; | ||
const VectorAuthFooter = (): ReactElement => { | ||
diff --git a/src/components/views/auth/AuthFooter.tsx b/src/components/views/auth/AuthFooter.tsx | ||
index 8d27a04c83..b9ff8e8416 100644 | ||
--- a/src/components/views/auth/AuthFooter.tsx | ||
+++ b/src/components/views/auth/AuthFooter.tsx | ||
@@ -15,9 +15,13 @@ import { _t } from "../../../languageHandler"; | ||
const AuthFooter = (): ReactElement => { | ||
const brandingConfig = SdkConfig.getObject("branding"); | ||
const links = brandingConfig?.get("auth_footer_links") ?? [ | ||
- { text: "Blog", url: "https://element.io/blog" }, | ||
- { text: "Twitter", url: "https://twitter.com/element_hq" }, | ||
- { text: "GitHub", url: "https://github.com/element-hq/element-web" }, | ||
+ //{ text: "Blog", url: "https://element.io/blog" }, | ||
+ //{ text: "Twitter", url: "https://twitter.com/element_hq" }, | ||
+ /* | ||
{ text: "Blog", url: "https://element.io/blog" }, | ||
{ text: "Twitter", url: "https://twitter.com/element_hq" }, | ||
{ text: "GitHub", url: "https://github.com/element-hq/element-web" }, | ||
+ */ | ||
+ { text: "About", url: "https://schildi.chat" }, | ||
+ { text: "GitHub", url: "https://github.com/schildichat/schildichat-desktop" }, | ||
]; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 7c034d6b2ef4f6133cd022c1d80d4a80513f9576 Mon Sep 17 00:00:00 2001 | ||
From 909d0c76ad56426699d9b8dfaebf818f21c09dd4 Mon Sep 17 00:00:00 2001 | ||
From: SpiritCroc <[email protected]> | ||
Date: Tue, 18 Jan 2022 13:28:22 +0100 | ||
Subject: Disable sticky rooms | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From b9a3556344a0689d84e08959e163153f4ac724a1 Mon Sep 17 00:00:00 2001 | ||
From 9cf40d600e00770aa7a56cebf5ab3413166e29e6 Mon Sep 17 00:00:00 2001 | ||
From: SpiritCroc <[email protected]> | ||
Date: Sun, 5 May 2024 10:12:17 +0200 | ||
Subject: Bring back unified room list | ||
|
@@ -16,7 +16,7 @@ Co-authored-by: su-ex <[email protected]> | |
5 files changed, 83 insertions(+), 5 deletions(-) | ||
|
||
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx | ||
index e27b2ca03f..311a54d9d8 100644 | ||
index 853bebc4fe..5af0c642bc 100644 | ||
--- a/src/components/views/rooms/RoomList.tsx | ||
+++ b/src/components/views/rooms/RoomList.tsx | ||
@@ -72,11 +72,13 @@ interface IState { | ||
|
@@ -98,7 +98,7 @@ index e27b2ca03f..311a54d9d8 100644 | |
@@ -447,9 +475,16 @@ export default class RoomList extends React.PureComponent<IProps, IState> { | ||
SpaceStore.instance.off(UPDATE_SUGGESTED_ROOMS, this.updateSuggestedRooms); | ||
RoomListStore.instance.off(LISTS_UPDATE_EVENT, this.updateLists); | ||
if (this.dispatcherRef) defaultDispatcher.unregister(this.dispatcherRef); | ||
defaultDispatcher.unregister(this.dispatcherRef); | ||
+ SettingsStore.unwatchSetting(this.unifiedRoomListWatcherRef); | ||
SdkContextClass.instance.roomViewStore.off(UPDATE_EVENT, this.onRoomViewStoreUpdate); | ||
} | ||
|
2 changes: 1 addition & 1 deletion
2
patches/element-web/0008-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 2ddade0c24cd4010d11539e2a4d986f1fee925bd Mon Sep 17 00:00:00 2001 | ||
From 9fb400a94a190f910b731e3c5ea2c3ccdd91adce Mon Sep 17 00:00:00 2001 | ||
From: SpiritCroc <[email protected]> | ||
Date: Sun, 17 Dec 2023 11:11:58 +0100 | ||
Subject: Don't sort muted rooms to bottom, I still want to see them. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 48d99af8575f9591d2ac445a64f9b70c54a651b5 Mon Sep 17 00:00:00 2001 | ||
From 96de5eb0667f130de17544eb104647f823b617b0 Mon Sep 17 00:00:00 2001 | ||
From: SpiritCroc <[email protected]> | ||
Date: Thu, 14 Dec 2023 10:32:10 +0100 | ||
Subject: Don't preview reactions | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 029aa23e06c76b25bc3ec6c58cd0dbbd5b19b850 Mon Sep 17 00:00:00 2001 | ||
From cc3db444dc3788e6eaca8db3bd77feccc0e2133d Mon Sep 17 00:00:00 2001 | ||
From: SpiritCroc <[email protected]> | ||
Date: Wed, 17 Nov 2021 12:50:25 +0100 | ||
Subject: Hide the "mute" notification state the same way as the other states | ||
|
@@ -11,10 +11,10 @@ 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 93fb42f447..09df8eaac9 100644 | ||
index 8351c176ff..a12fb141b9 100644 | ||
--- a/src/components/views/rooms/RoomTile.tsx | ||
+++ b/src/components/views/rooms/RoomTile.tsx | ||
@@ -304,7 +304,9 @@ export class RoomTile extends React.PureComponent<ClassProps, State> { | ||
@@ -305,7 +305,9 @@ export class RoomTile extends React.PureComponent<ClassProps, State> { | ||
|
||
// Only show the icon by default if the room is overridden to muted. | ||
// TODO: [FTUE Notifications] Probably need to detect global mute state | ||
|
2 changes: 1 addition & 1 deletion
2
patches/element-web/0011-Allow-muted-rooms-to-render-as-unread.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 96de0aab889c70f5a9f93a24cbf9fd117d509154 Mon Sep 17 00:00:00 2001 | ||
From 5b5635a2c649226fccdd47013c576a8e1789af4e Mon Sep 17 00:00:00 2001 | ||
From: SpiritCroc <[email protected]> | ||
Date: Fri, 10 May 2024 18:58:32 +0200 | ||
Subject: Allow muted rooms to render as unread | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From d67cf80d32b04f528fc2512a8a9a1c22125a2cdb Mon Sep 17 00:00:00 2001 | ||
From 532251811dbd3c3ff6ae43050acd6fb5140e20a0 Mon Sep 17 00:00:00 2001 | ||
From: SpiritCroc <[email protected]> | ||
Date: Sun, 30 Aug 2020 15:33:01 +0200 | ||
Subject: Increase default visible tiles | ||
|
2 changes: 1 addition & 1 deletion
2
patches/element-web/0013-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From cf656380d43b9ca289fec93b78dfab592ab04756 Mon Sep 17 00:00:00 2001 | ||
From 920a48f9ec942635cd6a877f366e6c38abad9b11 Mon Sep 17 00:00:00 2001 | ||
From: su-ex <[email protected]> | ||
Date: Sun, 26 May 2024 10:43:36 +0200 | ||
Subject: Bring back showSpaceDMBadges setting, force-enabled for now | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From aadba9f508f6227192d7e4409f10c5996c9b713b Mon Sep 17 00:00:00 2001 | ||
From 8f81368ec09b41f996955b8a8fabcc594c194194 Mon Sep 17 00:00:00 2001 | ||
From: SpiritCroc <[email protected]> | ||
Date: Wed, 29 May 2024 19:32:42 +0200 | ||
Subject: Squashed: Freeform reactions from tadzik/freeform-reactions-upstream | ||
|
@@ -118,10 +118,10 @@ index 4806ad4216..7d4a4353e2 100644 | |
<Preview emoji={this.state.previewEmoji} /> | ||
) : ( | ||
diff --git a/src/components/views/emojipicker/ReactionPicker.tsx b/src/components/views/emojipicker/ReactionPicker.tsx | ||
index 2c2eb442a0..62bfd2ea0f 100644 | ||
index b62df99e25..8291a38dc9 100644 | ||
--- a/src/components/views/emojipicker/ReactionPicker.tsx | ||
+++ b/src/components/views/emojipicker/ReactionPicker.tsx | ||
@@ -123,6 +123,7 @@ class ReactionPicker extends React.Component<IProps, IState> { | ||
@@ -126,6 +126,7 @@ class ReactionPicker extends React.Component<IProps, IState> { | ||
public render(): React.ReactNode { | ||
return ( | ||
<EmojiPicker | ||
|
2 changes: 1 addition & 1 deletion
2
patches/element-web/0015-Allow-reactions-to-take-more-space.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 08034162fa822b2bc76c709b4374001f766d856d Mon Sep 17 00:00:00 2001 | ||
From 4980c7e816e83a3dce4106c8485461044591da26 Mon Sep 17 00:00:00 2001 | ||
From: su-ex <[email protected]> | ||
Date: Sat, 22 Apr 2023 12:15:18 +0200 | ||
Subject: Allow reactions to take more space | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 6c48df6f72f68e8e972408cee568584274f1894d Mon Sep 17 00:00:00 2001 | ||
From b29702cd66f838ebe6af90fbf0b223caab3725b1 Mon Sep 17 00:00:00 2001 | ||
From: su-ex <[email protected]> | ||
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 d0edcccd4f..3146200c68 100644 | ||
index 80a648b5d5..f917d0bf7f 100644 | ||
--- a/src/components/structures/MatrixChat.tsx | ||
+++ b/src/components/structures/MatrixChat.tsx | ||
@@ -1457,7 +1457,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> { | ||
@@ -1456,7 +1456,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 d0edcccd4f..3146200c68 100644 | |
// Before defaulting to directory, show the last viewed room | ||
this.viewLastRoom(); | ||
} else { | ||
@@ -1469,6 +1477,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> { | ||
@@ -1468,6 +1476,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> { | ||
} | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 6fde2e8e1e827b5ca4e4fd719ee4651061fbc682 Mon Sep 17 00:00:00 2001 | ||
From 7d9fafb12e3bf1768e32b39ecf00b973309e6c1b Mon Sep 17 00:00:00 2001 | ||
From: SpiritCroc <[email protected]> | ||
Date: Tue, 9 Aug 2022 09:32:19 +0200 | ||
Subject: Exclude spaces from breadcrumbs | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 90b33a99e72375d4276677a5673c2db30df2e962 Mon Sep 17 00:00:00 2001 | ||
From 9a1518e041fa2d5364885725b259378952a2b445 Mon Sep 17 00:00:00 2001 | ||
From: SpiritCroc <[email protected]> | ||
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 05a3dac067..7861af6381 100644 | ||
index 15ba02b6b8..f9bcd695ca 100644 | ||
--- a/res/css/_common.pcss | ||
+++ b/res/css/_common.pcss | ||
@@ -181,6 +181,7 @@ input[type="search"].mx_textinput_icon { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 799670123ab61935532f19c509a58c745f8771ae Mon Sep 17 00:00:00 2001 | ||
From e5b9cc85889d539da3d4acff20cf8b3199ae94e3 Mon Sep 17 00:00:00 2001 | ||
From: SpiritCroc <[email protected]> | ||
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 7861af6381..f7a660a339 100644 | ||
index f9bcd695ca..ad7c298820 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. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From fbae86033a88de5c3096d288ef0f31e1f9e76b17 Mon Sep 17 00:00:00 2001 | ||
From 124ee073c6de89d111823c94922d7d2eeb596a0b Mon Sep 17 00:00:00 2001 | ||
From: su-ex <[email protected]> | ||
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 80c21235cc..a9c464f4b2 100644 | ||
index 32c75a936e..f420bdbc7b 100644 | ||
--- a/src/components/structures/BackdropPanel.tsx | ||
+++ b/src/components/structures/BackdropPanel.tsx | ||
@@ -13,6 +13,9 @@ interface IProps { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 4b223e86bbd72d5e72ecdb07510353b8472bc7d4 Mon Sep 17 00:00:00 2001 | ||
From ca4fa33dda5812b259c4391171358a50beb812fd Mon Sep 17 00:00:00 2001 | ||
From: su-ex <[email protected]> | ||
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 eca61f7d22..59dd12e7ab 100644 | ||
index 22da73bef7..455a57e33d 100644 | ||
--- a/src/components/views/rooms/EventTile.tsx | ||
+++ b/src/components/views/rooms/EventTile.tsx | ||
@@ -683,6 +683,12 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState> | ||
@@ -685,6 +685,12 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState> | ||
return false; | ||
} | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
patches/element-web/0022-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From bde0c9e75353f96ef5acbe221388876c5e19c70e Mon Sep 17 00:00:00 2001 | ||
From 45fea7a503d58e70e876bf5c94e5731fbed85551 Mon Sep 17 00:00:00 2001 | ||
From: SpiritCroc <[email protected]> | ||
Date: Sun, 13 Oct 2024 13:26:16 +0200 | ||
Subject: Always apply corner radius to all edges of the bubble | ||
|
Oops, something went wrong.