Skip to content

Commit

Permalink
Bump to 1.11.90
Browse files Browse the repository at this point in the history
  • Loading branch information
SpiritCroc committed Jan 16, 2025
1 parent a1299ff commit a9f81d8
Show file tree
Hide file tree
Showing 31 changed files with 107 additions and 107 deletions.
2 changes: 1 addition & 1 deletion compound-web
Submodule compound-web updated 38 files
+1 −1 .node-version
+3 −3 package.json
+1 −1 playwright/Dockerfile
+ playwright/visual.test.ts-snapshots/Breadcrumb-Controlled-1-chromium-linux.png
+ playwright/visual.test.ts-snapshots/Breadcrumb-Default-1-chromium-linux.png
+ playwright/visual.test.ts-snapshots/Form-Kitchen-Sink-Disabled-1-chromium-linux.png
+ playwright/visual.test.ts-snapshots/Form-Kitchen-Sink-Invalid-1-chromium-linux.png
+ playwright/visual.test.ts-snapshots/Form-Kitchen-Sink-Normal-1-chromium-linux.png
+ playwright/visual.test.ts-snapshots/Form-Kitchen-Sink-Read-Only-1-chromium-linux.png
+ playwright/visual.test.ts-snapshots/Icon-BigIcon-Default-1-chromium-linux.png
+ playwright/visual.test.ts-snapshots/Icon-BigIcon-Destructive-1-chromium-linux.png
+ playwright/visual.test.ts-snapshots/Icon-BigIcon-Medium-1-chromium-linux.png
+ playwright/visual.test.ts-snapshots/Icon-BigIcon-Small-1-chromium-linux.png
+ playwright/visual.test.ts-snapshots/Icon-BigIcon-Success-1-chromium-linux.png
+ playwright/visual.test.ts-snapshots/Link-Small-1-chromium-linux.png
+65 −0 src/components/Breadcrumb/Breadcrumb.module.css
+81 −0 src/components/Breadcrumb/Breadcrumb.stories.tsx
+63 −0 src/components/Breadcrumb/Breadcrumb.test.tsx
+126 −0 src/components/Breadcrumb/Breadcrumb.tsx
+68 −0 src/components/Breadcrumb/__snapshots__/Breadcrumb.test.tsx.snap
+17 −0 src/components/Breadcrumb/index.ts
+59 −34 src/components/Dropdown/Dropdown.test.tsx
+38 −47 src/components/Dropdown/Dropdown.tsx
+7 −13 src/components/Form/Controls/MFA/MFA.test.tsx
+0 −5 src/components/Form/form.module.css
+51 −0 src/components/Icon/BigIcon/BigIcon.module.css
+55 −0 src/components/Icon/BigIcon/BigIcon.stories.tsx
+51 −0 src/components/Icon/BigIcon/BigIcon.test.tsx
+61 −0 src/components/Icon/BigIcon/BigIcon.tsx
+106 −0 src/components/Icon/BigIcon/__snapshots__/BigIcon.test.tsx.snap
+17 −0 src/components/Icon/BigIcon/index.ts
+4 −0 src/components/Link/Link.module.css
+8 −1 src/components/Link/Link.stories.tsx
+5 −0 src/components/Link/Link.test.tsx
+12 −2 src/components/Link/Link.tsx
+12 −0 src/components/Link/__snapshots__/Link.test.tsx.snap
+2 −0 src/index.ts
+639 −731 yarn.lock
2 changes: 1 addition & 1 deletion element-web
Submodule element-web updated 2464 files
2 changes: 1 addition & 1 deletion matrix-js-sdk
Submodule matrix-js-sdk updated 44 files
+1 −1 .github/workflows/pull_request.yaml
+2 −2 .github/workflows/sonarcloud.yml
+35 −0 .github/workflows/static_analysis.yml
+1 −1 .github/workflows/tests.yml
+20 −0 CHANGELOG.md
+9 −15 examples/node/app.js
+7 −0 examples/node/package.json
+14 −0 examples/node/tsconfig.json
+3 −3 package.json
+28 −2 spec/integ/crypto/crypto.spec.ts
+1 −1 spec/integ/crypto/megolm-backup.spec.ts
+7 −0 spec/integ/matrix-client-syncing.spec.ts
+7 −0 spec/integ/sliding-sync-sdk.spec.ts
+1 −1 spec/test-utils/mockEndpoints.ts
+7 −0 spec/unit/crypto/secrets.spec.ts
+6 −0 spec/unit/matrix-client.spec.ts
+16 −109 spec/unit/matrixrtc/CallMembership.spec.ts
+84 −302 spec/unit/matrixrtc/MatrixRTCSession.spec.ts
+7 −17 spec/unit/matrixrtc/MatrixRTCSessionManager.spec.ts
+49 −24 spec/unit/matrixrtc/mocks.ts
+17 −0 spec/unit/oidc/validate.spec.ts
+118 −2 spec/unit/rust-crypto/rust-crypto.spec.ts
+12 −0 spec/unit/rust-crypto/secret-storage.spec.ts
+21 −7 spec/unit/secret-storage.spec.ts
+36 −9 src/@types/event.ts
+17 −10 src/client.ts
+86 −20 src/crypto-api/index.ts
+1 −1 src/crypto/CrossSigning.ts
+15 −18 src/crypto/EncryptionSetup.ts
+4 −4 src/crypto/SecretStorage.ts
+4 −3 src/crypto/index.ts
+1 −1 src/crypto/store/indexeddb-crypto-store-backend.ts
+2 −2 src/http-api/utils.ts
+70 −121 src/matrixrtc/CallMembership.ts
+25 −222 src/matrixrtc/MatrixRTCSession.ts
+58 −0 src/models/invites-ignorer-types.ts
+7 −42 src/models/invites-ignorer.ts
+2 −1 src/oidc/validate.ts
+34 −3 src/rust-crypto/rust-crypto.ts
+2 −2 src/rust-crypto/secret-storage.ts
+27 −30 src/secret-storage.ts
+2 −2 src/store/indexeddb-local-backend.ts
+0 −6 src/webrtc/groupCall.ts
+142 −74 yarn.lock
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ca9ce07f4817af4f81527f4bc19bd10388bd183b Mon Sep 17 00:00:00 2001
From feed71908222cd43aaa7f86dfbca809511b3a310 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
Expand Down Expand Up @@ -58,5 +58,5 @@ index 7282945..4be7ab0 100644
if (!haveDeploy) {
const outPath = path.join(pkgDir, filename);
--
2.47.1
2.48.1

Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
Date: Sun, 29 Nov 2020 23:30:59 +0100
Subject: Change default login background
Expand Down Expand Up @@ -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
Expand All @@ -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>
Expand All @@ -22130,5 +22130,5 @@ index f19343be20..f36fc9205b 100644
target="_blank"
>
--
2.47.1
2.48.1

4 changes: 2 additions & 2 deletions patches/element-web/0003-Don-t-welcome-to-Element.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 83914e8c9926004d2df7e92481fa09975b35d3a6 Mon Sep 17 00:00:00 2001
From f9addc874260af436513147a9711e7df3e69e1a1 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
Expand All @@ -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

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From a6f46111e119e941233de3aec8a2de95a07dcb90 Mon Sep 17 00:00:00 2001
From 0ec5e88ed052f645796ca8b258bbcb474ac54ae8 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
Expand All @@ -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
Expand All @@ -21,5 +21,5 @@ index 032744413f..71bf8ae6d6 100644
};

