Klaas Freitag
78c1bc6b22
Cleanup of sync result treewalk, build up journal in owncloudfolder.
2012-10-29 12:24:20 +01:00
Klaas Freitag
993d33f779
Fix fileStatus API.
...
Conflicts:
src/mirall/owncloudfolder.cpp
2012-10-29 12:23:01 +01:00
Klaas Freitag
0aa403eca3
Clean merge problems.
2012-10-29 12:20:57 +01:00
Klaas Freitag
8d1c7ddb9f
Make sure that path() has a trailing slash.
2012-10-29 12:20:57 +01:00
Jenkins for ownCloud
01e601db14
[tx-robot] updated from transifex
2012-10-29 00:03:36 +01:00
Klaas Freitag
8afe182e0c
Fix merge: Initialise data before accessing them.
2012-10-28 11:31:25 +01:00
Jenkins for ownCloud
0184993795
[tx-robot] updated from transifex
2012-10-28 00:03:12 +02:00
Daniel Molkentin
6b0abed4ee
Remove file checked-in by accident
2012-10-27 19:30:37 +02:00
Klaas Freitag
2bb52ef6f9
Merge branch 'master' into dav - get cmocka tests and database move.
...
Conflicts:
CMakeLists.txt
cmake/Modules/FindCMocka.cmake
src/csync.c
src/csync_exclude.c
src/csync_reconcile.c
src/csync_statedb.c
src/csync_update.c
src/csync_util.c
src/vio/csync_vio.c
tests/CMakeLists.txt
tests/csync_tests/check_csync_exclude.c
tests/csync_tests/check_csync_statedb_load.c
tests/csync_tests/check_csync_statedb_query.c
tests/csync_tests/check_csync_update.c
tests/std_tests/check_std_c_path.c
2012-10-27 19:27:14 +02:00
Daniel Molkentin
bf8b9246fe
Add docs
2012-10-27 17:05:01 +02:00
Daniel Molkentin
6d4f712f83
Make SSL error dialog more intuitive
2012-10-27 17:05:01 +02:00
Daniel Molkentin
d2ebcd065e
Fix tab order in setup page
2012-10-27 17:04:49 +02:00
Daniel Molkentin
28e15f5420
Escape HTML tags in self-signed certs
2012-10-27 17:04:49 +02:00
Daniel Molkentin
a315a3b5c7
There always must be both kinds of hashes, simplify code
2012-10-27 17:04:49 +02:00
Andreas Schneider
805621540a
csync: Move auth callback to a common struct.
2012-10-27 15:29:00 +02:00
Klaas Freitag
557b4bbe25
Use LIKE instead of GLOB to find files in dirs in database.
...
This fixes Github issue mirall#25
2012-10-27 12:03:39 +02:00
Jenkins for ownCloud
10766182bc
[tx-robot] updated from transifex
2012-10-27 00:02:51 +02:00
Klaas Freitag
9e4c873b16
Fixed csync testcases.
2012-10-26 21:33:13 +02:00
Dominik Schmidt
351f9aedfb
Add testing skeleton
2012-10-26 20:24:12 +02:00
Klaas Freitag
0db9427377
Add name of rename target to treewalk data structure.
2012-10-26 20:01:25 +02:00
Klaas Freitag
8bdf0694ca
Another rename issue to ocsync instead of csync.
2012-10-26 19:59:45 +02:00
Klaas Freitag
d82850f145
Fix more csync->ocsync renaming issues.
2012-10-26 16:11:34 +02:00
Klaas Freitag
0cea891a98
Fix name of config file in log test case.
2012-10-26 11:53:29 +02:00
Jenkins for ownCloud
6757db2e53
[tx-robot] updated from transifex
2012-10-26 02:07:36 +02:00
Bartek Przybylski
55c9c3bf12
remove compilation warning
2012-10-25 23:20:00 +02:00
Jenkins for ownCloud
e52d43f68b
[tx-robot] updated from transifex
2012-10-25 02:11:05 +02:00
Jenkins for ownCloud
cfe9a2476b
[tx-robot] updated from transifex
2012-10-24 02:10:48 +02:00
Daniel Molkentin
efa8d7670c
Show hashes of unknown certs
2012-10-24 01:44:13 +02:00
Jenkins for ownCloud
8ddba655df
[tx-robot] updated from transifex
2012-10-23 02:08:12 +02:00
Daniel Molkentin
5c13115fee
Remove 0% translations.
2012-10-22 16:39:56 +02:00
Andreas Schneider
14f03e0ebb
exclude: Simplify the csync_excluded() loop.
...
Thanks to Klaas Freitag.
2012-10-22 15:32:28 +02:00
Andreas Schneider
e43466d09d
tests: Add exclude test for journal db names.
2012-10-22 15:13:52 +02:00
Andreas Schneider
51ce3bea37
exclude: Reduce memory allocations of csync_excluded().
2012-10-22 15:13:02 +02:00
Andreas Schneider
9b11339a9e
util: Remove obsolete csync_create_statedb_hash().
2012-10-22 14:55:26 +02:00
Andreas Schneider
f92b8f1db7
exclude: Make sure we don't sync the csync_journal.db.
2012-10-22 14:55:26 +02:00
Andreas Schneider
76e6fbb72f
csync: Move the statedb (journal) to the local directory.
2012-10-22 14:53:59 +02:00
Andreas Schneider
42421cb4cc
exclude: Rework csync_excluded() to not leak memory on error.
2012-10-22 14:53:27 +02:00
Andreas Schneider
d507358c95
exclude: Fix build warning.
2012-10-22 14:39:03 +02:00
Thomas Müller
f948ce4015
[tx] minimum_perc = 70
2012-10-22 15:16:57 +03:00
Klaas Freitag
01a25db3fb
exclude: Fix checking the exclude pattern for subdirs.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2012-10-22 12:26:35 +02:00
Daniel Molkentin
2cbcd52f35
Do not allow the selection of a target in single folder mode
2012-10-22 11:32:53 +02:00
Andreas Schneider
31382d909e
vio: Fix a build warning.
2012-10-22 11:21:34 +02:00
Andreas Schneider
304371eecb
build: Add an option for clang.
2012-10-22 11:21:18 +02:00
Andreas Schneider
cea0c9e85f
cmake: Fix compile option on UNIX with Clang.
2012-10-22 11:20:30 +02:00
Andreas Schneider
68abef8626
util: Improve statedb hashing function to avoid possible data loss.
...
The statedb hash function only hashes the remote side and not the local
path. So if a user changes to a new empty directory to sync it with the
remote counter part, csync will delete all files.
This will result in a new full sync for all sync setups, but we will not
loose any data.
2012-10-22 11:00:51 +02:00
Jenkins for ownCloud
09405fc9f7
[tx-robot] updated from transifex
2012-10-22 02:08:53 +02:00
Jenkins for ownCloud
651517c3a7
[tx-robot] updated from transifex
2012-10-21 02:09:50 +02:00
Daniel Molkentin
b0801d469c
If present, select first item in status dialog
...
The old behavior is confusing and there is no real
reason to not have an object that is default-selected.
2012-10-20 14:58:49 +02:00
Daniel Molkentin
8fbc0e7c46
Show wizard with intro when starting without account
...
The message box was complicated and not even correct
on some OSes. The intro page is omitted if the wizard
gets called via the "Configure" menu item.
2012-10-20 13:58:37 +02:00
Daniel Molkentin
d8728a56bc
Pre-setup, disable irrelevant items in context menu
2012-10-20 13:58:37 +02:00
Klaas Freitag