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
Christian Kamm
705cd571a5
Download: Don't store message body if status != 2xx #2280
2014-10-08 14:18:29 +02:00
Christian Kamm
48d3c75745
GET: Retry if bad range header used. #2280
...
* If a 416 is returned and we used a Range header, try again
from scratch.
* The direct URL logic was also inconsistent for resumed downloads:
it sent the Range header but didn't check the returned
Content-Range header correctly. Now resuming is disabled for
direct URL downloads.
2014-10-08 14:18:29 +02:00
Markus Goetz
6fbd28d228
Merge branch 'overlayicon_cache' into 1.7
2014-10-08 11:02:58 +02:00
Christian Kamm
285cb78962
Sync scheduling: Don't always force-sync. #2268
...
If lastEtag was null, a force sync was triggered. Force syncs
don't update the etag. The etag retrieval job would only run if
lastEtag was not null. So it could never become non-null.
2014-10-08 10:51:32 +02:00
Christian Kamm
708655d9b2
fix incomplete rename
...
from 9bd7ffe952
2014-10-08 09:36:47 +02:00
Christian Kamm
9bd7ffe952
blacklist: Fix stale blacklist removal. #2247
...
Use the right check to determine whether a file has a blacklist entry,
SyncFileItem::FileIgnored was incorrect because that denotes files from
the ignore list or blacklisted files with no retries left.
The blacklistedInDb flag does the right thing. Rename it to
hasBlacklistEntry to be more explicit.
2014-10-08 09:17:40 +02:00
Markus Goetz
8febd90f2a
Propagator: Be less verbose
2014-10-08 09:07:29 +02:00
Jenkins for ownCloud
51109ea485
[tx-robot] updated from transifex
2014-10-08 01:25:32 -04:00
Daniel Molkentin
1579c23ff1
Fix order in which credentials are getting fetched
2014-10-07 18:21:22 +02:00
Markus Goetz
bf18ecae13
Propagator: Fix bw limiting bug, be less verbose in logging
2014-10-07 17:42:50 +02:00
Markus Goetz
89971925ca
Propagator: Be more verbose about propagator choice
2014-10-07 14:55:30 +02:00
Markus Goetz
2ba007ee4f
CMake: Add else() case for Qt detection
2014-10-07 14:46:55 +02:00
Markus Goetz
d1cc3c34c9
Propagator: Relative download limit
2014-10-07 14:46:55 +02:00
Markus Goetz
de79f9338a
Propagator: Bandwidth limiting for new propagator
2014-10-07 14:46:55 +02:00
Olivier Goffart
5471bfd5a8
No need to update mtime and etag after a move
...
The server keeps the mtime and etag anyway.
And changing the mtime also changes the etag and so make other clients re-download
the file instead of detecting the move
2014-10-07 09:13:13 +02:00
Daniel Molkentin
961df010cb
Propagator: Fix typo in Win32-only code
2014-10-06 15:39:49 +02:00
Jenkins for ownCloud
103986b320
[tx-robot] updated from transifex
2014-10-06 01:25:24 -04:00
Jenkins for ownCloud
764c0cdb03
[tx-robot] updated from transifex
2014-10-04 01:25:25 -04:00
Klaas Freitag
12b09fab67
CaseClash: more defensive logging on Windows.
2014-10-03 11:54:32 +02:00
Klaas Freitag
ed5a8ab090
Push version to beta3
2014-10-03 11:37:00 +02:00
