Commit Graph
14082 Commits
Author SHA1 Message Date
Klaas Freitag a723a968ba allow custom media at relative path for windows. 2012-08-27 19:09:56 +03:00
Klaas Freitag f4bb981ad4 add application path back to translation laoding. 2012-08-27 18:59:31 +03:00
Klaas Freitag a2b5596ee1 removed wrong path piece "win" 2012-08-27 18:56:34 +03:00
Jenkins for ownCloud dba0332bc0 [tx-robot] updated from transifex 2012-08-27 12:04:48 +02:00
Klaas Freitag b6edf82d4e Fixed license of tests, added dir check test. 2012-08-26 20:08:28 +02:00
Klaas Freitag 3b369c8b03 More robust query result access if columns are missing. 2012-08-26 20:07:36 +02:00
Klaas Freitag 9897335006 ownCloud: Test on null pointer before access for md5 sum. 2012-08-26 20:06:53 +02:00
Klaas Freitag ced6f0ed96 Fix compile problem. 2012-08-26 16:10:17 +02:00
Klaas Freitag fd7cb38c16 Use qthread more correct, see
http://labs.qt.nokia.com/2006/12/04/threading-without-the-headache/
2012-08-26 11:47:45 +02:00
Klaas Freitag a459f468a3 Use PlainTextEdit widget for more efficient log file display. 2012-08-26 11:46:59 +02:00
Lukas Reschke 803f3e4a14 Change the link to the oC repository. 2012-08-26 01:51:47 +03:00
Jenkins for ownCloud e3e163d453 [tx-robot] updated from transifex 2012-08-25 02:04:37 +02:00
Klaas Freitag 5294f446a2 Merge branch 'master' of gitorious.org:owncloud/mirall
Conflicts:
	src/mirall/owncloudinfo.cpp
	src/mirall/owncloudsetupwizard.cpp
	src/mirall/owncloudwizard.cpp
2012-08-24 11:16:58 +02:00
Jenkins for ownCloud dd2ac61200 [tx-robot] updated from transifex 2012-08-24 02:03:36 +02:00
Klaas Freitag ef64756334 Merge branch 'md5' of ssh://milliways.cryptomilk.org/users/freitag/csync into fastsync
Conflicts:
	modules/csync_owncloud.c
	src/csync_private.h
	src/csync_propagate.c
	src/csync_reconcile.c
	src/csync_statedb.c
2012-08-23 18:04:32 +03:00
Klaas Freitag 4169c4be05 More blackbox testing of csync ownCloud - enhanced test script. 2012-08-23 17:57:04 +03:00
Klaas Freitag 2420eeffd1 Read remote file tree from db if id has not changed. 2012-08-23 17:55:39 +03:00
Klaas Freitag 5b5fe29eb5 Make sqlite_query function able to deal with multiple row queries. 2012-08-23 17:54:36 +03:00
Klaas Freitag cf8f31914a Added a file type column to the database. 2012-08-23 17:53:53 +03:00
Klaas Freitag 1dc50eea5d Decide if the file tree is read from db or stat'ed 2012-08-23 17:50:30 +03:00
Klaas Freitag 1e41c469f0 Add the dbtree function module. 2012-08-23 17:49:47 +03:00
Klaas Freitag e349df9f4c Added flag to indicate to read the remote filetree from db. 2012-08-23 17:49:18 +03:00
Klaas Freitag 8876658810 Added functions to read the file tree from database. 2012-08-23 17:48:24 +03:00
Klaas Freitag e9cf546818 Free the memory for the MD5 string. 2012-08-23 17:44:07 +03:00
Klaas Freitag 97a7e46595 Set to INSTRUCTION_UPDATED only for NONE instructions. 2012-08-23 17:44:07 +03:00
Klaas Freitag 7f7c2b977c Avoid a null pointer dereference. 2012-08-23 17:44:07 +03:00
Klaas Freitag 337c56da66 Fix: If no database entry exists, the status is set to NEW. 2012-08-23 17:44:07 +03:00
Klaas Freitag a0353249f1 Remove a database column comment that just blows the log file. 2012-08-23 17:44:07 +03:00
Klaas Freitag 868a07c322 Update the md5 also if the instruction is not UPDATE. 2012-08-23 17:44:07 +03:00
Klaas Freitag dba2c1d105 Added get_file_id function. 2012-08-23 17:43:51 +03:00
Klaas Freitag f4c9ced446 Handle ID change propagation to the top directory. 2012-08-23 17:43:51 +03:00
Klaas Freitag 1c6da9c0bb Update the md5 sum of files in merge. 2012-08-23 17:43:51 +03:00
Klaas Freitag e3638ced2c Add csync_get_file_id function for modules. 2012-08-23 17:43:51 +03:00
Klaas Freitag 62b49e8bcc Query ids from database for local files, remove bogus code. 2012-08-23 17:43:51 +03:00
Klaas Freitag 9bd9949d68 Fixed merge conflict, only one md5 needed. 2012-08-23 17:43:21 +03:00
Klaas Freitag ede710843b Added csync_vio_file_id function and removed unused previous code. 2012-08-23 17:42:51 +03:00
Klaas Freitag 20f4ee16cc removed unneeded initialisations. 2012-08-23 17:42:33 +03:00
Klaas Freitag 3fb3f78446 Add a visible log entry at program start, easier to read log output. 2012-08-23 17:41:53 +03:00
Klaas Freitag d8967a2bd1 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-23 17:41:53 +03:00
Klaas Freitag c2e2f8de00 more md5 calculations 2012-08-23 17:41:53 +03:00
Klaas Freitag f2d603108a more logging, ids added. 2012-08-23 17:41:53 +03:00
Klaas Freitag ae1b8a5682 Query new id for local repository because of utimes changes. 2012-08-23 17:41:53 +03:00
Klaas Freitag 0618eb956d Merge conflicts solved. 2012-08-23 17:40:36 +03:00
Klaas Freitag ae5394ad75 UniqID based syncing, first WIP state. 2012-08-23 17:38:44 +03:00
Klaas Freitag d2ba37a419 Resolved merge conflict. 2012-08-23 17:38:25 +03:00
Klaas Freitag 3e85218be9 Do not do post copy stat for ownCloud. 2012-08-23 17:35:16 +03:00
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