Peters Git server - pub/Android/ownCloud.git/history - src/com/owncloud/android/files/services/FileUploader.java

projects / pub / Android / ownCloud.git / history

[pub/Android/ownCloud.git] / src / com / owncloud / android / files / services / FileUploader.java

2015-11-27	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/external...	blob \| commitdiff
2015-11-27	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/bug_1300...	blob \| commitdiff
2015-11-27	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/material...	blob \| commitdiff
2015-11-27	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/avoidDup...	blob \| commitdiff
2015-11-27	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/master...	blob \| commitdiff
2015-11-27	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/master...	blob \| commitdiff
2015-11-22	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/avoidDup...	blob \| commitdiff
2015-11-21	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/setAsWal...	blob \| commitdiff
2015-11-21	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/resizedI...	blob \| commitdiff
2015-11-21	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/master...	blob \| commitdiff
2015-11-21	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/avoidDup...	blob \| commitdiff
2015-11-21	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/switchOf...	blob \| commitdiff
2015-11-21	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/master...	blob \| commitdiff \| diff to current
2015-11-20	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/bug_1251...	blob \| commitdiff
2015-11-20	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/1193_upl...	blob \| commitdiff
2015-11-20	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/external...	blob \| commitdiff
2015-11-20	Maria Asensio	Merge pull request #1119 from owncloud/strip-index...	blob \| commitdiff \| diff to current
2015-11-18	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/multiSel...	blob \| commitdiff
2015-11-18	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/resizeCa...	blob \| commitdiff
2015-11-18	Tobias Kaminsky	Merge pull request #1290 from przybylski/bug_1288	blob \| commitdiff
2015-11-14	tobiasKaminsky	Merge branch 'master' of github.com:owncloud/android...	blob \| commitdiff \| diff to current
2015-11-13	tobiasKaminsky	fix merge errors	blob \| commitdiff
2015-11-13	tobiasKaminsky	Merge branch 'beta' of github.com:owncloud/android...	blob \| commitdiff \| diff to current
2015-11-13	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/master...	blob \| commitdiff \| diff to current
2015-11-13	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/target_m...	blob \| commitdiff \| diff to current
2015-11-13	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/cancelUp...	blob \| commitdiff \| diff to current
2015-11-13	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/material...	blob \| commitdiff \| diff to current
2015-11-13	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/switchLi...	blob \| commitdiff \| diff to current
2015-11-13	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/descendI...	blob \| commitdiff \| diff to current
2015-11-13	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/master...	blob \| commitdiff \| diff to current
2015-11-10	Andy Scherzinger	Merge branch 'master' of https://github.com/owncloud...	blob \| commitdiff \| diff to current
2015-11-10	Andy Scherzinger	Merge branch '1193_uploader_layout' of https://github...	blob \| commitdiff \| diff to current
2015-11-06	tobiasKaminsky	Merge branch 'setAsWallpaper' into beta	blob \| commitdiff \| diff to current
2015-11-06	Maria Asensio	Merge pull request #1184 from Wikinaut/show-certificate...	blob \| commitdiff \| diff to current
2015-11-05	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/resizedI...	blob \| commitdiff \| diff to current
2015-11-05	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/master...	blob \| commitdiff \| diff to current
2015-11-04	Andy Scherzinger	Merge branch 'material_buttons' of https://github.com...	blob \| commitdiff \| diff to current
2015-11-04	Andy Scherzinger	Merge branch 'material_buttons' of https://github.com...	blob \| commitdiff \| diff to current
2015-11-02	Andy Scherzinger	Merge branch 'material_buttons' of https://github.com...	blob \| commitdiff \| diff to current
2015-11-02	tobiasKaminsky	Merge branch 'setAsWallpaper' into beta	blob \| commitdiff \| diff to current
2015-11-02	tobiasKaminsky	Merge branch 'setAsWallpaper' into beta	blob \| commitdiff \| diff to current
2015-11-02	Andy Scherzinger	Merge branch 'master' of https://github.com/owncloud...	blob \| commitdiff \| diff to current
2015-11-01	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/streamin...	blob \| commitdiff \| diff to current
2015-11-01	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/video_th...	blob \| commitdiff \| diff to current
2015-11-01	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/streamin...	blob \| commitdiff \| diff to current
2015-11-01	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/master...	blob \| commitdiff \| diff to current
2015-10-31	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/master...	blob \| commitdiff \| diff to current
2015-10-31	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/master...	blob \| commitdiff \| diff to current
2015-10-31	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/resizedI...	blob \| commitdiff \| diff to current
2015-10-31	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/resizedI...	blob \| commitdiff \| diff to current
2015-10-30	Andy Scherzinger	Merge branch 'master' of https://github.com/owncloud...	blob \| commitdiff \| diff to current
2015-10-30	Andy Scherzinger	Merge branch 'master' of https://github.com/owncloud...	blob \| commitdiff \| diff to current
2015-10-30	Maria Asensio	Merge pull request #1109 from owncloud/sync_full_folder	blob \| commitdiff \| diff to current
2015-10-30	David A. Velasco	Merge pull request #1219 from owncloud/sync_full_folder...	blob \| commitdiff \| diff to current
2015-10-29	David A. Velasco	Merge pull request #1105 from owncloud/fixLegacyTravis	blob \| commitdiff \| diff to current
2015-10-29	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/multiSel...	blob \| commitdiff \| diff to current
2015-10-29	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/avoidDup...	blob \| commitdiff \| diff to current
2015-10-29	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/sortInUp...	blob \| commitdiff \| diff to current
2015-10-29	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/master...	blob \| commitdiff \| diff to current
2015-10-29	Andy Scherzinger	Merge branch 'descendIntoFolder' of https://github...	blob \| commitdiff \| diff to current
2015-10-27	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/master...	blob \| commitdiff \| diff to current
2015-10-27	masensio	Fix Select Local Version or Keep Both behaviour when...	blob \| commitdiff \| diff to current
2015-10-27	masensio	Merge branch 'master' into sync_full_folder	blob \| commitdiff \| diff to current
2015-10-26	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/resizedI...	blob \| commitdiff \| diff to current
2015-10-18	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/master...	blob \| commitdiff \| diff to current
2015-10-15	masensio	Merge branch 'detailThumbnail' of git://github.com...	blob \| commitdiff \| diff to current
2015-10-09	Andy Scherzinger	Merge branch 'master' of https://github.com/owncloud...	blob \| commitdiff \| diff to current
2015-10-07	tobiasKaminsky	wip	blob \| commitdiff \| diff to current
2015-10-07	tobiasKaminsky	Merge branch 'master' of github.com:owncloud/android...	blob \| commitdiff \| diff to current
2015-10-07	tobiasKaminsky	on wifi change: cancel all pending uploads, check prior...	blob \| commitdiff \| diff to current
2015-10-07	Andy Scherzinger	Merge branch 'master' of https://github.com/owncloud...	blob \| commitdiff \| diff to current
2015-10-06	Maria Asensio	Merge pull request #1117 from owncloud/sortAccents	blob \| commitdiff \| diff to current
2015-10-05	Andy Scherzinger	Merge branch 'master' of https://github.com/owncloud...	blob \| commitdiff \| diff to current
2015-10-01	masensio	Merge pull request #839 from fluffy88/develop	blob \| commitdiff \| diff to current
2015-09-30	masensio	Merge branch 'master' into sync_full_folder	blob \| commitdiff \| diff to current
2015-09-28	David A. Velasco	Upload operations end in conflict if overriding a versi...	blob \| commitdiff \| diff to current
2015-09-25	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/master...	blob \| commitdiff \| diff to current
2015-09-25	David A. Velasco	Removed some logs	blob \| commitdiff \| diff to current
2015-09-25	David A. Velasco	Clean-up: removed unused imports and methods, and comme...	blob \| commitdiff \| diff to current
2015-09-25	David A. Velasco	Fixed permanent 'uploading' icon on files that are...	blob \| commitdiff \| diff to current
2015-09-25	David A. Velasco	Removed conflict badge when conflict is solved	blob \| commitdiff \| diff to current
2015-09-25	David A. Velasco	ETag used to detect changes in remote files (not only...	blob \| commitdiff \| diff to current
2015-09-25	David A. Velasco	Fixed NullPointerExceptionS in upload cancelations	blob \| commitdiff \| diff to current
2015-09-25	David A. Velasco	Join cancelation of downloads and uploads in 'cancel...	blob \| commitdiff \| diff to current
2015-09-25	David A. Velasco	Rewritten queue of FileUploader based on IndexedForest	blob \| commitdiff \| diff to current
2015-09-19	tobiasKaminsky	#819, part 2: Instant uploads, depends on setting	blob \| commitdiff \| diff to current
2015-09-01	masensio	Merge branch 'develop' into uploadWhenCharging	blob \| commitdiff \| diff to current
2015-08-05	masensio	Merge commit 'refs/pr/707' into text_file_preview_pr_70...	blob \| commitdiff \| diff to current
2015-07-22	tobiasKaminsky	Merge remote-tracking branch 'upstream/develop' into...	blob \| commitdiff \| diff to current
2015-07-06	masensio	Merge branch 'release-1.7.2'	blob \| commitdiff \| diff to current
2015-07-01	tobiasKaminsky	Merge remote-tracking branch 'upstream/develop' into...	blob \| commitdiff \| diff to current
2015-06-25	David A. Velasco	Merge branch 'develop' into release-1.7.2	blob \| commitdiff \| diff to current
2015-06-25	masensio	Merge pull request #1027 from owncloud/auto_grid_only_w...	blob \| commitdiff \| diff to current
2015-06-25	David A. Velasco	Refactored extractions of server version from AccountMa...	blob \| commitdiff \| diff to current
2015-06-18	Sean	Trigger media scan after file upload	blob \| commitdiff \| diff to current
2015-05-21	tobiasKaminsky	Merge remote-tracking branch 'upstream/develop' into...	blob \| commitdiff \| diff to current
2015-04-28	David A. Velasco	Merge branch 'develop' into pinEnhancement	blob \| commitdiff \| diff to current
2015-04-07	masensio	Merge branch 'release-1.7.1' oc-android-1.7.1_signed	blob \| commitdiff \| diff to current
2015-03-25	purigarcia	Merge branch 'develop' into automationTest	blob \| commitdiff \| diff to current
2015-03-25	David A. Velasco	Merge pull request #924 from owncloud/add_user_agent_su...	blob \| commitdiff \| diff to current
next

ownCloud Android App

RSS Atom