Commit graph

70 commits

Author SHA1 Message Date
Olivier Goffart
9527b9f4d2 Compile fix
That file was removed
2013-08-21 12:59:22 +02:00
Olivier Goffart
b5ed352aa3 Merge remote-tracking branch 'origin/master' into ocsync
Only confluct resolution, do not compile or works

Conflicts:
	CMakeLists.txt
	CPackConfig.cmake
	ConfigureChecks.cmake
	client/csync_client.c
	cmake/Modules/DefineCompilerFlags.cmake
	cmake/Modules/DefineInstallationPaths.cmake
	cmake/Modules/FindIconv.cmake
	cmake/Modules/FindIniparser.cmake
	cmake/Modules/FindNeon.cmake
	config.h.cmake
	config/CMakeLists.txt
	config/ocsync.conf
	doc/CMakeLists.txt
	modules/csync_owncloud.c
	modules/csync_sftp2.c
	src/CMakeLists.txt
	src/csync.c
	src/csync.h
	src/csync_config.c
	src/csync_exclude.c
	src/csync_lock.c
	src/csync_macros.h
	src/csync_misc.c
	src/csync_misc.h
	src/csync_private.h
	src/csync_propagate.c
	src/csync_statedb.c
	src/csync_statedb.h
	src/csync_update.c
	src/csync_util.c
	src/csync_util.h
	src/std/c_dir.c
	src/std/c_file.c
	src/std/c_private.h
	src/std/c_string.c
	src/std/c_string.h
	src/std/c_time.c
	src/vio/csync_vio.c
	src/vio/csync_vio.h
	src/vio/csync_vio_file_stat.h
	src/vio/csync_vio_local.c
	src/vio/csync_vio_method.h
	tests/CMakeLists.txt
	tests/csync_tests/check_csync_statedb_load.c
	tests/csync_tests/check_csync_statedb_query.c
	tests/csync_tests/check_csync_treewalk.c
	tests/csync_tests/check_csync_update.c
	tests/ownCloud/HTTP/DAV.pm
	tests/ownCloud/ownCloud/Test.pm
	tests/std_tests/check_std_c_str.c
	tests/vio_tests/check_vio.c
2013-08-18 16:21:18 +02:00
Klaas Freitag
d3ec897fee Bump version to 0.82.0 2013-08-15 17:39:00 +02:00
Klaas Freitag
74b7d441c8 Bump version to 0.81.0 2013-08-08 16:00:20 +02:00
Klaas Freitag
f103e4203d Set csync version to 0.50.0
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-08-01 16:46:59 +02:00
Klaas Freitag
f47e8c4506 cmake: Disable cmake iconv check on win32.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-07-23 07:59:29 +02:00
Klaas Freitag
0c3becfdb6 cmake: Fix make install on win32 platform.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-07-23 07:41:41 +02:00
Daniel Molkentin
1a25644d60 Fix version number 2013-06-25 09:52:44 +02:00
Daniel Molkentin
16d99b8ff8 0.80 for ownCloud 1.3 2013-06-25 09:25:34 +02:00
Daniel Molkentin
77653747ac 0.70.93 2013-06-20 19:45:18 +02:00
Daniel Molkentin
92b9bf59a7 0.70.92 2013-06-12 11:10:34 +02:00
Daniel Molkentin
a06078f89f bump version 2013-05-31 16:26:54 +02:00
Daniel Molkentin
10437db2f9 Bump version 2013-05-22 15:33:42 +02:00
Daniel Molkentin
52a289d550 Bump version to distinguish nightlies 2013-04-23 16:51:29 +02:00
Klaas Freitag
4b98ee0644 Pushed version to 0.70.6 2013-03-28 09:57:49 +01:00
Klaas Freitag
b216b9f546 Push version to 0.70.4 2013-02-20 17:39:16 +01:00
Daniel Molkentin
9c0c693081 Add iconv support to convert charsets to different platforms. 2013-02-06 15:11:40 +01:00
Klaas Freitag
52f33de902 Set version to 0.70.3 plus ChangeLog 2013-01-24 10:39:42 +01:00
Klaas Freitag
460947a3ac Set version to 0.70.2 for release 2013-01-23 14:05:58 +01:00
Klaas Freitag
82a3e49d82 Bump version to 0.70.1 for oCC 1.2.0 beta2 2013-01-16 16:37:09 +01:00
Klaas Freitag
3d4ba6c29b Write config files after all directories were traversed. 2013-01-09 15:04:17 +01:00
Klaas Freitag
fe048f69cd Set version to upcoming version 0.70.0 2012-12-18 13:50:56 +01:00
Daniel Molkentin
3f24ab599c Do not compile with iconv on windows 2012-12-07 23:12:37 +01:00
Daniel Molkentin
49d2fd685b iconv support
This allows for files on mac to automatically be converted to UNC
2012-12-07 13:03:01 +01:00
Olivier Goffart
95edd6a9de Merge remote-tracking branch 'origin/master' into dav
Conflicts:
	config/ocsync_log.conf
	src/csync.c
	src/csync.h
	src/csync_config.c
	src/csync_log.h
	src/csync_private.h
	src/csync_statedb.c
	tests/csync_tests/check_csync_config.c
