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.

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

Merge release-1.18.4 to master #1504

Merged
merged 136 commits into from
May 31, 2024
Merged

Merge release-1.18.4 to master #1504

merged 136 commits into from
May 31, 2024

Conversation

bemusementpark
Copy link

No description provided.

bemusementpark and others added 30 commits July 11, 2023 19:12
* Fixes #874

* Removed accidentally left in line

* Fixed issue - push before cleanup

* Cleaned up

* Removed cruft

---------

Co-authored-by: = <=>
Co-authored-by: AL-Session <[email protected]>
* WIP

* Working - push before cleanup

* Fixes #1316

* Cleanup

* PR review adjustments

* Fixed scrolling when receiving an image based message while keyboard is up

* Prevent auto-scroll to last seen item pos in conversation view if <= 3

* Put back <=3 check to scroll

---------

Co-authored-by: = <=>
Co-authored-by: AL-Session <[email protected]>
Fix unresolved theme attributes exception
…toreActivity

Remove unused RecoveryPhraseRestoreActivity
* WIP

* Working - push before cleanup

* Fixes #1316

* Cleanup

* PR review adjustments

* Fixed scrolling when receiving an image based message while keyboard is up

* Prevent auto-scroll to last seen item pos in conversation view if <= 3

* Put back <=3 check to scroll

* Forced scrolling to bottom of long messages (both sent and received) when already at the bottom of the RecyclerView

* Fixes #1364

---------

Co-authored-by: = <=>
Co-authored-by: AL-Session <[email protected]>
fanchao and others added 26 commits May 27, 2024 10:29
Fix merge master to dev for release-1.18.3
[SES-1579] Copy issue for disappearing messages
[SES-1889] Fix IndexOutOfBounds in MediaPreview
[SES-1949] Move unapprovedMessageCount to IO
[SES-1948] Do not fetch quotes recursively
[SES-2009] Fix crashes on blinded conversation
@bemusementpark bemusementpark merged commit b544961 into master May 31, 2024
2 checks passed
@simophin simophin deleted the release-1.18.4 branch August 14, 2024 00:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants