 David A. Velasco
|
f58c19bb55
Minor fixes from own CR
|
9 gadi atpakaļ |
 tobiasKaminsky
|
145eb20a3d
Merge remote-tracking branch 'remotes/upstream/master' into cancelUploadOnWlanExit_2
|
9 gadi atpakaļ |
|
tobiasKaminsky
|
9e678fc697
changed according to latest comments
|
9 gadi atpakaļ |
 masensio
|
a7304351b1
Fix issue 1319: Error on the preview, Android 4.1.2
|
9 gadi atpakaļ |
|
tobiasKaminsky
|
d901208c1f
rename file is not working across mount points: therefore copying it and then delete
|
9 gadi atpakaļ |
|
tobiasKaminsky
|
4471d3beb9
changes according to CR (code review)
|
9 gadi atpakaļ |
|
tobiasKaminsky
|
2aac1e5270
Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles_Master
|
9 gadi atpakaļ |
|
masensio
|
bcfa07f565
Fix Select Local Version or Keep Both behaviour when solving file coflict
|
9 gadi atpakaļ |
|
tobiasKaminsky
|
8b3ed70791
wip
|
9 gadi atpakaļ |
|
masensio
|
08d02058c8
Use SYNC_CONFLICT instead CONFLICT for conflicts in UploadFileOperation
|
9 gadi atpakaļ |
 David A. Velasco
|
001801a39b
Upload operations end in conflict if overriding a version different than the last known
|
9 gadi atpakaļ |
|
David A. Velasco
|
44023a6059
Clean-up: removed unused imports and methods, and commented code
|
9 gadi atpakaļ |
|
David A. Velasco
|
5f41bb14d3
ETag used to detect changes in remote files (not only in folders)
|
9 gadi atpakaļ |
|
David A. Velasco
|
c0c52fa16a
Fixed NullPointerExceptionS in upload cancelations
|
9 gadi atpakaļ |
|
tobiasKaminsky
|
4b8a5a9c92
#819, part 2: Instant uploads, depends on setting
|
9 gadi atpakaļ |
 purigarcia
|
61e6191342
change the name of the method from keepInSync to favorite. Other changes commented in the review
|
9 gadi atpakaļ |
|
masensio
|
6af93bfdde
Refactor parameter user_agent out of RemoteOperation and children
|
10 gadi atpakaļ |
|
masensio
|
06d5cc9477
Add user agent in android project
|
10 gadi atpakaļ |
|
masensio
|
0bef9fdedb
Update year in license
|
10 gadi atpakaļ |
|
masensio
|
3d3046dc26
Add author's line in license
|
10 gadi atpakaļ |
|
masensio
|
01fc29c892
Bug fixed: Upload fails
|
10 gadi atpakaļ |
|
David A. Velasco
|
4d2b382785
Grant that the proper RemoteOperationResult is built when an upload is cancelled while copying to temporary space
|
10 gadi atpakaļ |
|
masensio
|
83ad608faa
Changes from Comments in PR#886
|
10 gadi atpakaļ |
|
masensio
|
acb2da8f02
Cancel the current upload when it hasn't started yet
|
10 gadi atpakaļ |
|
masensio
|
3ff42b6220
Cancel the transfers of an account when the account is deleted: Cancel current upload
|
10 gadi atpakaļ |
|
masensio
|
beb7d352f9
Cancel the transfers of an account when the account is deleted, part 1
|
10 gadi atpakaļ |
 jabarros
|
297cb6b5c3
Refactoring to avoid maintenance after CR
|
10 gadi atpakaļ |
|
jabarros
|
5d784d98b4
Get file mimeType and pass it for being checked on UploadFileOperation class. Take into account if file extension comes in content Uri
|
10 gadi atpakaļ |
|
jabarros
|
903b66595f
Add workaround for Drive app in which a creation of a temporal copy is needed
|
10 gadi atpakaļ |
|
jabarros
|
4599553545
Move Logger class to owncloud library and update references. Add async task for loading log info into LogHistoryActivity
|
10 gadi atpakaļ |