2012-12-03 17:32:08 +01:00
Klaas Freitag
b748fab6e9 Set version to next release 0.60.2 2012-11-09 17:14:24 +01:00
Andreas Schneider
0a6d7435b5 cmake: Get rid of log4c. 2012-10-30 11:27:21 +01:00
Klaas Freitag
2bb52ef6f9 Merge branch 'master' into dav - get cmocka tests and database move.
Conflicts:
	CMakeLists.txt
	cmake/Modules/FindCMocka.cmake
	src/csync.c
	src/csync_exclude.c
	src/csync_reconcile.c
	src/csync_statedb.c
	src/csync_update.c
	src/csync_util.c
	src/vio/csync_vio.c
	tests/CMakeLists.txt
	tests/csync_tests/check_csync_exclude.c
	tests/csync_tests/check_csync_statedb_load.c
	tests/csync_tests/check_csync_statedb_query.c
	tests/csync_tests/check_csync_update.c
	tests/std_tests/check_std_c_path.c
2012-10-27 19:27:14 +02:00
Andreas Schneider
c24a18cbfd cmake: Cleanup testing and enable test target. 2012-10-19 19:07:15 +02:00
Klaas Freitag
9d126bc45a Set version to next tag 0.60.1 2012-10-16 15:48:13 +02:00
Andreas Schneider
b1b0c2c510 tests: Start to use cmocka for the tests. 2012-10-16 10:37:40 +02:00
Klaas Freitag
48eec357d7 Push version to 0.60.0 - final release for owncloud client 1.1.0 2012-10-10 12:10:07 +02:00
Klaas Freitag
207c8d9786 Set version to 0.50.11 - for ownCloud 1.1.0 beta3 2012-10-04 12:59:38 +02:00
Klaas Freitag
404073fe7f Rename csync to ocsync to not collide with upstream csync. 2012-10-01 12:39:05 +02:00
Klaas Freitag
7a70a6fa69 Update version to 0.50.10 2012-09-20 17:57:58 +03:00
Klaas Freitag
50f698673c Update version number to 0.50.9 2012-08-30 18:45:36 +03:00
Klaas Freitag
60d61634e5 Updated version numbers to 0.50.8 ownCloud release. 2012-08-03 18:47:49 +03:00
Klaas Freitag
5f93c490a5 Make ownCloud cmocka test build on the win32 platform. 2012-07-11 18:01:08 +02:00
Klaas Freitag
b74fc47e3f More unit testing of the ownCloud module with mocka. 2012-07-11 16:50:25 +02:00
Klaas Freitag
e0eda77c6d set version to 0.50.7 2012-06-18 10:48:13 +02:00
Klaas Freitag
6eb0dd15b4 Set version to 0.50.6 for next oC version. 2012-05-11 09:29:20 +02:00
Dominik Schmidt
13f05db934 cmake: Make Log4C optional.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2012-04-17 11:21:03 +02:00
Klaas Freitag
db614ecf34 Pushed version to 0.50.5 and lib version 0.1.5 for next oC release. 2012-04-17 10:36:52 +02:00
Dominik Schmidt
0b7f273df3 fix building without log4c 2012-04-14 03:13:28 +02:00
Klaas Freitag
dfb774714e Create another beta version 0.50.2 2012-04-14 03:13:27 +02:00
Klaas Freitag
1380902ede Pushed version to 0.50.1. 2012-04-14 03:13:26 +02:00
Dominik Schmidt
9d73d7705d Make LOG4C optional 2012-04-14 00:05:52 +02:00
Dominik Schmidt
00c47f62c4 windows: install libcsync.dll to bin/ 2012-03-02 17:04:02 +01:00
Dominik Schmidt
ee6c631f28 windows: add missing status codes, types and return-values 2012-03-02 17:04:02 +01:00
Andreas Schneider
cd2c75e602 Increase version numbers for beta release. 2012-02-22 18:27:09 +01:00