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.9 code freeze to master #11941

Merged
merged 146 commits into from
May 19, 2020
Merged

Merge 14.9 code freeze to master #11941

merged 146 commits into from
May 19, 2020

Conversation

oguzkocer
Copy link
Contributor

No description provided.

jkmassel and others added 30 commits March 28, 2020 15:01
@jkmassel
Remove extra mocks files
f040f07
@planarvoid
Use FluxC version without GlobalScope
aef8bb4
@planarvoid
Update FluxC version
8bf62a9
@planarvoid
Replace GlobalScope with coroutine scope
0b0cd6e
@hypest
Retrieve is-new-post flag when switching editors
40a0c1c
@planarvoid
Replace GlobalScope with scopes specific to the owner class
40d14cb
@planarvoid
Use original coroutine scope
e59ed7d
@planarvoid
Remove unused imports
3d9f3f1
@planarvoid
Merge branch 'develop' into fix/9527-stop-using-global-scope-in-fluxc
01db338
@planarvoid
Update FluxC version to the latest develop
be2dd12
@hypest
Shouldn't bump analytics when restarting in classic/block editor
e9ccbd0
@hypest
Add an e2e test to verify switch and preview
d696b0d
@hypest
Fix lint violation
88c4829
@planarvoid
Use default dispatcher instead of global scope to keep previous behav…
cbae4b1 
…iour
@planarvoid
Use previous dispatcher in WidgetUtils
23a6506
@planarvoid
Merge branch 'develop' into fix/9527-stop-using-global-scope-in-fluxc
ff3db30
@planarvoid
Fix lint issue
c226090
@zwarm
updated empty view strings
1315e78
@hypest
Disable block editor UI test to match #11530
8e4a56c
@khaykov
Added version code provider.
f4d1fb3
@khaykov
Added version code to feature announcement.
06492c9
@khaykov
Added feature announcement prefs
0deadf4
@khaykov
Updated main view model and tests
08be308
@khaykov
Linked feature announcement request to main activity.
f908cf4
@zwarm
Updated assets and strings
daabf2a
@khaykov
Updated announcement display logic.
16165c8
@khaykov
Fixed lint issues.
06052ec
@ashiagr
Fix to position scrollbar to the edge of the screen
8c33234
@planarvoid
Show video player on long press on video item in media list
677d178
@khaykov
Added temporary feature flag to lock the feature announcement from ma…
9f50e49 
…in view model.
develric and others added 22 commits May 15, 2020 00:04
@develric
Merge pull request #11836 from wordpress-mobile/issue/11816-feature-a…
45e46a4 
…nnouncement-analytics

Issue/11816 feature announcement analytics
@malinajirka
Replace FragmentTransaction.show/hide with attach/detach - fix lifecycle
b41f81a
@planarvoid
Merge pull request #11927 from wordpress-mobile/fix-fragment-lifecycl…
0f863e7 
…e-in-bottom-nav

Replace FragmentTransaction.show/hide with attach/detach - fix lifecycle
@SergioEstevao
Update GB reference.
2989741
@mchowning
Insure BUILD_GUTENBERG_FROM_SOURCE and buildGutenbergMobileJSBundle work
7220511 
together
@mchowning
Prevent CI from failing if directories already exist
23d5954
@mchowning
Clarify error message when building gb from source with node_modules …
599730e 
…is missing
@mchowning
Use Circle CI cache to avoid rebuilding Gutenberg JS bundle
bdf3354 
wip CircleCI
@mchowning
Update gutenberg ref with new JS bundle location
afb45aa
@oguzkocer
Merge remote-tracking branch 'origin/develop' into merge/14.8-final-t…
b5a9978 
…o-develop
@mchowning
Merge pull request #11921 from wordpress-mobile/gutenberg/no-jitpack-…
469c837 
…to-develop

Gutenberg/no jitpack updates to gutenberg 1.28 branch
@mchowning
Update gutenberg submodule ref
ff886bb
@mchowning
Merge remote-tracking branch 'origin/develop' into gutenberg/integrat…
8ca288d 
…e_release_1.28.0
@mchowning
Cleanup release notes from automatic merge
7248a87 
The automatic merge made some rather questionable conflict resolution decisions.
@mchowning
Update gutenberg submodule
ccc18c7
@mchowning
Merge pull request #11894 from wordpress-mobile/gutenberg/integrate_r…
9ce01e3 
…elease_1.28.0

Update to Gutenberg 1.28.0
@mchowning
Merge remote-tracking branch 'origin/develop' into merge/14.8-final-t…
0863281 
…o-develop

Committing conflicts to be resolved in subsequent commit
@mchowning
Resolving merge conflicts
c0ac240
@oguzkocer
Merge pull request #11933 from wordpress-mobile/merge/14.8-final-to-d…
2c707d8 
…evelop

Merge 14.8 final to develop
@oguzkocer
Bump version number
47ee23c
@oguzkocer
Update release notes.
e7932aa
@oguzkocer
Update FluxC version to 1.6.12
50089ce
@oguzkocer oguzkocer added the Releases Label related to managing releases label May 18, 2020
@oguzkocer oguzkocer requested a review from loremattei May 18, 2020 20:57
@peril-wordpress-mobile
Copy link

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

@peril-wordpress-mobile
Copy link

Messages
📖

This PR contains changes in the subtree libs/utils/. It is your responsibility to ensure these changes are merged back into wordpress-mobile/WordPress-Utils-Android. Follow these handy steps!
WARNING: Make sure your git version is 2.19.x or lower - there is currently a bug in later versions that will corrupt the subtree history!

  1. cd WordPress-Android
  2. git checkout merge/14.9-code-freeze-to-master
  3. git subtree push --prefix=libs/utils/ https://github.com/wordpress-mobile/WordPress-Utils-Android.git merge/WordPress-Android/11941
  4. Browse to https://github.com/wordpress-mobile/WordPress-Utils-Android/pull/new/merge/WordPress-Android/11941 and open a new PR.

Generated by 🚫 dangerJS

@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented May 18, 2020 •
edited
Loading

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

@loremattei loremattei merged commit ad78b8c into master May 19, 2020
@loremattei loremattei deleted the merge/14.9-code-freeze-to-master branch May 19, 2020 09:35
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

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.