Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder #1109

Merged
merged 27 commits into from
Oct 30, 2015
Merged

Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder #1109

merged 27 commits into from
Oct 30, 2015
+638 −893

Commits on Sep 25, 2015

  1. Extend SyncFolderOperation to check local changes of all files and tr… 

    …igger uploads
    @davivel
    davivel committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    ac68569 View commit details
    Browse the repository at this point in the history

  2. Keep the old operation to sync folder as DownloadFolderOperation to a… 

    …llow its use while the new SyncFolderOperation gets stable
    @davivel
    davivel committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    0162d2f View commit details
    Browse the repository at this point in the history

  3. Added icon for files synchronizing; folders use it whenever downloadi… 

    …ng or uploading any file inside
    @davivel
    davivel committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    e885c78 View commit details
    Browse the repository at this point in the history

  4. Rewritten queue of FileUploader based on IndexedForest

    @davivel
    davivel committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    68b52dd View commit details
    Browse the repository at this point in the history

  5. Join cancelation of downloads and uploads in 'cancel sync', both for … 

    …files and folders
    @davivel
    davivel committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    9b5506f View commit details
    Browse the repository at this point in the history

  6. Fixed NullPointerExceptionS in upload cancelations

    @davivel
    davivel committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    c0c52fa View commit details
    Browse the repository at this point in the history

  7. ETag used to detect changes in remote files (not only in folders)

    @davivel
    davivel committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    5f41bb1 View commit details
    Browse the repository at this point in the history

  8. Persist conflicts in local database and show with an icon in the list… 

    … of files
    @davivel
    davivel committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    e6c1454 View commit details
    Browse the repository at this point in the history

  9. Added conflict icon to folders containing files with conflicts

    @davivel
    davivel committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    a2aa047 View commit details
    Browse the repository at this point in the history

  10. Removed conflict badge when conflict is solved

    @davivel
    davivel committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    7399508 View commit details
    Browse the repository at this point in the history

  11. Remove conflict badge from ancestors when conflict is solved there ar… 

    …e no more conflicts below
    @davivel
    davivel committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    95bebe9 View commit details
    Browse the repository at this point in the history

  12. Safe blanket to clean DB if wrong conflicts keep stored

    @davivel
    davivel committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    b8a3dc7 View commit details
    Browse the repository at this point in the history

  13. Fixed permanent 'uploading' icon on files that are automatically rena… 

    …med during the upload
    @davivel
    davivel committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    1e59a63 View commit details
    Browse the repository at this point in the history

  14. Removed separated 'download folder' in contextual menu and unused Dow… 

    …nloadFolderOperation class
    @davivel
    davivel committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    499d628 View commit details
    Browse the repository at this point in the history

  15. Clean-up: removed unused imports and methods, and commented code

    @davivel
    davivel committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    44023a6 View commit details
    Browse the repository at this point in the history

  16. Removed some logs

    @davivel
    davivel committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    7d7767a View commit details
    Browse the repository at this point in the history

  17. Updated error message for failed folder synchronization ('download' n… 

    …ot anymore)
    @davivel
    davivel committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    056b7c9 View commit details
    Browse the repository at this point in the history

  18. Updated reference to library after rebase

    @davivel
    davivel committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    fb482fa View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2015

  1. Upload operations end in conflict if overriding a version different t… 

    …han the last known
    @davivel
    davivel committed Sep 28, 2015
    Configuration menu
    Copy the full SHA
    001801a View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2015

  1. Merge branch 'master' into sync_full_folder 

    Conflicts:
	src/com/owncloud/android/providers/FileContentProvider.java
    masensio committed Sep 30, 2015
    Configuration menu
    Copy the full SHA
    9494620 View commit details
    Browse the repository at this point in the history

  2. Use SYNC_CONFLICT instead CONFLICT for conflicts in UploadFileOperation

    masensio committed Sep 30, 2015
    Configuration menu
    Copy the full SHA
    08d0205 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2015

  1. Fix: Long press menu shows two extra options: old cancel download and… 

    … old cancel upload
    masensio committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    8f67624 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2015

  1. Merge branch 'master' into sync_full_folder 

    Conflicts:
	owncloud-android-library
	src/com/owncloud/android/files/services/FileUploader.java
    masensio committed Oct 27, 2015
    Configuration menu
    Copy the full SHA
    b9ef747 View commit details
    Browse the repository at this point in the history

  2. Fix Select Local Version or Keep Both behaviour when solving file cof… 

    …lict
    masensio committed Oct 27, 2015
    Configuration menu
    Copy the full SHA
    bcfa07f View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2015

  1. Detect conflict when local and server version are changed

    masensio committed Oct 29, 2015
    Configuration menu
    Copy the full SHA
    3444d61 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2015

  1. Merge pull request #1219 from owncloud/sync_full_folder__fix_conflict… 

    …_save_local_version

Fixed  "Select Local Version" or "Keep Both behaviour" in conflict dialog
    @davivel
    davivel committed Oct 30, 2015
    Configuration menu
    Copy the full SHA
    09a3493 View commit details
    Browse the repository at this point in the history

  2. Update library reference, sync_full_folder

    masensio committed Oct 30, 2015
    Configuration menu
    Copy the full SHA
    9b95d53 View commit details
    Browse the repository at this point in the history