Jenkins for ownCloud [Sun, 19 Jun 2016 06:18:34 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 18 Jun 2016 06:18:33 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Markus Goetz [Fri, 17 Jun 2016 08:31:30 +0000 (10:31 +0200)]
VERSION.cmake: This is 2.2.2
Jenkins for ownCloud [Fri, 17 Jun 2016 06:19:00 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Jocelyn Turcotte [Thu, 16 Jun 2016 13:27:10 +0000 (15:27 +0200)]
SocketAPI: Push new status of dirty files regardless when not synced (#4970)
The FolderWatcher inserts files to be marked as SYNC and we
currently assume that all file statuses will be updated by the
following sync. It's however possible that the FolderWatcher
notify us of a change that csync won't consider necessary to
propagate, in which case a new status wouldn't be pushed and
the file manager would continue showing this file as syncing.
Re-push the file status when emptying the dirty files list
before propagating to avoid this issue, most likely the OK
status.
Olivier Goffart [Thu, 16 Jun 2016 06:28:30 +0000 (08:28 +0200)]
Checksum speedup. (#4968)
No need to allocate (and initialize to 0) a 10 MiB buffer for each files, even
when most files are much smaller than that.
So make sure the buffer that we allocate is not bigger than the file size.
And Also 10 MiB is a bit big for a buffer. 500 KiB should be more than enough.
(Too big allocations can cause problem because of memory fragmentation and such)
Olivier Goffart [Wed, 15 Jun 2016 15:01:00 +0000 (17:01 +0200)]
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.
Jenkins for ownCloud [Thu, 16 Jun 2016 06:18:46 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jocelyn Turcotte [Wed, 15 Jun 2016 16:53:47 +0000 (18:53 +0200)]
Merge pull request #4971 from owncloud/fixAccountHandleSslErrorsCrash
Attempt to fix the Account::slotHandleSslErrors crash
Jocelyn Turcotte [Wed, 15 Jun 2016 16:05:56 +0000 (18:05 +0200)]
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.
Jocelyn Turcotte [Wed, 15 Jun 2016 15:57:28 +0000 (17:57 +0200)]
Account: Use smart pointers to hold its credentials and QNAM objects
Also make sure that both use QObject::deleteLater as their delete
function.
Olivier Goffart [Wed, 15 Jun 2016 12:32:25 +0000 (14:32 +0200)]
PropagateUpload: fix crash in PUTFileJob::slotTimeout
Same fix as in commit
60c101d9
From the crash reporter:
Crash
EXCEPTION_ACCESS_VIOLATION_READ at 0x4
qnetworkreply.cpp in QNetworkReply::request at line 476
propagateupload.cpp in OCC::PUTFileJob::slotTimeout at line 100
moc_abstractnetworkjob.cpp in OCC::AbstractNetworkJob::qt_static_metacall at line 98
qobject.cpp in QMetaObject::activate at line 3716
moc_qtimer.cpp in QTimer::timeout at line 192
qtimer.cpp in QTimer::timerEvent at line 247
qobject.cpp in QObject::event at line 1267
qapplication.cpp in QApplicationPrivate::notify_helper at line 3722
qapplication.cpp in QApplication::notify at line 3505
qcoreapplication.cpp in QCoreApplication::notifyInternal at line 932
Jenkins for ownCloud [Wed, 15 Jun 2016 06:18:44 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 14 Jun 2016 06:18:36 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Olivier Goffart [Mon, 13 Jun 2016 13:30:06 +0000 (15:30 +0200)]
Fix docker build instruction for windows
Jenkins for ownCloud [Mon, 13 Jun 2016 06:18:35 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 12 Jun 2016 06:18:35 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 11 Jun 2016 06:18:33 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 10 Jun 2016 06:18:39 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 9 Jun 2016 06:26:12 +0000 (02:26 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 8 Jun 2016 06:19:30 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Jürgen Weigert [Tue, 7 Jun 2016 13:59:53 +0000 (15:59 +0200)]
Merge pull request #4949 from owncloud/jnweiger-tray-patch-patch-patch
Update accountsettings.cpp fixing the tray-patch
Jürgen Weigert [Tue, 7 Jun 2016 12:21:50 +0000 (14:21 +0200)]
Update accountsettings.cpp
ckamm [Tue, 7 Jun 2016 09:48:25 +0000 (11:48 +0200)]
Workaround for Ubuntu 16.04 tray issue #4944 (#4947)
Jenkins for ownCloud [Tue, 7 Jun 2016 06:19:44 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 6 Jun 2016 06:19:25 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Carla Schroder [Sun, 5 Jun 2016 08:56:56 +0000 (01:56 -0700)]
fix win install instructions: build path and docker image name (#4901)
Jenkins for ownCloud [Sun, 5 Jun 2016 06:18:37 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 4 Jun 2016 06:19:18 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Olivier Goffart [Fri, 3 Jun 2016 11:28:44 +0000 (13:28 +0200)]
Fix compilation on windows
Olivier Goffart [Fri, 3 Jun 2016 11:10:01 +0000 (13:10 +0200)]
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.
Olivier Goffart [Fri, 3 Jun 2016 11:06:11 +0000 (13:06 +0200)]
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.
Jenkins for ownCloud [Fri, 3 Jun 2016 06:19:51 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Daniel Molkentin [Thu, 2 Jun 2016 16:37:38 +0000 (18:37 +0200)]
Merge pull request #4939 from owncloud/osx_filewatcher_fix
OS X filewatcher fix
Markus Goetz [Thu, 2 Jun 2016 16:12:47 +0000 (18:12 +0200)]
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).
Daniel Molkentin [Thu, 2 Jun 2016 16:13:25 +0000 (18:13 +0200)]
Merge pull request #4938 from owncloud/fix_4840
GUI: don't force the environment variable for high DPI on linux.
Olivier Goffart [Thu, 2 Jun 2016 15:57:10 +0000 (17:57 +0200)]
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
Daniel Molkentin [Thu, 2 Jun 2016 13:36:49 +0000 (15:36 +0200)]
Merge pull request #4935 from owncloud/fix_updater_memleak
Fix memleak in updater
Daniel Molkentin [Wed, 1 Jun 2016 22:51:24 +0000 (00:51 +0200)]
Fix memleak in updater
Giovanni Capuano [Thu, 2 Jun 2016 08:18:01 +0000 (10:18 +0200)]
Fix link to the binary packages in README.md
Jenkins for ownCloud [Thu, 2 Jun 2016 06:19:35 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 1 Jun 2016 06:19:17 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Markus Goetz [Tue, 31 May 2016 08:20:29 +0000 (10:20 +0200)]
QNAM: Try to workaround missing Qt patches #4720 #3888 #4051
We try this on all platforms now so we have more consistent behaviour.
Stephen Colebrook [Wed, 25 May 2016 22:52:33 +0000 (18:52 -0400)]
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.
Markus Goetz [Tue, 31 May 2016 07:35:04 +0000 (09:35 +0200)]
Connectivity: Reduce ETag job timeout to 60 sec #4275
Before it used the default job timeout
Jenkins for ownCloud [Tue, 31 May 2016 06:20:28 +0000 (02:20 -0400)]
[tx-robot] updated from transifex
Markus Goetz [Mon, 30 May 2016 16:15:41 +0000 (18:15 +0200)]
Connectivity: Delete job on timeout #4275
This was not done if there was no reply
Klaas Freitag [Mon, 30 May 2016 15:19:40 +0000 (17:19 +0200)]
Update changelog for 2.2.1
Daniel Molkentin [Mon, 30 May 2016 10:05:22 +0000 (12:05 +0200)]
Remove stray file
Daniel Molkentin [Mon, 30 May 2016 09:50:50 +0000 (11:50 +0200)]
Merge pull request #4923 from RobinGeuze/2.2
Fix Qt4 build
Robin Geuze [Mon, 30 May 2016 07:55:45 +0000 (09:55 +0200)]
Fix Qt4 build
Daniel Molkentin [Mon, 30 May 2016 07:20:50 +0000 (09:20 +0200)]
Merge pull request #4922 from owncloud/fix_4840
Don't try to determine pixel ratio with Qt < 5.6.0
Jenkins for ownCloud [Mon, 30 May 2016 06:41:51 +0000 (02:41 -0400)]
[tx-robot] updated from transifex
Daniel Molkentin [Mon, 30 May 2016 04:55:31 +0000 (06:55 +0200)]
Don't try to determine pixel ratio with Qt < 5.6.0
This seems to be broken. Worst case users can still
set it manually
Addresses #4840
Jenkins for ownCloud [Sun, 29 May 2016 06:18:52 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 28 May 2016 06:19:09 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Daniel Molkentin [Fri, 27 May 2016 16:08:08 +0000 (18:08 +0200)]
Merge pull request #4913 from owncloud/normalize_name_in_filestatus
Undo regression caused by
727e73d
Daniel Molkentin [Fri, 27 May 2016 14:03:59 +0000 (16:03 +0200)]
Undo regression caused by
727e73d
normalization to NFC is still required. Mac OS API will not take
care of that by default.
Resolves #4884
ckamm [Fri, 27 May 2016 10:08:42 +0000 (12:08 +0200)]
Certs: Re-ask for different cert after rejection #4898 (#4911)
Previously rejecting any kind of certificate meant that the user
was never asked again, even if the certificate changed.
Now we keep track of which certificates were rejected and ask again
if the ones mentioned in the ssl errors change.
mitmproxy is excellent for testing this.
ckamm [Fri, 27 May 2016 08:52:00 +0000 (10:52 +0200)]
Progress: Don't count items without propagation jobs #4856 (#4910)
* Progress: Don't count dirs without propagation jobs #4856
These directory SyncFileItems are necessary for bookkeeping
but should not influence the progress display at all.
* Progress: Skip ignored files #4856
Jenkins for ownCloud [Fri, 27 May 2016 06:19:21 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Olivier Goffart [Thu, 26 May 2016 10:15:53 +0000 (12:15 +0200)]
Utility: Better fix for the translation of minutes, seconds, ...
The plural was not translated because of QTBUG-3945. Work around it.
Issue #4855
Jenkins for ownCloud [Thu, 26 May 2016 06:33:30 +0000 (02:33 -0400)]
[tx-robot] updated from transifex
Olivier Goffart [Tue, 24 May 2016 13:17:35 +0000 (15:17 +0200)]
SyncEngine: cleanup setting isDirectory
Olivier Goffart [Wed, 25 May 2016 14:23:58 +0000 (16:23 +0200)]
Merge remote-tracking branch '2.1' into 2.2
Olivier Goffart [Wed, 25 May 2016 13:01:26 +0000 (15:01 +0200)]
SyncEngine: invalid the blacklist entry when the rename destination change
The problem in this case is if we rename the file "xxx" to "invalid\file".
The rename will fail because the new filename constains a slash, and it
will be blacklisted.
But then if the user re-rename the file to "valid_name", then we should
invalidate the blacklist entry and retry to upload. But we did not do
that because renaming don't change the mtime and we did not store the
rename target in the database
IL issue 558
Jenkins for ownCloud [Wed, 25 May 2016 06:19:18 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Markus Goetz [Tue, 24 May 2016 15:27:31 +0000 (17:27 +0200)]
sqlite: Update bundled version to 3.13.0
For OS X and Windows.
Markus Goetz [Tue, 24 May 2016 15:04:04 +0000 (17:04 +0200)]
Add ChangeLog for 2.2.1
Jenkins for ownCloud [Tue, 24 May 2016 11:40:14 +0000 (07:40 -0400)]
[tx-robot] updated from transifex
Daniel Molkentin [Tue, 24 May 2016 09:30:03 +0000 (11:30 +0200)]
Travis coverity: Enforce Ubuntu 14.04 env, fix repo
Daniel Molkentin [Tue, 24 May 2016 09:21:25 +0000 (11:21 +0200)]
Fix pot. mem leak found by coverity (CID 96004)
Daniel Molkentin [Tue, 24 May 2016 09:04:35 +0000 (11:04 +0200)]
Fix pot. mem leak found by coverity (CID 12900)
Jenkins for ownCloud [Tue, 24 May 2016 06:19:53 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
ckamm [Mon, 23 May 2016 07:03:03 +0000 (09:03 +0200)]
Remember to upload files that are locked during a sync run (#4865)
See owncloud/enterprise#1342
Jenkins for ownCloud [Mon, 23 May 2016 06:19:05 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 22 May 2016 06:19:13 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 21 May 2016 06:19:09 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Markus Goetz [Fri, 20 May 2016 14:58:44 +0000 (16:58 +0200)]
SyncEngine: Set isDirectory before syncItemDiscovered
(cherry picked from commit
fc1933803e86ac03d4d5f9c8a1911cd82f6579cb)
Markus Goetz [Fri, 20 May 2016 14:58:44 +0000 (16:58 +0200)]
SyncEngine: Set isDirectory before syncItemDiscovered
Markus Goetz [Fri, 20 May 2016 14:31:47 +0000 (16:31 +0200)]
Checksums: Use SHA1 like in >=2.2
Olivier Goffart [Fri, 20 May 2016 13:06:07 +0000 (15:06 +0200)]
Upload: put the job in the active list while doing the checksum computation.
This fixes an issue in which too many jobs are started un parallel
while uploading many files, which could cause too much memory usage as the
chunks are stored in memory.
Probably the fix for #4611
Christian Kamm [Wed, 2 Mar 2016 13:20:36 +0000 (14:20 +0100)]
Checksums: Compute content checksum on download #4375
Cherry-picked from
d6d35029
ckamm [Fri, 20 May 2016 13:07:54 +0000 (15:07 +0200)]
Progress info: Reset between syncs #4856 (PR #4872)
Jenkins for ownCloud [Fri, 20 May 2016 06:19:16 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 19 May 2016 06:19:20 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Markus Goetz [Wed, 18 May 2016 14:17:52 +0000 (16:17 +0200)]
Upload: Remove bandwidth quota debug message #4837
Olivier Goffart [Wed, 18 May 2016 08:20:29 +0000 (10:20 +0200)]
Utility: Fix translation of second, minute, hour
Issue #4855
A typo in the context string made the translation lookup fail.
But also the %Ln was not recognized as a plural form by transifex, so only
the singular was translated
Olivier Goffart [Tue, 17 May 2016 08:49:57 +0000 (10:49 +0200)]
FolderWizard: remove dead code and fix the alias
Remove a bunch of dead code.
And also set the root folder name properly since alias is gone.
Fix the warning:
QWizard::field: No such field 'alias'
Jenkins for ownCloud [Wed, 18 May 2016 06:19:16 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Olivier Goffart [Tue, 17 May 2016 10:28:07 +0000 (12:28 +0200)]
Shibboleth: Show the inspector if OWNCLOUD_SHIBBOLETH_DEBUG is set
Help to debug https://github.com/owncloud/enterprise/issues/1265
Jenkins for ownCloud [Tue, 17 May 2016 06:18:59 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 15 May 2016 06:19:07 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 14 May 2016 06:19:15 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
hefee [Fri, 13 May 2016 14:55:11 +0000 (16:55 +0200)]
A final release version number breaks this regex (#4835)
f.ex. a valid verson nr: 2.2.0
-> fist \d+ = 2
-> second \d+ = 2
-> the last \d+ = 0
-> .+ in not matching, because there is nothing to match
Jenkins for ownCloud [Fri, 13 May 2016 06:25:05 +0000 (02:25 -0400)]
[tx-robot] updated from transifex
Olivier Goffart [Thu, 12 May 2016 11:14:07 +0000 (13:14 +0200)]
SyncEngine: Add a compile option so we rename to restoring a move we don't have the permission to do
IL issue 550
Christian Kamm [Fri, 18 Mar 2016 11:41:57 +0000 (12:41 +0100)]
Fix compile with strict C flags
Christian Kamm [Thu, 17 Mar 2016 13:25:18 +0000 (14:25 +0100)]
Ignores: expand escapes #4568
(cherry picked from commit
d7bd1300a8397c2782e8d75cf7c595b1ada70d88)
Hefee [Tue, 10 May 2016 23:17:16 +0000 (01:17 +0200)]
For tests we do not need a xserver running.
Use for tests QTEST_GUILESS_MAIN and QTEST_APPLESS_MAIN.