Daniel Molkentin
3f5887cc03
Merge pull request #2565 from owncloud/accountsettings_itemsontop
...
Refactor generic settings dialog
2014-12-01 15:01:45 +01:00
Olivier Goffart
fb3f5d86cf
Fix compilation after merge
2014-12-01 14:41:39 +01:00
Olivier Goffart
512492bf30
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/libsync/propagatedownload.cpp
2014-12-01 14:37:47 +01:00
Olivier Goffart
2477c3914e
csync_update: Ignore a difference of time of exactly one hour
...
Issue #2438
2014-12-01 13:53:30 +01:00
Daniel Molkentin
afee1ee1c0
Make all ptr-based members either const or check for their existance
2014-12-01 13:08:49 +01:00
Daniel Molkentin
f233593909
Add missing accounts icon
2014-12-01 13:07:44 +01:00
Olivier Goffart
3253cc38b2
Propagator upload: Mark error while opening the file as SoftError
...
Because otherwise a lot of error are shown to the user when
the user deletes a directory that is syncing
Task #1981
2014-12-01 12:22:52 +01:00
Olivier Goffart
b154e1baa1
Nautilus shell integration: Use fallback when XDG_RUNTIME_DIR is not defined
...
Same fallback as in Qt5
Task #2477
2014-12-01 12:06:09 +01:00
Daniel Molkentin
714599aeaa
Refactor generic settings dialog
...
- move items on top like on Mac OS (right is free for accounts now)
- The account icon no longer reflects the current status (in prep for multi-account)
2014-12-01 11:37:06 +01:00
Jenkins for ownCloud
119a9983a9
[tx-robot] updated from transifex
2014-11-30 01:25:22 -05:00
Jenkins for ownCloud
8866494c94
[tx-robot] updated from transifex
2014-11-29 02:06:10 -05:00
Jenkins for ownCloud
2e06b4be66
[tx-robot] updated from transifex
2014-11-29 01:25:23 -05:00
Jenkins for ownCloud
0ec2e71f58
[tx-robot] updated from transifex
2014-11-28 01:25:25 -05:00
Olivier Goffart
fc3a8b944e
Propagator: Don't forget to mark the direcotry as finished if its first job fails
...
Otherwise we would go ahead and propagate the content of the directory
2014-11-27 15:36:13 +01:00
Olivier Goffart
2ed2ef3b28
Propagator QNAM: Fix resuming
...
We forgot to account the fact that we could have been resuming when
comparing the size of the Content-lenght to the size of the temporary file
2014-11-27 14:50:49 +01:00
Markus Goetz
a3c5da90d2
Update issue_template.md
2014-11-27 13:10:14 +01:00
Olivier Goffart
e7e91b6931
Revert "Folder: Don't blindly trigger sync on first EtagJob result"
...
We need to do a sync even if the etag was empty because we do not know
if this is because the etag really changed or because it was new.
Also, some part of the code rely on this fact to schedule a sync.
The fact that there is two sync with 30 sec at the beginning is not
a big problem, because we also need to do the sync the put the directory
etag in the db.
This reverts commit 1c001ee138
2014-11-27 12:50:36 +01:00
Olivier Goffart
1f9d02e7fa
Shibboleth: Fix our implemtnation of CookieJar::deleteCookie
...
It was deleting too many cookies.
That function is virtual in Qt5 and is used when adding cookie.
But some Shibboleth have several cookies with the same name, and we need to keep them.
Our implementaiton was meant to delete all the shiboleth cookies when we want to log out
2014-11-27 12:26:59 +01:00
Markus Goetz
0895ca3e4a
Update issue_template.md
2014-11-27 12:09:06 +01:00
Jenkins for ownCloud
2ee70db7cd
[tx-robot] updated from transifex
2014-11-26 01:25:24 -05:00
Olivier Goffart
c9c1547813
Compile with Qt4
...
(QSharedPointer::reset is only in Qt5)
2014-11-25 16:24:47 +01:00
Olivier Goffart
9a8c868793
Propagator upload: Remove debug output
2014-11-25 15:34:06 +01:00
Olivier Goffart
13ec5da84e
neon jobs: Start them in their thread.
2014-11-25 15:08:32 +01:00
Klaas Freitag
3e34d000f2
Propagator: Add the chunk size to PUT requests.
2014-11-25 10:21:33 +01:00
Olivier Goffart
12203461f0
Import the dolphin plugin
2014-11-24 15:06:08 +01:00
Olivier Goffart
a337564864
shell_integration/windows/OCShellExtensions/OCUtilTest: remove
...
We do not need it anymore
2014-11-24 14:53:37 +01:00
Olivier Goffart
734db6f932
propagate Upload: Let the poll job count for a job
...
In order to avoid that there are many concurrent poll jobs that takes
all the QNAM channel and causes timeouts of queued jobs
2014-11-24 13:33:13 +01:00
Olivier Goffart
d76e3c0488
Parallel chunk upload: abort all chunks if one of them errors out
2014-11-24 12:05:25 +01:00
Olivier Goffart
c0de20dda0
UploadDevice: reduce debug verbosity
2014-11-24 12:05:25 +01:00
Markus Goetz
79c37f9fe4
Poll Jobs: Properly use DB index
...
Why do we sometimes use 0-based, sometimes 1-based indices?
2014-11-24 11:35:39 +01:00
Jenkins for ownCloud
7f520a6f28
[tx-robot] updated from transifex
2014-11-24 01:25:22 -05:00
Jenkins for ownCloud
23f72ecf7b
[tx-robot] updated from transifex
2014-11-23 01:25:22 -05:00
Jenkins for ownCloud
8c57e7621b
[tx-robot] updated from transifex
2014-11-22 01:25:37 -05:00
Olivier Goffart
c460b3f3be
Bandwith manager: It needs do be initialiazed after the limits of the propagator
2014-11-21 16:55:46 +01:00
Markus Goetz
1c001ee138
Folder: Don't blindly trigger sync on first EtagJob result
...
For #2352
2014-11-21 16:47:15 +01:00
Markus Goetz
fab82107bb
OS X: Don't use hardcoded name in packages file
2014-11-21 16:34:30 +01:00
Olivier Goffart
78362af168
Compile with TOKEN_AUTH_ONLY
...
(QtGui is not included in that case)
2014-11-21 12:15:41 +01:00
Olivier Goffart
1c58b75ac2
Merge branch '1.7'
2014-11-21 11:08:20 +01:00
Olivier Goffart
41568c885d
Propagator: only check the content-lenght if it is there
...
If content-lenght is 0, don't chack it is the size we recieved.
It can be zero when using HTTP chunk encoding.
Also do not remove the temporary file so it can be re-used on the next sync
and ask for a new sync immediatly to re-do the sync.
Fixup the fix to task #2528
2014-11-21 11:03:14 +01:00
Jenkins for ownCloud
dba2efe367
[tx-robot] updated from transifex
2014-11-21 02:52:45 -05:00
Christian Kamm
e3b07f569a
FolderWatcherTest: Use Utility::usleep.
2014-11-21 08:21:36 +01:00
Klaas Freitag
65a307970b
Propagator: Compare the actual file size with the request content length
...
The values must match. Otherwise the request did succeed, but the file
was not downloaded completely.
This fixes https://github.com/owncloud/mirall/issues/2528
2014-11-20 18:49:34 +01:00
Christian Kamm
3e3ca14b4c
Print ssl library version only on Qt >=5.0.0.
2014-11-20 13:46:44 +01:00
Christian Kamm
8b45d1c928
Sync: Change force-sync interval to 2h everywhere. #2297
2014-11-20 13:38:32 +01:00
Christian Kamm
0fe7a69b39
FolderWatcher: Detect own changes. #2297
2014-11-20 13:16:29 +01:00
Christian Kamm
6d09f1b6c0
Folder watcher now reports changing paths instead of dirs.
2014-11-20 12:51:16 +01:00
Christian Kamm
1ada20ac7b
Linux folderwatcher: Get full path of changed file. #2297
2014-11-20 12:42:59 +01:00
Christian Kamm
d04eedeb8d
OSX: Trust the file watcher. #2297
...
* Use a bigger default force sync interval (2h)
* Allow the file watcher to schedule a sync while a sync for
the same file is running.
2014-11-20 12:42:59 +01:00
Christian Kamm
f275002ebe
Merge branch '1.7'
2014-11-20 12:41:06 +01:00
Christian Kamm
d4e0941c27
Windows filewatcher: switch to ReadDirectoryChangesW.
...
Based on danimo's #2454 fix for #2455 and related to #2297 .
2014-11-20 12:36:17 +01:00
