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 14.4 code freeze and release notes into master #11425

Merged
merged 60 commits into from
Mar 11, 2020
Merged

Merge 14.4 code freeze and release notes into master #11425

merged 60 commits into from
Mar 11, 2020

Conversation

oguzkocer
Copy link
Contributor

Merges all code changes present in 14.4-rc-1 into master.

Also merges release notes for 14.4.

planarvoid and others added 30 commits December 19, 2019 12:19
@planarvoid
Update Insights management control use case
103c411
@planarvoid
New design for Insight management screen
eef5024
@planarvoid
Update FluxC version for updated default insights
e82d873
@planarvoid
Remove unused files
5c8c27a
@planarvoid
Merge branch 'develop' into feature/insights-management-tweaks
178974c
@planarvoid
Rename string variable
c110241
@khaykov
Hiding lazy loading preferences for unsupported sites.
76dfaff
@mkevins
Add log template event method to EditorFragmentListener interface
db1aa4f
@mkevins
Add gutenberg event listener to parameter list
0cea8be
@mkevins
Implement anonymous gutenberg user event listener
45b2cf2
@mkevins
Implement log template event in EditPostActivity
fabf896
@mkevins
Add applyTemplate method to analytics session
d1bda1e
@mkevins
Update gutenberg-mobile reference
2e0e4ca
@khaykov
Merge branch 'develop' of https://github.com/wordpress-mobile/WordPre…
71211bb 
…ss-Android into issue/11021-remove-non-supported-site-settings
@jkmassel
Merge pull request #11372 from wordpress-mobile/merge/14.3-code-freez…
7d48076 
…e-to-develop

Merge 14.3 code freeze into develop
@mkevins
Add template apply and preview to EditorFragmentListener interface
0fdcdaa
@mkevins
Add template apply and preview methods to gutenberg fragment
1d042d8
@mkevins
Add template apply and preview events to tracker
45afc7f
@mkevins
Prevent logging null template payload
f762a79
@mkevins
Update gutenberg-mobile reference
e093945
@mkevins
Use single method interface for logging gutenberg user events
602261d
@mkevins
Update gutenberg-mobile reference
dc36fd2
@malinajirka
Fix isMediaInGutenberg method
5cda9ec
@malinajirka
Update release notes
c762d27
@develric
Linking to correct FluxC tag (based on FluxC RP 1460).
1c10b6e
@develric
Merge branch 'develop' into feature/insights-management-tweaks
b5b74ee
@develric @oguzkocer
Update build.gradle
f4cfa50 
Co-Authored-By: Oguz Kocer <[email protected]>
@develric
Merge pull request #10995 from wordpress-mobile/feature/insights-mana…
ddb3be8 
…gement-tweaks

Insights management tweaks
@oguzkocer
Inject Nosara tracker through Dagger
59d3b59
@oguzkocer
Adds TrackerTestModule which provides a mocked tracker
93d27c8
mkevins and others added 21 commits February 26, 2020 23:00
@mkevins
Merge branch 'develop' into gutenberg/issue-1883-spt-metrics
36f5a37
@chipsnyder
Update gutenberg mobil reference
63b7e1f
Merge pull request #11362 from wordpress-mobile/gutenberg/issue-1883-…
d5687d5 
…spt-metrics

[Gutenberg] Add logging to Page Template Picker
@oguzkocer
Merge pull request #11396 from wordpress-mobile/merge/14.3-release-no…
10bb6a1 
…te-changes-and-bug-fixes-to-develop

Merge 14.3 release note changes and bug fixes to develop
@jkmassel
Merge pull request #11381 from wordpress-mobile/issue/disable-trackin…
06002db 
…g-for-ui-tests

Inject Tracker and disable tracking for tests
@maxme
Merge branch 'develop' into issue/remove-gutenberg-dialog-on-new-sites
64ba843
@maxme
Don't show the block editor dialog for new users
4ff75c3
@maxme
Update the local editor setting when enabling/disabling the block editor
4f01138
@maxme
Merge pull request #11385 from wordpress-mobile/issue/remove-gutenber…
031e045 
…g-dialog-on-new-sites

Remove the Gutenberg dialog on new sites
@malinajirka
Merge pull request #11378 from wordpress-mobile/issue/10203-img-local…
d5fb57b 
…-path

Issue/10203 img local path
@oguzkocer
Update Nokogiri to 1.10.9
482a93e
@jkmassel
Merge pull request #11414 from wordpress-mobile/merge/14.3-final-to-d…
74413a3 
…evelop

Merge 14.3 final into develop
@oguzkocer
Updates FluxC version to 1.6.7
0f8506c
@jkmassel
Merge pull request #11417 from wordpress-mobile/update/nokogiri
09da08b 
Update Nokogiri to 1.10.9 to fix a warning
@jkmassel
Merge pull request #11418 from wordpress-mobile/update/fluxc-version
0f7f9cf 
Updates FluxC version to 1.6.7
@oguzkocer
Bump version number
59f49e4
@oguzkocer
Update release notes.
4353c53
@oguzkocer
Moves a release note to 14.4 where it belongs
1c7cf8b
@oguzkocer
Update release notes in metadata for 14.4
ea3cd66
@oguzkocer
Update metadata strings
0ed7af3
@oguzkocer
Merge remote-tracking branch 'origin/master' into merge/release-14.4-…
b7a514e 
…to-master-after-code-freeze
@oguzkocer oguzkocer added the Releases Label related to managing releases label Mar 10, 2020
@oguzkocer oguzkocer added this to the 14.4 ❄️ milestone Mar 10, 2020
@peril-wordpress-mobile
Copy link

Warnings
⚠️ 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.

loremattei
loremattei approved these changes Mar 11, 2020
View reviewed changes
Copy link
Contributor

@loremattei loremattei left a comment

Choose a reason for hiding this comment

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

LGTM

@oguzkocer oguzkocer merged commit 1054180 into master Mar 11, 2020
@oguzkocer oguzkocer deleted the merge/release-14.4-to-master-after-code-freeze branch March 11, 2020 14:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@loremattei loremattei loremattei approved these changes

@jkmassel jkmassel Awaiting requested review from jkmassel

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

Successfully merging this pull request may close these issues.
10 participants
@oguzkocer @loremattei @planarvoid @khaykov @mkevins @jkmassel @malinajirka @develric @maxme @chipsnyder