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/upload media failed state #13615

Merged
merged 23 commits into from
Jan 31, 2019
Merged

Conversation

marecar3
Copy link
Contributor

Added support for upload media failed state and cancel action.

WPAndroid : wordpress-mobile/WordPress-Android#9158
Gutenberg Mobile : wordpress-mobile/gutenberg-mobile#528

@marecar3
Copy link
Contributor Author

Hey @etoledom, I had merge conflicts with your code, so please check if something is broken, thanks!

I also needed to fix some lint errors.
@etoledom
Copy link
Contributor

Hey @etoledom, I had merge conflicts with your code, so please check if something is broken, thanks!

Looks good to me! The little wheel is there in the inline toolbar 👍
The block wasn't selecting tapping on the image itself though (iOS).

A heads up that I continue working in the same file, so we will continue having these merge conflicts for a bit more.

Copy link
Contributor

@mzorz mzorz left a comment

Choose a reason for hiding this comment

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

LGTM, will be all green once lint errors get fixed

@marecar3 marecar3 merged commit 22aba0d into master Jan 31, 2019
@marecar3 marecar3 deleted the rnmobile/upload_media_failed_state branch January 31, 2019 16:48
daniloercoli added a commit that referenced this pull request Feb 1, 2019
…rnmobile/372-use-RichText-on-Title-block

* 'master' of https://github.com/WordPress/gutenberg:
  Try alternate list item jump fix. (#12941)
  Mobile bottom sheet component (#13612)
  Remove unintentional right-margin on last odd-item. (#12199)
  Introduce left and right float alignment options to latest posts block (#8814)
  Fix Google Docs table paste (#13543)
  Increase bottom padding on gallery image caption (#13623)
  Fix the editor save keyboard shortcut not working in code editor view (#13159)
  Plugin: Deprecate gutenberg_add_admin_body_class (#13572)
  Rnmobile/upload media failed state (#13615)
  Make clickOnMoreMenuItem not dependent on aria labels (#13166)
  Add: className prop support to server side render. (#13568)
  Fix: Categories Block: hierarchical Dropdown (#13567)
  Docs: Add clarification about git workflow (#13534)
  Plugin: Remove `user_can_richedit` filtering (#13608)
  eslint-plugin: Add rule `no-unused-vars-before-return` (#12828)
  Image settings button (#13597)
  Fixed wording for the color picker saturation (#13479)

# Conflicts:
#	packages/block-library/src/image/edit.native.js
@youknowriad youknowriad added this to the 5.0 (Gutenberg) milestone Feb 4, 2019
youknowriad pushed a commit that referenced this pull request Mar 6, 2019
*Implement upload media failed state
youknowriad pushed a commit that referenced this pull request Mar 6, 2019
*Implement upload media failed state
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants