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

[ZP-13183] Merge Upstream #5

Merged
merged 20 commits into from
Oct 20, 2023
Merged

[ZP-13183] Merge Upstream #5

merged 20 commits into from
Oct 20, 2023

Conversation

davidofwatkins
Copy link

@davidofwatkins davidofwatkins commented Oct 20, 2023

This updates our fork with the latest from Apache.

To see the new diff between our repo and the upstream one, see here: apache/cordova-plugin-camera@master...zenput:cordova-plugin-camera:dw/merge-upstream

Abrissirba and others added 20 commits March 18, 2022 09:08
Solves the issue with duplicate queries elements in AppManifest.xml

apache#779
Co-authored-by: Alexandre Alves <aalves@seamlink.com>
Co-authored-by: エリス <erisu@users.noreply.github.com>
* dep(dev)!: bump @cordova/eslint-config@5.0.0
* chore: apply automatic lint fix
* feat(android)!: Android 13 support
* refactor(android): simplify getPermissions logic
* feat(android)!: bump cordova-android requirement to >=12.0.0
* feat(android): update saveAlbumPermission to include Android 9 and below use case

---------

Co-authored-by: ochakov <evgeny@ochakov.com>
@davidofwatkins davidofwatkins merged commit b567317 into master Oct 20, 2023
18 of 22 checks passed
@davidofwatkins davidofwatkins deleted the dw/merge-upstream branch October 20, 2023 22: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
8 participants