This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Overlay virtual room call events into main timeline#9626

Merged

kerryarchibald merged 41 commits intodevelopfrom

psg-1020/combined-timeline

Dec 8, 2022

Commits on Nov 24, 2022

super WIP POC for merging virtual room events into main timeline
Kerry Archibald
committed
remove some debugs
Kerry Archibald
committed
c
Kerry Archibald
committed

Commits on Nov 25, 2022

Merge branch 'develop' into psg-1020/combined-timeline
Kerry Archibald
committed
add some todos
Kerry Archibald
committed
remove hardcoded fake virtual user
Kerry Archibald
committed
insert overlay events into main timeline without resorting main tl events
Kerry Archibald
committed
remove more debugs
Kerry Archibald
committed

Commits on Nov 28, 2022

add extra tick to roomview tests
Kerry Archibald
committed
RoomView test case for virtual room
Kerry Archibald
committed
test case for merged timeline
Kerry Archibald
committed
make overlay event filter generic
Kerry Archibald
committed
Merge branch 'develop' into psg-1020/combined-timeline
Kerry Archibald
committed

Commits on Nov 29, 2022

remove TODOs from LegacyCallEventGrouper
Kerry Archibald
committed
tidy comments
Kerry Archibald
committed
remove some newlines
Kerry Archibald
committed
test timelinepanel room timeline event handling
Kerry Archibald
committed
Merge branch 'develop' into psg-1020/combined-timeline
Kerry Archibald
committed
Merge branch 'develop' into psg-1020/combined-timeline
Kerry
authored

Commits on Nov 30, 2022

use newState.roomId
Kerry Archibald
committed
Merge branch 'develop' into psg-1020/combined-timeline
Kerry
authored

Commits on Dec 1, 2022

Merge branch 'develop' into psg-1020/combined-timeline
Kerry
authored
fix strict errors in RoomView
Kerry Archibald
committed
fix strict errors in TimelinePanel
Kerry Archibald
committed
Merge branch 'psg-1020/combined-timeline' of https://github.com/matrix-org/matrix-react-sdk into psg-1020/combined-timeline
Kerry Archibald
committed

Commits on Dec 2, 2022

Merge branch 'develop' into psg-1020/combined-timeline
Kerry
authored

Commits on Dec 5, 2022

Merge branch 'develop' into psg-1020/combined-timeline
Kerry Archibald
committed
add type
Kerry Archibald
committed
pr tweaks
Kerry Archibald
committed
strict errors
Kerry Archibald
committed
more strict fix
Kerry Archibald
committed
strict error whackamole
Kerry Archibald
committed

Commits on Dec 6, 2022

Merge branch 'develop' into psg-1020/combined-timeline
Kerry
authored

Commits on Dec 7, 2022

Commits on Dec 8, 2022

update ROomView tests to use rtl
Kerry Archibald
committed
Merge branch 'develop' into psg-1020/combined-timeline
Kerry
authored
more test coverage
Kerry Archibald
committed
Merge branch 'psg-1020/combined-timeline' of https://github.com/matrix-org/matrix-react-sdk into psg-1020/combined-timeline
Kerry Archibald
committed
strict fixes in test
Kerry Archibald
committed
Merge branch 'develop' into psg-1020/combined-timeline
Kerry
authored