Commit Graph
12636 Commits
Author SHA1 Message Date
Klaas Freitag 64660df84b removed obsolete FindOpenSSL. 2012-08-23 17:34:19 +03:00
Klaas Freitag 8e401e662f MD5 Support WIP 2012-08-23 17:34:19 +03:00
Klaas Freitag 943e960bc0 Fixed merge conflict. 2012-08-23 17:34:02 +03:00
Klaas Freitag 2a40106e70 Fixed merge conflict. 2012-08-23 17:33:41 +03:00
Dominik Schmidt 21d3ec4d2d Add patched FindOpenSSL to fix cross-compilation for windows 2012-08-23 17:24:23 +03:00
Jenkins for ownCloud d2c7087395 [tx-robot] updated from transifex 2012-08-23 02:02:45 +02:00
Jenkins for ownCloud 6836732a5c [tx-robot] updated from transifex 2012-08-22 16:25:50 +02:00
Jenkins for ownCloud bd39fbeefd [tx-robot] updated from transifex 2012-08-21 02:03:27 +02:00
Klaas Freitag faf1970e3a Avoid a null pointer dereference. 2012-08-20 19:11:46 +03:00
Klaas Freitag ec63ab4e16 Fix: If no database entry exists, the status is set to NEW. 2012-08-20 19:11:18 +03:00
Klaas Freitag 4a6b0e7241 Remove a database column comment that just blows the log file. 2012-08-20 19:10:29 +03:00
Klaas Freitag bc1e59a048 Update the md5 also if the instruction is not UPDATE. 2012-08-20 19:10:03 +03:00
Klaas Freitag 30d1c9ed9d ownCloud: Some code cleanup, added documentation. 2012-08-20 19:09:24 +03:00
Jenkins for ownCloud d5570ab55e [tx-robot] updated from transifex 2012-08-20 02:02:42 +02:00
Jenkins for ownCloud e52b51b5d6 [tx-robot] updated from transifex 2012-08-19 02:03:13 +02:00
Jenkins for ownCloud e6e0dd35a3 [tx-robot] updated from transifex 2012-08-18 02:03:05 +02:00
Klaas Freitag d733aac0e8 Fix QLatin1String issues. 2012-08-17 18:13:17 +03:00
Klaas Freitag a8296a6b6e Removed unneeded win32 headers. 2012-08-17 18:00:03 +03:00
Klaas Freitag 094f791400 Removed unused file temporarydir. 2012-08-17 17:55:15 +03:00
Klaas Freitag 82d22d1494 Added get_file_id function. 2012-08-17 16:50:31 +03:00
Klaas Freitag d9267f7928 Handle ID change propagation to the top directory. 2012-08-17 16:48:56 +03:00
Klaas Freitag 972412e436 Update the md5 sum of files in merge. 2012-08-17 16:48:15 +03:00
Klaas Freitag 38cf0f2704 Add csync_get_file_id function for modules. 2012-08-17 16:46:50 +03:00
Klaas Freitag 0443764308 Query ids from database for local files, remove bogus code. 2012-08-17 16:46:07 +03:00
Klaas Freitag 7dcb9ffdeb Added id lists to context type and removed change counter. 2012-08-17 16:45:12 +03:00
Klaas Freitag fcba1cefce Added csync_vio_file_id function and removed unused previous code. 2012-08-17 16:44:38 +03:00
Klaas Freitag bac0002eeb Add a visible log entry at program start, easier to read log output. 2012-08-17 16:42:23 +03:00
Jenkins for ownCloud 6ff09ddfd7 [tx-robot] updated from transifex 2012-08-17 02:03:02 +02:00
Jenkins for ownCloud 6497ee701a [tx-robot] updated from transifex 2012-08-16 02:04:24 +02:00
Klaas Freitag 3669b43332 Merge branch 'master' of gitorious.org:owncloud/mirall 2012-08-15 18:17:02 +03:00
Klaas Freitag 58d75e7bfe Show pathes in platform specific notation 2012-08-15 18:16:44 +03:00
Klaas Freitag 0147063090 try to propagate EVAL status up by detecting changes in underlying
directories. That does not work as the reconciler runs through the
directoires in the wrong order, ie. the outermost first.
2012-08-15 16:32:10 +03:00
Klaas Freitag 19f52313a8 more md5 calculations 2012-08-15 12:46:36 +03:00
Jenkins for ownCloud 706b9e4e09 [tx-robot] updated from transifex 2012-08-15 02:04:21 +02:00
Klaas Freitag 142ef140f0 more logging, ids added. 2012-08-14 16:32:23 +03:00
Klaas Freitag eb019905e4 Query new id for local repository because of utimes changes. 2012-08-14 16:31:52 +03:00
Klaas Freitag b37096354f Fix url to calculate hash 2012-08-14 16:31:01 +03:00
Klaas Freitag dc54fa563f Update to version 1.0.5 with Changelog entry. 2012-08-14 13:26:24 +03:00
Klaas Freitag 1b7ad22e2e Fix setup dialog: Use https if checkbox is activated. 2012-08-14 13:23:06 +03:00
Klaas Freitag e975ec6200 Merge branch 'master' of gitorious.org:owncloud/mirall 2012-08-14 12:23:45 +03:00
Jenkins for ownCloud 4e62abe542 [tx-robot] updated from transifex 2012-08-14 02:03:03 +02:00
Klaas Freitag cf24513879 Merge branch 'dav' of ssh://milliways.cryptomilk.org/users/freitag/csync into md5
Conflicts:
	modules/csync_owncloud.c
	src/csync_private.h
	src/csync_reconcile.c
	src/vio/csync_vio.c
2012-08-13 15:24:15 +03:00
Klaas Freitag 6b98958de6 Fatal error if svn2ico is missing. 2012-08-13 15:05:40 +03:00
Jenkins for ownCloud 3f360c7e7b [tx-robot] updated from transifex 2012-08-13 02:02:27 +02:00
Thomas Mueller 2827a4724b removing mirall_zh_CN.GB2312.ts as this file format is not supported and causes conflicts with mirall_zh_CN.ts 2012-08-12 23:47:51 +02:00
Jenkins for ownCloud b9a7ce65a7 [tx-robot] updated from transifex 2012-08-12 23:33:05 +02:00
Thomas Mueller 6a69200ae7 transifex configuration added 2012-08-12 23:31:27 +02:00
Klaas Freitag 4012e3ff25 Updated translation list in installer template 2012-08-10 13:25:36 +03:00
Klaas Freitag ebfeda7304 Updated Changelog for 0.50.8. 2012-08-10 12:37:22 +03:00
Klaas Freitag f26b91f509 ownCloud: Still require time sync between the two repos. 2012-08-10 12:36:55 +03:00