Rnmobile/upload media failed state #13615
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Support for failed upload retry
…om/WordPress/gutenberg into rnmobile/upload_media_failed_state
…om/WordPress/gutenberg into rnmobile/upload_media_failed_state
… and fixed typo (#13610) Added new state MEDIA_UPLOAD_STATE_RESET and fixed typo
# Conflicts: # packages/block-library/src/image/edit.native.js
|
Hey @etoledom, I had merge conflicts with your code, so please check if something is broken, thanks! |
1 task
I also needed to fix some lint errors.
Looks good to me! The little wheel is there in the inline toolbar 👍 A heads up that I continue working in the same file, so we will continue having these merge conflicts for a bit more. |
mzorz
approved these changes
Jan 31, 2019
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
This was referenced 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added support for upload media failed state and cancel action.
WPAndroid : wordpress-mobile/WordPress-Android#9158
Gutenberg Mobile : wordpress-mobile/gutenberg-mobile#528