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.

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

Add onImageFailedRetry interface #528

Merged
merged 29 commits into from
Feb 1, 2019
Merged

Add onImageFailedRetry interface #528

Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
06d992e
fixed merge conflict and added onImageFailedRetry interface
mzorz Jan 30, 2019
35fb5f9
Merge branch 'develop' into add/retry-failed-upload
marecar3 Jan 30, 2019
b7debe2
Update gutenberg submodule
marecar3 Jan 30, 2019
bac9a79
Updated gutenberg module
marecar3 Jan 30, 2019
48a1383
Added onImageFailedRetry method in bridge
marecar3 Jan 30, 2019
d44850c
Removed callback from onImageFailedRetry interface method
marecar3 Jan 30, 2019
626c83b
Added onImageUploadCancel method
marecar3 Jan 30, 2019
4c33129
Update gutenberg submodule
marecar3 Jan 30, 2019
0fb0ab4
Refactored names of imageFailed and imageCancel methods
marecar3 Jan 30, 2019
8cb197f
removed setting mPendingMediaUploadCallback to null as we need to kee…
mzorz Jan 30, 2019
6f9b05f
added state clear methods to bridge
mzorz Jan 31, 2019
77773c2
added cancel in progress upload wiring for Android in bridge
mzorz Jan 31, 2019
00d31b0
Merge branch 'develop' into add/retry-failed-upload
marecar3 Jan 31, 2019
c3525ea
Updated gutenberg submodule
marecar3 Jan 31, 2019
62e2208
Implement iOS new GB bridge methods for media options.
SergioEstevao Jan 31, 2019
5bbe893
Refactor save to file to separate method.
SergioEstevao Jan 31, 2019
474113a
Updated gutenberg submodule
marecar3 Jan 31, 2019
38e90d3
Updated gutenberg sumodule
marecar3 Jan 31, 2019
ba3ed81
Add methods to track ongoing and failed uploads.
SergioEstevao Jan 31, 2019
d0621cb
Merge branch 'add/retry-failed-upload' of github.com:wordpress-mobile…
SergioEstevao Jan 31, 2019
2b0a660
Updated gutenberg submodule
marecar3 Jan 31, 2019
690529d
Merge branch 'add/retry-failed-upload' of github.com:wordpress-mobile…
SergioEstevao Jan 31, 2019
0fb1b6a
Updated gutenberg submodule
marecar3 Jan 31, 2019
b05b221
Split media pick logic from media upload logic.
SergioEstevao Jan 31, 2019
0b79a24
Merge branch 'add/retry-failed-upload' of github.com:wordpress-mobile…
SergioEstevao Jan 31, 2019
c3e4006
Implement media actions.
SergioEstevao Jan 31, 2019
c7b16f5
Making sure we will only send a 32 bits number for the media to avoid…
SergioEstevao Jan 31, 2019
26df2ca
Make uploads to be successful.
SergioEstevao Jan 31, 2019
136ab22
Merge branch 'develop' into add/retry-failed-upload
SergioEstevao Jan 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'develop' into add/retry-failed-upload
  • Loading branch information
@marecar3
marecar3 committed Jan 30, 2019
commit 35fb5f9147fd3c39f484608898cb5e2b147f9cdb

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.