PR #9626 Overlay virtual room call events into main timeline

Overlay virtual room call events into main timeline #9626

kerryarchibald merged 41 commits into develop from psg-1020/combined-timeline

super WIP POC for merging virtual room events into main timeline

8435994b

remove some debugs

fe7fcc5f

f6b9303c

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

431347d8

add some todos

0dfb306f

remove hardcoded fake virtual user

4905371c

insert overlay events into main timeline without resorting main tl ev…

660fbcaa

remove more debugs

622aa62f

add extra tick to roomview tests

4facc7c5

RoomView test case for virtual room

112471ee

test case for merged timeline

1b1a2e0f

make overlay event filter generic

ef0786df

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

28f039da

kerryarchibald added T-Enhancement

remove TODOs from LegacyCallEventGrouper

66530051

tidy comments

e831aa62

remove some newlines

26b39d48

kerryarchibald changed the title ~~WIP: Overlay virtual room call events into main timeline~~ Overlay virtual room call events into main timeline 3 years ago

test timelinepanel room timeline event handling

103f399d

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

87120147

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

6ba8c89a

kerryarchibald marked this pull request as ready for review 3 years ago

kerryarchibald requested a review 3 years ago

kerryarchibald requested a review from

robintown 3 years ago

kerryarchibald requested a review from

artcodespace 3 years ago

use newState.roomId

eebd307e

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

9309b530

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

49dc6a4d

fix strict errors in RoomView

67adbd95

fix strict errors in TimelinePanel

cbb06c2d

Merge branch 'psg-1020/combined-timeline' of https://github.com/matri…

a2f17c8e

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

6e1cee7b

robintown commented on 2022-12-02

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

463db5cc

add type

93f5d7aa

pr tweaks

b8df60e7

strict errors

772c8b33

more strict fix

3ab91f09

kerryarchibald requested a review from

robintown 3 years ago

strict error whackamole

e5522742

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

458b1f1a

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

da1dca45

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

8431820c

robintown approved these changes on 2022-12-07

robintown removed review request from

artcodespace 3 years ago

update ROomView tests to use rtl

6f480d8b

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

9b787ca7

kerryarchibald enabled auto-merge (squash) 3 years ago

more test coverage

284d56e3

Merge branch 'psg-1020/combined-timeline' of https://github.com/matri…

cdd4f098

strict fixes in test

8f352216

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

4d42a843

kerryarchibald merged 6150b864 into develop 3 years ago

kerryarchibald deleted the psg-1020/combined-timeline branch 3 years ago

Reviewers

robintown

Assignees

No one assigned

Labels

T-Enhancement

Milestone

No milestone

matrix-react-sdk Overlay virtual room call events into main timeline #9626 Merged

Overlay virtual room call events into main timeline #9626

matrix-react-sdk
Overlay virtual room call events into main timeline
#9626

Merged