Daniel Molkentin
52a5729298
Merge pull request #2319 from owncloud/sqlite_capi
...
Introduce a common sqlite layer across csync and mirall.
This avoids conflicts that both each load different and/or updated sqlite versions.
2014-10-17 12:11:27 +02:00
Daniel Molkentin
4525161e7c
Updater: allow overriding update URL through environment
2014-10-17 12:07:18 +02:00
Daniel Molkentin
dee6d18d69
Discovery phase: Improve UI by quoting folder names
2014-10-17 12:07:18 +02:00
Daniel Molkentin
d44179142f
Discovery phase: Properly decode percent encoding
2014-10-17 12:07:18 +02:00
Klaas Freitag
c66c01245b
Beautified some debug logging strings.
2014-10-17 11:35:06 +02:00
Markus Goetz
b1c10c8454
Remove references to qsqlite3
2014-10-16 17:51:17 +02:00
Markus Goetz
1d5b3aadea
sqlite3: Bundle 3.8.6 for Mac and Windows
...
it is linked into ocsync.
2014-10-16 17:38:45 +02:00
Markus Goetz
2d420cd72c
ownSql: Always use SQLITE_TRANSIENT
...
More safe.
2014-10-16 15:30:50 +02:00
Markus Goetz
707d6880a8
main: Show console message if already running
2014-10-16 15:25:33 +02:00
Markus Goetz
dbad1a8d45
ownSql: Don't allow copying of SqlQuery
...
This fixes a crash on OS X where the destructor
calls sqlite3 to invalidate the underlying handle.
2014-10-16 15:10:25 +02:00
Klaas Freitag
36eaff92e5
JournalDb: Some Sql statement fixes, make t7 work again.
...
plus some minor fixes.
2014-10-16 11:22:57 +02:00
Klaas Freitag
e51c299937
ownSql: create an null value of an empty string in bindValue.
2014-10-16 11:20:50 +02:00
Klaas Freitag
8c7953a47c
ownSql: Proper initialization of result value plus assert on it.
2014-10-16 11:20:21 +02:00
Daniel Molkentin
4527784905
Second part of #1661
...
- QT_INSTALL_TRANSLATIONS was not defined in Qt5
- Some languages have been split up in multiple qm's. We only need qtbase for now
2014-10-16 11:08:29 +02:00
Klaas Freitag
ee8a93ae9a
ownSql: Proper initialization of errId
2014-10-16 10:39:10 +02:00
Klaas Freitag
89c51e7649
ownsql: Implement the transaction functions.
2014-10-15 19:47:25 +02:00
Olivier Goffart
2bba4134fb
owncloudgui: Fix a small leak
...
The systray icon were not destroyed while qutting
2014-10-15 18:11:52 +02:00
Klaas Freitag
336c95ce5b
ownsql: Cleanups: In modern C++, we use 0 instead of NULL
2014-10-15 16:46:39 +02:00
Klaas Freitag
babe891242
SyncEngine: Show a warning if post update script can not be exec.
2014-10-15 16:43:58 +02:00
Klaas Freitag
eeb5ca42e0
ownsql: Added some paranthisis to make clear whats happening.
2014-10-15 13:29:25 +02:00
Daniel Molkentin
03ee742981
Correct lookup logic for Qt translations
...
Fixes #1661
2014-10-15 09:33:38 +02:00
Klaas Freitag
0094c1ecf5
Make the sync work with new sql implementation.
2014-10-14 20:51:51 +02:00
Klaas Freitag
357c08c5b3
NewSQL: minor fixes to get stuff going
2014-10-14 12:18:33 +02:00
Klaas Freitag
e7d9ec50dc
Merge branch 'sqlite_capi' of github.com:owncloud/mirall into sqlite_capi
...
Conflicts:
src/mirall/socketapi.cpp
2014-10-14 11:43:10 +02:00
Klaas Freitag
09b0ba31ef
Sql: New implementation of ownSql class to go away from Qt's own Sql
2014-10-14 11:14:57 +02:00
Klaas Freitag
26ffa078ef
SocketAPI: Cache database conections and statements
2014-10-13 17:31:40 +02:00
Markus Goetz
eb60aca34f
SyncJournalDB: Clarify debug message
2014-10-13 17:29:26 +02:00
Markus Goetz
4d3020421a
SocketAPI: Remove old dbFileRecord function
...
We will use the _capi functions
2014-10-13 17:29:26 +02:00
Markus Goetz
f1ce0a1cf3
SocketAPI: Use non-recursive (heuristic) computation of icons
2014-10-13 17:29:26 +02:00
Klaas Freitag
dd28a645a1
SocketAPI: Cleanup, removed helper namespace, added as private methods.
2014-10-13 15:38:57 +02:00
Klaas Freitag
561e3c780d
socketapi: if the filename is empty, it's actually /
2014-10-13 15:36:13 +02:00
Klaas Freitag
46fd79604d
JournalDb: Do not use static variable for path.
2014-10-13 14:49:53 +02:00
Klaas Freitag
d08c2de619
Use sqlite C api.
2014-10-13 14:14:43 +02:00
Jürgen Weigert
07bcaaebf9
unreachable --version code made reachable.
...
error message improved.
2014-10-12 19:28:13 +02:00
Markus Goetz
b285e98988
SQlite: Print versions we use
2014-10-11 17:33:35 +02:00
Klaas Freitag
ab40ba2f75
owncloudcmd: Handle trust ssl switch correctly by overwriting trustssl
...
method in a subclass of HTTPCredentials.
2014-10-11 17:17:43 +02:00
Klaas Freitag
bbcb8ba3e7
credentials: Allow to trust ssl certs in subclasses of HTTPCredentials.
...
This allows to handle the --trust option in owncloudcmd. In the
owncloudcmd subclass of the httpcredentials, we allow to manually trust
the ssl certificate through a command line switch.
2014-10-11 17:17:43 +02:00
Markus Goetz
ef48de34f7
Logger: Log the thread pointer
...
Maybe we can somehow reduce this to make it not so many characters wide?
2014-10-11 16:58:47 +02:00
Olivier Goffart
7e898cf60c
SelectiveSync: rename blacklist to selectiveSyncBlackList in some places
...
Issue #2301
2014-10-11 16:24:45 +02:00
Klaas Freitag
2f5cea0e73
owncloudcmd: Add a custom ssl verification callback for neon.
...
That fixes the SSL related problems we had with ci.owncloud.org
2014-10-11 15:55:37 +02:00
Olivier Goffart
282abdd804
Sync engine: Restart sync when we get a precondition failed error
2014-10-11 15:40:28 +02:00
Olivier Goffart
9b178c5bb2
Sync engine: Do not write to the database too early
...
It is possible that we have should_update_etag set to true for files
that we also need to propagate. In which case we must not write to the DB
too early as this could cause data loss. (cf: issue #2296 )
2014-10-11 15:40:28 +02:00
Klaas Freitag
d491663143
owncloudcmd: Fix some slash screwup, to make the split succeed bug #2211
2014-10-11 15:14:07 +02:00
Klaas Freitag
8eaeba6486
owncloudcmd: Fix url handling with csync, make owncloudcmd sync again.
...
This fixes mirall issue #2211
2014-10-11 12:21:26 +02:00
Daniel Molkentin
77d2cba155
owncloudcmd: don't prompt for password if it was provided
2014-10-10 18:04:00 +02:00
Daniel Molkentin
2149092c7a
owncloudcmd: Fix crash
2014-10-10 18:04:00 +02:00
Olivier Goffart
100d1361b6
Add Folder wizard: Sort the folders when selecting the remote folder
...
Issue #1872
2014-10-10 16:56:05 +02:00
Daniel Molkentin
76f5266fa1
Fix small inefficiency in socketapi
2014-10-10 16:20:57 +02:00
Daniel Molkentin
3ebe3b1196
Use local socket (named pipe) connection also on Windows
2014-10-10 15:57:05 +02:00
Daniel Molkentin
c4f96c2fba
owncloudcmd: Implement --version, fix strings
...
Part of #2211
2014-10-10 15:55:58 +02:00
