5d58a8164c
csync: Remove get_etag
2014-02-27 14:03:17 +01:00
71cc74a0d6
csync: Remove csync_get_local_username
2014-02-27 13:55:34 +01:00
77d9256e03
csync: Remove more unneeded code
2014-02-27 13:52:30 +01:00
e7fb84a491
csync: Remove capabilities
2014-02-27 13:42:20 +01:00
a652fec5a0
csync: Remove more unused stuff
2014-02-27 13:33:22 +01:00
0d34a2bca5
csync: Remove unused vio stuff
2014-02-27 13:25:31 +01:00
a2e8bfd962
csync: Remove unix_extensions
2014-02-27 13:23:35 +01:00
eff2427a03
csync: Remove time_sync_required
2014-02-27 13:12:21 +01:00
869793592d
Merge branch '1.5'
...
Conflicts:
VERSION.cmake
src/mirall/owncloudpropagator.cpp
src/mirall/owncloudpropagator.h
2014-02-27 11:40:34 +01:00
d4fa06c4e1
Fix potential crash in c_iconv on Mac OS X
2014-02-25 12:48:40 +01:00
75cff87316
add missing copyright header
2014-02-24 19:32:41 +01:00
1e43d1fa49
Add missing license headers in tests
...
LGPL for csync tests, GPL for mirall tests
2014-02-24 11:08:58 +01:00
f92cf3dee3
ammand last commit
...
We should not close the directory twice in the normal case
2014-02-21 19:09:38 +01:00
a71cb1d3ef
Fix potential crash in case of abort while update:
...
We need to reset ctx->remote.read_from_db BEFORE caling vio_closedir
Otherwise, it may interpret the handle as a 'bdtree' handle instead of
a owncloud handle.
Should fix #1442
2014-02-21 16:57:24 +01:00
4630244b51
Windows: Special case csync_vio_local_stat
...
By not calling tstat _and_ GetFileInformationByHandle, but only
GetFileInformationByHandle, we can save some precious msec in the local
update phase.
2014-02-21 14:15:34 +01:00
f1fa1f125d
Fix previous commit
2014-02-19 17:39:11 +01:00
141f005c34
Ignore conflict files all the time
...
The OwncloudCmd currently does not load the exclude files.
It is safer to just always ignore conflict files.
2014-02-19 17:16:10 +01:00
fcc0e89044
Update phase: Allow benchmarking / progress update
2014-02-18 21:41:20 +01:00
93f31fa9d7
Merge branch '1.5'
2014-02-12 16:44:24 +01:00
1a9a14bdec
Fix problems if a file is moved, and another file is created with the same name
2014-02-12 13:44:32 +01:00
b84253054a
Read configuration from /etc/ownCloud/t1.cfg
2014-02-10 15:08:40 +01:00
593d528b6a
Removed unused function.
2014-02-07 11:57:10 +01:00
3649869650
Optimize restoring of the remote tree from database.
...
If the etag of a directory hasn't changed, the content for the csync
tree can be restored from database. The code doing that is now optimized
so that this does not take so long any more.
2014-02-07 11:53:58 +01:00
bb378902ae
Also force an update of the etag in case of renames
...
Imagine we have a file:
foo/bar/moo
if we do mv 'foo' 'foo2' and that we issue a MOVE on the server
and will update the entry 'foo' in the database with the new etag
If we write the etag of foo but not the etag of the sub item, when
we read from db on the next sync, we will miss them and beleive they
have been removed on the server
2014-02-06 17:56:27 +01:00
ee3df45fd8
remove csync_lock
...
It is not used anymore for a long time
2014-02-05 17:31:34 +01:00
8e7e2dded8
Bump csync version.
2014-02-04 16:23:44 +01:00
44e09892f4
Remove cmake warning
2014-02-02 22:59:08 +01:00
08d08e1f29
SAFE_FREE added as result to valgrind check.
2014-02-02 12:51:19 +01:00
93db6ca6ab
Properly install cmake in OS X app bundle
2014-01-30 22:09:37 +01:00
94190b73ff
fix test compilation
2014-01-26 19:05:43 +01:00
2eb9962f4c
Adapt the test to the changes in the exclude list
...
The exclude list was removed from csync in commit
f32d901653
2014-01-26 18:58:56 +01:00
5119d5d366
Remove csync_config
...
commit c585c73044
2014-01-26 18:39:47 +01:00
f32d901653
Remove ocsyncs config which is unused in the owncloud client.
2014-01-24 13:43:05 +01:00
c585c73044
Do not load the config file and csync exclude list.
2014-01-24 13:43:05 +01:00
0b680ef90e
Removed the csync documentation as it is not longer used here.
2014-01-24 13:43:05 +01:00
86eb68df7f
csync_rename.cc: Remove superflous semicolon
2014-01-24 10:50:33 +01:00
04d8c82dbd
Make NEON_WITH_LFS conditional to avoid build warnings.
2014-01-23 16:05:35 +01:00
d868df3b9b
Fix windows compilation after having merged in csync.
2014-01-23 15:19:27 +01:00
05b81bc7d8
rename csync/doc to csync/csync_doc to satisfy cmake.
...
CMake throws a warning if there are two subdirs with the same name.
2014-01-20 16:19:30 +01:00
19a19978b7
fix csync BINARYDIR and SOURCEDIR
2014-01-20 16:16:29 +01:00
b93efbaefe
EIO is not necessarily a proxy error.
...
Should change error message such as
"CSync failed to connect through a proxy. 500 Internal Server Error"
To:
"CSync processing step update failed. 500 Internal Server Error"
2014-01-20 13:58:54 +01:00
c7227297af
Make it compile with the merge of csync mirall
2014-01-15 12:20:03 +01:00
bf7ca60bec
Move csync in order to merge it with mirall
2014-01-13 14:39:50 +01:00
Markus Goetz