-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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/19.6 (19.6-rc-3) #16319
Conversation
…ion-fixes [Site Intent Question] String corrections and input sanitisation
By annotating the 2 problematic color resources individually, instead of adjusting the exception rule with a too-broad regexp See https://github.com/wordpress-mobile/WordPress-Android/pull/16285\#discussion_r846318394
…-lint-errors-properly Fix `values-night/colors_aztec.xml` properly
You can trigger optional UI/connected tests for these changes by visiting CircleCI here. |
You can test the changes on this Pull Request by downloading the APKs: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great work @ParaskP7 👍
I did a quick sanity test of the CI produced build on a Pixel 5 (Android 12) and didn't notice any issues.
I confirm that my changes are included in this PR. The rest of the code and string changes also look consistent to me. 🎉
Thank you so much for reviewing and testing it @antonis ! 🥇 🙇 |
Merging the release branch after doing a new 19.6-rc-3 beta.
This new beta contains:
values-night/colors_aztec.xml
linter errors properly this time #16293strings.xml
from GlotPress)version.properties
)Merge Conflicts:
And I kept the
merge/release-19.6-rc-3
in favor of thetrunk
version for the 2 x conflicting strings, while I kept the 3 x non-conflicting new strings that were ontrunk
.