Olivier Goffart
92309013da
SyncEngine: make abort and closing more robust
...
We first need to set the abort flag to csync and then aborting the discovery
job, otherwise, the discovery thread could start a new job in the mean time.
We also need to make sure that the thread has existed before we destroy the
exclude list.
2016-06-16 08:26:33 +02:00
Jenkins for ownCloud
4895589e4d
[tx-robot] updated from transifex
2016-06-16 02:18:46 -04:00
Jocelyn Turcotte
cb50fae0a7
SocketAPI: Move the normalization closer to the data entrance ( #4972 )
...
Follow-up for #4884
2016-06-15 21:03:21 +02:00
Jocelyn Turcotte
05d199881e
Merge pull request #4971 from owncloud/fixAccountHandleSslErrorsCrash
...
Attempt to fix the Account::slotHandleSslErrors crash
2016-06-15 18:53:47 +02:00
Jocelyn Turcotte
147cf798a6
Attempt to fix the Account::slotHandleSslErrors crash
...
Events from the crash reporter suggest that the QNAM and its
child replies might get deleted before returning from this method
and the only possible cause we can see is that the inner event
loop has something to do with it.
Try keeping a ref on the QNAM while in this method to make sure
that it won't get deleted by the inner event loop.
2016-06-15 18:12:02 +02:00
Jocelyn Turcotte
d40c56eda5
Account: Use smart pointers to hold its credentials and QNAM objects
...
Also make sure that both use QObject::deleteLater as their delete
function.
2016-06-15 18:12:01 +02:00
Olivier Goffart
6dade0b114
PropagateUpload: fix crash in PUTFileJob::slotTimeout
...
Same fix as in commit 60c101d9
2016-06-15 14:32:25 +02:00
Jenkins for ownCloud
5de44407bf
[tx-robot] updated from transifex
2016-06-15 02:18:44 -04:00
Jenkins for ownCloud
2df741e456
[tx-robot] updated from transifex
2016-06-14 02:18:36 -04:00
Olivier Goffart
8b5f71f49e
Fix docker build instruction for windows
2016-06-13 15:30:39 +02:00
Jenkins for ownCloud
77791ccb34
[tx-robot] updated from transifex
2016-06-13 02:18:35 -04:00
Jenkins for ownCloud
a6e4f9939c
[tx-robot] updated from transifex
2016-06-12 02:18:35 -04:00
Jenkins for ownCloud
523cdff1cf
[tx-robot] updated from transifex
2016-06-11 02:18:33 -04:00
Jenkins for ownCloud
c4d6277ce3
[tx-robot] updated from transifex
2016-06-10 02:18:39 -04:00
Jenkins for ownCloud
73cc3a4fd4
[tx-robot] updated from transifex
2016-06-10 01:15:55 -04:00
Christian Kamm
d655074f85
Log: Include start of propagation and lap duration
2016-06-09 14:28:15 +02:00
Christian Kamm
85a173e174
Log: Write the sync log during propagation #3108
...
...instead of when done with the sync. This way we get information
even if the client crashes.
2016-06-09 14:10:47 +02:00
Christian Kamm
87b4693a9d
Add error message for trailing spaces on Windows #4878
2016-06-09 12:41:02 +02:00
ckamm
28c12a3ca0
Move touched-files tracking to SyncEngine #4927 ( #4946 )
2016-06-09 12:07:18 +02:00
Jenkins for ownCloud
70196eb48c
[tx-robot] updated from transifex
2016-06-09 02:26:12 -04:00
Jenkins for ownCloud
9b249716a3
[tx-robot] updated from transifex
2016-06-08 02:19:30 -04:00
Jürgen Weigert
a4b46db91e
Merge pull request #4949 from owncloud/jnweiger-tray-patch-patch-patch
...
Update accountsettings.cpp fixing the tray-patch
2016-06-07 15:59:53 +02:00
Jürgen Weigert
ebc44fa494
Update accountsettings.cpp
2016-06-07 14:21:50 +02:00
ckamm
355a8a0a27
Workaround for Ubuntu 16.04 tray issue #4944 ( #4947 )
2016-06-07 11:48:25 +02:00
Christian Kamm
66f041f74c
Fix Qt4 build
2016-06-07 10:05:57 +02:00
Christian Kamm
6d02d76cfd
Fix compile warnings in tests
2016-06-07 09:43:04 +02:00
Christian Kamm
48efbcb8ca
Merge remote-tracking branch 'origin/2.2'
2016-06-07 09:39:44 +02:00
Jenkins for ownCloud
ab050f9093
[tx-robot] updated from transifex
2016-06-07 02:19:44 -04:00
Jenkins for ownCloud
bf9cffe4b3
[tx-robot] updated from transifex
2016-06-06 02:19:25 -04:00
Carla Schroder
43f727cf69
fix win install instructions: build path and docker image name ( #4901 )
2016-06-05 10:56:56 +02:00
Jenkins for ownCloud
256331fbaa
[tx-robot] updated from transifex
2016-06-05 02:18:37 -04:00
Jenkins for ownCloud
32e6585ae6
[tx-robot] updated from transifex
2016-06-04 02:19:18 -04:00
Olivier Goffart
d072e4a678
Fix compilation on windows
2016-06-03 13:28:53 +02:00
Olivier Goffart
b99c8fe28b
Folder: fix removing folder with escaped characters ( #4943 )
...
FolderDefinition::save and load escapes the alias. We also need to escape
it when we remove it.
New folder can't be created with alias that needs escaping, but old folder
from old config may still exist, and we must allow user to delete them.
2016-06-03 13:10:01 +02:00
Olivier Goffart
5a3120bd52
Folder: Ignore change from the watcher if the file has not changed its mtime or size ( #4942 )
...
For issue #4927 :
On Windows 10, we get a notification after the sync is finished for file that were
just downloaded. The guard we have against our "own changes" are only working when
the sync is running and the OwncloudPropagator still alive.
2016-06-03 13:06:11 +02:00
Jenkins for ownCloud
9ea69be6ab
[tx-robot] updated from transifex
2016-06-03 02:19:51 -04:00
Jenkins for ownCloud
86680a53e0
[tx-robot] updated from transifex
2016-06-03 01:15:59 -04:00
Daniel Molkentin
801cb42d57
Merge pull request #4939 from owncloud/osx_filewatcher_fix
...
OS X filewatcher fix
2016-06-02 18:37:38 +02:00
Markus Goetz
51f8a59a9a
OS X: White-list the folder watcher enums
...
I got syncs triggered for even opening a file by double clicking it in Finder
and having launched Preview.app (e.g. for JPEG files).
2016-06-02 18:20:07 +02:00
Daniel Molkentin
ebbe5acf2b
Merge pull request #4938 from owncloud/fix_4840
...
GUI: don't force the environment variable for high DPI on linux.
2016-06-02 18:13:25 +02:00
Olivier Goffart
6ccd9e872d
GUI: don't force the environment variable for high DPI on linux.
...
Setting the Environment variable only for owncloud makes in inconsistant with
other Qt application running at the same time.
The users can still set it themself for the whole desktop if they wish.
Addresses #4840
2016-06-02 17:57:10 +02:00
Daniel Molkentin
da69756bb0
Merge pull request #4935 from owncloud/fix_updater_memleak
...
Fix memleak in updater
2016-06-02 15:36:49 +02:00
Daniel Molkentin
1787da8a9d
Fix memleak in updater
2016-06-02 15:03:52 +02:00
Giovanni Capuano
f0f82d02ff
Fix link to the binary packages in README.md
2016-06-02 14:55:48 +02:00
Jenkins for ownCloud
ff20cd4d57
[tx-robot] updated from transifex
2016-06-02 02:19:35 -04:00
Jenkins for ownCloud
9ab812f89b
[tx-robot] updated from transifex
2016-06-01 02:19:17 -04:00
Jenkins for ownCloud
e031f7d090
[tx-robot] updated from transifex
2016-06-01 01:18:50 -04:00
Markus Goetz
de82d8fcdb
QNAM: Try to workaround missing Qt patches #4720 #3888 #4051
...
We try this on all platforms now so we have more consistent behaviour.
2016-05-31 10:26:52 +02:00
Stephen Colebrook
af2b712dc6
Search results are filtered by server. Don't filter a second time.
...
Also allows searching on attributes other than displayname in ldap
configurations. Search results match web and mobile apps.
2016-05-31 09:46:52 +02:00
Stephen Colebrook
d4b72132d6
Search results are filtered by server. Don't filter a second time. Also allows searching on attributes other than displayname in ldap configurations. Search results match web and mobile apps. ( #4902 )
2016-05-31 09:45:38 +02:00
