mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-11 10:14:59 +03:00
Code Issues Projects Releases Packages Wiki Activity
1991 commits 483 branches 256 tags 439 MiB
Commit graph

30 commits

Author SHA1 Message Date
Olivier Goffart
9f5388544a Fix cmake after merge 
iniparser dependency is gone.
 2013-08-18 16:29:35 +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
Andreas Schneider
d80da2a088 LICENSE: Change license of libcsync from GPL to LGPL. 
All contributors have agreed to change the license of libcsync to LGPL.
 2013-07-29 14:04:37 +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
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
Andreas Schneider
dd60412a50 doc: Remove all references to 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
e603d1c6d0 doc: Fix typos in userguide. 
Thanks to Thomas Renninger <trenn@suse.de>
 2012-10-07 12:22:16 +02:00
Klaas Freitag
e7837c0716 Fixed rename to ocsync in doc subdir. 2012-10-05 14:54:13 +02:00
Andreas Schneider
fdea54edc5 Fix the vim modlines. 2009-05-13 10:12:07 +02:00
Andreas Schneider
0634e0fdea Don't require a C++ compiler. 2009-03-18 10:55:14 +01:00
Andreas Schneider
467c082368 Set version to 0.42.0. 2009-02-10 12:50:26 +01:00
Andreas Schneider
add8f35bef Small text improvements. 2009-02-02 10:42:32 +01:00
Andreas Schneider
eca50e32a6 Add more documentation to the userguide. 2009-01-20 18:06:42 +01:00
Andreas Schneider
2d3412b0fa More improvements to the user guide. 
Thanks to Jim McDonough <jmcd@samba.org> for this.
 2008-12-23 16:48:33 +01:00
Andreas Schneider
69bb51d7af Some improvement and corrections. 
Thanks to Joe Brockmeier <zonker@opensuse.org> for proofreading.
 2008-12-23 10:26:21 +01:00
Andreas Schneider
0f6a55bb23 Add more test to the userguide. 2008-12-17 18:23:32 +01:00
Andreas Schneider
2a9ac9a91a Update the manpage to make clear which are debugging options. 2008-12-17 16:53:48 +01:00
Andreas Schneider
cd2b94e20b Some more documentation. 2008-12-05 14:44:33 +01:00
Andreas Schneider
7f53e66be4 Enable doxygen for developer documentation again. 2008-09-10 10:50:49 +02:00
Andreas Schneider
36d164a338 Fix the installation path of the user guide. 2008-09-10 10:39:43 +02:00
Andreas Schneider
0ddd5d9e82 More work on the userguide. 2008-09-05 16:54:48 +02:00
Andreas Schneider
1b8935a857 Install the userguide. 2008-09-04 10:26:53 +02:00
Andreas Schneider
1119e84d96 Add user guide. 2008-09-03 13:38:45 +02:00
Andreas Schneider
f059286e48 Update doxygen generation. 2008-08-20 18:58:17 +02:00
Andreas Schneider
e5286c7c8a Rename journal functions to statedb. 2008-07-09 10:10:00 +02:00
Andreas Schneider
36ae0468f6 Don't autogenerate manpages for now. 2008-07-03 11:10:12 +02:00
Andreas Schneider
1cd21855f2 Improve the manpage, add description and example section. 2008-07-02 20:37:21 +02:00
Andreas Schneider
67efe90536 Add a manpage for the csync commandline client. 2008-07-02 19:02:27 +02:00
Andreas Schneider
1b29a420bc Initial commit 2008-02-27 18:56:47 +01:00