Markus Goetz
|
049d49eba8
|
OwnSql: Show potential error on close #3421
|
2015-08-06 15:47:38 +02:00 |
|
Olivier Goffart
|
16786eed54
|
Merge pull request #3281 from owncloud/confirm
Confirm feature (sync engine part only)
|
2015-06-10 13:39:52 +02:00 |
|
Olivier Goffart
|
1b9d82679c
|
OwnSQL: fix initialisation of variables
|
2015-06-08 15:30:39 +02:00 |
|
Olivier Goffart
|
2c67692958
|
JournalDb: add a table in the db for the selective sync
|
2015-05-26 12:33:54 +02:00 |
|
Markus Goetz
|
39d103adf7
|
OwnSql: Fix numRowsAffected()
|
2015-05-13 12:54:03 +02:00 |
|
Christian Kamm
|
cd0ad21132
|
SQL: Improve error reporting of failed exec(). #2693
|
2015-01-29 09:47:48 +01:00 |
|
Christian Kamm
|
b50475bc17
|
SQL: Fix error reporting on prepare fail. #2697
|
2015-01-16 09:12:25 +01:00 |
|
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 |
|
Daniel Molkentin
|
ae85aa33fd
|
Adjust namespaces
|
2014-11-09 22:34:07 +01:00 |
|
Daniel Molkentin
|
dc1e73dcb7
|
Merge remote-tracking branch 'origin/1.7'
Conflicts:
src/libsync/syncjournaldb.cpp
test/CMakeLists.txt
|
2014-10-28 23:27:58 -04: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 |
|