1
0
Fork 0
Commit Graph

5303 Commits

Author SHA1 Message Date
Klaas Freitag 39924d79cb Add new test to test the csync database code. 2014-03-20 11:15:28 +01:00
Klaas Freitag f7866aabde Add C++ extern "C" 2014-03-20 11:15:28 +01:00
Klaas Freitag eb59f98ec9 Fix quoting of query by text. 2014-03-20 11:15:28 +01:00
Klaas Freitag c3cee3426e Improved database access code for csync.
- Use precompiled database statements
- Store them in the csync context struct
- Hand whole context as parameter to db access functions
2014-03-20 11:15:28 +01:00
Klaas Freitag f21dd05c2d Streamline logging. 2014-03-20 11:15:28 +01:00
Klaas Freitag 6005b9c16e Remove some superflous logging. 2014-03-20 11:15:28 +01:00
Mr. Jenkins 77bf37c6f6 [tx-robot] updated from transifex 2014-03-20 01:26:23 -04:00
Mr. Jenkins 8e133dc8ea [tx-robot] updated from transifex 2014-03-19 01:26:24 -04:00
Daniel Molkentin d10aec6055 NSIS: Install owncloudcmd on Windows 2014-03-18 23:56:50 +01:00
Klaas Freitag 9d1208baa4 Also allow http and https protocols. 2014-03-18 17:10:03 +01:00
Klaas Freitag 8e914deb99 Revert "Do not rely on the url scheme owncloud(s) any more."
This reverts commit 34dd3b207e.
It can be implemented simpler.
2014-03-18 16:57:01 +01:00
Klaas Freitag 34dd3b207e Do not rely on the url scheme owncloud(s) any more.
If it is not owncloud or ownclouds, rely on the scheme
that was given by the user.
2014-03-18 14:16:50 +01:00
Klaas Freitag 68e8d659fb Remove unused code. 2014-03-18 14:16:06 +01:00
Mr. Jenkins f79765a536 [tx-robot] updated from transifex 2014-03-18 01:26:28 -04:00
Daniel Molkentin eef57032f8 OCUpdater: Compare to the current version
Fixes #1548
2014-03-18 00:28:26 +01:00
Olivier Goffart 6377dca4b0 Add the file and line number of the debug in the debug view 2014-03-17 12:15:45 +01:00
Olivier Goffart f05320c32c Clean the debug a bit 2014-03-17 12:15:16 +01:00
Olivier Goffart b0f8a24c20 CSyncThread was renamed, give proper names in Folder
take in account that the object live in the same thread
2014-03-17 11:47:23 +01:00
Olivier Goffart c841b9c0c4 Remove unused libsync_HEADERS
This was unused and is redudent with owncloudsync_HEADERS
2014-03-17 11:36:53 +01:00
Olivier Goffart 7b482c0e96 Rename CSyncThread to SyncEngine
CSyncThread has not been a thread for a long time now
2014-03-17 11:34:51 +01:00
Olivier Goffart bf5091d862 Merge branch '1.5' 2014-03-17 11:26:28 +01:00
Olivier Goffart 5c45ede4a5 Read the quota as double
The server is sending floating point number when the amount of storage
is set to a custom number (say 1.2GB)

This should fix #1374
2014-03-17 10:37:06 +01:00
Olivier Goffart cabcdd890e Only run the CheckQuota job if the account is connected
We use another job to check the connection.
And this may cause wrong password failure as we are still in the wizzard

Fixes #1567
2014-03-17 10:35:43 +01:00
Olivier Goffart 0a5e691ba3 Remove debug output that might cause a crash
The account may not be finilized when this is called while the
wizzard is still running on first connection
2014-03-17 10:22:14 +01:00
Olivier Goffart ba300c2fc1 Fix memory leak: Don't use raw pointers 2014-03-17 10:04:42 +01:00
Mr. Jenkins c74e7550af [tx-robot] updated from transifex 2014-03-17 01:26:59 -04:00
Jenkins for ownCloud 0f385db314 [tx-robot] updated from transifex 2014-03-16 03:17:49 -04:00
Mr. Jenkins 2396831846 [tx-robot] updated from transifex 2014-03-16 02:19:35 -04:00
Mr. Jenkins adb868a63b [tx-robot] updated from transifex 2014-03-15 01:26:42 -04:00
Olivier Goffart 62e95e540b Remove Progress::Kind
It's not really used,  one need to  look at the instruction of the items
being processed to see what happens
2014-03-14 18:43:23 +01:00
Olivier Goffart d744b5e481 Fix the file count in the progress
And clear the ignored files between syncs
2014-03-14 18:29:23 +01:00
Olivier Goffart f9b82d852c Do not destroy the settings dialog when it is hidden.
That way the protocol widget stay filled.
And the state is kept
2014-03-14 17:39:20 +01:00
Olivier Goffart 33289bde29 Merge remote-tracking branch 'origin/1.5'
Conflicts:
	CMakeLists.txt
	VERSION.cmake
	src/CMakeLists.txt
2014-03-14 17:27:50 +01:00
Olivier Goffart 9053662fe8 remove Progress::SyncProblem and the problem slots
They are merged into normal progress
2014-03-14 17:18:26 +01:00
Markus Goetz 07904e078a CSyncThread: Emit a signal for each file before propagate
This can be used to display info before the sync is happening
2014-03-14 14:08:32 +01:00
Olivier Goffart aacc278583 Refactor the progress
Consider that there might be several files processed at the same time
2014-03-14 13:32:32 +01:00
Klaas Freitag 57aa86910c Add dependency on mingw32-sqlite, needed for make package 2014-03-13 14:02:48 +01:00
Mr. Jenkins 7071c895df [tx-robot] updated from transifex 2014-03-13 01:26:36 -04:00
Daniel Molkentin 87f3755b1f Deploy with Qt5 2014-03-13 00:52:01 +01:00
Daniel Molkentin 3f4bcbbd62 Find Qt5 version of QtKeychain when built with Qt5 2014-03-12 18:38:59 +01:00
Daniel Molkentin 955b932806 Qt5: QtLocation is not required 2014-03-12 18:23:45 +01:00
Daniel Molkentin e7b6560c39 cmake: Remove debug 2014-03-12 18:20:45 +01:00
Daniel Molkentin 80e583c337 Error out if a Qt module is missing
Fixes #1487
2014-03-12 18:18:02 +01:00
Daniel Molkentin bc3d298491 Find QtKeychain on multiarch Debian/Ubuntu 2014-03-12 18:17:43 +01:00
Daniel Molkentin 28cf9ce1a4 Properly abort if QtKeychain is not found
Fixes #1486
2014-03-12 17:55:30 +01:00
Markus Goetz d5fd6309ed CMake: Fix target_link_libraries parameters 2014-03-12 15:03:11 +01:00
Markus Goetz a2467b5dea CMake: Do options one directory above
This fixes linking when keychain was not desired.
2014-03-12 14:20:38 +01:00
Mr. Jenkins f723d11d90 [tx-robot] updated from transifex 2014-03-12 01:25:59 -04:00
Denis Dzyubenko aee4c06b8d Renamed a member variable to have underscore prefix for consistency 2014-03-11 20:34:00 +01:00
Denis Dzyubenko 89a4833cae Fixed a memory leak in FSEvents folderwatcher backend 2014-03-11 20:34:00 +01:00