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

Merge 13.6 code freeze into develop #10729

Merged
merged 3 commits into from
Nov 5, 2019
Merged

Merge 13.6 code freeze into develop #10729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b30e463
Bump version number
jkmassel Nov 4, 2019
0730221
Update release notes.
jkmassel Nov 4, 2019
116dff3
Update strings
jkmassel Nov 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
13.7
-----

13.6
-----
* Change navigation bar color to white on Android 8.1+
Expand Down
8 changes: 4 additions & 4 deletions WordPress/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ android {
if (project.hasProperty("versionName")) {
versionName project.property("versionName")
} else {
versionName "alpha-193"
versionName "alpha-194"
}
versionCode 788
versionCode 791
minSdkVersion 21
targetSdkVersion 28

Expand All @@ -83,9 +83,9 @@ android {
dimension "buildType"
// Only set the release version if one isn't provided
if (!project.hasProperty("versionName")) {
versionName "13.5"
versionName "13.6-rc-1"
}
versionCode 789
versionCode 790
buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
}

Expand Down
4 changes: 2 additions & 2 deletions WordPress/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,8 @@

<!-- gutenberg informative dialog -->
<string name="dialog_gutenberg_informative_title">Block Editor Enabled</string>
<string name="dialog_gutenberg_informative_description_post">You\’re now using the block editor for new posts \u2014 great! If you\’d like to change to the classic editor, go to \'My Site\' > \'Site Settings\'.</string>
<string name="dialog_gutenberg_informative_description_page">You\’re now using the block editor for new pages \u2014 great! If you\’d like to change to the classic editor, go to \'My Site\' > \'Site Settings\'.</string>
<string name="dialog_gutenberg_informative_description_post">You\’re now using the block editor for new posts \u2014 great! If you\’d like to change to the classic editor, go to \'My Site\' &gt; \'Site Settings\'.</string>
<string name="dialog_gutenberg_informative_description_page">You\’re now using the block editor for new pages \u2014 great! If you\’d like to change to the classic editor, go to \'My Site\' &gt; \'Site Settings\'.</string>

<!-- reload drop down -->
<string name="loading">Loading…</string>
Expand Down