1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-10-24 00:42:48 +02:00
Commit Graph

12110 Commits

Author SHA1 Message Date
Dominik Schmidt
b4b1409148 Fix app icon macro 2018-06-27 01:28:44 +02:00
Jenkins for ownCloud
1a7a1552b0 [tx-robot] updated from transifex 2018-06-26 02:18:43 +02:00
Markus Goetz
8e4d2e8c9f Updater: Comments 2018-06-25 12:29:45 +02:00
Christian Kamm
b2fa9edd14 Wizard errors in a scroll area #6546 2018-06-25 11:21:17 +02:00
Jenkins for ownCloud
8dad4406ec [tx-robot] updated from transifex 2018-06-25 02:18:41 +02:00
Jenkins for ownCloud
f27fd4f693 [tx-robot] updated from transifex 2018-06-24 02:18:47 +02:00
Jenkins for ownCloud
2fec00a052 [tx-robot] updated from transifex 2018-06-23 02:18:44 +02:00
Jenkins for ownCloud
4cf53aa5ef [tx-robot] updated from transifex 2018-06-22 02:18:43 +02:00
Jenkins for ownCloud
a93f2d4ba9 [tx-robot] updated from transifex 2018-06-21 02:18:44 +02:00
Markus Goetz
e1a4c3ab72 GeneralSettings: Hide update channel for other themes
For #6585
2018-06-20 12:29:52 +02:00
Dominik Schmidt
4f96647bae Rename ocsync library to ${APPLICATION_EXECUTABLE}_csync 2018-06-20 11:23:16 +02:00
Dominik Schmidt
79ef892e71 Install libocsync to lib/ without subfolder.
Installing to lib/${APPLICATION_EXECUTABLE} has caused a bunch of
irritations in the past and subtle annoying to fix bugs. To avoid name
clashes with branded clients ${APPLICATION_EXECUTABLE} becomes now
part of the filename instead of the subfolder.

The concrete motivation to change this now is that on Windows there
is no RPATH and it's not possible to run owncloud directly from the
Craft Root folder, which is nice when you're developing on Windows.

It would have been possible to change this just for Windows but as
written earlier this has caused lots of issues and thus I think it's
a good idea to just stay consistent accross platforms when touching it.
2018-06-20 11:23:16 +02:00
Jenkins for ownCloud
464c1fbce0 [tx-robot] updated from transifex 2018-06-20 02:18:42 +02:00
Olivier Goffart
841606d138 nautilus shell integration: Fix when there are several branded client installed
It appears that several extension can be loaded at the same time, but their
classname for the extension need to be different, otherwise only the last
loaded one would be active.

Issue #6524
2018-06-19 19:38:31 +02:00
Olivier Goffart
850dc67a25 Wizard + OAuth: Make opening a new browser after clicking back works again
Issue #6574

When there is an error in the advanced page, OwncloudAdvancedSetupPage::updateStatus
(and others) call completeChanged(), which is connected to
QWizardPrivate::_q_updateButtonStates which will re-enable the back button from the
last page.

When the user click "back" and re-open the browser, the account's credentials
already have a oauth token set. So the call to the API to get a new token fails
because we use the previous token instead of using the client's secret_id.
Fix this with the HttpCredentials::DontAddCredentialsAttribute.

Now, this is still not working because the session cookies are confusing the
server.  So we'll clear the cookies when re-opening the browser
2018-06-19 15:12:29 +02:00
Olivier Goffart
ae80317a74 Updater: Fix beta channel for translated clients.
The names in the combobox are being translated, so we need to rely
on the index rather than the text.
2018-06-19 12:56:31 +02:00
Christian Kamm
a0d6139505 fixup: remove outdated Qt5.5 workaround code 2018-06-19 12:47:23 +02:00
Christian Kamm
8b1d9799a3 fixup: use initializer for contextMenuVisibleManual 2018-06-19 12:47:23 +02:00
Christian Kamm
ca033b9685 fixup: make logging "info" 2018-06-19 12:47:23 +02:00
Christian Kamm
99116acdca Tray workarounds #6545
* Disentangle the previous 'qdbusWorkarounds' into three different
  things
* Make not trusting tray.isVisible() a new workaround
* Introduce env vars for all workaround flags
* Use the workaround flags for OSX
* Determine workaround flags for KDE when the plasma integration plugin
  is missing
2018-06-19 12:47:23 +02:00
Markus Goetz
92219c5bf7 SettingsDialogMac: Show the page for the newly created account 2018-06-19 09:47:07 +02:00
Olivier Goffart
de6b23c854 SettingsDialog: Show the page for the newly created account 2018-06-19 09:47:07 +02:00
Jenkins for ownCloud
5b1057ea94 [tx-robot] updated from transifex 2018-06-19 02:18:44 +02:00
Christian Kamm
92b1375c58 Windows shellext: Update copyrights and company name 2018-06-18 10:49:14 +02:00
Olivier Goffart
9dac8be0ed windows shell extension: add OCUtil/resource.h
It's a copy from OCContextMenu/resources.h
2018-06-18 10:49:14 +02:00
Christian Kamm
d188b37caf Windows shellext: Add rc for OCUtil #6554
To set the dll's metadata.
2018-06-18 10:49:14 +02:00
Jenkins for ownCloud
343a27cbd8 [tx-robot] updated from transifex 2018-06-18 02:18:42 +02:00
Jenkins for ownCloud
0c49e6cc19 [tx-robot] updated from transifex 2018-06-17 02:18:44 +02:00
Jenkins for ownCloud
cdf0f04e45 [tx-robot] updated from transifex 2018-06-16 02:18:43 +02:00
Dominik Schmidt
5989c84949 Move theme related logic into a single THEME.cmake 2018-06-15 09:44:24 +02:00
Jenkins for ownCloud
3e9dadc1ed [tx-robot] updated from transifex 2018-06-15 02:18:50 +02:00
Olivier Goffart
0062a28864 Theme: Put back the string as it was in 2.4, for branded clients.
Issue #6422
2018-06-14 12:59:02 +02:00
Olivier Goffart
4cc0539080 OAuth2: Try to refresh the token even if the credentials weren't ready.
This can happen when the client is started and the internet connection
was not enabled. Then we would fetch the credentials, but we would
no do the refresh token step (because network is down).
So next time we try to connect, we would also not refresh the token
because the credentials are not marked as 'ready'

Reported in
https://github.com/owncloud/client/issues/6522#issuecomment-396845167
2018-06-14 12:58:18 +02:00
Jenkins for ownCloud
9bb2f1965d [tx-robot] updated from transifex 2018-06-14 02:18:54 +02:00
Christian Kamm
62d9f74aa8 ShareLink: translate the send-email string 2018-06-13 16:47:11 +02:00
Christian Kamm
ad2446b036 Ensure GETFileJob notices finishing #6581
It could happen that readyRead was emitted for incoming data while the
download was not yet finished. Then the network job could finish with
no more data arriving - so readyRead wasn't emitted again.

To fix this, the finished signal also gets connected to the readyRead
slot.
2018-06-13 16:44:24 +02:00
Christian Kamm
9c66dbb2b7 Selective sync: Hide ui on disconnect #5809
The previous patch did forget about the big-folder-ui which should
also be hidden on disconnect.
2018-06-13 14:51:39 +02:00
Jenkins for ownCloud
e4574b2628 [tx-robot] updated from transifex 2018-06-13 02:18:45 +02:00
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