 David A. Velasco
|
40e9bb0529
Merged FileUploadService into FileUploader to avoid that changes from other branches are circumvented
|
9 жил өмнө |
 masensio
|
b59b0283bd
Review uploads for favourite files
|
9 жил өмнө |
|
masensio
|
3a908b8c1d
Second step: merging services FileUploader + FileUploadService
|
9 жил өмнө |
|
masensio
|
1a74d5ba59
Changes from comments in reliable_uploads code review
|
9 жил өмнө |
|
masensio
|
dc0aea30f0
Merge branch 'master' into reliable_uploads
|
9 жил өмнө |
|
masensio
|
bcfa07f565
Fix Select Local Version or Keep Both behaviour when solving file coflict
|
9 жил өмнө |
 David A. Velasco
|
b8a3dc71e4
Safe blanket to clean DB if wrong conflicts keep stored
|
9 жил өмнө |
|
David A. Velasco
|
a2aa0479fc
Added conflict icon to folders containing files with conflicts
|
9 жил өмнө |
|
David A. Velasco
|
e6c1454458
Persist conflicts in local database and show with an icon in the list of files
|
9 жил өмнө |
|
David A. Velasco
|
5f41bb14d3
ETag used to detect changes in remote files (not only in folders)
|
9 жил өмнө |
|
David A. Velasco
|
c0c52fa16a
Fixed NullPointerExceptionS in upload cancelations
|
10 жил өмнө |
|
masensio
|
e5e5b3638c
Merge branch 'develop' into reliable_uploads
|
9 жил өмнө |
 purigarcia
|
61e6191342
change the name of the method from keepInSync to favorite. Other changes commented in the review
|
10 жил өмнө |
|
masensio
|
6af93bfdde
Refactor parameter user_agent out of RemoteOperation and children
|
10 жил өмнө |
|
masensio
|
06d5cc9477
Add user agent in android project
|
10 жил өмнө |
|
masensio
|
0bef9fdedb
Update year in license
|
10 жил өмнө |
|
masensio
|
3d3046dc26
Add author's line in license
|
10 жил өмнө |
|
David A. Velasco
|
e409b5afb6
Fixed a couple of null pointers
|
10 жил өмнө |
|
David A. Velasco
|
399251bc5a
Optimize operation flow
|
10 жил өмнө |
 Luke Owncloud
|
d1386ea140
Use OCFile inside UploadDbObject,
|
10 жил өмнө |
|
Luke Owncloud
|
1369ef8f28
made UploadDbObject serializable
|
10 жил өмнө |
|
Luke Owncloud
|
64827cf4ad
refactoring, commenting, understanding code. added TODO for FileUploadService.
|
10 жил өмнө |
|
David A. Velasco
|
fe2f7ce8a6
Fix lost update of remoteId when file is sync'ed after being replaced in server by other one
|
10 жил өмнө |
 jabarros
|
4599553545
Move Logger class to owncloud library and update references. Add async task for loading log info into LogHistoryActivity
|
10 жил өмнө |
|
David A. Velasco
|
ad11d6a2b1
Fixed lack of synchronization on local changes for kept-in-sync files
|
11 жил өмнө |
|
masensio
|
df4ae2eb35
Move execution of 'refresh file' operation to OperationsService
|
11 жил өмнө |
|
David A. Velasco
|
ba2dbeb735
Updated references to reordered classes in owncloud-android-library
|
11 жил өмнө |
|
masensio
|
8c6e069293
OC-2746: Changes from improvements in library
|
11 жил өмнө |
|
David A. Velasco
|
195256194e
Fixed crash in synchronization of kept-in-sync files triggered by browsing
|
11 жил өмнө |
|
David A. Velasco
|
1e68dccd8b
Library updated with final names (project and packages)
|
11 жил өмнө |
