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

projects / pub / Android / ownCloud.git / history

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

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-14	tobiasKaminsky	Merge branch 'master' of github.com:owncloud/android...	blob \| commitdiff \| diff to current
2015-11-13	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/master...	blob \| commitdiff
2015-11-13	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/target_m...	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/material...	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-13	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/master...	blob \| commitdiff
2015-11-12	David A. Velasco	Merge pull request #1254 from owncloud/droid-update	blob \| commitdiff \| diff to current
2015-11-10	Andy Scherzinger	Merge branch 'master' of https://github.com/owncloud...	blob \| commitdiff
2015-11-10	Andy Scherzinger	Merge branch '1193_uploader_layout' of https://github...	blob \| commitdiff
2015-11-06	tobiasKaminsky	Merge branch 'setAsWallpaper' into beta	blob \| commitdiff
2015-11-06	Andy Scherzinger	Merge branch 'material_fab' of https://github.com/owncl...	blob \| commitdiff \| diff to current
2015-11-06	Andy Scherzinger	Merge branch 'material_buttons' of https://github.com...	blob \| commitdiff \| diff to current
2015-11-06	Andy Scherzinger	Merge branch 'master' of https://github.com/owncloud...	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
2015-11-05	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/master...	blob \| commitdiff \| diff to current
2015-11-05	Maria Asensio	Merge pull request #1252 from owncloud/share_with_users	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	David A. Velasco	Added operation to create shares with a sharee, separat...	blob \| commitdiff \| diff to current
2015-10-30	David A. Velasco	Sync user and group shares into database	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	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/videoBig...	blob \| commitdiff \| diff to current
2015-10-29	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/resizeCa...	blob \| commitdiff \| diff to current
2015-10-29	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/switchOf...	blob \| commitdiff \| diff to current
2015-10-29	masensio	Detect conflict when local and server version are changed	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 \| 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	enabled all occurrences.	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	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	Keep the old operation to sync folder as DownloadFolder...	blob \| commitdiff \| diff to current
2015-09-25	David A. Velasco	Extend SyncFolderOperation to check local changes of...	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-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-22	David A. Velasco	Merge branch 'master' into develop	blob \| commitdiff \| diff to current
2015-06-15	masensio	Merge branch 'develop' into forbidden_characters_from_s...	blob \| commitdiff \| diff to current
2015-06-15	masensio	Merge pull request #995 from owncloud/navigationDrawer_...	blob \| commitdiff \| diff to current
2015-06-15	masensio	Merge remote-tracking branch 'origin/develop' into...	blob \| commitdiff \| diff to current
2015-06-15	David A. Velasco	Merge branch 'develop' into navigationDrawer_basic	blob \| commitdiff \| diff to current
2015-05-27	tobiasKaminsky	Merge branch 'navigationDrawer_update' of github.com...	blob \| commitdiff \| diff to current
2015-05-27	masensio	Merge branch 'remove_ActionBarSherlock' into navigation...	blob \| commitdiff \| diff to current
2015-05-25	masensio	Disable On Device option in Navigation Drawer	blob \| commitdiff \| diff to current
2015-05-23	tobiasKaminsky	Merge remote-tracking branch 'upstream/develop' into...	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
next

ownCloud Android App

RSS Atom