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

Switch to importing models/room-state & models/room-member from main js-sdk export #11362

Merged
merged 18 commits into from
Aug 4, 2023

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Aug 3, 2023

Requires #11361


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 Aug 3, 2023
@t3chguy t3chguy self-assigned this Aug 3, 2023
Base automatically changed from t3chguy/imports/3aug1 to develop August 4, 2023 08:08
… t3chguy/imports/3aug2

# Conflicts:
#	.eslintrc.js
#	cypress/support/axe.ts
#	src/autocomplete/UserProvider.tsx
#	src/components/structures/MessagePanel.tsx
#	src/components/structures/RightPanel.tsx
#	src/components/structures/RoomView.tsx
#	src/components/structures/TimelinePanel.tsx
#	src/components/views/avatars/RoomAvatar.tsx
#	src/components/views/dialogs/BulkRedactDialog.tsx
#	src/components/views/dialogs/ForwardDialog.tsx
#	src/components/views/dialogs/InviteDialog.tsx
#	src/components/views/dialogs/ShareDialog.tsx
#	src/components/views/elements/RoomFacePile.tsx
#	src/components/views/right_panel/PinnedMessagesCard.tsx
#	src/components/views/right_panel/UserInfo.tsx
#	src/components/views/rooms/AuxPanel.tsx
#	src/components/views/rooms/EventTile.tsx
#	src/components/views/rooms/MemberList.tsx
#	src/components/views/rooms/MessageComposer.tsx
#	src/components/views/rooms/RoomPreviewBar.tsx
#	src/components/views/rooms/RoomUpgradeWarningBar.tsx
#	src/components/views/rooms/ThirdPartyMemberInfo.tsx
#	src/components/views/rooms/WhoIsTypingTile.tsx
#	src/editor/parts.ts
#	src/hooks/room/useTopic.ts
#	src/hooks/useCall.ts
#	src/hooks/useIsEncrypted.ts
#	src/hooks/useRoomMembers.ts
#	src/hooks/useRoomState.ts
#	src/indexing/EventIndex.ts
#	src/models/Call.ts
#	src/stores/WidgetStore.ts
#	src/stores/right-panel/RightPanelStoreIPanelState.ts
#	src/stores/spaces/SpaceStore.ts
#	src/stores/widgets/WidgetLayoutStore.ts
#	src/utils/membership.ts
#	src/utils/permalinks/Permalinks.ts
#	src/voice-broadcast/hooks/useVoiceBroadcastPlayback.ts
#	src/voice-broadcast/hooks/useVoiceBroadcastRecording.tsx
#	test/components/structures/PipContainer-test.tsx
#	test/components/views/avatars/MemberAvatar-test.tsx
#	test/components/views/messages/CallEvent-test.tsx
#	test/components/views/rooms/LegacyRoomHeader-test.tsx
#	test/components/views/rooms/MemberList-test.tsx
#	test/components/views/rooms/RoomPreviewCard-test.tsx
#	test/components/views/rooms/RoomTile-test.tsx
#	test/components/views/voip/CallView-test.tsx
#	test/models/Call-test.ts
#	test/stores/room-list/algorithms/Algorithm-test.ts
#	test/test-utils/call.ts
#	test/toasts/IncomingCallToast-test.tsx
@t3chguy t3chguy enabled auto-merge August 4, 2023 11:13
@t3chguy t3chguy added this pull request to the merge queue Aug 4, 2023
Merged via the queue into develop with commit e6af09e Aug 4, 2023
19 checks passed
@t3chguy t3chguy deleted the t3chguy/imports/3aug2 branch August 4, 2023 11:46
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