Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Refactor SlashCommands to not use MatrixClientPeg #10905

Merged
merged 19 commits into from
May 25, 2023

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented May 15, 2023

For element-hq/element-web#21967
Requires #10910


This change is marked as an internal change (Task), so will not be included in the changelog.

@t3chguy t3chguy added the T-Task Refactoring, enabling or disabling functionality, other engineering tasks label May 15, 2023
@t3chguy t3chguy changed the base branch from develop to t3chguy/kill-client-peg-1 May 16, 2023 13:59
…-org/matrix-react-sdk into t3chguy/slashcommands-peg

# Conflicts:
#	src/ScalarMessaging.ts
#	src/SlashCommands.tsx
#	src/components/structures/MatrixChat.tsx
#	src/components/views/rooms/Stickerpicker.tsx
#	src/integrations/IntegrationManagers.ts
#	src/utils/WidgetUtils.ts
#	src/utils/leave-behaviour.ts
Base automatically changed from t3chguy/kill-client-peg-1 to develop May 23, 2023 15:24
 into t3chguy/slashcommands-peg

# Conflicts:
#	src/SlashCommands.tsx
#	src/components/structures/MessagePanel.tsx
#	src/components/structures/UserMenu.tsx
#	src/components/views/rooms/EditMessageComposer.tsx
#	src/components/views/rooms/EventTile.tsx
#	src/utils/pages.ts
#	test/utils/EventRenderingUtils-test.ts
Copy link
Contributor

@weeman1337 weeman1337 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested, works ✔️

@t3chguy t3chguy merged commit 796ed35 into develop May 25, 2023
@t3chguy t3chguy deleted the t3chguy/slashcommands-peg branch May 25, 2023 15:29
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
T-Task Refactoring, enabling or disabling functionality, other engineering tasks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants