Christian Kamm [Thu, 16 Mar 2017 09:57:23 +0000 (10:57 +0100)]
About: Show the runtime versions of Qt and OpenSSL #5592
I didn't want to touch this visible translated string in a
patch release so I just switched the data.
For Qt versions before 5, we continue to show the build-time version
of OpenSSL but it's clearly marked as such.
Olivier Goffart [Thu, 16 Mar 2017 08:27:17 +0000 (09:27 +0100)]
SyncEngine: fix test regression in TestChunkingNG::testCreateConflictWhileSyncing
In
8ef11a38c99c6a33b175f1ad792ec02b52f88d25, we started blacklisting
SoftError for 0 seconds. But if the two sync happen with less than
1s interval, we would still prevent them to happen.
So make sure we expire if 0 seconds have expired
Jenkins for ownCloud [Thu, 16 Mar 2017 01:18:29 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Olivier Goffart [Wed, 15 Mar 2017 16:17:33 +0000 (17:17 +0100)]
Attempt to fix a crash in FolderStatusModel::slotUpdateDirectories
The backtrace looks like:
File "atomic_base.h", line 396, in QString::~QString
File "qlist.h", line 442, in OCC::FolderStatusModel::slotUpdateDirectories
This is the only QList operation, and it may crash if the list is empty.
It can be empty if the propfind returned empty results.
I'm not sure how this can be possible to have an empty list there since
the server is always supposed to return at least one entry, for the directory
itself. But it can happen if a directory was transformed in a file, or
if there is a bug on the server.
Christian Kamm [Tue, 14 Mar 2017 14:59:22 +0000 (15:59 +0100)]
HttpCreds: Update app passwords url #5605
See also owncloud/core#27360
Christian Kamm [Tue, 14 Mar 2017 14:57:57 +0000 (15:57 +0100)]
Account server version: Helper to create versions
Hex literals don't work well with version 10: 0x100000 doesn't do
the right thing.
Olivier Goffart [Wed, 15 Mar 2017 15:00:48 +0000 (16:00 +0100)]
Ignore list editor: adjust the size
The previous patch on this file made it a bit too big, so make it a bit smaller
For issue #5600
Jenkins for ownCloud [Wed, 15 Mar 2017 01:18:36 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Christian Kamm [Fri, 10 Mar 2017 14:32:25 +0000 (15:32 +0100)]
Add more versions to --version #5592
* Add git revision, if available
* Add SSL runtime version
* Add compile-time Qt version
Christian Kamm [Tue, 7 Mar 2017 10:47:38 +0000 (11:47 +0100)]
Windows/NTFS: Do not attempt to upload inaccessible files #5544
It is possible to create files with filenames that differ
only by case in NTFS, but most operations such as stat and
open only target one of these by default.
When that happens, we want to avoid uploading incorrect data
and give up on the file.
Typically this situation should never occurr during normal use
of Windows. It can happen, however, when a NTFS partition is
mounted in another OS.
Jenkins for ownCloud [Tue, 14 Mar 2017 01:18:30 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Olivier Goffart [Mon, 13 Mar 2017 16:05:24 +0000 (17:05 +0100)]
Ignore list editor: adjust the size of the columns in the table
So the title of the column is fully visible.
Adjust the default size and the size policy of the label so it behave
correctly as the window get resized
Issue #5600
Jenkins for ownCloud [Mon, 13 Mar 2017 01:18:30 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 12 Mar 2017 01:18:30 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 11 Mar 2017 01:18:38 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Christian Kamm [Mon, 20 Feb 2017 14:05:17 +0000 (15:05 +0100)]
Blacklist: Escalate repeated SoftError to NormalError #5500
Jenkins for ownCloud [Fri, 10 Mar 2017 01:18:30 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Olivier Goffart [Thu, 9 Mar 2017 08:41:36 +0000 (09:41 +0100)]
Propagator: Attempt to fix a crash in OwncloudPropagator::scheduleNextJob
The crash reporter shows many crashes in OwncloudPropagator::scheduleNextJob.
We don't really know what could be the cause, but it's probably because
the _activeJobList contains dangling pointer.
So this patch makes sure to remove all the jobs from this list as they get
destroyed.
Jenkins for ownCloud [Thu, 9 Mar 2017 01:18:30 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 8 Mar 2017 01:18:33 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Christian Kamm [Fri, 3 Mar 2017 10:20:53 +0000 (11:20 +0100)]
AbstractNetworkJob: Improve redirect handling #5555
* For requests:
- reuse the original QNetworkRequest, so headers and attributes
are the same as in the original request
- determine the original http method from the reply and the request
attributes
- keep the original request body around such that it can be sent
again in case the request is redirected
* Simplify the interface that is used for creating new requests in
AbstractNetworkJob.
Jenkins for ownCloud [Tue, 7 Mar 2017 01:18:31 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 7 Mar 2017 00:15:15 +0000 (01:15 +0100)]
[tx-robot] updated from transifex
Olivier Goffart [Mon, 6 Mar 2017 15:14:09 +0000 (16:14 +0100)]
ActivityListModel: fix possible crash in slotActivitiesReceived
Backtrace from the crash reporter:
Crash: EXCEPTION_ACCESS_VIOLATION_READ at 0x401
File "moc_activitylistmo_M5OEXJ7XGJYTWT.cpp", line 92, in OCC::ActivityListModel::qt_static_metacall
File "qobject.cpp", line 3730, in QMetaObject::activate
File "moc_networkjobs_7AMNCW4BBANVRK.cpp", line 1342, in OCC::JsonApiJob::jsonReceived
File "networkjobs.cpp", line 714, in OCC::JsonApiJob::finished
File "abstractnetworkjob.cpp", line 207, in OCC::AbstractNetworkJob::slotFinished
File "moc_abstractnetwor_PFI2TXGQHRE33H.cpp", line 98, in OCC::AbstractNetworkJob::qt_static_metacall
File "qobject.cpp", line 3730, in QMetaObject::activate
File "moc_qnetworkreply.cpp", line 367, in QNetworkReply::finished
File "qnetworkreplyhttpimpl.cpp", line 2100, in QNetworkReplyHttpImplPrivate::finished
File "qnetworkreplyhttpimpl.cpp", line 279, in QNetworkReplyHttpImpl::abort
My theory is that the AccountState stored in a property of the job was destroyed.
before the job timed out.
Therefore, the qobject_cast within the qvariant_cast would call the metaObject()
virtual function on a dangling pointer.
Fix it by storing a QPointer instead which will track the deletion.
Olivier Goffart [Mon, 6 Mar 2017 12:07:08 +0000 (13:07 +0100)]
Propagator: Fix finished signal of directory being emited twice and causing crash
When there is a FatalError, we ended up emiting the finished signal for
the directory job several times, which would lead to crashes
Issue #5578
Markus Goetz [Mon, 6 Mar 2017 14:40:10 +0000 (15:40 +0100)]
NSIS: Don't display link on finish page
Jenkins for ownCloud [Sun, 5 Mar 2017 01:18:29 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 4 Mar 2017 01:18:29 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Olivier Goffart [Fri, 3 Mar 2017 09:48:47 +0000 (10:48 +0100)]
2.3.0 was released: Update version
Olivier Goffart [Thu, 2 Mar 2017 08:57:14 +0000 (09:57 +0100)]
SslButton: Remove additional ')'
Regression since
7bfe0613827aa7cee93a77ccbedab9b07ea9ca78
Issue: #5573
Jenkins for ownCloud [Fri, 3 Mar 2017 01:18:27 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 2 Mar 2017 01:18:30 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 1 Mar 2017 01:18:28 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 28 Feb 2017 01:18:28 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jocelyn Turcotte [Mon, 27 Feb 2017 16:09:29 +0000 (17:09 +0100)]
Potential fix for crash in PropagateDirectory::abort (#5564)
Jenkins for ownCloud [Mon, 27 Feb 2017 01:18:29 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 26 Feb 2017 01:18:29 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 25 Feb 2017 01:18:28 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 24 Feb 2017 01:18:31 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Olivier Goffart [Thu, 23 Feb 2017 13:54:17 +0000 (14:54 +0100)]
Verify that all strings are properly escaped (#5558)
- I checked every occurence of a '%2' and make correct use of the
QString::arg overload that takes several argument instead of chaining
them, because the first argument can contains a '%1'
- I tried to look for every label that they either use plain text or richtext
and escape the user provided strings in there.
Jenkins for ownCloud [Thu, 23 Feb 2017 01:18:29 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Christian Kamm [Wed, 22 Feb 2017 12:04:26 +0000 (13:04 +0100)]
Wizard: Handle PROPFIND redirects #5553
By default, followRedirects is true for all requests, to transparently
handle redirections. In the wizard, we have special redirect-handling
code though and that was being skipped.
Setting the flag to false allows the wizard to be aware of redirects
and to handle them in the correct way. Tested with the server described
in
https://github.com/owncloud/administration/tree/master/redirectServer
There's a second bug here, where followRedirects always converts
redirected requests to the GET verb. That means redirected PROPFINDs
will never have worked. This change un-breaks them for the wizard only.
There should be no case that previously worked that stops working now.
Jenkins for ownCloud [Wed, 22 Feb 2017 01:18:36 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Markus Goetz [Tue, 21 Feb 2017 10:53:54 +0000 (11:53 +0100)]
Update ChangeLog
Jenkins for ownCloud [Tue, 21 Feb 2017 01:18:36 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Markus Goetz [Mon, 20 Feb 2017 12:58:35 +0000 (13:58 +0100)]
Message Boxes: Force to be more on top #5503 (#5536)
Jenkins for ownCloud [Mon, 20 Feb 2017 01:18:28 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 19 Feb 2017 01:18:28 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 18 Feb 2017 01:18:30 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Olivier Goffart [Fri, 17 Feb 2017 08:28:20 +0000 (09:28 +0100)]
Propagator: Fix t8.pl
The test sets OWNCLOUD_MAX_PARALLEL to 1 to disable parallelism.
But since the max amount of parallelism is twice as much, that does not
work.
So change the way we compute the hardMaximumActiveJob: Use the value of
OWNCLOUD_MAX_PARALLEL to maximize this amount and base the maximum amount
of transfer jobs on it instead of the other way.
A result of this change is that, in case of bandwidth limit, we keep the
default of 6 non-transfer jobs in parallel. I believe that's fine since
the short jobs do not really use bandwidth, so we can still keep the same
amount of small jobs.
Christian Kamm [Fri, 17 Feb 2017 15:21:54 +0000 (16:21 +0100)]
Revert "Don't blacklist 507 Insufficent Storage #5346 (#5424)"
This reverts commit
e1f5a49c21826590811710f73e37b7b72e256960.
Retrying uploads with insufficent storage errors frequently leads to
high server traffic. See #5537 for links and a sketch of a correct
solution.
Jocelyn Turcotte [Fri, 17 Feb 2017 13:05:47 +0000 (14:05 +0100)]
Revert "Fix TestSyncEngine::abortAfterFailedMkdir"
This reverts commit
1cec2ca13dc35aba6aaf79f42bde9a6dd00143a7
but keeps the reset() -> take() part that is probably the cause
of crashes we've seen in the crash reporter.
Jenkins for ownCloud [Fri, 17 Feb 2017 01:18:36 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Olivier Goffart [Thu, 16 Feb 2017 15:14:55 +0000 (16:14 +0100)]
AccessManager: don't set an invalid network configuration on linux (#5538)
If we call
setConfiguration(QNetworkConfiguration());
This sets an invalid configuration on the QNAM.
But later, when we really go online because interfaces are discovered,
QNetworkAccessManagerPrivate::_q_onlineStateChanged is called (with isOnline=true).
And this will set the state to disconnected because customNetworkConfiguration is
true, and the networkConfiguration state is disabled.
The workaround we to fix another bug on Windows in which the default network
configuration was not behaving properly.
The issue on linux is hard to reproduce and only happen in some condition,
but it was reproduced on smashbox when they run two owncloudcmd at the same time.
Issues: #4720 , #3600
Christian Kamm [Thu, 16 Feb 2017 14:09:06 +0000 (15:09 +0100)]
Recent Changes: Fix duplicates #5256
The transmissionProgress emission when the whole sync finishes
shouldn't look exactly like the one for the last file.
Jenkins for ownCloud [Thu, 16 Feb 2017 01:18:36 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Olivier Goffart [Wed, 15 Feb 2017 12:27:41 +0000 (13:27 +0100)]
Folder: Keep files option after aboutToRemoveAllFiles should not clear selective sync list (#5531)
We were removing the wholme journal db when the user wanted to keep all files,
But that would also remove the selective sync lists.
We should only remove the metadata table.
Issue #5484
Roeland Jago Douma [Tue, 14 Feb 2017 12:12:41 +0000 (13:12 +0100)]
Update windows docker file to use 2.3 OBS repo
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Jenkins for ownCloud [Wed, 15 Feb 2017 01:18:29 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Olivier Goffart [Tue, 14 Feb 2017 14:08:10 +0000 (15:08 +0100)]
Merge remote-tracking branch 'origin/2.3'
Jocelyn Turcotte [Fri, 10 Feb 2017 14:12:03 +0000 (15:12 +0100)]
Disable tests uncompatible with Qt4 for that build
Jocelyn Turcotte [Tue, 7 Feb 2017 18:31:55 +0000 (19:31 +0100)]
Fix the UNIT_TESTING build on Windows
- Put all tests in the bin directory so that DLLs can be loaded
- Add missing exports
- Skip tests that use code depending on zlib
- The "GMT" timezone is named differently, use the int constructor instead
5 tests are still failing, it's not really worth fixing at the moment
since no developper is currently using Windows as its main platform.
Jocelyn Turcotte [Thu, 9 Feb 2017 17:17:01 +0000 (18:17 +0100)]
Fix FolderManTest on macOS
On macOS /var is a symlink to /private/var and we have to make sure that we
use the canonical path before and after it enters the code to make sure we
compare paths correctly.
Jocelyn Turcotte [Thu, 9 Feb 2017 16:53:02 +0000 (17:53 +0100)]
Fix ExcludedFilesTest on macOS
Use the same logic to find sync-exclude as check_csync_exclude.c
Jocelyn Turcotte [Thu, 9 Feb 2017 16:40:32 +0000 (17:40 +0100)]
Fix FileSystemTest on macOS
Jocelyn Turcotte [Tue, 7 Feb 2017 20:30:55 +0000 (21:30 +0100)]
Fix FolderWatcherTest on macOS and Windows
- We need to use a QGuiApplication on macOS or else we don't get notifications
- Switch to use QSignalSpy rather than lists and sleeps
- Use system() for all modifications since we pass kFSEventStreamCreateFlagIgnoreSelf
- Keep using the local process on Windows since it catches its own events
Jocelyn Turcotte [Fri, 27 Jan 2017 17:12:18 +0000 (18:12 +0100)]
Fix UtilityTest on macOS
Olivier Goffart [Tue, 14 Feb 2017 08:16:16 +0000 (09:16 +0100)]
Folder: remove unused variable
Jenkins for ownCloud [Tue, 14 Feb 2017 01:18:27 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Markus Goetz [Mon, 13 Feb 2017 13:47:51 +0000 (14:47 +0100)]
Modify Jenkinsfile for 2.3
Jenkins for ownCloud [Mon, 13 Feb 2017 01:18:28 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 12 Feb 2017 01:18:28 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 11 Feb 2017 01:18:34 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Christian Kamm [Fri, 10 Feb 2017 11:50:35 +0000 (12:50 +0100)]
Doc: For conflicts, the local file is renamed #5521
Jenkins for ownCloud [Fri, 10 Feb 2017 01:18:29 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 9 Feb 2017 01:18:33 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jocelyn Turcotte [Wed, 8 Feb 2017 16:57:02 +0000 (17:57 +0100)]
Remove unneeded Q_DECLARE_METATYPE
Jocelyn Turcotte [Wed, 8 Feb 2017 16:31:13 +0000 (17:31 +0100)]
Fix TestSyncEngine::abortAfterFailedMkdir
It could be possible that _firstJob is marked as finished if
aborted before its parent PropagateDirectory was marked as finished,
allowing a posted scheduleNextJob call to schedule the child job
in-between.
Jocelyn Turcotte [Wed, 8 Feb 2017 16:25:14 +0000 (17:25 +0100)]
Skip TestSyncEngine::abortAfterFailedMkdir
ckamm [Wed, 8 Feb 2017 14:25:02 +0000 (15:25 +0100)]
Merge pull request #5518 from ckamm/asserts
Improve usage of asserts
Christian Kamm [Tue, 7 Feb 2017 09:29:29 +0000 (10:29 +0100)]
CMake: Don't force-enable asserts #5429
Should be safer now that we've gone through asserts and assured that
one ones that should be fatal continue to exist in release builds
independently of QT_NO_DEBUG.
Christian Kamm [Tue, 7 Feb 2017 12:52:15 +0000 (13:52 +0100)]
Double check usage of asserts #5429
A few are supposed to be fatal.
Christian Kamm [Wed, 8 Feb 2017 13:55:18 +0000 (14:55 +0100)]
Performance: reserve() _remotePerm #5496
Olivier Goffart [Wed, 8 Feb 2017 11:33:46 +0000 (12:33 +0100)]
Folder: Change the wording for the massive deletion message
Issue #5503
ckamm [Wed, 8 Feb 2017 13:28:50 +0000 (14:28 +0100)]
Settings: Don't migrate settings on access error #5499 (#5523)
Previously, we'd try migrating from legacy settings if reading
the settings failed with an error. Now, we try again after a
couple of seconds and eventually give up.
Olivier Goffart [Wed, 8 Feb 2017 11:30:32 +0000 (12:30 +0100)]
AccountManager: Fix small leak in the account migration code
The QSettings object was not deleted in every possible code paths
Markus Goetz [Wed, 8 Feb 2017 10:39:28 +0000 (11:39 +0100)]
CentOS: More build fixes
Markus Goetz [Wed, 8 Feb 2017 10:14:31 +0000 (11:14 +0100)]
CentOS: Another attempt
Jenkins for ownCloud [Wed, 8 Feb 2017 01:18:27 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Markus Goetz [Tue, 7 Feb 2017 18:40:32 +0000 (19:40 +0100)]
Improve previous fix
After comment on https://github.com/owncloud/client/commit/
78a798eef3eb8d04360c6d9542db55469f59cacd
Markus Goetz [Tue, 7 Feb 2017 18:22:04 +0000 (19:22 +0100)]
CentOS: Another fix for old compiler version (2)
Markus Goetz [Tue, 7 Feb 2017 18:04:00 +0000 (19:04 +0100)]
ChangeLog for 2.3 additions
Markus Goetz [Tue, 7 Feb 2017 17:54:40 +0000 (18:54 +0100)]
Old Qt: Another build fix
Markus Goetz [Tue, 7 Feb 2017 17:32:34 +0000 (18:32 +0100)]
CentOS: Another fix for old compiler version
Markus Goetz [Tue, 7 Feb 2017 17:05:29 +0000 (18:05 +0100)]
CentOS: Fix build for old compiler version
Markus Goetz [Tue, 7 Feb 2017 16:35:04 +0000 (17:35 +0100)]
Revert "Disable RTTI"
This reverts commit
85d3de15898385a06b2f34479e875c885e5df6be.
This breaks our old Qt on CentOS.
We can re-introduce this with #5470
Jenkins for ownCloud [Tue, 7 Feb 2017 01:18:27 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 6 Feb 2017 01:18:27 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 5 Feb 2017 01:18:27 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 4 Feb 2017 01:18:27 +0000 (02:18 +0100)]
[tx-robot] updated from transifex