Commit Graph
17214 Commits
Author SHA1 Message Date
Jenkins for ownCloud 310f29d3fd [tx-robot] updated from transifex 2013-04-03 00:04:53 +02:00
Daniel Molkentin 07db03d6bc 1.2.3 v1.2.3 2013-04-02 15:27:37 +02:00
Daniel Molkentin d68c4b379f Unbreak self-signed certificate handling 2013-04-02 15:22:27 +02:00
Klaas Freitag 34668e42b3 Merge branch 'dav_0.70.5' into dav - WIP
Conflicts:
	CMakeLists.txt
	CPackConfig.cmake
	src/csync.h
	src/csync_update.c
	tests/ownCloud/t1.pl
2013-04-02 14:44:01 +02:00
Daniel Molkentin 396a12dfde Amend ChangeLog v1.2.2 2013-04-02 10:14:02 +02:00
Klaas Freitag 867595e1ef Fix release date. 2013-04-02 10:01:28 +02:00
Jenkins for ownCloud c79f4f91a8 [tx-robot] updated from transifex 2013-04-02 00:05:14 +02:00
Olivier Goffart 296011436a Store the error string in the database when blacklisting 2013-03-28 13:54:01 +01:00
Olivier Goffart 6659ee6d76 store the error string for files in the tree 2013-03-28 13:54:01 +01:00
Klaas Freitag bec2f7c9b9 Removed verbose logging on Win32. 2013-03-28 11:14:16 +01:00
Klaas Freitag 4b98ee0644 Pushed version to 0.70.6 2013-03-28 09:57:49 +01:00
Klaas Freitag 6de7ddf294 Use httpbf for all transfers. 2013-03-27 18:06:54 +01:00
Klaas Freitag 6f3168e88a Added function to retrieve http error code and fix return value check. 2013-03-27 18:05:50 +01:00
Klaas Freitag d1efcb7dd4 Changelog for 0.70.5 2013-03-27 15:29:27 +01:00
Jenkins for ownCloud d4c8cad0e2 [tx-robot] updated from transifex 2013-03-27 00:11:52 +01:00
Klaas Freitag 2010c4ad21 Fix a typo. 2013-03-26 15:07:41 +01:00
Klaas Freitag b826d59925 Make VIO_METHOD_HAS_FUNC macro more robust. 2013-03-26 12:39:52 +01:00
Klaas Freitag 5e0e42baaf Make VIO_METHOD_HAS_FUNC macro more robust. 2013-03-26 12:35:35 +01:00
Klaas Freitag 5951039894 Improved C style and added more tests. 2013-03-26 12:01:48 +01:00
Klaas Freitag a84332c910 Improved C style and added more tests. 2013-03-26 12:00:57 +01:00
Klaas Freitag 79c51540da 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.

Conflicts:
	src/csync_propagate.c
2013-03-26 11:57:32 +01:00
Klaas Freitag 0baa80c235 Test added for c_compare_file. 2013-03-26 11:53:14 +01:00
Klaas Freitag a71aef1731 Added c_compare_file function and test - WIP. 2013-03-26 11:52:46 +01:00
Klaas Freitag 466faba761 Fix test script. 2013-03-26 10:06:00 +01:00
Klaas Freitag 6aec7f4211 Push context to module to make logging of the module work. 2013-03-26 10:05:15 +01:00
Daniel Molkentin 0ad2bd4b91 Add favlink generation support for Nautilus 2013-03-25 18:00:58 +01:00
Daniel Molkentin dcc8f9fa6c Fix favlink manual test 2013-03-25 18:00:25 +01:00
Markus Goetz d7a93c74aa OS X: Fix creation of Finder Favorite 2013-03-25 14:57:34 +01:00
Daniel Molkentin 408547611b Manual test for favlinks 2013-03-25 12:53:40 +01:00
rominf a8f0e79046 Skipping folders with no absolute path. 2013-03-23 10:48:37 +04:00
Jenkins for ownCloud 3e45147497 [tx-robot] updated from transifex 2013-03-23 00:07:09 +01:00
Klaas Freitag ef7c5c261d Fix memory allocation for path. 2013-03-22 21:48:01 +01:00
Klaas Freitag 43fa6e4418 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.
2013-03-22 21:04:09 +01:00
Klaas Freitag 5657ff3d34 Fix: set path correctly. 2013-03-22 16:29:04 +01:00
Daniel Molkentin 48310d3f5e Add 1.2.2 changelog 2013-03-22 14:59:22 +01:00
Daniel Molkentin 1831a975eb SSLErrorDialog: We cannot use the existing key chain
... use the one returned by the new server instead.
2013-03-22 14:59:22 +01:00
Klaas Freitag a3f29967f7 Test added for c_compare_file. 2013-03-22 13:54:46 +01:00
Jenkins for ownCloud a766a44bcf [tx-robot] updated from transifex 2013-03-22 12:08:57 +01:00
Cedric Bellegarde 8165b83a27 Check for service availability 2013-03-22 11:58:55 +01:00
Cedric Bellegarde fa62c270e6 Merge git://github.com/owncloud/mirall 2013-03-22 11:40:58 +01:00
Cedric Bellegarde c03199e78a Re add space 2013-03-22 11:35:25 +01:00
Cedric Bellegarde f346503534 Better fdo detection 2013-03-22 11:34:21 +01:00
Klaas Freitag d43779671f Added missing changelog 0.70.4. 2013-03-22 11:09:24 +01:00
Klaas Freitag 7b7ce3a43c Remove versions table before new creation. 2013-03-22 11:04:04 +01:00
Klaas Freitag 3ce614039a Added c_compare_file function and test - WIP. 2013-03-22 10:23:17 +01:00
Klaas Freitag 8b229f6413 Minor fixups. 2013-03-22 10:22:50 +01:00
Jenkins for ownCloud 287f1c55ff [tx-robot] updated from transifex 2013-03-22 00:05:37 +01:00
Daniel Molkentin 1c6523bcec Add plugin for screenreader support 2013-03-21 17:49:03 +03:00
Daniel Molkentin 337c6d3e4e Try to avoid crash on Mac OS during setup
... by moving setupFavLink to a place only called
if the folder to be referenced exists for sure.
2013-03-21 12:50:47 +01:00
Jenkins for ownCloud 4a57957420 [tx-robot] updated from transifex 2013-03-21 00:05:23 +01:00