Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rebase against on Element X v0.7.6 #29

Merged
merged 304 commits into from
Jan 20, 2025
Merged

Rebase against on Element X v0.7.6 #29

merged 304 commits into from
Jan 20, 2025

Conversation

yostyle
Copy link

@yostyle yostyle commented Jan 20, 2025 •
edited
Loading

Content

Motivation and context

Screenshots / GIFs

Tests

  • Step 1
  • Step 2
  • Step ...

Tested devices

  • Physical
  • Emulator
  • OS version(s):

Checklist

  • Changes have been tested on an Android device or Android emulator with API 23
  • UI change has been tested on both light and dark themes
  • Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility
  • Pull request is based on the develop branch
  • Pull request title will be used in the release note, it clearly define what will change for the user
  • Pull request includes screenshots or videos if containing UI changes
  • Pull request includes a sign off
  • You've made a self review of your PR

ganfra and others added 30 commits December 9, 2024 11:01
@ganfra
knock requests : use proper banner string resources
e383c7f
@ganfra
misc : introduce List.firstIfSingle extension
cc9365a
@ganfra
knock request : emit accept single request from banner
364a374
@ganfra
Merge pull request element-hq#4005 from element-hq/feature/fga/reques…
9dac27a 
…ts_to_join_banner

feat(knock) : Knock Requests Banner UI
@bmarty
Merge pull request element-hq#4007 from element-hq/sync-localazy
c1c1264 
Sync Strings
@bmarty
Media Gallery
3e1b1c2
@bmarty
Sync strings.
653c1e8
@bmarty
Fix preview.
d818597
@ElementBot
Update screenshots
68dd3a0
@bmarty
Fix preview
73143d8
@ElementBot
Update screenshots
c2ad4a9
@ganfra
fix(dm) : remove duplicate LaunchedEffect
6ad89fd
@renovate
Update dagger to v2.53.1
4e3cab0
@bmarty
Rename preview.
ae0593d
@bmarty
remove blank line.
2207040
@bmarty
Rename onDone to onBackClick.
197fda5
@bmarty
Rename imageItems to imageAndVideoItems.
323ae0a
@bmarty
Remove TimelineMediaItemsCacheInvalidator, it is not needed.
e55e977
@bmarty
Change scope to RoomScope
a40aff6
@renovate
Update dependency io.sentry:sentry-android to v7.18.1 (element-hq#3972)
e20800d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency com.posthog:posthog-android to v3.9.3
85df35e
@bmarty
Remove not needed MediaGalleryTimelineProvider
a89a9c3
@bmarty
Remove extra space.
6386645
@bmarty
Format file.
cce1c99
@bmarty
Add test.
b78039a
@bmarty
Fix test.
6dbfa94
@bmarty
Fix test.
ff86d06
@bmarty
More formatting
0f43e7c
@ganfra
Merge pull request element-hq#4012 from element-hq/feature/fga/fix_op…
967115b 
…en_dm_twice

fix(dm) : remove duplicate LaunchedEffect when opening DM
@bmarty
Improve avatar rendering
d008414
@yostyle yostyle changed the title Rebase against on Element X Android Rebase against on Element X main Jan 20, 2025
@yostyle yostyle added the Record-Screenshots Runs the 'Record Screenshots' CI job and adds a commit with any new screenshots found. label Jan 20, 2025
@github-actions github-actions bot removed the Record-Screenshots Runs the 'Record Screenshots' CI job and adds a commit with any new screenshots found. label Jan 20, 2025
@yostyle yostyle self-assigned this Jan 20, 2025
@yostyle yostyle merged commit b3cf5b3 into develop Jan 20, 2025
18 checks passed
@yostyle yostyle changed the title Rebase against on Element X main Rebase against on Element X 0.7.6 Jan 20, 2025
@yostyle yostyle changed the title Rebase against on Element X 0.7.6 Rebase against on Element X v0.7.6 Jan 20, 2025
@yostyle yostyle added the PR-Change For updates to an existing feature label Jan 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@yostyle yostyle

Labels
PR-Change For updates to an existing feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@yostyle @ganfra @bmarty @ElementBot @gradle-update-robot @richvdh @BillCarsonFr