Commit Graph
6294 Commits
Author SHA1 Message Date
Daniel Molkentin 55a56cc275 Find csync_version.h, local config.h 2013-04-25 13:19:38 +02:00
Daniel Molkentin 776d5dfe37 Generate csync version from CMake variables 2013-04-25 12:32:01 +02:00
Jenkins for ownCloud 20101527b2 [tx-robot] updated from transifex 2013-04-25 01:27:34 +02:00
Olivier Goffart 959c987749 Fix storing the error of renames 2013-04-24 14:53:31 +02:00
Olivier Goffart 844c2bbafa Avoid double free 2013-04-24 14:53:31 +02:00
Andreas Schneider 9409d1c96e If there is no vio commit function don't fail. 2013-04-24 14:35:19 +02:00
Klaas Freitag b09093a496 Make csync_commit and csync_destroy more readable. 2013-04-24 14:22:54 +02:00
Klaas Freitag 3b6d1cab91 Test for csync_commit 2013-04-24 14:21:51 +02:00
Klaas Freitag fef18208d6 Add module method for csync_commit. 2013-04-24 14:21:51 +02:00
Klaas Freitag 98e6d3818f Allow windows to load user exclude list. 2013-04-24 14:21:51 +02:00
Klaas Freitag 8b65e8fbf3 Added csync_commit to be able to reuse the csync context. 2013-04-24 14:21:51 +02:00
Olivier Goffart eb38f5beb1 Don't reset the md5 if the mtime change locally.
Consider this case when one creates a file with an invalid filename (for
the server) in a directory in the local side.
say: foo/bar/%invalid%.txt

The following would happen:
- in the update for the local parent folder  foo/bar/, the md5 is 0
  because the mtime has changed
- During the reconcile, we try to send %invalid%, but there will be an
  error and nothing will be changed on the server, the etags stay the
  same
- We do not do any PROPFIND at the end so we do not fetch the etag
  anymore.  The md5 is still 0 and will be saved like that in the DB
- Next run, since the etags have  not changed on the server, we read
  from the DB.  But a md5 of 0 in the DB means the folder was removed on
  the server.  That would remove the local folder (BAD!)

So we load the md5 from the db even if the local mtime change.
That means we need to compare the mtime in the local case rather than
the md5 to see if something has changed.
2013-04-24 14:09:20 +02:00
Daniel Molkentin 311bd39100 Add simplified FancyLineEdit from Qt Creator to 3rdparty 2013-04-24 13:36:25 +02:00
Klaas Freitag fab77a15f0 Fix build after merge 2013-04-24 13:33:26 +02:00
Klaas Freitag 09e7f5c618 Add qprogressindicator widget 2013-04-24 11:45:53 +02:00
Klaas Freitag c5a674b1df More work on new Connection dialog. First working version. 2013-04-24 11:40:29 +02:00
Jenkins for ownCloud f83453cfc7 [tx-robot] updated from transifex 2013-04-24 01:27:36 +02:00
Daniel Molkentin 1ca8ebebd9 Do not add shortcuts to non-existent files 2013-04-23 17:19:27 +02:00
Klaas Freitag 460c5b067d Fix httpbf test. 2013-04-23 17:17:31 +02:00
Klaas Freitag 7cc73ed46c Merge feature branch that introduces non terminating csync. 2013-04-23 16:52:02 +02:00
Daniel Molkentin 52a289d550 Bump version to distinguish nightlies 2013-04-23 16:51:29 +02:00
Daniel Molkentin 01b4694b47 Bump version to distinguish nightlies 2013-04-23 16:49:15 +02:00
dragotin bcc6d59c6b Update CONTRIBUTING.md 2013-04-23 12:35:44 +03:00
Daniel Molkentin b4e2e5f586 1.2.5 ChangeLog v1.2.5 2013-04-22 15:48:21 +02:00
Klaas Freitag 374d9b0a8c Merge from feature branch csync_commit. 2013-04-22 15:39:43 +02:00
Jenkins for ownCloud 43ed874789 [tx-robot] updated from transifex 2013-04-22 15:28:38 +02:00
Klaas Freitag b91b96922e Remove frees from module destroy which happend in commit before 2013-04-22 15:17:45 +02:00
Klaas Freitag 8928c87fc3 Removed silly configDir hack from thread. 2013-04-22 15:06:28 +02:00
Klaas Freitag 2f6441afb0 Do not use asprintf any more, added missing header. 2013-04-22 14:30:57 +02:00
Klaas Freitag c46371b469 Push WIN32 preprocessor derectives to csync_lock.c. 2013-04-22 14:30:12 +02:00
Klaas Freitag 072edefc7b Use __mingw_asprintf if asprintf is not available. 2013-04-22 13:51:53 +02:00
Klaas Freitag 4bdabb7f46 Added a module commit function. 2013-04-22 13:51:44 +02:00
Klaas Freitag 19f6b919af Use __mingw_asprintf if asprintf is not available. 2013-04-22 13:50:59 +02:00
Daniel Molkentin e3f8a918d6 Merge pull request #559 from ghmer/master
Fix for Issue #424
2013-04-22 04:01:22 -07:00
Daniel Molkentin 668bb94270 1.2.5 2013-04-22 12:46:16 +02:00
Daniel Molkentin 89e0543e0a Merge pull request #562 from fastfwd/master
Fix Issue #382 (Minor Windows Installer Issue: Missing descriptions on the "Choose Components" screen).
2013-04-22 03:41:17 -07:00
Klaas Freitag 64927899af Use pointer to stat struct for id_list. 2013-04-22 10:22:20 +02:00
fastfwd 6695b50965 Fix Issue #382
Just a couple of typo/cut-and-paste errors.
2013-04-22 01:22:16 -07:00
Jenkins for ownCloud 5c02c85126 [tx-robot] updated from transifex 2013-04-21 01:26:18 +02:00
Mario Enrico Ragucci de99c0c7e7 Silently ignore "installed = true" string in JSON string returned by status.php 2013-04-21 00:46:37 +02:00
Klaas Freitag 9f0348979b Simplify csyncthread with keeping csync ctx intact 2013-04-20 13:15:27 +03:00
Klaas Freitag a496bb0e13 Fix memleak with id_list - WIP 2013-04-20 13:06:59 +03:00
Klaas Freitag 275c18df82 Added csync_commit to be able to reuse the csync context. 2013-04-20 12:11:16 +03:00
Klaas Freitag 0d238ae1fe Allow to set progress- and log-callback any time. 2013-04-20 12:10:45 +03:00
Klaas Freitag 66d8f8b0db Added csync_commit to be able to reuse the csync context. 2013-04-20 11:51:27 +03:00
Klaas Freitag 0c5cdc2105 Allow to set progress- and log-callback any time. 2013-04-20 11:50:13 +03:00
Klaas Freitag 84f425a326 Remove WIN32 preprocessor directive from csync.c. 2013-04-20 11:38:25 +03:00
Jenkins for ownCloud 5b5cd310b9 [tx-robot] updated from transifex 2013-04-20 01:27:05 +02:00
Daniel Molkentin ea85d68a26 Revert non-working hack 2013-04-19 16:20:30 +02:00
Daniel Molkentin fb0a883f7b Init member to 0, remove nonsensical if (foo) delete foo 2013-04-19 16:20:30 +02:00