Christian Kamm
|
53d5de685c
|
Merge remote-tracking branch 'origin/1.7'
Conflicts:
src/gui/folder.cpp
src/gui/folder.h
src/libsync/networkjobs.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagatedownload.cpp
|
2014-12-10 13:01:36 +01:00 |
|
Daniel Molkentin
|
a42709f814
|
Namespace fixes
|
2014-12-02 14:20:13 +01:00 |
|
Olivier Goffart
|
fb3f5d86cf
|
Fix compilation after merge
|
2014-12-01 14:41:39 +01:00 |
|
Olivier Goffart
|
3253cc38b2
|
Propagator upload: Mark error while opening the file as SoftError
Because otherwise a lot of error are shown to the user when
the user deletes a directory that is syncing
Task #1981
|
2014-12-01 12:22:52 +01:00 |
|
Olivier Goffart
|
734db6f932
|
propagate Upload: Let the poll job count for a job
In order to avoid that there are many concurrent poll jobs that takes
all the QNAM channel and causes timeouts of queued jobs
|
2014-11-24 13:33:13 +01:00 |
|
Olivier Goffart
|
d76e3c0488
|
Parallel chunk upload: abort all chunks if one of them errors out
|
2014-11-24 12:05:25 +01:00 |
|
Olivier Goffart
|
c0de20dda0
|
UploadDevice: reduce debug verbosity
|
2014-11-24 12:05:25 +01:00 |
|
Olivier Goffart
|
1113980b20
|
Propagator: Change the scheduler
It still needs to be a bit optimized, but it allows to paralelized jobs between directories
(this is required to paralelize the mkcol)
|
2014-11-18 17:35:31 +01:00 |
|
Olivier Goffart
|
14f5e8e32e
|
Move all the neon code to the _legacy files
|
2014-11-14 16:13:50 +01:00 |
|
Olivier Goffart
|
506ba022f1
|
Split propagator_qnam.cpp into propagateupload.cpp and propagatedownload.cpp
|
2014-11-11 12:17:10 +01:00 |
|