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-12-08	Peter Henn	Merge tag 'oc-android-1.9' into sdcard-save sdcard-save sd-android-1.9	blob \| commitdiff
2015-12-03	masensio	Merge branch 'release-1.9' into stable oc-android-1.9	blob \| commitdiff
2015-11-20	Maria Asensio	Merge pull request #1119 from owncloud/strip-index...	blob \| commitdiff
2015-11-12	David A. Velasco	Merge pull request #1254 from owncloud/droid-update	blob \| commitdiff
2015-11-06	Maria Asensio	Merge pull request #1184 from Wikinaut/show-certificate...	blob \| commitdiff
2015-11-05	Maria Asensio	Merge pull request #1252 from owncloud/share_with_users	blob \| commitdiff
2015-10-30	David A. Velasco	Added operation to create shares with a sharee, separat...	blob \| commitdiff
2015-10-30	David A. Velasco	Sync user and group shares into database	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	masensio	Detect conflict when local and server version are changed	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-15	masensio	Merge branch 'detailThumbnail' of git://github.com...	blob \| commitdiff \| diff to current
2015-10-03	Peter Henn	Merge tag 'oc-android-1.8' into sdcard-save sd-android-1.8	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-08-21	tobiasKaminsky	Merge branch 'develop' of github.com:owncloud/android...	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	purigarcia	change the name of the method from keepInSync to favori...	blob \| commitdiff \| diff to current
2015-07-08	Peter Henn	Merge branch 'master' into sdcard-save sd-android-1.7.2	blob \| commitdiff \| diff to current
2015-07-06	masensio	Merge branch 'release-1.7.2'	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
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-19	masensio	Merge branch 'develop' into cancel_transfer_for_deleted...	blob \| commitdiff \| diff to current
2015-02-19	David A. Velasco	Merge branch 'master' into develop	blob \| commitdiff \| diff to current
2015-02-05	David A. Velasco	Updated services clean-up; Android 4.3 and 4.4 keep...	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-26	David A. Velasco	Fixed cancellation of SynchronizeOperationFolder	blob \| commitdiff \| diff to current
2015-01-19	jabarros	Merge branch 'develop' into download_folder	blob \| commitdiff \| diff to current
2015-01-13	David A. Velasco	Move every sendBroadcast from SynchronizeFolderOperatio...	blob \| commitdiff \| diff to current
2015-01-12	David A. Velasco	Merge pull request #837 from owncloud/download_folder_f...	blob \| commitdiff \| diff to current
2015-01-09	jabarros	Fix. Subfolders are not cancelled correctly	blob \| commitdiff \| diff to current
2015-01-08	tobiasKaminsky	Merge remote-tracking branch 'upstream/develop' into...	blob \| commitdiff \| diff to current
2015-01-08	David A. Velasco	Merge pull request #836 from owncloud/download_folder__...	blob \| commitdiff \| diff to current
2015-01-08	David A. Velasco	Aesthetic fixes	blob \| commitdiff \| diff to current
2015-01-08	jabarros	Notify the download cancelation for updating the screen...	blob \| commitdiff \| diff to current
2015-01-08	jabarros	Fix for downloads that are not cancelled	blob \| commitdiff \| diff to current
2015-01-08	jabarros	Merge branch 'download_folder' into download_folder__fi...	blob \| commitdiff \| diff to current
2015-01-07	David A. Velasco	First try	blob \| commitdiff \| diff to current
2015-01-07	jabarros	Merge branch 'develop' into download_folder	blob \| commitdiff \| diff to current
2015-01-07	jabarros	Fix. App does not realize that the folder does not...	blob \| commitdiff \| diff to current
2015-01-05	tobiasKaminsky	update	blob \| commitdiff \| diff to current
2014-12-31	jabarros	Fix. App does not realize that the folder does not...	blob \| commitdiff \| diff to current
2014-12-26	jabarros	Merge branch 'develop' into obeySortOrder_fixmerge	blob \| commitdiff \| diff to current
2014-12-23	jabarros	Fixed. Yellow arrow is not gone when there is not somet...	blob \| commitdiff \| diff to current
2014-12-17	jabarros	Merge pull request #813 from owncloud/download_folder__...	blob \| commitdiff \| diff to current
2014-12-17	David A. Velasco	Added cancellation checks in SynchronizeFolderOperation...	blob \| commitdiff \| diff to current
2014-12-17	jabarros	Merge pull request #812 from owncloud/download_folder__...	blob \| commitdiff \| diff to current
2014-12-17	David A. Velasco	Merge pull request #811 from owncloud/download_folder_c...	blob \| commitdiff \| diff to current
2014-12-16	jabarros	Merge branch 'download_folder' into download_folder_can...	blob \| commitdiff \| diff to current
2014-12-16	jabarros	Added cancelation for each synchronizeFolderOperation...	blob \| commitdiff \| diff to current
2014-12-15	jabarros	Merge pull request #806 from owncloud/download_folder__...	blob \| commitdiff \| diff to current
2014-12-15	David A. Velasco	Avoid unneeded parameter	blob \| commitdiff \| diff to current
2014-12-15	David A. Velasco	Merge pull request #805 from owncloud/download_folder_c...	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-12	David A. Velasco	Delay load of cached information about folder (mLocalFo...	blob \| commitdiff \| diff to current
2014-12-12	David A. Velasco	Merge pull request #803 from owncloud/download_folder_c...	blob \| commitdiff \| diff to current
2014-12-11	jabarros	Update OperationsService to receive requests for cancel...	blob \| commitdiff \| diff to current
2014-12-11	jabarros	Merge pull request #797 from owncloud/download_folder__...	blob \| commitdiff \| diff to current
2014-12-10	David A. Velasco	Fixed compilation error	blob \| commitdiff \| diff to current
2014-12-10	David A. Velasco	Fixed access to storage manager in SynchronizeFolderOpe...	blob \| commitdiff \| diff to current
2014-12-10	David A. Velasco	Added construction of SynchronizeFolderOperation to...	blob \| commitdiff \| diff to current
2014-12-10	jabarros	Merge branch 'fix_protocol_send_mail' into fix_logs_cha...	blob \| commitdiff \| diff to current
2014-12-10	jabarros	Merge pull request #794 from owncloud/download_folder__...	blob \| commitdiff
next

ownCloud Android App

RSS Atom