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 14.7 code freeze to develop #11714

Merged
merged 7 commits into from
Apr 22, 2020
Merged

Merge 14.7 code freeze to develop #11714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ce4d16f
Bump version number
oguzkocer Apr 20, 2020
c9bcf31
Update release notes.
oguzkocer Apr 20, 2020
c993d10
Revert "Update media insertion to send caption information."
cameronvoell Apr 20, 2020
54592b0
Merge pull request #11706 from wordpress-mobile/revert-11670-issue/in…
mchowning Apr 21, 2020
9447d22
Update FluxC version to 1.6.10
oguzkocer Apr 21, 2020
dbef167
Revert "Revert "Update media insertion to send caption information.""
mchowning Apr 21, 2020
a859bce
Merge remote-tracking branch 'origin/develop' into merge/14.7-code-fr…
oguzkocer Apr 22, 2020
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 @@
14.8
-----

14.7
-----
* Block editor: Disable ripple effect for Slider control
Expand Down
6 changes: 3 additions & 3 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-216"
versionName "alpha-217"
}
versionCode 849
versionCode 852
minSdkVersion rootProject.minSdkVersion
targetSdkVersion rootProject.targetSdkVersion

Expand All @@ -84,7 +84,7 @@ android {
dimension "buildType"
// Only set the release version if one isn't provided
if (!project.hasProperty("versionName")) {
versionName "14.6.1"
versionName "14.7-rc-1"
}
versionCode 853
buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ ext {
targetSdkVersion = 28

daggerVersion = '2.22.1'
fluxCVersion = '1.6.10-beta-2'
fluxCVersion = '1.6.10'

appCompatVersion = '1.0.2'
constraintLayoutVersion = '1.1.3'
Expand Down