Skip to content

Master -> Develop merge for 1.15.2 #1514

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
Closed
mchowning wants to merge 21 commits into from
Closed

Master -> Develop merge for 1.15.2 #1514

mchowning wants to merge 21 commits into from

Conversation

@mchowning
Copy link
Contributor

@mchowning mchowning commented Oct 29, 2019

Update release notes:

  • If there are user facing changes, I have added an item to RELEASE-NOTES.txt.

SergioEstevao and others added 21 commits October 24, 2019 21:46
@SergioEstevao
Fix request import to send the correct information.
67d2796 
Beside fixing the request for import to send the correct parameters in
the callback, we are also improving the interface by replacing a tupple
for a structure to make parameters more explicit.
@SergioEstevao
Make MediaInfo properties public
b8f574b
@etoledom
Update gutenberg ref
7a5f155
@SergioEstevao
Update release notes.
65964a8
@etoledom
Update RELEASE-NOTES.txt
bb8d92a
@etoledom
Update gutenberg ref
6dfba3d
@etoledom
Merge pull request #1495 from wordpress-mobile/issue/fix-block-picker…
2abde85 
…-landscape

Force block inserter to re-render on device rotation
@pinarol
Add left right borders to inner blocks (#1496)
d65c7f9 
* Update gutenberg ref

* Update gutenberg ref
@pinarol
Remove alignment options from Media & Text until they are fixed (#1500)
f190247 
* Update gutenberg ref

* Update gutenberg ref

* Update gutenberg ref
@SergioEstevao
Add extension to encode MediaInfo to JS.
9624986
@SergioEstevao
Merge branch 'release/1.15.2' into issue/fix_request_import_on_bridge
a4bab40
@etoledom
Merge pull request #1494 from wordpress-mobile/issue/fix_request_impo…
e243459 
…rt_on_bridge

Fix requestImport call to send the correct arguments.
@etoledom
Update JS Bundles
59022ee
@etoledom
Bump version to 1.15.2
73c2873
@dratwas @pinarol
[FIX] Scroll position android (#1478)
1811d84 
* Fix native test of image block (#1456)

* Add ref to gutenberg repo

* Update ret to point to master

* Introduce grouping in the block settings inspector (#1397)

* Feat: cover cross platform RangeControl (#1342)

* feat: add RangeCell component

* update ref

* update ref and bundle
@etoledom
Update gutenberg ref
c1f86ea
@pinarol
Fix: Media & Text Loses upload status if post is closed/reopened duri…
f42bc54 
…ng the upload #18137 (#1506)

* Update gutenberg ref

* Update gutenberg ref

* Update gutenberg ref

* Update gutenberg ref

* Update gutenberg ref
@etoledom
Update JS Bundles
d502c46
@etoledom
Update gutenberg ref
649a22a
@mchowning
Update bundles
6e4b4f2
@mchowning
Merge pull request #1503 from wordpress-mobile/release/1.15.2
6865978 
Hotfix v1.15.2
@mchowning mchowning requested a review from etoledom October 29, 2019 21:26
@mchowning mchowning added this to the 1.15.2 milestone Oct 29, 2019
@mchowning mchowning removed this from the 1.15.2 milestone Oct 29, 2019
@mchowning
Copy link
Contributor Author

mchowning commented Oct 29, 2019

Closing this in favor of #1515, which is merging from a branch off of master where we can resolve merge conflicts and update the gutenberg ref before merging to develop.

@mchowning mchowning closed this Oct 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@etoledom etoledom Awaiting requested review from etoledom

Assignees

No one assigned

Labels

release-process

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@mchowning @SergioEstevao @etoledom @pinarol @dratwas