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

Merge Release/14.5 into master #11586

Merged
merged 19 commits into from
Apr 3, 2020
Merged

Merge Release/14.5 into master #11586

merged 19 commits into from
Apr 3, 2020

Conversation

loremattei
Copy link
Contributor

Merging this now in order to upload some new strings to GlotPress.

To test:

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered adding accessibility improvements for my changes.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

loremattei and others added 19 commits March 27, 2020 11:50
@loremattei
Bump version number
1d38d25
@hypest
Revert "Merge pull request #11362 from wordpress-mobile/gutenberg/iss…
870ddd1 
…ue-1883-spt-metrics"

This reverts commit d5687d5, reversing
changes made to 8a1f43e.
@loremattei
Update Version Code
f5ace63
@hypest
Merge remote-tracking branch 'origin/hotfix/14.4.1' into gutenberg/re…
82350ab 
…vert-post-1.23-code-that-crashes-button-block
@hypest
Update RELEASE notes
781d32c
@maxme
Merge pull request #11543 from wordpress-mobile/gutenberg/revert-post…
076d831 
…-1.23-code-that-crashes-button-block

 Revert work after editor v1.23 that landed in WPAndroid 14.4
@oguzkocer
Merge branch 'hotfix/14.4.1' into merge/14.4.1-to-release/14.5
4c15b03
@loremattei
Merge pull request #11549 from wordpress-mobile/merge/14.4.1-to-relea…
265b130 
…se/14.5

Merge/14.4.1 to release/14.5
@oguzkocer
Bump version number
d50504b
@oguzkocer
Bump version number to 843
7d73c60
@oguzkocer
Bump alpha version number to 844
d6d3cda
@oguzkocer
Updates translations
e9feed8
@oguzkocer
Bump version number
e1e033a
@oguzkocer
Update metadata translations for 14.5
52405a5
@oguzkocer
Shorten some release notes for 14.5
75f6708
@maxme
Merge gutenberg strings in the main strings.xml file
8564fcb
@maxme
Fix a lint error in imported strings
393b776
@maxme
Update strings.xml after building gutenberg.pot
878eada
@maxme
Merge pull request #11585 from wordpress-mobile/issue/update-translat…
d207c3d 
…ions-for-14.5

Merge gutenberg strings in the main strings.xml file
@loremattei loremattei added the Releases Label related to managing releases label Apr 3, 2020
@loremattei loremattei requested review from maxme and oguzkocer April 3, 2020 15:57
@peril-wordpress-mobile
Copy link

Warnings
⚠️ PR is not assigned to a milestone.
⚠️ PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.

Generated by 🚫 dangerJS

@peril-wordpress-mobile
Copy link

You can test the changes on this Pull Request by downloading the APK here.

maxme
maxme approved these changes Apr 3, 2020
View reviewed changes
Copy link
Contributor

@maxme maxme left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I confirm the new gutenberg strings have been added, LGTM. Thanks for taking care of this @loremattei!

@loremattei loremattei merged commit 76869b1 into master Apr 3, 2020
@maxme maxme deleted the release/14.5 branch April 3, 2020 16:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maxme maxme maxme approved these changes

@oguzkocer oguzkocer Awaiting requested review from oguzkocer

Assignees
No one assigned
Labels
Releases Label related to managing releases
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@loremattei @maxme @hypest @oguzkocer