Merge remote-tracking branch 'remotes/upstream/cancelUploadOnWlanExit' into beta
[pub/Android/ownCloud.git] / src / com / owncloud / android / files / services / FileUploader.java
2015-11-13 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/cancelUp...
2015-11-13 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/material...
2015-11-13 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/switchLi...
2015-11-13 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/descendI...
2015-11-13 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-11-06 tobiasKaminskyMerge branch 'setAsWallpaper' into beta
2015-11-06 Maria AsensioMerge pull request #1184 from Wikinaut/show-certificate...
2015-11-05 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizedI...
2015-11-05 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-11-04 Andy ScherzingerMerge branch 'material_buttons' of https://github.com...
2015-11-04 Andy ScherzingerMerge branch 'material_buttons' of https://github.com...
2015-11-02 Andy ScherzingerMerge branch 'material_buttons' of https://github.com...
2015-11-02 tobiasKaminskyMerge branch 'setAsWallpaper' into beta
2015-11-02 tobiasKaminskyMerge branch 'setAsWallpaper' into beta
2015-11-02 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-11-01 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/streamin...
2015-11-01 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/video_th...
2015-11-01 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/streamin...
2015-11-01 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-10-31 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-10-31 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-10-31 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizedI...
2015-10-31 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizedI...
2015-10-30 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-30 Maria AsensioMerge pull request #1109 from owncloud/sync_full_folder
2015-10-30 David A. VelascoMerge pull request #1219 from owncloud/sync_full_folder...
2015-10-29 David A. VelascoMerge pull request #1105 from owncloud/fixLegacyTravis
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/multiSel...
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/avoidDup...
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/sortInUp...
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-10-29 Andy ScherzingerMerge branch 'descendIntoFolder' of https://github...
2015-10-27 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-10-27 masensioFix Select Local Version or Keep Both behaviour when...
2015-10-27 masensioMerge branch 'master' into sync_full_folder
2015-10-26 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizedI...
2015-10-18 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-10-15 masensioMerge branch 'detailThumbnail' of git://github.com...
2015-10-09 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-07 tobiasKaminskywip
2015-10-07 tobiasKaminskyMerge branch 'master' of github.com:owncloud/android...
2015-10-07 tobiasKaminskyon wifi change: cancel all pending uploads, check prior...
2015-10-07 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-06 Maria AsensioMerge pull request #1117 from owncloud/sortAccents
2015-10-05 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-01 masensioMerge pull request #839 from fluffy88/develop
2015-09-30 masensioMerge branch 'master' into sync_full_folder
2015-09-28 David A. VelascoUpload operations end in conflict if overriding a versi...
2015-09-25 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-09-25 David A. VelascoRemoved some logs
2015-09-25 David A. VelascoClean-up: removed unused imports and methods, and comme...
2015-09-25 David A. VelascoFixed permanent 'uploading' icon on files that are...
2015-09-25 David A. VelascoRemoved conflict badge when conflict is solved
2015-09-25 David A. VelascoETag used to detect changes in remote files (not only...
2015-09-25 David A. VelascoFixed NullPointerExceptionS in upload cancelations
2015-09-25 David A. VelascoJoin cancelation of downloads and uploads in 'cancel...
2015-09-25 David A. VelascoRewritten queue of FileUploader based on IndexedForest
2015-09-19 tobiasKaminsky#819, part 2: Instant uploads, depends on setting
2015-09-01 masensioMerge branch 'develop' into uploadWhenCharging
2015-08-05 masensioMerge commit 'refs/pr/707' into text_file_preview_pr_70...
2015-07-22 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2015-07-06 masensioMerge branch 'release-1.7.2'
2015-07-01 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2015-06-25 David A. VelascoMerge branch 'develop' into release-1.7.2
2015-06-25 masensioMerge pull request #1027 from owncloud/auto_grid_only_w...
2015-06-25 David A. VelascoRefactored extractions of server version from AccountMa...
2015-06-18 SeanTrigger media scan after file upload
2015-05-21 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2015-04-28 David A. VelascoMerge branch 'develop' into pinEnhancement
2015-04-07 masensioMerge branch 'release-1.7.1' oc-android-1.7.1_signed
2015-03-25 purigarciaMerge branch 'develop' into automationTest
2015-03-25 David A. VelascoMerge pull request #924 from owncloud/add_user_agent_su...
2015-03-24 masensioRefactor parameter user_agent out of RemoteOperation...
2015-03-18 masensioAdd user-agent string to setup options
2015-03-18 masensioMerge branch 'develop' into add_user_agent_support
2015-03-16 masensioMerge branch 'develop' into create_folder_during_upload...
2015-03-13 masensioAdd user agent in android project
2015-03-10 masensioMerge branch 'develop' into accessibility
2015-03-09 David A. VelascoMerge branch 'develop' into update_propfind_for_server_8.1
2015-03-06 masensioMerge branch 'develop' into share_password_support
2015-03-06 David A. VelascoMerge pull request #912 from owncloud/review_license
2015-03-05 masensioUpdate year in license
2015-02-25 David A. VelascoMerge pull request #886 from owncloud/cancel_transfer_f...
2015-02-25 masensioMerge branch 'develop' into cancel_transfer_for_deleted...
2015-02-24 masensioMerge branch 'develop' into cancel_transfer_for_deleted...
2015-02-20 masensioChanges from comments, FileUploader and FileDownloader...
2015-02-19 masensioChanges from Comments in PR#886
2015-02-19 masensioMerge branch 'develop' into cancel_transfer_for_deleted...
2015-02-19 masensioTry to cancel transfers when an account is deleted...
2015-02-19 David A. VelascoMerge branch 'master' into develop
2015-02-18 masensioCancel downloads for deleted users
2015-02-18 masensioMerge branch 'develop' into cancel_transfer_for_deleted...
2015-02-16 masensioCancel the current upload when it hasn't started yet
2015-02-16 masensioMerge branch 'develop' into cancel_transfer_for_deleted...
2015-02-13 masensioMerge branch 'develop' into cancel_transfer_for_deleted...
2015-02-05 David A. VelascoUpdated services clean-up; Android 4.3 and 4.4 keep...
2015-02-04 masensioCancel the transfers of an account when the account...
2015-02-03 David A. VelascoMerge branch 'master' into release-1.7.0
2015-02-03 masensioMerge branch 'develop' into cancel_transfer_for_deleted...
2015-02-02 masensioCancel transfers of an account when it detects that...
next