Commit Graph

11872 Commits

Author SHA1 Message Date
Jenkins for ownCloud
7557a124d8 [tx-robot] updated from transifex 2018-06-12 02:18:44 +02:00
Jenkins for ownCloud
f80c237c5c [tx-robot] updated from transifex 2018-06-11 02:18:42 +02:00
Jenkins for ownCloud
b7cee004cb [tx-robot] updated from transifex 2018-06-10 02:18:42 +02:00
Jenkins for ownCloud
bfd6b21591 [tx-robot] updated from transifex 2018-06-09 02:18:42 +02:00
Jenkins for ownCloud
d11e3e1f5f [tx-robot] updated from transifex 2018-06-08 02:18:42 +02:00
Jenkins for ownCloud
ab0813c77f [tx-robot] updated from transifex 2018-06-07 02:18:42 +02:00
Jenkins for ownCloud
4a8f99d628 [tx-robot] updated from transifex 2018-06-06 02:18:43 +02:00
Jenkins for ownCloud
789c7062fe [tx-robot] updated from transifex 2018-06-05 02:18:43 +02:00
Olivier Goffart
9a8078944f FindSql3.cmake: Add the input variable in the search path
Issue #6278
2018-06-04 11:44:09 +02:00
Olivier Goffart
76bb76a59e FolderStatusModel: Fix crash when there is an error while expanding folders
In FolderStatusModel::slotLscolFinishedWithError, the call to parentInfo->resetSubs
deleted the 'job' and the reply 'r' which we accessed later to get the error code.

Fix this problem twice by
 1) Get the error code before caling resetSubs
 2) in FolderStatusModel::SubFolderInfo::resetSubs, call deleteLater instead of delete

Regression introduced in commit d69936e0

Issue #6562
2018-06-04 10:32:30 +02:00
Olivier Goffart
888f2aae2f csync: refactor csync_s::error_string to avoid valgrind error
The problem here is that we were sometimes allocating the error_string with
qstrdup, which need to be released with delete[] and not free().

Simplify the code by using QString instead.

