Skip to content

Release/1.12.0#1358

Merged
mchowning merged 67 commits intomasterfrom
release/1.12.0
Sep 9, 2019
Merged

Release/1.12.0#1358
mchowning merged 67 commits intomasterfrom
release/1.12.0

Conversation

@mchowning
Copy link
Copy Markdown
Contributor

@mchowning mchowning commented Sep 6, 2019

Merging release/1.12.0 branch into master

Remaining work

  • Merge gutenberg side (there is nothing to merge because rnmobile/release-1.12.0 hasn't been updated since it was branched off of rnmobile/master (branch comparison).
  • Test and approve WPiOS PR
  • Test and approve WPAndroid PR
  • Merge this PR
  • Tag Gutenberg
  • Tag head of master branch for 1.12.0 release
  • Update iOS PR to reference gutenberg-mobile release tag and merge iOS PR
  • Update Android PR to reference tagged commit and merge Android PR
  • Open PR from master to develop (won't be necessary unless we end up adding changes to this PR)
  • 🎉

Please let me know if you think I am missing any steps ⤴️

Tug and others added 30 commits August 6, 2019 14:10
…om_web

Incorporate ListEdit change from web
Adding additional error messaging because with the
`--list-different` flag (which is needed to force a non-zero exit code)
and without the `--write` flag (which would cause a 0/successful exit
code) the default error messaging confusingly says both success and
error.
Fix initial html after changes to text alignment
…tier_on_ci

Enforce Prettier (add CI and pre-commit hook)
JavonDavis and others added 22 commits August 29, 2019 21:31
* update ref

* update ref

* update ref

* Merge branch 'develop' into callstack/media-upload-props

* change git submodule url

* update ref
Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.3.1 to 1.4.2.
- [Release notes](https://github.com/mysticatea/eslint-utils/releases)
- [Commits](mysticatea/eslint-utils@v1.3.1...v1.4.2)

Signed-off-by: dependabot[bot] <support@github.com>
* Add ref to PR #17251 from gutenberg

* update ref

* update ref

* update ref

* Update to the latest rnmobile/master
Copy link
Copy Markdown
Contributor

@marecar3 marecar3 left a comment

Choose a reason for hiding this comment

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

LGTM!
Nice work @mchowning

* Prevent keyboard dismissal when switching between caption and text block on Android
* Blocks that would be replaced are now hidden when add block bottom sheet displays
* Tapping on empty editor area now always inserts new block at end of post

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Not sure if we are missing Media&Text and Group blocks from this list, or we want to hide them in 1.12.0 release?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I confirmed with @etoledom that we do not want either of those blocks to be available in this release, and they are guarded by a dev flag.

I also made release builds of both iOS and Android and confirmed that those blocks are not selectable from the bottom modal block picker and if a post is shown on mobile that contains those blocks (created on the web), then the app just displays a block placeholder. Sounds like you were observing something different though, would you like to double-check this before we merge @marecar3 ?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks @mchowning for confirmation.
It's always good to check it :)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

It's always good to check it :)

Absolutely! Thanks for bringing it up!

@mchowning mchowning merged commit 9110081 into master Sep 9, 2019
@mchowning mchowning deleted the release/1.12.0 branch September 9, 2019 11:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants