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.

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

[RNMobile] Merge mobile release v1.20.0 back into master (step 2) #19568

Closed
wants to merge 1 commit into from

Conversation

Tug
Copy link
Contributor

@Tug Tug commented Jan 10, 2020

Description

This is step 2 in our merge process of gutenberg-mobile v1.20.0 into master. The first one is accepted #19562. This one should be fixing conflicts with master.

Related PR in gutenberg-mobile: wordpress-mobile/gutenberg-mobile#1752

Details:

How has this been tested?

This should be tested in this gutenberg-mobile PR: wordpress-mobile/gutenberg-mobile#1752 and in the WP apps directly (WPAndroid - wordpress-mobile/WordPress-Android#11052, WPiOS - wordpress-mobile/WordPress-iOS#13190).

Checklist:

  • My code is tested.
  • My code follows the WordPress code style.
  • My code follows the accessibility standards.
  • My code has proper inline documentation.
  • I've included developer documentation if appropriate.
  • I've updated all React Native files affected by any refactorings/renamings in this PR. .

* styling fixes after navigation feature merge (#19455)

* Styling fixes to navigation feature

* Add netural styles for toolbar

* Fix condition for not registered component

* Display 'Unsupported' in breadcrumbs for missing components

* Refactor after CR

* Remove leftovers

* [FIX] rich text focus loop (#19240)

* check if onBlur event contains text that is different than value

* add check if there is a text in native event

* Prevent re-selection of RichText when native selection changes as a result of resigning focus

* Fix typo

* Check if isSelected only in onSelectionChangeFromAztec

Co-authored-by: Jorge Bernal <jbernal@gmail.com>

* [RNMobile] Correct displaying photo during upload (#19502)

* [RNMobile] Fix crash once adding Group (#19457)

* Add extra branch for travis to run tests onto

Co-authored-by: Luke Walczak <lukasz.walczak.pwr@gmail.com>
Co-authored-by: Drapich Piotr <drapich.piotr@gmail.com>
Co-authored-by: Jorge Bernal <jbernal@gmail.com>
@Tug Tug added the Mobile App - i.e. Android or iOS Native mobile impl of the block editor. (Note: used in scripts, ping mobile folks to change) label Jan 10, 2020
@Tug Tug requested a review from hypest January 10, 2020 17:05
@Tug Tug self-assigned this Jan 10, 2020
@@ -19,7 +19,7 @@ branches:
only:
- master
- rnmobile/master
- rnmobile/releases
- /rnmobile\/release.*/
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think we can safely keep this change, @hypest wdyt?

@Tug
Copy link
Contributor Author

Tug commented Jan 10, 2020

Closing as rnmobile/releases-2020 is actually a protected branch and we cannot fix conflicts here

@Tug Tug closed this Jan 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Mobile App - i.e. Android or iOS Native mobile impl of the block editor. (Note: used in scripts, ping mobile folks to change)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant