Daniel Molkentin
83880aed52
Add proper background for OS X installer
...
Fixes #2335
2014-10-22 18:02:19 -04:00
Olivier Goffart
de56b753d1
protocolwidget: fix string that need to use plural translation
2014-10-22 18:26:40 +02:00
Olivier Goffart
dab01e3f3f
csync_update: add the perms in the log
2014-10-22 17:25:38 +02:00
Olivier Goffart
e46ab72718
SocketAPI: Show error when we are not allowed
...
Issue #1931
2014-10-22 17:25:38 +02:00
Klaas Freitag
9f6d7eb587
tests: use the ocs_url in the same semantics as the 1.6 branch.
2014-10-22 16:06:39 +02:00
Daniel Molkentin
bbd9098e44
Switch git submodule for qtmacgoodies back to shadone
2014-10-22 09:58:08 -04:00
Markus Goetz
47ad4e3fe8
CSync: Close/Reopen DB between update and reconcile
...
update and reconcile happen in different threads. This code is safer.
(Even though depending on sqlite3 version it should work anyway)
2014-10-22 15:42:13 +02:00
Olivier Goffart
9330d2e1e8
SocketAPI: always clean the path and use the normal slash
2014-10-22 15:33:35 +02:00
Olivier Goffart
020e19f770
SocketAPI: Fix all files are new
...
(Introduced because of bad resolution of merge conflict
in my last commit)
2014-10-22 15:32:09 +02:00
Olivier Goffart
3be5600caf
t6.pl: fix missing space in curl command
2014-10-22 15:16:22 +02:00
Olivier Goffart
22dd275b15
SocketAPI: Fix the shared symbol, including for owncloud6 Shared dir
...
The shared symbol would not appear if the status came for estimateState
Also added the shared symbol for the Shared/ directories (owncloud 6 compat)
2014-10-22 15:10:21 +02:00
Markus Goetz
6342e76e19
Wizard: Change misleading text
2014-10-22 15:06:33 +02:00
Markus Goetz
55dd149a03
SocketAPI: Less verbose
2014-10-22 14:43:23 +02:00
Markus Goetz
39a0f28753
Move qtmacgoodies module forward
2014-10-22 14:43:03 +02:00
Olivier Goffart
dd45b448d9
t6.pl: pass the --insecure flag to curl so it works on the test machine
2014-10-22 13:57:22 +02:00
Olivier Goffart
7740150576
Selective Sync widget: add a "Loading..." label
...
Task #2088
2014-10-22 13:48:05 +02:00
Olivier Goffart
4f367faf4d
SocketAPI: Show an error for files inside the selective sync folders
...
Task #2283
2014-10-22 13:31:20 +02:00
Olivier Goffart
3840186dd8
Utility: fix function signature
2014-10-22 13:31:20 +02:00
Christian Kamm
d77fcea365
Csync tests: Don't use sqlite3_close_v2.
2014-10-22 12:44:33 +02:00
Daniel Molkentin
ed51a45187
Add title to selective sync dialog
2014-10-22 06:29:22 -04:00
Christian Kamm
c832226aa1
Merge remote-tracking branch 'origin/1.7' into master
2014-10-22 12:25:58 +02:00
Christian Kamm
a20375372d
Blacklist: Don't ignore error files forever. #2247
...
Instead try them again regularly, but don't show the user any
error messages if the error persists.
2014-10-22 12:25:18 +02:00
Christian Kamm
ba86988101
Csync tests: Fix broken tests.
...
It is no longer ok to call csync_statedb_load() on a non-existant
database since it opens readonly only.
2014-10-22 12:22:13 +02:00
Olivier Goffart
6073e3f345
SocketAPI: do not show a progress icon in case of errors
2014-10-22 12:19:57 +02:00
Olivier Goffart
d31ccacf57
SocketAPI: show an ignored icon for paused folders
2014-10-22 12:19:57 +02:00
Markus Goetz
7e3d2029e0
OS X: Fix bundle creation after merge
2014-10-22 12:06:43 +02:00
Christian Kamm
de48e65091
Csync tests: Fix compile.
2014-10-22 11:45:48 +02:00
Klaas Freitag
3243365210
JournalDb: Do not longer always have a write operation on version table.
...
Rather read the value from the table and if it is what we expect do not
write it.
2014-10-22 10:59:58 +02:00
Christian Kamm
7ae0338f5c
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/socketapi.h
src/libsync/syncengine.h
test/CMakeLists.txt
2014-10-22 10:41:55 +02:00
Jenkins for ownCloud
b2460fbee2
[tx-robot] updated from transifex
2014-10-22 02:06:40 -04:00
Jenkins for ownCloud
8dc3f2146a
[tx-robot] updated from transifex
2014-10-22 01:25:37 -04:00
Markus Goetz
a993496ab4
SyncJournalDB/SyncEngine: Properly detect 1.5 upgrade
...
Else we end up never reading file data from the DB.
2014-10-21 20:25:15 +02:00
Markus Goetz
61e72ef50b
CSync: statedb sanity check changes
2014-10-21 18:09:23 +02:00
Markus Goetz
d7ac878efd
SyncJournalDB: Fix deleteBatch
2014-10-21 16:37:51 +02:00
Markus Goetz
e5a0db8782
SyncJournalDB: Fix version table filling up
2014-10-21 16:37:39 +02:00
Markus Goetz
24d4840c93
SyncJournalDB: Set WAL files to hidden
2014-10-21 15:58:56 +02:00
Markus Goetz
fa70798fb5
SyncJournalDB: WAL checkpoint at end of sync
2014-10-21 15:41:11 +02:00
Markus Goetz
1af480ea3b
CMake: Fix RPATH
2014-10-21 15:39:31 +02:00
Olivier Goffart
a76fc0ee5a
SocketAPI: send the change of the parent folder in the broatcast
...
Also do not compute the status if there is nno listeners
2014-10-21 15:26:51 +02:00
Olivier Goffart
80e86d6c1b
ownsql: fix warning with clang
...
warning: equality comparison with extraneous parentheses [-Wparentheses-equality]
2014-10-21 14:59:42 +02:00
Olivier Goffart
dc13e39bb1
SocketAPI: do not have a special case for UPDATE_VIEW on windows
...
This is a relique on the old times when there was no persistant connection
in the windows plugin
2014-10-21 14:57:50 +02:00
Olivier Goffart
98c5871d38
Windows shell integration: Add SHCNF_FLUSHNOWAIT to SHChangeNotify
...
(TortoiseSVN have this flag)
Also do not call SHChangeNotify if there was no change
2014-10-21 14:51:18 +02:00
Olivier Goffart
5a109d9293
Fix t3.pl
...
The fix in commit 86d8079
made the detection of changes inside
a directory more robust.
As a result, changes are detected inside a directory, even if the
files that are changed were moved away on the other remote, the algorithm
won't let the directory be removed and the directory will be re-created
2014-10-21 12:10:12 +02:00
Olivier Goffart
56316bc980
csync_reconcile: remove useless debug output
2014-10-21 11:47:18 +02:00
Klaas Freitag
21c8e65d13
csync tests: Fix test after db changes.
2014-10-21 11:26:04 +02:00
Olivier Goffart
86d8079739
Reconcile: Make sure not to loose new files added in a directory removed on the server
...
Found while investigating #2296
The problem is that we should not remove a directory locally if it contains
modified files.
But the modification time of the directory is not necessarily chaning (so
the instruction of the directory may still be NONE)
We have to move the child_modified test a bit down to be recursive
2014-10-21 10:38:21 +02:00
Jenkins for ownCloud
d2be45bce1
[tx-robot] updated from transifex
2014-10-21 01:25:34 -04:00
Markus Goetz
5d048c18bc
Sqlite3: Switch to WAL
...
This is faster.
2014-10-20 23:09:28 +02:00
Markus Goetz
0fb779d363
SyncEngine: De-initialize recursive PROPFIND value correctly
2014-10-20 22:24:28 +02:00
Daniel Molkentin
d0ed82a686
We need SqlDatabase and SqlQuery to be exported
...
Required due to 53b3e5af1b
2014-10-20 19:58:10 +02:00