Christian Kamm
|
53d5de685c
|
Merge remote-tracking branch 'origin/1.7'
Conflicts:
src/gui/folder.cpp
src/gui/folder.h
src/libsync/networkjobs.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagatedownload.cpp
|
2014-12-10 13:01:36 +01:00 |
|
Christian Kamm
|
40f44c2389
|
DB: Delete corrupt database. #2547
* Also use readonly DB access for SocketAPI.
|
2014-12-04 15:35:55 +01:00 |
|
Daniel Molkentin
|
1297ac77b9
|
Fix tests
|
2014-11-09 22:37:56 +01: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 |
|
Klaas Freitag
|
2f740fe471
|
tests: Added unicode read an write testcase for ownsql.
|
2014-10-16 21:21:47 +02:00 |
|
Klaas Freitag
|
6b5fcf53eb
|
Test module for the new sql implementation.
|
2014-10-14 20:51:34 +02:00 |
|