nextcloud-desktop.git
5 years agoUpdater: show the human readable version in the settings
Olivier Goffart [Tue, 4 Dec 2018 14:21:49 +0000 (15:21 +0100)]
Updater: show the human readable version in the settings

The xml looks like this:

   <version>2.5.0.328</version>
   <versionstring>ownCloud Client 2.5.0 alpha1 (build 238)</versionstring>

And we should show the version string

Issue #6602

5 years agoUpdater: remove unused function
Olivier Goffart [Tue, 4 Dec 2018 13:47:26 +0000 (14:47 +0100)]
Updater: remove unused function

5 years agoRemove unused installers before copying new ones into the appdata dir
Dominik Schmidt [Sun, 2 Sep 2018 08:36:55 +0000 (10:36 +0200)]
Remove unused installers before copying new ones into the appdata dir

5 years agoMSI: Fix crash in the auto updater
Olivier Goffart [Tue, 7 Aug 2018 07:50:55 +0000 (09:50 +0200)]
MSI: Fix crash in the auto updater

'auto' here is a QStringBuilder referencing a temporary

Ammend commit 150d4f5935c9480cae0a84506af4efa940b64095
(MSI: Always with logfile #6609)

Found in the crash reporter:
https://sentry.io/owncloud/desktop-win-and-mac/issues/623245771/

5 years agoMSI: Always with logfile #6609
Markus Goetz [Mon, 25 Jun 2018 11:42:12 +0000 (13:42 +0200)]
MSI: Always with logfile #6609

5 years agoExtract filename of updateFile without leading slash
Dominik Schmidt [Wed, 13 Jun 2018 20:41:57 +0000 (22:41 +0200)]
Extract filename of updateFile without leading slash

5 years agoEscape msi and owncloud.exe path (who knows...)
Dominik Schmidt [Wed, 13 Jun 2018 20:23:21 +0000 (22:23 +0200)]
Escape msi and owncloud.exe path (who knows...)

5 years agoRun msi properly and restart client after update
Dominik Schmidt [Wed, 13 Jun 2018 12:06:37 +0000 (14:06 +0200)]
Run msi properly and restart client after update

5 years agoImplement basic .msi support in updater
Dominik Schmidt [Tue, 12 Jun 2018 10:39:05 +0000 (12:39 +0200)]
Implement basic .msi support in updater

5 years agoUpdater: Comments
Markus Goetz [Mon, 25 Jun 2018 10:29:28 +0000 (12:29 +0200)]
Updater: Comments

5 years agoUpdater: Make sparkle updater respect release channel
Christian Kamm [Fri, 18 May 2018 12:17:13 +0000 (14:17 +0200)]
Updater: Make sparkle updater respect release channel

5 years agoAuto Updater: Show UI element also on macOS
Markus Goetz [Fri, 27 Apr 2018 07:10:38 +0000 (09:10 +0200)]
Auto Updater: Show UI element also on macOS

(cherry picked from commit dfdc2e1e87f99d387a042f4983c999fbb7fcf3d9)

5 years agoSettings: Add update channel combobox #6259
Christian Kamm [Thu, 26 Apr 2018 09:24:30 +0000 (11:24 +0200)]
Settings: Add update channel combobox #6259

5 years agoSparkle: Delegate calls work now with 1.18.1 (maybe even before)
Markus Goetz [Wed, 16 May 2018 09:29:27 +0000 (11:29 +0200)]
Sparkle: Delegate calls work now with 1.18.1 (maybe even before)

We can extend on this to give UI feedback.

5 years agoMerge pull request #2660 from nextcloud/folder-watcher
Camila [Tue, 24 Nov 2020 18:19:08 +0000 (19:19 +0100)]
Merge pull request #2660 from nextcloud/folder-watcher

FolderWatcher: fixes and improvements

5 years agoFolderWatcher: Disable test on OSX #7305
Christian Kamm [Tue, 16 Jul 2019 12:23:15 +0000 (14:23 +0200)]
FolderWatcher: Disable test on OSX #7305

5 years agoFolderWatcher: Usage of QTime for elapsed time is deprecated
Olivier Goffart [Wed, 5 Feb 2020 11:29:06 +0000 (12:29 +0100)]
FolderWatcher: Usage of QTime for elapsed time is deprecated

5 years agoFolderWatcher: Wait for ready before testing #7305
Christian Kamm [Thu, 11 Jul 2019 11:31:54 +0000 (13:31 +0200)]
FolderWatcher: Wait for ready before testing #7305

5 years agoFolderWatcher: Become unreliable if test notification fails #7241
Christian Kamm [Thu, 13 Jun 2019 07:59:01 +0000 (09:59 +0200)]
FolderWatcher: Become unreliable if test notification fails #7241

Necessary for some filesystems on windows that don't have full file
watching capabilities.

5 years agoFolderWatcher linux: Make automatically recursive #7068
Christian Kamm [Tue, 5 Mar 2019 12:20:09 +0000 (13:20 +0100)]
FolderWatcher linux: Make automatically recursive #7068

Previously it depended on addFolder() / removeFolder() calls to adjust
watchers when new folders were added or removed. There also needed to be
complex move handling.

Now, any folder creation/move-in notifications automatically trigger
watcher additions and folder deletion/move-out triggers removal.

5 years agoFolderWatcher: Always notify about conflict files #7073
Christian Kamm [Wed, 6 Mar 2019 13:22:18 +0000 (14:22 +0100)]
FolderWatcher: Always notify about conflict files #7073

This makes sure that the conflict list can be updated if a user resolves
a conflict by deleting the local conflict file. Previously one had to
wait for the next sync run.

5 years agoFolderwatcher: On linux, fix paths after dir renames #6808
Christian Kamm [Fri, 12 Oct 2018 09:03:10 +0000 (11:03 +0200)]
Folderwatcher: On linux, fix paths after dir renames #6808

If a folder was renamed A -> B, the folder watcher for the inode
would be unaware and still report changes for A/foo. Now directory
renames in the watched folders are tracked and paths are updated
accordingly.

5 years agoMerge pull request #2663 from nextcloud/fix-windows-compilation
allexzander [Tue, 24 Nov 2020 16:34:04 +0000 (18:34 +0200)]
Merge pull request #2663 from nextcloud/fix-windows-compilation

Fix Windows compilation broken after QML debugging fix.

5 years agoFix Windows compilation broken after QML debugging fix.
allexzander [Tue, 24 Nov 2020 14:50:16 +0000 (16:50 +0200)]
Fix Windows compilation broken after QML debugging fix.

Signed-off-by: allexzander <blackslayer4@gmail.com>
5 years agoMerge pull request #2662 from nextcloud/fix-qml-debugging
allexzander [Tue, 24 Nov 2020 14:24:17 +0000 (16:24 +0200)]
Merge pull request #2662 from nextcloud/fix-qml-debugging

Fix QML debugging by removing incorrect dependency

5 years agoFix QML debugging by removing incorrect dependency
allexzander [Tue, 24 Nov 2020 13:19:17 +0000 (15:19 +0200)]
Fix QML debugging by removing incorrect dependency

Signed-off-by: allexzander <blackslayer4@gmail.com>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 24 Nov 2020 03:41:57 +0000 (03:41 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #2658 from nextcloud/enable_qml_debugger_on_debug_builds
Kevin Ottens [Mon, 23 Nov 2020 17:59:52 +0000 (18:59 +0100)]
Merge pull request #2658 from nextcloud/enable_qml_debugger_on_debug_builds

Enable the QML debugger on debug builds

5 years agoEnable the QML debugger on debug builds
Kevin Ottens [Mon, 23 Nov 2020 16:09:44 +0000 (17:09 +0100)]
Enable the QML debugger on debug builds

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
5 years agoMerge pull request #2655 from nextcloud/use-dinamyc-path-for-account-state-icons
allexzander [Mon, 23 Nov 2020 16:01:13 +0000 (18:01 +0200)]
Merge pull request #2655 from nextcloud/use-dinamyc-path-for-account-state-icons

Use dynamic path for account online/offline state icon. Refresh GUI on connection state change.

5 years agoUse dynamic path for account online/offline state icon. Refresh GUI on connection...
allexzander [Mon, 23 Nov 2020 05:45:26 +0000 (07:45 +0200)]
Use dynamic path for account online/offline state icon. Refresh GUI on connection state change.

Signed-off-by: Alex Zolotov <alex.zolotov.nextcloud.com>
Signed-off-by: allexzander <blackslayer4@gmail.com>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 23 Nov 2020 03:38:35 +0000 (03:38 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 21 Nov 2020 03:44:21 +0000 (03:44 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 20 Nov 2020 03:43:18 +0000 (03:43 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 19 Nov 2020 03:43:51 +0000 (03:43 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #2648 from nextcloud/debian_packages_should_not_block_ci
Kevin Ottens [Wed, 18 Nov 2020 15:32:29 +0000 (16:32 +0100)]
Merge pull request #2648 from nextcloud/debian_packages_should_not_block_ci

Issue a warning for Debian pipeline failures but don't fail the CI

5 years agoIssue a warning for Debian pipeline failures but don't fail the CI
Kevin Ottens [Wed, 18 Nov 2020 15:05:19 +0000 (16:05 +0100)]
Issue a warning for Debian pipeline failures but don't fail the CI

Since this fails every time we bump the version number and takes time to
catch up while failing every following PRs, let's prevent this pipeline
from failing the CI.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 18 Nov 2020 03:41:49 +0000 (03:41 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 16 Nov 2020 03:43:48 +0000 (03:43 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 15 Nov 2020 03:41:36 +0000 (03:41 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 14 Nov 2020 03:44:00 +0000 (03:44 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 13 Nov 2020 03:43:12 +0000 (03:43 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #2630 from nextcloud/bump_to_version_3.0.81
Kevin Ottens [Thu, 12 Nov 2020 15:31:01 +0000 (16:31 +0100)]
Merge pull request #2630 from nextcloud/bump_to_version_3.0.81

Master is now 3.0.81

5 years agoMaster is now 3.0.81
Kevin Ottens [Thu, 12 Nov 2020 14:53:16 +0000 (15:53 +0100)]
Master is now 3.0.81

This feels a bit like moving back in that case, but that's due to the
change of convention in the release process. We used to bump early but
now we're moving to a point when we bump at the last minute.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 12 Nov 2020 03:44:40 +0000 (03:44 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 11 Nov 2020 03:47:29 +0000 (03:47 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #2616 from nextcloud/move_journaldb_files_back_to_sync_folders
Camila [Tue, 10 Nov 2020 18:19:14 +0000 (19:19 +0100)]
Merge pull request #2616 from nextcloud/move_journaldb_files_back_to_sync_folders

Move journaldb files back to sync folders

5 years agoMigrate journal dbs files back to the sync folder
Kevin Ottens [Thu, 5 Nov 2020 16:18:13 +0000 (17:18 +0100)]
Migrate journal dbs files back to the sync folder

In case of past collisions during the 3.0 times... well one will resync
from scratch unfortunately. But if that happened there are likely other
problems which occurred.

Also this might fix some of the bugs with people loosing settings from
the database. Indeed the -wal and -shm concatenations were wrong. Using
append was in fact changing the folderDefinition member which (I guess)
would potentially lead to funny ".db-wal-shm-wal-shm" names.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
5 years agoRevert "moved default db sync file to Qt standard path AppDataLocation"
Kevin Ottens [Thu, 5 Nov 2020 14:27:27 +0000 (15:27 +0100)]
Revert "moved default db sync file to Qt standard path AppDataLocation"

This reverts commit fc6b895f524cfadd7edff83098c70d7cc44248a9.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
5 years agoPartial Revert "Adapted for cmd version and added migration step for config file"
Kevin Ottens [Thu, 5 Nov 2020 14:24:45 +0000 (15:24 +0100)]
Partial Revert "Adapted for cmd version and added migration step for config file"

This partially reverts commit 67ed54671b5f3be9520089f85d9e2e7aebc037f6.

The migration code was left untouched.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
5 years agoRevert "Adjust to makeDbName returning an absolute path"
Kevin Ottens [Thu, 5 Nov 2020 14:22:29 +0000 (15:22 +0100)]
Revert "Adjust to makeDbName returning an absolute path"

This reverts commit 2492e241ac1b22cfbdbcb97739e9365fba69ac22.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
5 years agoMerge pull request #2531 from nextcloud/bring_back_systray_menu_pause_sync_action
Camila [Tue, 10 Nov 2020 17:43:52 +0000 (18:43 +0100)]
Merge pull request #2531 from nextcloud/bring_back_systray_menu_pause_sync_action

Bring back the "Pause sync" action in the systray context menu

5 years agoBring back the pause/resume action in the systray menu
Kevin Ottens [Thu, 8 Oct 2020 14:49:27 +0000 (16:49 +0200)]
Bring back the pause/resume action in the systray menu

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
5 years agoMove pause/unpause helpers to Systray
Kevin Ottens [Thu, 8 Oct 2020 14:32:10 +0000 (16:32 +0200)]
Move pause/unpause helpers to Systray

We had signals just to call those backs in ownCloudGui, they were
otherwise unused. So let's move them inside of Systray since it's
specific to it anyway.

Also fix the dangerous call to sender(). We can call this function
without going through a signal/slot connection and also it's never
connected to an AccountState.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
5 years agoMerge pull request #2620 from nextcloud/fix_crash_when_displaying_share_dialog
Camila [Tue, 10 Nov 2020 17:09:54 +0000 (18:09 +0100)]
Merge pull request #2620 from nextcloud/fix_crash_when_displaying_share_dialog

Make sure the settings dialog exist before hiding it

5 years agoMake sure the settings dialog exist before hiding it
Kevin Ottens [Mon, 9 Nov 2020 11:02:15 +0000 (12:02 +0100)]
Make sure the settings dialog exist before hiding it

Because of PR #2580 the settings dialog doesn't always exist. We need to
check for it first before placing calls to it.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
5 years agoMerge pull request #2621 from nextcloud/wiswedel/documentation/chunkedUpload
Camila [Tue, 10 Nov 2020 16:56:28 +0000 (17:56 +0100)]
Merge pull request #2621 from nextcloud/wiswedel/documentation/chunkedUpload

[documentation] upload chunks config

5 years ago[documentation] upload chunks config
Sascha Wiswedel [Tue, 10 Nov 2020 13:56:32 +0000 (14:56 +0100)]
[documentation] upload chunks config

documenting https://github.com/nextcloud/desktop/commit/e86499d9907f3bab5eac6e371eef772f8befd2e5

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 10 Nov 2020 03:45:50 +0000 (03:45 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 9 Nov 2020 03:42:28 +0000 (03:42 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 8 Nov 2020 03:42:17 +0000 (03:42 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 7 Nov 2020 03:42:02 +0000 (03:42 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #2615 from nextcloud/fetch_apps_on_connectivity_changes_only
Kevin Ottens [Thu, 5 Nov 2020 12:55:36 +0000 (13:55 +0100)]
Merge pull request #2615 from nextcloud/fetch_apps_on_connectivity_changes_only

Fetch apps when we get connected only

5 years agoFetch apps when we get connected only
Kevin Ottens [Thu, 5 Nov 2020 12:37:25 +0000 (13:37 +0100)]
Fetch apps when we get connected only

This was right now on the check connectivity beat which is too much when
you got many users. Be more conservative there and only update the list
of apps when the account gets connected.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 5 Nov 2020 03:40:34 +0000 (03:40 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 4 Nov 2020 03:41:27 +0000 (03:41 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 3 Nov 2020 03:41:44 +0000 (03:41 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #2603 from nextcloud/remove_findqt5keychain_cmake_module
Camila [Mon, 2 Nov 2020 13:36:46 +0000 (14:36 +0100)]
Merge pull request #2603 from nextcloud/remove_findqt5keychain_cmake_module

Get rid of FindQt5Keychain.cmake

5 years agoAdjust AppImage build of QtKeychain to be found by cmake
Kevin Ottens [Mon, 2 Nov 2020 12:28:02 +0000 (13:28 +0100)]
Adjust AppImage build of QtKeychain to be found by cmake

Now that things are done in a more standard way, let's adjust the
AppImage build so that QtKeychain is picked up properly now that our
FindQt5Keychain.cmake file is gone.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
5 years agoGet rid of FindQt5Keychain.cmake
Kevin Ottens [Thu, 29 Oct 2020 12:24:20 +0000 (13:24 +0100)]
Get rid of FindQt5Keychain.cmake

QtKeychain provides Qt5KeychainConfig.cmake and friends nowadays, so no
need to have a less reliable and outdated find module on our end.

Also this shows that we were including keychain.h in the wrong way and
were not using the link target, so both got fixed as well.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 2 Nov 2020 03:41:37 +0000 (03:41 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 1 Nov 2020 03:40:38 +0000 (03:40 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 31 Oct 2020 03:41:57 +0000 (03:41 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 30 Oct 2020 03:42:51 +0000 (03:42 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #2589 from sryze/windows7-fixes
Kevin Ottens [Wed, 28 Oct 2020 06:39:14 +0000 (07:39 +0100)]
Merge pull request #2589 from sryze/windows7-fixes

Misc fixes for Windows 7

5 years agoMisc fixes for Windows 7
Sergey Zolotarev [Mon, 26 Oct 2020 19:51:12 +0000 (01:51 +0600)]
Misc fixes for Windows 7

Signed-off-by: Sergey Zolotarev <sryze@protonmail.com>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 28 Oct 2020 03:42:53 +0000 (03:42 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 27 Oct 2020 03:42:33 +0000 (03:42 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #2591 from nextcloud/fix_conflict_dialog_wording
Kevin Ottens [Mon, 26 Oct 2020 15:09:49 +0000 (16:09 +0100)]
Merge pull request #2591 from nextcloud/fix_conflict_dialog_wording

Remove last left over of the "remote" wording

5 years agoRemove last left over of the "remote" wording
Kevin Ottens [Mon, 26 Oct 2020 12:58:34 +0000 (13:58 +0100)]
Remove last left over of the "remote" wording

I switched from "remote" to "server" but apparently left one behind by
mistake...

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
5 years agoMerge pull request #2586 from nextcloud/Valdnet-patch-2
Valdnet [Mon, 26 Oct 2020 14:09:15 +0000 (15:09 +0100)]
Merge pull request #2586 from nextcloud/Valdnet-patch-2

l10n: Change the triple dot to ellipsis

5 years agol10n: Change the ellipsis
Valdnet [Mon, 26 Oct 2020 12:38:31 +0000 (13:38 +0100)]
l10n: Change the ellipsis

5 years agol10n: Add a space in generalsettings.ui
Valdnet [Fri, 23 Oct 2020 10:54:21 +0000 (12:54 +0200)]
l10n: Add a space in generalsettings.ui

5 years agoMerge pull request #2582 from nextcloud/macos_add_more_information_on_skipped_file_wa...
Kevin Ottens [Mon, 26 Oct 2020 13:15:15 +0000 (14:15 +0100)]
Merge pull request #2582 from nextcloud/macos_add_more_information_on_skipped_file_watcher_event

Also output the event flags in the debug logs

5 years agoAlso output the event flags in the debug logs
Kevin Ottens [Thu, 22 Oct 2020 11:17:52 +0000 (13:17 +0200)]
Also output the event flags in the debug logs

When we skip a watcher event on mac, we log the file path but not the
event flags which came with it. Let's add it, it should help figure out
what's going on with #2578.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
5 years agoMerge pull request #2587 from nextcloud/rakekniven-patch-1
Valdnet [Mon, 26 Oct 2020 12:32:42 +0000 (13:32 +0100)]
Merge pull request #2587 from nextcloud/rakekniven-patch-1

Triple dot to ellipsis

5 years agoTriple dot to ellipsis
rakekniven [Fri, 23 Oct 2020 13:02:29 +0000 (15:02 +0200)]
Triple dot to ellipsis

Reported at Transifex.

Signed-off-by: rakekniven <mark.ziegler@rakekniven.de>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 26 Oct 2020 03:37:49 +0000 (03:37 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 25 Oct 2020 03:39:15 +0000 (03:39 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 24 Oct 2020 03:39:31 +0000 (03:39 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 23 Oct 2020 03:38:53 +0000 (03:38 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #2581 from nextcloud/ensure_systray_window_doesnt_prevent_windows_...
Camila [Thu, 22 Oct 2020 17:48:43 +0000 (19:48 +0200)]
Merge pull request #2581 from nextcloud/ensure_systray_window_doesnt_prevent_windows_session_close

Ensure we quickly show/hide the systray window on startup

5 years agoEnsure we quickly show/hide the systray window on startup
Kevin Ottens [Thu, 22 Oct 2020 10:39:40 +0000 (12:39 +0200)]
Ensure we quickly show/hide the systray window on startup

This is quick enough that no flickering should appear in practice.

We end up doing this because for some reason on Windows (I dug up deep
into the Windows QPA without nailing it down) not showing that systray
window at least once prevents the app object to return from exec() when
the session ends.

It's as if that window would be in some limbo state (neither opened nor
closed) which would prevent quitting. Clearly what we're doing here is a
workaround...

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
5 years agoMerge pull request #2527 from nextcloud/improve_conflict_handling_gui
Kevin Ottens [Thu, 22 Oct 2020 16:27:45 +0000 (18:27 +0200)]
Merge pull request #2527 from nextcloud/improve_conflict_handling_gui

Improve conflict handling gui

5 years agoUse the ConflictDialog directly from the activity list
Kevin Ottens [Wed, 7 Oct 2020 16:05:21 +0000 (18:05 +0200)]
Use the ConflictDialog directly from the activity list

No need to go to the file manager first to then have the user go through
the context menu, just popup the dialog directly.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
5 years agoMove the activity action behavior on the C++ side
Kevin Ottens [Wed, 7 Oct 2020 11:23:34 +0000 (13:23 +0200)]
Move the activity action behavior on the C++ side

We better do this before this business logic grows in the QML side and
gets out of control. We'll need finer grained information due to the
conflict handling anyway.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
5 years agoRepair SettingsDialog::showIssuesList
Kevin Ottens [Wed, 7 Oct 2020 10:28:31 +0000 (12:28 +0200)]
Repair SettingsDialog::showIssuesList

This was completely disabled code and the connect was gone... So let's
introduce the connect back and have it trigger the main window while
selecting the right user. This way the new activity list is displayed
and since the conflicts are shown at the top this is hopefully obvious
again.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
5 years agoAdd a function to know the user id matching a given account
Kevin Ottens [Wed, 7 Oct 2020 10:27:32 +0000 (12:27 +0200)]
Add a function to know the user id matching a given account

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
5 years agoIn the case of conflicts, have the socket api propose the config dialog
Kevin Ottens [Wed, 7 Oct 2020 15:51:57 +0000 (17:51 +0200)]
In the case of conflicts, have the socket api propose the config dialog

This should be safe in the case of conflicts in folders on which the
user can write. For other cases we still use the older actions.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
5 years agoAdd a conflict dialog to help the user solve them
Kevin Ottens [Wed, 7 Oct 2020 15:51:18 +0000 (17:51 +0200)]
Add a conflict dialog to help the user solve them

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>