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

Re-merge release/3.10 to release/4.0 branch #4263

Open
wants to merge 5 commits into
base: release/4.0
Choose a base branch
from
Open

Re-merge release/3.10 to release/4.0 branch #4263

wants to merge 5 commits into from

Commits on Jul 9, 2024

  1. Upgrade Google Play Billing library to 6.0.1 

    On Google Play's notice. Details: https://developer.android.com/google/play/billing/deprecation-faq?hl=en
    @TranceLove
    TranceLove committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    9f7dcb5 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. Merge pull request #4216 from TeamAmaze/feature/billing-60 

    Upgrade Google Play Billing library to 6.0.1
    @VishalNehra
    VishalNehra authored Jul 30, 2024
    Configuration menu
    Copy the full SHA
    06c8739 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. SftpConnectDialog: Wrap open DocumentsUI intent with Intent.createCho… 

    …oser() to get PEM content

To fix regressions in newer Androids that SftpConnectDialog unable to load PEM for SSH authentication.

Reference: https://stackoverflow.com/questions/10002065/android-gallery-always-returns-result-canceled-to-onactivityresult
    @TranceLove
    TranceLove committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    2410b08 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. Merge pull request #4234 from TeamAmaze/bugfix/sftpconnectdialog-sele… 

    …ct-pem

SftpConnectDialog: Wrap open DocumentsUI intent with Intent.createChooser() to get PEM content
    @VishalNehra
    VishalNehra authored Aug 20, 2024
    Configuration menu
    Copy the full SHA
    f4eec02 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. Merge remote-tracking branch 'upstream/release/3.10' into HEAD

    @TranceLove
    TranceLove committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    0f01031 View commit details
    Browse the repository at this point in the history