Code

Feature/fga/timeline virtual room#3520

Code

Merged

bmarty merged 11 commits intodevelopelement-hq/element-android:developfrom feature/fga/timeline_virtual_roomelement-hq/element-android:feature/fga/timeline_virtual_roomCopy head branch name to clipboardJun 24, 2021

+304-31

Commits

Commits on Jun 9, 2021

• Timeline merging : introduce TimelineProxy (WIP)

  

  ganfra

  committed
  5781adb

Commits on Jun 10, 2021

• Merge branch 'develop' into feature/fga/timeline_virtual_room

  

  ganfra

  committed
  4d2fb30

Commits on Jun 11, 2021

• Merge branch 'develop' into feature/fga/timeline_virtual_room

  

  ganfra

  committed
  63bbc89

• Merging timeline: start branching it

  

  ganfra

  committed
  736a8a1

• Merge branch 'develop' into feature/fga/timeline_virtual_room

  

  ganfra

  committed
  6d9c494

• Timeline merging: branch virtual room (still some issues to deal with)

  

  ganfra

  committed
  b7dd7ef

• Theme: fix call tile text color

  

  ganfra

  committed
  99d05d8

Commits on Jun 14, 2021

• Timeline merge: wait for both timeline to be ready

  

  ganfra

  committed
  01d0d1a

Commits on Jun 17, 2021

• Merge develop

  

  ganfra

  committed
  1d8b9f8

• Clean and add towncrier file

  

  ganfra

  committed
  4a8a6d1

Commits on Jun 24, 2021

• Delete unused drawable to avoid conflict on develop

  bmarty

  committed
  5eb0097