--
2.47.1
2.48.1

6 changes: 3 additions & 3 deletions patches/element-web/0005-Schildify-login-footer.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 4e1da585f2305c2e5ed325768759028aa7ecf837 Mon Sep 17 00:00:00 2001
From fc68141219ce4367db44ad05aa89c9367c894856 Mon Sep 17 00:00:00 2001
From: SpiritCroc <[email protected]>
Date: Sun, 27 Oct 2024 20:07:30 +0100
Subject: Schildify login footer
Expand All @@ -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";
Expand All @@ -26,5 +26,5 @@ index a792896a88..6ecfd6ae20 100644

const authFooterLinks: JSX.Element[] = [];
--
2.47.1
2.48.1

6 changes: 3 additions & 3 deletions patches/element-web/0006-Disable-sticky-rooms.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 7184e891326aaea6d1f70492b25f7427e0dd3cdb Mon Sep 17 00:00:00 2001
From 6c8b5594b57b22cb3e195d9e28a6843a0c36611d Mon Sep 17 00:00:00 2001
From: SpiritCroc <[email protected]>
Date: Tue, 18 Jan 2022 13:28:22 +0100
Subject: Disable sticky rooms
Expand All @@ -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 {
Expand All @@ -25,5 +25,5 @@ index c3450d70cf..e296676149 100644
}

