-
Notifications
You must be signed in to change notification settings - Fork 3k
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.
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
Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder #1109
Conversation
Implemented, but pending of clean-up. I will comment again when development is finished. |
Clean-up done. Ready to test & review. cc @purigarcia & @masensio |
Implements #3 (in manual mode) |
1254acb
to
de93f92
Compare
@purigarcia , @masensio : rebased after last merges into master; ready to go again |
} | ||
} | ||
*/ | ||
//} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FileDataStorageManager.java is cleaner. 👍
Awesome job!! Code review done. |
de93f92
to
58661c6
Compare
58661c6
to
2d3919d
Compare
Delayed to next release due to problem not detecting some conflicts |
Is the date for this written down somewhere? I know there's the GitHub Milestones, but they don't say (AFAIK) when releases will be shipped. I was really, really looking forward to having this feature, and it'd be nice to know when it's expected. |
MIlestones have a date, though it's not as easy to find as should: https://github.com/owncloud/android/milestones In this view dates are listed below the milestone names. |
@davivel thanks, I appreciate it. |
…llow its use while the new SyncFolderOperation gets stable
…ng or uploading any file inside
…files and folders
2d3919d
to
fb482fa
Compare
…han the last known
Conflicts: src/com/owncloud/android/providers/FileContentProvider.java
… old cancel upload
There is a bug here, in case there is a conflict, it´s not possible to fix the conflict
|
@rperezb There is something missing in your test description, or? Point 15 ends in the middle of the sentence. |
Conflicts: owncloud-android-library src/com/owncloud/android/files/services/FileUploader.java
…_save_local_version Fixed "Select Local Version" or "Keep Both behaviour" in conflict dialog
Bug fixed in #1219. Aaaaand, please @Dianafg76 |
That's it. |
I tested with Nexus 9 v6.0 and Android Galaxy S3 v 4 and is working OK |
Waiting for Travis :) |
Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder
No description provided.