Peters Git server - pub/Android/ownCloud.git/history - src/com/owncloud/android/operations/SynchronizeFileOperation.java

projects / pub / Android / ownCloud.git / history

[pub/Android/ownCloud.git] / src / com / owncloud / android / operations / SynchronizeFileOperation.java

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
2015-11-20	Maria Asensio	Merge pull request #1119 from owncloud/strip-index...	blob \| commitdiff
2015-11-18	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/multiSel...	blob \| commitdiff
2015-11-14	tobiasKaminsky	Merge branch 'master' of github.com:owncloud/android...	blob \| commitdiff
2015-11-13	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/cancelUp...	blob \| commitdiff
2015-11-13	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/switchLi...	blob \| commitdiff
2015-11-13	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/descendI...	blob \| commitdiff
2015-11-06	Maria Asensio	Merge pull request #1184 from Wikinaut/show-certificate...	blob \| commitdiff
2015-11-05	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/master...	blob \| commitdiff
2015-11-02	Andy Scherzinger	Merge branch 'master' of https://github.com/owncloud...	blob \| commitdiff
2015-11-01	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/video_th...	blob \| commitdiff
2015-11-01	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/master...	blob \| commitdiff
2015-10-31	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/master...	blob \| commitdiff
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
2015-10-30	Andy Scherzinger	Merge branch 'master' of https://github.com/owncloud...	blob \| commitdiff
2015-10-30	Maria Asensio	Merge pull request #1109 from owncloud/sync_full_folder	blob \| commitdiff
2015-10-30	David A. Velasco	Merge pull request #1219 from owncloud/sync_full_folder...	blob \| commitdiff
2015-10-29	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/sortInUp...	blob \| commitdiff \| diff to current
2015-10-29	Andy Scherzinger	Merge branch 'descendIntoFolder' of https://github...	blob \| commitdiff \| diff to current
2015-10-27	masensio	Fix Select Local Version or Keep Both behaviour when...	blob \| commitdiff
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 branch 'uploadWhenCharging' of github.com:ownclou...	blob \| commitdiff \| diff to current
2015-10-15	masensio	Merge branch 'detailThumbnail' of git://github.com...	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-25	David A. Velasco	Safe blanket to clean DB if wrong conflicts keep stored	blob \| commitdiff \| diff to current
2015-09-25	David A. Velasco	Added conflict icon to folders containing files with...	blob \| commitdiff \| diff to current
2015-09-25	David A. Velasco	Persist conflicts in local database and show with an...	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-01	masensio	Merge branch 'develop' into uploadWhenCharging	blob \| commitdiff \| diff to current
2015-08-21	tobiasKaminsky	Merge branch 'develop' of github.com:owncloud/android...	blob \| commitdiff \| diff to current
2015-08-14	tobiasKaminsky	Merge remote-tracking branch 'upstream/video_thumbnail...	blob \| commitdiff \| diff to current
2015-08-10	Andy Scherzinger	Merge branch 'master' of https://github.com/owncloud...	blob \| commitdiff \| diff to current
2015-08-07	David A. Velasco	Merge branch 'develop'	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-28	purigarcia	merge develop	blob \| commitdiff \| diff to current
2015-07-26	AndyScherzinger	Merge branch 'master' of https://github.com/owncloud...	blob \| commitdiff \| diff to current
2015-07-23	David A. Velasco	Merge pull request #1050 from owncloud/favourites_conte...	blob \| commitdiff \| diff to current
2015-07-22	tobiasKaminsky	Merge remote-tracking branch 'upstream/develop' into...	blob \| commitdiff \| diff to current
2015-07-22	purigarcia	change the name of the method from keepInSync to favori...	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
2015-03-24	masensio	Refactor parameter user_agent out of RemoteOperation...	blob \| commitdiff \| diff to current
2015-03-18	masensio	Merge branch 'develop' into add_user_agent_support	blob \| commitdiff \| diff to current
2015-03-16	masensio	Merge branch 'develop' into create_folder_during_upload...	blob \| commitdiff \| diff to current
2015-03-13	masensio	Add user agent in android project	blob \| commitdiff \| diff to current
2015-03-10	masensio	Merge branch 'develop' into accessibility	blob \| commitdiff \| diff to current
2015-03-09	David A. Velasco	Merge branch 'develop' into update_propfind_for_server_8.1	blob \| commitdiff \| diff to current
2015-03-06	masensio	Merge branch 'develop' into share_password_support	blob \| commitdiff \| diff to current
2015-03-06	David A. Velasco	Merge pull request #912 from owncloud/review_license	blob \| commitdiff \| diff to current
2015-03-05	masensio	Update year in license	blob \| commitdiff \| diff to current
2015-03-05	masensio	Add author's line in license	blob \| commitdiff \| diff to current
2015-02-03	David A. Velasco	Merge branch 'master' into release-1.7.0	blob \| commitdiff \| diff to current
2015-02-02	David A. Velasco	Merge branch 'develop' into imageGrid	blob \| commitdiff \| diff to current
2015-01-30	masensio	Merge commit 'refs/pr/701' into create_folder_during_up...	blob \| commitdiff \| diff to current
2015-01-28	masensio	Merge branch 'develop' into delete_local_files	blob \| commitdiff \| diff to current
2015-01-28	masensio	Merge pull request #866 from owncloud/download_folder	blob \| commitdiff \| diff to current
2015-01-19	jabarros	Merge branch 'develop' into download_folder	blob \| commitdiff \| diff to current
2015-01-07	jabarros	Merge branch 'develop' into download_folder	blob \| commitdiff \| diff to current
2014-12-15	jabarros	Merge pull request #806 from owncloud/download_folder__...	blob \| commitdiff \| diff to current
2014-12-12	David A. Velasco	Fixed a couple of null pointers	blob \| commitdiff \| diff to current
2014-12-12	David A. Velasco	Optimize operation flow	blob \| commitdiff \| diff to current
2014-12-09	David A. Velasco	Merge remote-tracking branch 'rhabbachi/feature/308_syn...	blob \| commitdiff \| diff to current
2014-11-05	tobiasKaminsky	Merge remote-tracking branch 'upstream/develop' into...	blob \| commitdiff \| diff to current
2014-10-31	David A. Velasco	Merge branch 'remember_last_share_location' into rememb...	blob \| commitdiff \| diff to current
2014-10-29	grecep	Merge pull request #669 from grecep/master	blob \| commitdiff \| diff to current
2014-10-28	Jorge Antonio Diaz...	Merge branch 'us4_view_text_files' of github.com:ownclo...	blob \| commitdiff \| diff to current
2014-10-28	Jorge Antonio Diaz...	Merge branch 'gradleWithInternalDependency' of github...	blob \| commitdiff \| diff to current
2014-10-24	tobiasKaminsky	Merge remote-tracking branch 'upstream/develop' into	blob \| commitdiff \| diff to current
2014-10-24	tobiasKaminsky	Merge remote-tracking branch 'upstream/develop' into...	blob \| commitdiff \| diff to current
2014-10-24	jabarros	Merge branch 'thumbnails_from_server' of https://github...	blob \| commitdiff \| diff to current
2014-10-23	jabarros	Merge branch 'develop' into idn_hosts	blob \| commitdiff \| diff to current
2014-10-23	jabarros	Merge branch 'sortingFiles' of https://github.com/tobia...	blob \| commitdiff \| diff to current
2014-10-23	jabarros	Merge branch 'develop' into sorting_files_2	blob \| commitdiff \| diff to current
2014-10-22	tobiasKaminsky	- cleaned up	blob \| commitdiff \| diff to current
2014-10-22	tobiasKaminsky	- moved MediaScan to DownloadFileOperation.	blob \| commitdiff \| diff to current
2014-10-22	tobiasKaminsky	- update to obey non-image files	blob \| commitdiff \| diff to current
2014-10-22	tobiasKaminsky	Merge remote-tracking branch 'upstream/develop' into...	blob \| commitdiff \| diff to current
2014-10-21	David A. Velasco	Merge pull request #653 from LukeOwncloud/develop	blob \| commitdiff \| diff to current
2014-10-20	jabarros	Merge branch 'master' into develop	blob \| commitdiff \| diff to current
2014-10-17	MMMarcy	Merge remote-tracking branch 'theirs/develop' into...	blob \| commitdiff \| diff to current
2014-10-17	Magnus Sjoqvist	Merge with develop	blob \| commitdiff \| diff to current
2014-10-16	David A. Velasco	Fix lost update of remoteId when file is sync'ed after...	blob \| commitdiff \| diff to current
2014-10-15	jabarros	Merge branch 'idn_hosts' of https://github.com/ogasser...	blob \| commitdiff \| diff to current
2014-10-09	jabarros	Merge branch 'sortingFiles' of https://github.com/tobia...	blob \| commitdiff \| diff to current
2014-10-06	jabarros	Merge branch 'master' of https://github.com/loripino21...	blob \| commitdiff \| diff to current
2014-10-01	Javier Gonzalez	Merge pull request #641 from owncloud/thumbnails_for_do...	blob \| commitdiff \| diff to current
2014-09-18	David A. Velasco	Merge branch 'develop' into release-1.6.0	blob \| commitdiff \| diff to current
2014-09-18	David A. Velasco	Merge pull request #627 from owncloud/better_loggin_system	blob \| commitdiff \| diff to current
2014-09-18	David A. Velasco	Fixed conflict - Merge branch 'develop' into better_log...	blob \| commitdiff \| diff to current
2014-09-17	jabarros	Merge branch 'develop' into better_loggin_system	blob \| commitdiff \| diff to current
2014-09-11	jabarros	Move Logger class to owncloud library and update refere...	blob \| commitdiff \| diff to current
next

ownCloud Android App

RSS Atom