Merge 17.7 into develop after 17.6.1, 17.7-rc-2 and Release Notes#14975
Merged
Merge 17.7 into develop after 17.6.1, 17.7-rc-2 and Release Notes#14975
Conversation
…ature-flag Layout Grid: Update the config flag so that is available in production
…-migration Reverting paging3 migration
…into-release-17.7 Merge hotfix 17.6.1 into current release 17.7
AliSoftware
commented
Jul 1, 2021
| @@ -0,0 +1 @@ | |||
| ../metadata/JetpackPlayStoreStrings.po No newline at end of file | |||
Contributor
Author
There was a problem hiding this comment.
A symlink for convenience until we update the cron job in the sandbox to point to the new location 😓
AliSoftware
commented
Jul 1, 2021
Comment on lines
+14
to
+17
| msgctxt "release_note_177" | ||
| msgid "" | ||
| "17.7:\n" | ||
| "Block editor: New block layout grid, Badge style tweaks, Fixed new block not created when pressing enter inside text-based block, Tablet view fixes for inserter button\n" |
Contributor
Author
There was a problem hiding this comment.
p2JRYi-5oG-p2#comment-20627
AliSoftware
commented
Jul 1, 2021
Comment on lines
14
to
20
| msgctxt "release_note_177" | ||
| msgid "" | ||
| "17.7:\n" | ||
| "New! Get blogging reminder prompts on days of your choice\n" | ||
| "Block editor: New block layout grid, Badge style tweaks, Fixed new block not created when pressing enter inside text-based block, Tablet view fixes for inserter button\n" | ||
| "Fixed Reader duplicate post issue\n" | ||
| "Added ability to subscribe to conversations by email from Reader\n" |
Contributor
Author
There was a problem hiding this comment.
p2JRYi-5oG-p2#comment-20626
AliSoftware
commented
Jul 1, 2021
Comment on lines
-4
to
+5
| wordpress.versionName=17.7-rc-1 | ||
| wordpress.versionCode=1068 | ||
| wordpress.versionName=17.7-rc-2 | ||
| wordpress.versionCode=1072 |
Contributor
Author
There was a problem hiding this comment.
The jump is due to the 17.6.1 hotfix that was done in-between
|
You can test the changes on this Pull Request by downloading the APKs: |
oguzkocer
approved these changes
Jul 2, 2021
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This includes:
JetpackPlayStoreStrings.pofile from the Jetpackrelease_notes.txtfiles🚨 Note: For consistency in the git branch graph, the (empty) PR to merge hotfix 17.6.1 into develop should be merged before this one.