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 develop #18

Merged
merged 13 commits into from
Nov 25, 2024
Merged

Rebase against on Element X develop #18

merged 13 commits into from
Nov 25, 2024

Conversation

yostyle
Copy link

@yostyle yostyle commented Nov 25, 2024

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 12 commits November 22, 2024 17:13
@ganfra
change : confirm biometric before allowing biometric unlock.
2b75fff
@bmarty
Ensure that the SDK is syncing during an incoming call so that the ap…
031ed22 
…plication can detect if the call has been answered on another session.

This is dealing with the case the application is not in foreground.
@renovate
Update dependency org.matrix.rustcomponents:sdk-android to v0.2.65
5b21258
@ElementBot @bmarty
Sync Strings (element-hq#3936)
d9f8e9c 
Co-authored-by: bmarty <[email protected]>
@bmarty
Merge pull request element-hq#3931 from element-hq/feature/bma/stopIn…
e347294 
…comingElementCall

Ensure that the SDK is syncing during an incoming call so that the app can cancel the notification
@bmarty
Fix test compilation issue.
9c71d72
@bmarty
Merge pull request element-hq#3932 from element-hq/renovate/org.matri…
41b1211 
…x.rustcomponents-sdk-android-0.x

Update dependency org.matrix.rustcomponents:sdk-android to v0.2.65
@jmartinesp
Fix long click not working on pinned events timeline (element-hq#3940)
a080444
@ganfra
Merge pull request element-hq#3930 from element-hq/feature/fga/check_…
9ad8c35 
…fingerprint_before_enabling

change : confirm biometric before allowing biometric unlock.
@renovate
Update media3 to v1.5.0 (element-hq#3942)
9ea4a2b 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@yostyle
Merge remote-tracking branch 'upstream/develop' into yostyle/rebase_2…
5c6e0e8 
…0241126
@yostyle
Update user displayname computing from userId
da392c7
@yostyle yostyle self-assigned this Nov 25, 2024
@yostyle yostyle added the Record-Screenshots Runs the 'Record Screenshots' CI job and adds a commit with any new screenshots found. label Nov 25, 2024
@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 Nov 25, 2024
@yostyle yostyle merged commit ed856e3 into develop Nov 25, 2024
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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@yostyle @ganfra @bmarty @ElementBot @jmartinesp