Olivier Goffart
|
02704cdf74
|
Merge remote-tracking branch 'origin/1.6' into il
Conflicts:
VERSION.cmake
csync/src/csync_statedb.c
src/mirall/syncengine.cpp
src/mirall/syncfileitem.h
|
2014-06-23 12:48:34 +02:00 |
|
Olivier Goffart
|
5225fe07e0
|
csync_owncloud_recursive_propfind: "fix" possible memory leak
This was only leaking memory if ne_path_parent returns 0, which
should never happen
This fixes coverity issue 12897
|
2014-06-20 11:12:45 +02:00 |
|
Markus Goetz
|
9a7fbd4f71
|
csync_owncloud: Parse properties in one function
|
2014-06-06 13:41:16 +02:00 |
|
Markus Goetz
|
2e91557c28
|
CSync: Rename callback functions
|
2014-06-03 15:01:35 +02:00 |
|
Markus Goetz
|
4d4eab8b1c
|
CSync & Propagator: Support a direct download URL
This is for server file backends that support sending a
direct URL.
|
2014-06-03 14:55:34 +02:00 |
|
Markus Goetz
|
8a55f831f4
|
CSync: Use context instead of global variable
|
2014-06-03 11:51:12 +02:00 |
|
Markus Goetz
|
5ee00a8df7
|
CSync: Simplify csync_owncloud stat/resource handling
|
2014-06-03 11:51:12 +02:00 |
|
Olivier Goffart
|
8de9bec122
|
Remove progress info from csync
csync doesn't do no propagation no more
|
2014-03-28 10:50:15 +01:00 |
|
Olivier Goffart
|
bf7ca60bec
|
Move csync in order to merge it with mirall
|
2014-01-13 14:39:50 +01:00 |
|