Klaas Freitag
a9d8e9dcd8
Setupwizard: Close the database in case of moving the folder.
2014-10-24 13:05:29 +02:00
Klaas Freitag
542e989046
Setup Dialog: Terminate sync if the new folder is a an actual folder.
2014-10-24 11:59:56 +02:00
Klaas Freitag
f5c199740d
Followup: To unregister a path in socket api use the alias of folder.
2014-10-24 11:36:01 +02:00
Klaas Freitag
f37b81c8b7
Unregister path in socketapi before removing it.
2014-10-24 11:12:06 +02:00
Christian Kamm
c0ea69ee24
SqlQuery: Reset after each successful exec().
...
In e5269a4151
I moved the reset calls to
before the first bindValue() because we didn't consistently reset()
after exec().
However, some queries may keep a lock on the database so it is necessary
to reset() as soon as the data is read. This commit reintroduces these
reset() calls.
2014-10-24 10:11:00 +02:00
Christian Kamm
5640cbf653
SqlDatabase: Make it non-copyable.
2014-10-24 09:56:30 +02:00
Jenkins for ownCloud
6d81e5c87a
[tx-robot] updated from transifex
2014-10-24 01:25:23 -04:00
Daniel Molkentin
3c7ff97ed4
SocketAPI: Don't use a theme dependent name for now
...
We will revert this once #2388 is implemented
2014-10-23 17:46:17 -04:00
Craig Morrissey
2120ff8037
fix resources path and permissions
2014-10-23 16:42:32 -04:00
Daniel Molkentin
92c35c6aa6
Update reference to binary submodule
2014-10-23 15:09:49 -04:00
Daniel Molkentin
149b16aefd
Win32 Shell Integration: Use RegDeleteKey instead of RegDeleteKeyEx
...
RegDeleteKeyEx does not exist on Windows XP 32 bit
Fixes : #2165
2014-10-23 21:00:31 +02:00
Klaas Freitag
114c38c1ff
csync tests: add some debug code to get behind the jenkins fails.
2014-10-23 17:33:47 +02:00
Christian Kamm
e5269a4151
Add SyncJournalDB autotests.
...
There also was a bug in syncjournaldb: in some error conditions the
sql query wasn't reset properly. We now always reset a query before
calling bindValue.
2014-10-23 15:15:47 +02:00
Markus Goetz
81584c6d51
VERSION.cmake: rc1
2014-10-23 12:22:07 +02:00
Markus Goetz
0d9ae241c9
OwnCloudFinder: Rename to SyncStateFinder
...
Project file names stay the same, only the output file(s) changed
2014-10-23 12:19:19 +02:00
Klaas Freitag
e726e7aad8
util: Use canonicalFilePath to clean the path opened by explorer.
...
This fixes bug #2299
2014-10-23 10:41:07 +02:00
Jenkins for ownCloud
c7c05ea869
[tx-robot] updated from transifex
2014-10-23 01:25:33 -04:00
Carla Schroder
b5da8423a6
Update navigating.rst
2014-10-22 19:24:19 -07:00
Carla Schroder
c3de0a2d4b
Add section on Overlay Icons to 'Using the Synchronization Client'
2014-10-22 19:20:58 -07:00
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