Commit Graph
6076 Commits
Author SHA1 Message Date
Klaas Freitag 84febf4b77 Merge branch 'dav_0.70.5' into dav 2013-04-15 15:37:17 +02:00
Klaas Freitag da52acbec6 Add FindPackage to httpbf module. 2013-04-15 15:32:21 +02:00
Daniel Molkentin 3cae8e7124 Remove debugging code 2013-04-15 14:32:23 +02:00
Klaas Freitag 8b52387c1a Fix temp file name generation for Win32. 2013-04-15 13:24:46 +02:00
Jenkins for ownCloud 2595b9eae7 [tx-robot] updated from transifex 2013-04-15 01:02:18 +02:00
Jenkins for ownCloud 46a8561925 [tx-robot] updated from transifex 2013-04-14 01:02:45 +02:00
Jenkins for ownCloud bb74cab887 [tx-robot] updated from transifex 2013-04-13 01:02:28 +02:00
Jenkins for ownCloud dd7f58b9b9 [tx-robot] updated from transifex 2013-04-12 01:02:18 +02:00
Daniel Molkentin ee080222d8 Bump version v1.2.4 2013-04-11 12:52:58 +04:00
Daniel Molkentin c7aaa3ab28 Add 1.2.4 changelog 2013-04-11 12:34:33 +04:00
Daniel Molkentin fcde01fd4c Clarify string in folder wizard 2013-04-11 10:57:19 +04:00
Daniel Molkentin da5169bd55 Add ChangeLog for 0.70.6 2013-04-11 10:56:43 +04:00
Jenkins for ownCloud 83be334ee8 [tx-robot] updated from transifex 2013-04-11 01:02:21 +02:00
Jenkins for ownCloud 819f76c2b9 [tx-robot] updated from transifex 2013-04-10 01:02:30 +02:00
Klaas Freitag 7171da53e8 Check that file is unchanged before copying in propagator. 2013-04-09 16:43:21 +02:00
Klaas Freitag 2a5c403d63 Default timeout to 300 seconds. 2013-04-09 15:18:26 +02:00
Klaas Freitag c38514934c A good word. 2013-04-09 14:41:36 +02:00
Klaas Freitag 90c4f52b34 Handle IGNORE status correctly. 2013-04-09 11:12:17 +02:00
Klaas Freitag e93bf9fa0a Fix for Coverity CID #996823 2013-04-09 09:42:38 +02:00
Jenkins for ownCloud 783b16676f [tx-robot] updated from transifex 2013-04-09 01:09:43 +02:00
Klaas Freitag aa6160ab62 Fixed some valgrind warnings. 2013-04-08 14:50:47 +02:00
Daniel Molkentin aa390dd17e Set path and phash for ignored files 2013-04-08 14:21:00 +02:00
Klaas Freitag 6cee3f49bc More robust error handling in utimes function 2013-04-08 12:27:27 +02:00
Klaas Freitag 1585cab673 Compare to explicit NULL for clearer code. 2013-04-08 09:11:25 +02:00
Klaas Freitag a1ebf8556a Fix for Coverity CID #996827 2013-04-08 09:07:19 +02:00
Andreas Schneider 85b565fcbe csync: Use macros for CSYNC_STATUS checking. 2013-04-06 18:48:16 +02:00
Andreas Schneider 7934cde2db csync: Pass the errno to csync_errno_to_status().
This is needed to be sure we are thread-safe. See also the manpage of
strerror_r(3).
2013-04-06 18:48:16 +02:00
Andreas Schneider b701bf3d9b csync: Rename UNSPEC_ERROR to UNSUCCESSFUL. 2013-04-06 18:48:16 +02:00
Klaas Freitag 4e6d54194f Check for file equalness after having created a conflict file.
If the files are equal and the conflict was created because the
timestamps were screwed the conflict is removed again. This only
works on the local repository so far.

Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-06 18:48:11 +02:00
Klaas Freitag 9f7de96a73 Added c_compare_file function plus a test function.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-06 18:11:18 +02:00
Klaas Freitag b8cf6f7f5c Make VIO_METHOD_HAS_FUNC macro more robust.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-06 18:11:18 +02:00
Klaas Freitag 4280adc60a More optimized database handling for csync journal build up.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-06 18:11:15 +02:00
Jenkins for ownCloud 8bae06802b [tx-robot] updated from transifex 2013-04-06 00:06:25 +02:00
Olivier Goffart 68fdf56db7 Add an API to be able to pass information to the vio module.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:22 +02:00
Klaas Freitag bec2c4a2ea Added get_status_string function.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:22 +02:00
Klaas Freitag 3de8a78e1c Added error_string handling, improved error handling.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:22 +02:00
Klaas Freitag 2204c94770 Introduce csync status codes
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:22 +02:00
Klaas Freitag 7c138efd0e Rename csync_errno_to_csync_error to csync_errno_to_csync_status.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:21 +02:00
Klaas Freitag f4ee205fe9 Minor code cleanups, warning avoidings and indentation.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:21 +02:00
Klaas Freitag aada909836 Use multibyte character in file system functions.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:21 +02:00
Klaas Freitag 33d57eec3c Remove parenthesis to make Win32 compile and happy.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:21 +02:00
Klaas Freitag f5c9458079 Define iconv conversions as thread safe varialbe instead of static.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:21 +02:00
Klaas Freitag 72dddfd7f5 Introduce csync status codes for a more detailed error reporting.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:21 +02:00
Klaas Freitag 10863cd32d Add CSYNC_STATUS_CODE, a general csync status code.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:21 +02:00
Klaas Freitag f8f82a9af2 Added custom errnos for use with csync in addition to the system errnos.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:21 +02:00
Klaas Freitag 5de0173804 Fix for Coverity CID #996824 2013-04-05 15:08:28 +02:00
Klaas Freitag 5d5ee328b0 Fix for Coverity CID #996825 2013-04-05 15:05:44 +02:00
Andreas Schneider e1edda17db getpass: Don't fail if stdin is not a tty.
We don't need to manipulate the tty state (such as turning off echo)
when prompting for passwords if we're not reading from a tty.
2013-04-05 14:12:05 +02:00
Jenkins for ownCloud a20f572448 [tx-robot] updated from transifex 2013-04-05 00:24:21 +02:00
Daniel Molkentin 28aa1448c1 Remove superfluous frees. 2013-04-04 18:31:01 +02:00