mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-01 03:34:51 +03:00
Code Issues Projects Releases Packages Wiki Activity
2134 commits 481 branches 256 tags 517 MiB
Commit graph

34 commits

Author SHA1 Message Date
Olivier Goffart
77b3780ab2 Do not put the conflict_copies in the ocsync config file. 
Because owncloud sets it too true programmaticaly, and we don't
want to overwrite it with the config
 2013-10-02 15:33:48 +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
Olivier Goffart
acc0b53916 Added a comment in the exclude list config file 2013-07-29 15:04:00 +02:00
Olivier Goffart
af7e36422e Add ignore files that need cleanup 
Add the possibility to ignore files but specify they should be deleted
if the directory is deleted.
 2013-07-29 15:03:25 +02:00
Andreas Schneider
acf3dc6aff config: Implement a new config parser. 2013-07-28 23:16:04 +02:00
Olivier Goffart
b6a37064e9 Allow to configure the timeout in the config 2013-02-13 18:25:28 +01:00
Andreas Schneider
7cb8763e13 cmake: Don't copy and install deprecated csync_log.conf. 2013-02-06 18:20:39 +01:00
Olivier Goffart
cab1324d18 Remove references to ocsync_log.conf 2012-12-03 17:56:47 +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
295de77a7d Added .directory to ignore. 2012-11-08 11:21:53 +01:00
Klaas Freitag
f65be04415 Added Windows tmp file pattern to exclude list. 2012-11-06 14:05:52 +01:00
Andreas Schneider
0a6d7435b5 cmake: Get rid of log4c. 2012-10-30 11:27:21 +01:00
Klaas Freitag
9b72504b30 Added more specific values to the ignore values. 2012-10-10 12:10:06 +02:00
Klaas Freitag
b27899ecc4 Rename of the config files. 2012-10-05 14:45:04 +02:00
Klaas Freitag
a9e544fd7d renamed config files and dirs to ocsync. 2012-10-05 14:38:33 +02:00
Andreas Schneider
3ff5ad5f7a Added more cache entries to the default config. 2010-01-17 08:32:55 +01:00
Andreas Schneider
b54e952efe Add some comments and move log4c config to the end. 2009-04-12 11:33:50 +02:00
Andreas Schneider
9650bccc2f Add a rolling file appender to the config file. 2009-04-12 11:25:58 +02:00
Andreas Schneider
f95b6c0b6f Add some comments to the logging config file. 2009-01-08 16:26:11 +01:00
Andreas Schneider
e5286c7c8a Rename journal functions to statedb. 2008-07-09 10:10:00 +02:00
Andreas Schneider
879680cc0c Add some examples and more documentation to the exclude file. 2008-07-09 09:48:00 +02:00
Andreas Schneider
9a96239e7c Change the exclude list to match the directories exactly. 2008-06-28 20:46:25 +02:00
Andreas Schneider
1608edb5cb Add beagle dir to default exclude list. 2008-06-12 10:15:13 +02:00
Andreas Schneider
35d32c045a Add .snapshot dir to default exclude list. 2008-06-11 18:16:20 +02:00
Andreas Schneider
d5aced82ca Disable sync of symlinks cause they need a lot of work. 2008-05-26 17:09:42 +02:00
Andreas Schneider
c16abe8a7b Add error message in csync_vio_mkdir. 2008-05-21 16:43:08 +02:00
Andreas Schneider
a46a39ce0e Fix typo in config and config parser. 2008-05-21 15:22:45 +02:00
Andreas Schneider
c9745ab851 Add csync.time logging category. 2008-05-06 17:48:26 +02:00
Andreas Schneider
ea9819da6c Add missing log categories. 2008-04-30 10:42:36 +02:00
Andreas Schneider
ef0f29f561 Add more directories to exclude. 2008-04-28 16:47:09 +02:00
Andreas Schneider
f24524dd2a Fix the default exclude lists. 2008-04-23 17:33:22 +02:00
Andreas Schneider
d2c3e0734f Add exclude config 2008-03-25 16:07:06 +01:00
Andreas Schneider
57b74f8ce3 Copy config to the build directory. 2008-03-06 17:42:39 +01:00
Andreas Schneider
1b29a420bc Initial commit 2008-02-27 18:56:47 +01:00