--
2.47.1
2.48.1

20 changes: 10 additions & 10 deletions patches/element-web/0007-Bring-back-unified-room-list.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d9a321ecaeb54cb4a0c7ca1ee28aaf6be1643b42 Mon Sep 17 00:00:00 2001
From 4cad8ad554645e437ba9a486734247257d577f43 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
Expand All @@ -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 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 {
Expand Down Expand Up @@ -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,
Expand All @@ -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
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand All @@ -259,5 +259,5 @@ index 50cecda665..8efc2d040d 100644
DefaultTagID.Conference,
DefaultTagID.Untagged,
--
2.47.1
2.48.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ab77eb4263607e3883a06fee306cb6dacedfe066 Mon Sep 17 00:00:00 2001
From 3023a83c05387fd322420f8bea8fa97c1bcef85d 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.
Expand All @@ -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 {
Expand All @@ -21,5 +21,5 @@ index 67ee1ca084..67dcaa3855 100644

/**
--
2.47.1
2.48.1

6 changes: 3 additions & 3 deletions patches/element-web/0009-Don-t-preview-reactions.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c208ee73713f33642c78a26dece9fd3f144b24a7 Mon Sep 17 00:00:00 2001
From a80b770c4ba54d653ab9249ce7af18908d0c577e 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
Expand All @@ -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<
Expand All @@ -25,5 +25,5 @@ index 2577b2ba23..0df13f33a8 100644
isState: false,
previewer: new PollStartEventPreview(),
--
2.47.1
2.48.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c99af69db7b5c3278e30ce9e3dfac277c1696d29 Mon Sep 17 00:00:00 2001
From 79080d4521da718362deb31c1d01b0e0a40124c2 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
Expand All @@ -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> {
Expand All @@ -26,5 +26,5 @@ index 7953c5068d..42f7fabb8e 100644

return (
--
2.47.1
2.48.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 9ff9e5f77bd4e40f5ea0a4c38aca772af69fb65a Mon Sep 17 00:00:00 2001
From 76daaebf1462651e4156e8b73bcaa15d7922ffc3 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
Expand All @@ -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(
Expand All @@ -21,5 +21,5 @@ index 7c281d0d2d..f06be85437 100644
}

--
2.47.1
2.48.1

6 changes: 3 additions & 3 deletions patches/element-web/0012-Increase-default-visible-tiles.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0028933498a0f286187166d637d23c46b441d0b6 Mon Sep 17 00:00:00 2001
From aa4a0d3e9ce9d4031ebaa38b9568aa434ce9cbe5 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
Expand All @@ -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 {
Expand All @@ -21,5 +21,5 @@ index ff60309e08..275b6d330b 100644

public tilesWithPadding(n: number, paddingPx: number): number {
--
2.47.1
2.48.1

Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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 <[email protected]>
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(),
},
Expand All @@ -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> {
Expand Down Expand Up @@ -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

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 9b12990f85ba4c358347d12fb502eed68ae5ef66 Mon Sep 17 00:00:00 2001
From 34991cb7a32166efbfab4f09f05f2874180751ae 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
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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> {
Expand All @@ -130,5 +130,5 @@ index bd16634490..d70c3df6ec 100644
isEmojiDisabled={this.isEmojiDisabled}
onFinished={this.props.onFinished}
--
2.47.1
2.48.1

Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
Date: Sat, 22 Apr 2023 12:15:18 +0200
Subject: Allow reactions to take more space
Expand All @@ -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.
Expand All @@ -28,5 +28,5 @@ index dd9d7ddb47..9ebe95021e 100644
white-space: nowrap;
text-overflow: ellipsis;
--
2.47.1
2.48.1

Loading

0 comments on commit a9f81d8

Please sign in to comment.