David A. Velasco
|
57de2968fb
Removed dependency of OCUpload on OCFile
|
9 years ago |
Juan Carlos González Cabrero
|
5fd891413e
Line wrapping and getApplicationContext calls removed from last commit
|
9 years ago |
Juan Carlos González Cabrero
|
e6cfedc285
Changed calls to FileUploader service to static methods to manage service Intents internally
|
9 years ago |
David A. Velasco
|
40e9bb0529
Merged FileUploadService into FileUploader to avoid that changes from other branches are circumvented
|
9 years ago |
masensio
|
44f2894731
Checking Uploads with the same name
|
9 years ago |
masensio
|
6a8d0383c6
Show current uploads in uploads list view. Apply code review changes, merging FileUpload + FileUploadService
|
9 years ago |
masensio
|
e89104b40e
Save OCFile into DB when a file is prepare to be uploaded, before uploading (WIP)
|
9 years ago |
masensio
|
dc0aea30f0
Merge branch 'master' into reliable_uploads
|
9 years ago |
tobiasKaminsky
|
9e678fc697
changed according to latest comments
|
9 years ago |
David A. Velasco
|
d1a06c2dd3
Prevent that repeated requests to FileDownloader/FileUploader/SyncFolderHandler get to the worker thread
|
9 years ago |
tobiasKaminsky
|
2aac1e5270
Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles_Master
|
9 years ago |
masensio
|
bcfa07f565
Fix Select Local Version or Keep Both behaviour when solving file coflict
|
9 years ago |
masensio
|
b9ef747a0b
Merge branch 'master' into sync_full_folder
|
9 years ago |
masensio
|
99d7e18916
Merge pull request #839 from fluffy88/develop
|
9 years ago |
David A. Velasco
|
001801a39b
Upload operations end in conflict if overriding a version different than the last known
|
9 years ago |
David A. Velasco
|
7d7767aa11
Removed some logs
|
9 years ago |
David A. Velasco
|
44023a6059
Clean-up: removed unused imports and methods, and commented code
|
9 years ago |
David A. Velasco
|
1e59a632bc
Fixed permanent 'uploading' icon on files that are automatically renamed during the upload
|
9 years ago |
David A. Velasco
|
7399508e05
Removed conflict badge when conflict is solved
|
9 years ago |
David A. Velasco
|
5f41bb14d3
ETag used to detect changes in remote files (not only in folders)
|
9 years ago |
David A. Velasco
|
c0c52fa16a
Fixed NullPointerExceptionS in upload cancelations
|
9 years ago |
David A. Velasco
|
9b5506f81e
Join cancelation of downloads and uploads in 'cancel sync', both for files and folders
|
9 years ago |
David A. Velasco
|
68b52ddc5f
Rewritten queue of FileUploader based on IndexedForest
|
9 years ago |
tobiasKaminsky
|
4b8a5a9c92
#819, part 2: Instant uploads, depends on setting
|
9 years ago |
David A. Velasco
|
51a04aa541
Refactored extractions of server version from AccountManager through
|
9 years ago |
Sean
|
1551a5280a
Trigger media scan after file upload
|
10 years ago |
masensio
|
6af93bfdde
Refactor parameter user_agent out of RemoteOperation and children
|
10 years ago |
masensio
|
7a42dc2bf4
Add user-agent string to setup options
|
10 years ago |
masensio
|
06d5cc9477
Add user agent in android project
|
10 years ago |
masensio
|
0bef9fdedb
Update year in license
|
10 years ago |