Daniel Molkentin
0a96aa3aaf
Merge pull request #2307 from owncloud/fix-version-jw
...
owncloudcmd --version needs this.
2014-10-12 20:17:57 +02:00
Jürgen Weigert
07bcaaebf9
unreachable --version code made reachable.
...
error message improved.
2014-10-12 19:28:13 +02:00
Jenkins for ownCloud
0cde7c8ac1
[tx-robot] updated from transifex
2014-10-12 01:25:42 -04: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
Jenkins for ownCloud
631e67949e
[tx-robot] updated from transifex
2014-10-11 01:25:35 -04: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
Olivier Goffart
d880f2ffbc
propagator: Do not show an error message saying it was done by user interaction if it was not
...
There is many reasons why we could abort (for example timeouts)
And in this case we should not show to the user it was aborted
by user interaction
2014-10-10 14:58:56 +02:00
Markus Goetz
f8f5a7ceaa
OS X Overlay Icons: Fix static analyzer warnings
2014-10-10 11:44:40 +02:00
Markus Goetz
b01839e9a4
OS X: Remove dead JSON code
2014-10-10 11:44:40 +02:00
Markus Goetz
75dbf12ae6
CSync: Remove dead code
2014-10-10 11:44:40 +02:00
Klaas Freitag
9bb89dced5
Less offensive logging, only use error if there was one.
2014-10-10 10:16:59 +02:00
Olivier Goffart
661fe5df66
csync_statedb: fix inverted logic in testing if the sqlite was compiled with threads
2014-10-10 10:12:54 +02:00
Jenkins for ownCloud
8a93437e55
[tx-robot] updated from transifex
2014-10-10 01:25:39 -04:00
Olivier Goffart
b20752f13e
Fix the build with clang and Qt4
2014-10-09 17:54:46 +02:00
Klaas Freitag
61967f6e1b
csync tests: conform to read only db.
2014-10-09 17:45:20 +02:00
Markus Goetz
f0fef4f232
OS X: Fix .app creation for non-system Qt
2014-10-09 16:50:03 +02:00
Daniel Molkentin
7eb10a08b8
SSL error dialog: Remove debug noise
2014-10-09 16:49:31 +02:00
Olivier Goffart
4c83653d5d
Selective sync: do not upload or rename file that would ends up in a not selected folder
...
Issue #2283
2014-10-09 16:50:03 +02:00
Christian Kamm
3149cd03be
Sync scheduling: Never enqueue a folder while it is synced.
...
Issues: #2268 , #2275
2014-10-09 15:55:10 +02:00
Christian Kamm
5314765410
fix compile
2014-10-09 15:55:10 +02:00
Olivier Goffart
621a37be15
Selective sync: Remove the etag of parent folders in the db when adding or removing items in the selective sync blacklist
2014-10-09 15:28:51 +02:00
Olivier Goffart
6de104a03a
Selective Sync: ensure that the blacklist contains the last '/'
...
In the sync engine. Because that makes tha tthe lower_bounds in selective sync works properly.
For example, if both "Test" and "Test Test" are in the list, then "Test/Foo" would match the "Test Test"
because slash is after space
Task #2289
2014-10-09 15:11:04 +02:00
Olivier Goffart
97560509ea
Selective sync: change the text of the label.
...
Selective sync is a black list. Unchecked folder are blacklisted
Partially checked folders are not in the blacklist and the files there
are sync'ed
2014-10-09 14:36:26 +02:00
Markus Goetz
32aaecd832
macdeployqt: Fix missing symbol
2014-10-09 12:07:00 +02:00
Christian Kamm
dfba8fbe5e
CheckServerJob: Require status code 200. #2290
2014-10-09 11:06:00 +02:00
Klaas Freitag
32fea6523f
Use climits for ULONG_MAX rather than modern C++ option
2014-10-09 11:03:07 +02:00
Klaas Freitag
d1c1a18226
SyncJournal: Use precompiled statement in blacklist query.
2014-10-09 10:05:20 +02:00
Klaas Freitag
04558beabe
SyncJournal: Use the NOCASE Collate for blacklist query.
2014-10-09 10:05:20 +02:00
Klaas Freitag
425d0d77c5
Two little typo fixes.
2014-10-09 10:05:20 +02:00
Klaas Freitag
edf7cd29dd
csync statedb: Set PRAGMA synchronous to NORMAL for read only db.
2014-10-09 10:05:20 +02:00
Klaas Freitag
27318dded6
csync statedb: Issue a warning if sqlite is not compiled thread safe.
2014-10-09 10:05:20 +02:00
Klaas Freitag
11fe0c5b4b
csync statedb: Open the statedb in read only mode and with mutex set.
...
For that, sqlite3_open_v2 is used with the appropiate flags.
2014-10-09 10:05:20 +02:00
Christian Kamm
886f9d82f2
Sync scheduling: Improve logging. #2275
2014-10-09 09:01:35 +02:00
Jenkins for ownCloud
4f2fb4af5d
[tx-robot] updated from transifex
2014-10-09 01:25:28 -04:00
Daniel Molkentin
6c8eab734e
Remove C++11ism that doesn't work with older GCCs
2014-10-08 18:56:30 +02:00
Daniel Molkentin
9d5d6aff38
Q_DECL_OVERRIDE for Qt4 only for GCC >= 4.7
2014-10-08 18:55:41 +02:00
