Olivier Goffart
|
b1d392e415
|
Download job: allow redirect on direct download link
Issue #2614
|
2014-12-16 11:51:25 +01:00 |
|
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
|
3016844dd7
|
Merge branch 'master' into rename_client
Conflicts:
README.md
src/gui/folderman.cpp
src/gui/settingsdialog.cpp
src/libsync/accessmanager.cpp
src/libsync/propagateupload.h
|
2014-12-02 13:37:22 +01:00 |
|
Olivier Goffart
|
fb3f5d86cf
|
Fix compilation after merge
|
2014-12-01 14:41:39 +01:00 |
|
Olivier Goffart
|
512492bf30
|
Merge remote-tracking branch 'origin/1.7'
Conflicts:
src/libsync/propagatedownload.cpp
|
2014-12-01 14:37:47 +01:00 |
|
Olivier Goffart
|
1c58b75ac2
|
Merge branch '1.7'
|
2014-11-21 11:08:20 +01:00 |
|
Christian Kamm
|
0fe7a69b39
|
FolderWatcher: Detect own changes. #2297
|
2014-11-20 13:16:29 +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 |
|
Daniel Molkentin
|
281c0e1553
|
Merge branch 'master' into rename_client
Conflicts:
CMakeLists.txt
src/gui/main.cpp
src/libsync/accessmanager.cpp
src/libsync/accessmanager.h
src/libsync/owncloudpropagator_p.h
|
2014-11-12 00:07:59 +01:00 |
|
Olivier Goffart
|
134650eb44
|
Parallel DELETE
|
2014-11-11 13:19:29 +01:00 |
|
Olivier Goffart
|
506ba022f1
|
Split propagator_qnam.cpp into propagateupload.cpp and propagatedownload.cpp
|
2014-11-11 12:17:10 +01:00 |
|