```
==7230== Mismatched free() / delete / delete []
==7230==    at 0x4C2E10B: free (vg_replace_malloc.c:530)
==7230==    by 0x57C2321: csync_s::reinitialize() (csync.cpp:247)
==7230==    by 0x548130F: OCC::SyncEngine::finalize(bool) (syncengine.cpp:1212)
==7230==    by 0x5481223: OCC::SyncEngine::handleSyncError(csync_s*, char const*) (syncengine.cpp:746)
==7230==    by 0x5483E78: OCC::SyncEngine::slotDiscoveryJobFinished(int) (syncengine.cpp:965)
==7230==    by 0x5495E34: QtPrivate::FunctorCall<QtPrivate::IndexesList<0>, QtPrivate::List<int>, void, void (OCC::SyncEngine::*)(int)>::call(void (OCC::SyncEngine::*)(int), OCC::SyncEngine*, void**) (qobjectdefs_impl.h:134)
==7230==    by 0x5495D92: void QtPrivate::FunctionPointer<void (OCC::SyncEngine::*)(int)>::call<QtPrivate::List<int>, void>(void (OCC::SyncEngine::*)(int), OCC::SyncEngine*, void**) (qobjectdefs_impl.h:167)
==7230==    by 0x5495CB5: QtPrivate::QSlotObject<void (OCC::SyncEngine::*)(int), QtPrivate::List<int>, void>::impl(int, QtPrivate::QSlotObjectBase*, QObject*, void**, bool*) (qobjectdefs_impl.h:396)
==7230==    by 0xA9BF2E1: QObject::event(QEvent*) (in /usr/lib/libQt5Core.so.5.11.0)
==7230==    by 0x64BE983: QApplicationPrivate::notify_helper(QObject*, QEvent*) (in /usr/lib/libQt5Widgets.so.5.11.0)
==7230==    by 0x64C625A: QApplication::notify(QObject*, QEvent*) (in /usr/lib/libQt5Widgets.so.5.11.0)
==7230==    by 0xA994BC8: QCoreApplication::notifyInternal2(QObject*, QEvent*) (in /usr/lib/libQt5Core.so.5.11.0)
==7230==  Address 0x225b2640 is 0 bytes inside a block of size 50 alloc'd
==7230==    at 0x4C2DC6F: operator new[](unsigned long) (vg_replace_malloc.c:423)
==7230==    by 0xA7E8FC8: qstrdup(char const*) (in /usr/lib/libQt5Core.so.5.11.0)
==7230==    by 0x53F5750: OCC::DiscoveryJob::remote_vio_opendir_hook(char const*, void*) (discoveryphase.cpp:666)
==7230==    by 0x57E1278: csync_vio_opendir(csync_s*, char const*) (csync_vio.cpp:39)
==7230==    by 0x57D718F: csync_ftw(csync_s*, char const*, int (*)(csync_s*, std::unique_ptr<csync_file_stat_s, std::default_delete<csync_file_stat_s> >), unsigned int) (csync_update.cpp:674)
==7230==    by 0x57C1B05: csync_update(csync_s*) (csync.cpp:109)
==7230==    by 0x53F5BCC: OCC::DiscoveryJob::start() (discoveryphase.cpp:718)
==7230==    by 0x54B8F74: OCC::DiscoveryJob::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) (moc_discoveryphase.cpp:494)
==7230==    by 0xA9BF2E1: QObject::event(QEvent*) (in /usr/lib/libQt5Core.so.5.11.0)
==7230==    by 0x64BE983: QApplicationPrivate::notify_helper(QObject*, QEvent*) (in /usr/lib/libQt5Widgets.so.5.11.0)
==7230==    by 0x64C625A: QApplication::notify(QObject*, QEvent*) (in /usr/lib/libQt5Widgets.so.5.11.0)
==7230==    by 0xA994BC8: QCoreApplication::notifyInternal2(QObject*, QEvent*) (in /usr/lib/libQt5Core.so.5.11.0)
==7230==
```
2018-06-04 08:57:24 +02:00
Chih-Hsuan Yen
9e26b0fea3 Fix build without Sparkle.framework
(PR #6567)
2018-06-04 08:57:10 +02:00
Jenkins for ownCloud
52cfb6bfef [tx-robot] updated from transifex 2018-06-04 02:18:42 +02:00
Jenkins for ownCloud
1c03ba03e4 [tx-robot] updated from transifex 2018-06-03 02:18:41 +02:00
Jenkins for ownCloud
eeff148051 [tx-robot] updated from transifex 2018-06-02 02:18:42 +02:00
Olivier Goffart
13cb9ab1c5 PropagateDownload: Don't discard the body of error message
We want to keep the body so we can get the message from it
(Issue #6459)

TestDownload::testErrorMessage did not fail because the FakeErrorReply
did not emit readyRead and did not implement bytesAvailable.
2018-06-01 13:21:22 +02:00
Jenkins for ownCloud
f5ac5f2973 [tx-robot] updated from transifex 2018-06-01 02:18:43 +02:00
Jenkins for ownCloud
bff1c1cf28 [tx-robot] updated from transifex 2018-05-31 02:18:44 +02:00
Olivier Goffart
40d432ecdd .desktop file: the MimeType entry must ends with a semi colon
Also remove some comments
2018-05-30 13:38:45 +02:00
Olivier Goffart
1753ce651b Virtual Files: Allow to download a folder recursively from the socket API
Issue: #6466
2018-05-30 11:57:57 +02:00
Markus Goetz
104f8c9ba2 NSIS: SVG imageformats plugin DLL #6515 2018-05-30 11:56:41 +02:00
Markus Goetz
7a776dbb6a NSIS: SVG DLL #6515 2018-05-30 11:56:41 +02:00
Christian Kamm
3a7a6b0b9e Virtual files: Wipe virtual after download completes, not before
Otherwise a interrupted or unsuccessful download would mean that the
download-intend was forgotten. The next sync would reestablish the
virtual file instead.
2018-05-30 11:50:14 +02:00
Olivier Goffart
d7792dc951 Rename SocketApi::FileData::accountRelativePath to serverRelativePath
As discussed in issue #6552
2018-05-30 10:51:44 +02:00
Olivier Goffart
1434fa5139 Share dialog: use the original name and not the virtual file name
When sharing a virtual file, we should actually use the original file name
not the virtual file name

Issue: #6461
2018-05-30 10:51:17 +02:00
Christian Kamm
252484e875 Virtual files: Only remove virtual file once on download
With thanks to @ogoffart for spotting the problem.
2018-05-30 10:39:49 +02:00
Olivier Goffart
94535a75d9 Update submodule 2018-05-30 09:10:27 +02:00
Jenkins for ownCloud
91044fee81 [tx-robot] updated from transifex 2018-05-30 02:18:42 +02:00
Olivier Goffart
47aa1ade71 Fix make doc-man in shadow build
Issue #6555
2018-05-29 16:12:58 +02:00
Olivier Goffart
7ba48849c6 Windows Shell extention: Fix clicking on the menu entries
Issue #6553
2018-05-29 14:51:28 +02:00
Jenkins for ownCloud
ce1aa6af53 [tx-robot] updated from transifex 2018-05-29 02:18:40 +02:00
Olivier Goffart
7aded05f40 Fix compilation warning
propagateuploadng.cpp:500:10: warning: lambda capture 'this' is not used [-Wunused-lambda-capture]
2018-05-28 14:55:34 +02:00
Jenkins for ownCloud
f7b5665bce [tx-robot] updated from transifex 2018-05-28 02:18:41 +02:00
Jenkins for ownCloud
1a4ce88afb [tx-robot] updated from transifex 2018-05-27 02:18:39 +02:00
Jenkins for ownCloud
11ae820db1 [tx-robot] updated from transifex 2018-05-26 02:18:49 +02:00
Olivier Goffart
46077f0de2 Merge remote-tracking branch 'owncloud/master' into 2.5 2018-05-25 18:09:56 +02:00
Dominik Schmidt
13d0595296 Update libcrashreporter-qt to build it with msvc
(cherry picked from commit b9323bd191)
2018-05-25 15:36:54 +02:00
Markus Goetz
88abf43bda ChangeLog: More entries 2018-05-25 15:32:16 +02:00
Christian Kamm
de77514671 AccountWizard: Reserve space for error label #6546 2018-05-25 08:44:03 +02:00
Jenkins for ownCloud
5c69130300 [tx-robot] updated from transifex 2018-05-25 02:18:51 +02:00
Markus Goetz
74e412c789 owncloudsynclog: 1 MB -> 10 MB #6420 2018-05-24 16:02:52 +02:00
Christian Kamm
5811c74f9c Settings migration: Preserve future settings where possible
See discussion in #6506
2018-05-24 12:18:44 +02:00
Christian Kamm
57a2881906 Config: Add version flags to accounts and folders
Also, if there is too-new configuration, backup the file, show a
warning message asking the user whether it's ok to discard the
configuration from the future.

See #6504
2018-05-24 12:18:44 +02:00
Olivier Goffart
c625d8e3b7 Credentials: Retry fetching from the keychain in case the keychain is still starting
When owncloud is restored, at boot time, it might be started before the
crendential manager. So if we detect an error, wait 10 seconds and hopefully
it'd be loaded by then.

Issues: #4274, #6522
2018-05-24 12:10:55 +02:00
Christian Kamm
53f52b4cf5 Settings: Add warning when switching update channel 2018-05-24 12:09:40 +02:00
Christian Kamm
293c2b4f79 Updater: Make sparkle updater respect release channel 2018-05-24 12:09:40 +02:00
Markus Goetz
29349d4b3a Auto Updater: Show UI element also on macOS
(cherry picked from commit dfdc2e1e87f99d387a042f4983c999fbb7fcf3d9)
2018-05-24 12:09:40 +02:00
Christian Kamm
7790953a2c Settings: Add update channel combobox #6259 2018-05-24 12:09:40 +02:00
Jenkins for ownCloud
e3083d6791 [tx-robot] updated from transifex 2018-05-24 02:18:53 +02:00
Dominik Schmidt
b9323bd191 Update libcrashreporter-qt to build it with msvc 2018-05-23 16:59:34 +02:00