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>
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
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>
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>
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
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>
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
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
Nextcloud bot [Tue, 10 Nov 2020 03:45:50 +0000 (03:45 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Mon, 9 Nov 2020 03:42:28 +0000 (03:42 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sun, 8 Nov 2020 03:42:17 +0000 (03:42 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 7 Nov 2020 03:42:02 +0000 (03:42 +0000)]
[tx-robot] updated from transifex
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
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>
Nextcloud bot [Thu, 5 Nov 2020 03:40:34 +0000 (03:40 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Wed, 4 Nov 2020 03:41:27 +0000 (03:41 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Tue, 3 Nov 2020 03:41:44 +0000 (03:41 +0000)]
[tx-robot] updated from transifex
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
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>
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>
Nextcloud bot [Mon, 2 Nov 2020 03:41:37 +0000 (03:41 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sun, 1 Nov 2020 03:40:38 +0000 (03:40 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 31 Oct 2020 03:41:57 +0000 (03:41 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Fri, 30 Oct 2020 03:42:51 +0000 (03:42 +0000)]
[tx-robot] updated from transifex
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
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>
Nextcloud bot [Wed, 28 Oct 2020 03:42:53 +0000 (03:42 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Tue, 27 Oct 2020 03:42:33 +0000 (03:42 +0000)]
[tx-robot] updated from transifex
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
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>
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
Valdnet [Mon, 26 Oct 2020 12:38:31 +0000 (13:38 +0100)]
l10n: Change the ellipsis
Valdnet [Fri, 23 Oct 2020 10:54:21 +0000 (12:54 +0200)]
l10n: Add a space in generalsettings.ui
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
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>
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
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>
Nextcloud bot [Mon, 26 Oct 2020 03:37:49 +0000 (03:37 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sun, 25 Oct 2020 03:39:15 +0000 (03:39 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 24 Oct 2020 03:39:31 +0000 (03:39 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Fri, 23 Oct 2020 03:38:53 +0000 (03:38 +0000)]
[tx-robot] updated from transifex
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
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>
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
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>
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>
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>
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>
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>
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>
Kevin Ottens [Thu, 8 Oct 2020 13:54:32 +0000 (15:54 +0200)]
Add KeepBothVersions as a possible solution to ConflictSolver
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Kevin Ottens [Wed, 7 Oct 2020 14:30:43 +0000 (16:30 +0200)]
Move some of the SocketApi conflict handling in a ConflictSolver class
The socket api move and delete commands are not strictly about conflicts
since they also deal with files which couldn't be uploaded for some
other reason. Still the new ConflictSolver could be used in those cases.
This opens the door at reusing that logic in other places.
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Kevin Ottens [Wed, 7 Oct 2020 15:47:48 +0000 (17:47 +0200)]
Repair the canAddToDir logic
This could only work at the root of the sync folder where the record for
the parent folder would be invalid. Otherwise the negation would be
wrong... assuming you can add a file only if the permission is not
there.
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Christian Kamm [Wed, 7 Oct 2020 12:51:04 +0000 (14:51 +0200)]
SocketAPI: Introduce conflict resolution actions #6252
For conflicts generally as well as new files in read-only directories
the context menu will now present delete and move options.
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Christian Kamm [Tue, 22 May 2018 09:49:02 +0000 (11:49 +0200)]
FileSystem: make removeRecursively() reusable
We want to use it for deleting directory conflicts.
Christian Kamm [Tue, 22 May 2018 08:40:45 +0000 (10:40 +0200)]
FileSystem: Fix bad indentation
Kevin Ottens [Thu, 22 Oct 2020 13:08:01 +0000 (15:08 +0200)]
Merge pull request #2580 from nextcloud/delay-settingsdialog-init
Delay initialization of SettingsDialog
Michael Schuster [Thu, 22 Oct 2020 02:14:09 +0000 (04:14 +0200)]
Fix crash in SettingsDialog with delayed initialization
setWindowFlags triggered changeEvent, thus causing a crash in customizeStyle.
This fix should be kept even if we decide against delayed init in the future.
Signed-off-by: Michael Schuster <michael@schuster.ms>
Michael Schuster [Thu, 22 Oct 2020 01:57:29 +0000 (03:57 +0200)]
Delay initialization of SettingsDialog
ownCloudGui::slotShowSettings already got what it takes to create it only when we try to show it for the first time.
This however has some implications:
Pros:
- Only created when needed, while testing saved ca. 20 MB of RAM and got freed again after closing the dialog.
- Since we defaulted to the new Tray UI from 3.0, this is an added bonus for users don't opening the settings.
Cons:
- Resources like the avatar image have to be refetched everytime the dialog is recreated.
This may be desired as well, because it ensures displaying no outdated info (e.g. on connection issues).
Signed-off-by: Michael Schuster <michael@schuster.ms>
Nextcloud bot [Thu, 22 Oct 2020 03:39:17 +0000 (03:39 +0000)]
[tx-robot] updated from transifex
Kevin Ottens [Wed, 21 Oct 2020 12:13:40 +0000 (14:13 +0200)]
Merge pull request #2575 from nextcloud/expose_branding_values_to_qtquick
Expose branding values to qtquick
Kevin Ottens [Wed, 21 Oct 2020 11:46:51 +0000 (13:46 +0200)]
Use the Theme colors for the header part of the window
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Kevin Ottens [Wed, 21 Oct 2020 11:46:38 +0000 (13:46 +0200)]
Expose Theme on the QML side
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Kevin Ottens [Wed, 21 Oct 2020 11:46:04 +0000 (13:46 +0200)]
Expose the branding related members of Theme as properties
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Kevin Ottens [Wed, 21 Oct 2020 11:40:42 +0000 (13:40 +0200)]
Don't hardcode the color of text in the header
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Kevin Ottens [Wed, 21 Oct 2020 09:24:06 +0000 (11:24 +0200)]
Get rid of ncBlueHover
Use a similar trick of a semi-transparent rectangle on top when the
mouse area is hovered. This way it will always work whatever is the
background color.
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Kevin Ottens [Wed, 21 Oct 2020 08:16:14 +0000 (10:16 +0200)]
Merge pull request #2572 from nextcloud/avoid_depth_infinity_propfind_for_e2ee
Avoid depth infinity propfind for e2ee
Kevin Ottens [Tue, 20 Oct 2020 15:05:57 +0000 (17:05 +0200)]
Don't use depth infinity anymore to get the folders e2ee status
This way we avoid the expensive SQL query on the server at the price of
more round-trips since we're doing the recursive traversal by hand now.
Also it turns out this depth was used for all the other propfind calls
during sync when we want fresher information regarding a folder. This
was very inefficient in all cases and won't happen anymore.
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Kevin Ottens [Tue, 20 Oct 2020 14:51:38 +0000 (16:51 +0200)]
Make sure jobs don't outlive ClientSideEncryption
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Kevin Ottens [Tue, 20 Oct 2020 14:48:54 +0000 (16:48 +0200)]
Factor out the logic to start a new e2ee status job
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Kevin Ottens [Tue, 20 Oct 2020 14:36:10 +0000 (16:36 +0200)]
Mention the folder we listed in the debug logs
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Kevin Ottens [Tue, 20 Oct 2020 14:33:46 +0000 (16:33 +0200)]
Change the way we store the job result
If there's more than one job we need to unite the maps not simply overwrite
them.
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Kevin Ottens [Tue, 20 Oct 2020 14:27:20 +0000 (16:27 +0200)]
Start managing a list of GetFolderEncryptStatusJob
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Kevin Ottens [Tue, 20 Oct 2020 14:15:56 +0000 (16:15 +0200)]
Add a way to know which folder was listed for encrypted status
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Nextcloud bot [Wed, 21 Oct 2020 03:39:44 +0000 (03:39 +0000)]
[tx-robot] updated from transifex
Kevin Ottens [Tue, 20 Oct 2020 14:38:13 +0000 (16:38 +0200)]
Merge pull request #2568 from nextcloud/fix-macos-crash-403-folder-view
Fix crash when clicking on folder with status 403 in the main dialog.
Camila San [Tue, 20 Oct 2020 10:21:12 +0000 (12:21 +0200)]
Fix crash when clicking on folder with status 403 in the main dialog.
LsColJob was still being used after delete was called.
Signed-off-by: Camila San <hello@camila.codes>
Nextcloud bot [Tue, 20 Oct 2020 03:38:46 +0000 (03:38 +0000)]
[tx-robot] updated from transifex
Kevin Ottens [Mon, 19 Oct 2020 15:09:55 +0000 (17:09 +0200)]
Merge pull request #2551 from nextcloud/fix_share_dialog_animation_for_enforced_password_policy
Fix share dialog animation for enforced password policy
Kevin Ottens [Wed, 14 Oct 2020 16:41:35 +0000 (18:41 +0200)]
Stop the animation if we got an error message
Otherwise it would spin forever while we know we're not doing any work
anymore since we got a message from the server.
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Kevin Ottens [Wed, 14 Oct 2020 16:37:34 +0000 (18:37 +0200)]
Inform _emptyShareLinkWidget of linkShareRequiresPassword signals
All the other ShareLinkWidgets process that signal (which allows to
display error messages for instance) but not that one for some reason.
That being said it might need to deal with an enforced password
situation.
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Kevin Ottens [Wed, 14 Oct 2020 16:35:12 +0000 (18:35 +0200)]
Emit last to avoid use after delete crash
It turns out the shareDeleted() signal is connected to a function
cleaning up the ShareLinkWidget holding the last shared pointer to the
Share object. Since we use member variables for calling updateFolder()
this would lead to using deleted objects.
Just swap the call and the signal to have everything back in order.
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Nextcloud bot [Sat, 17 Oct 2020 03:38:33 +0000 (03:38 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Fri, 16 Oct 2020 03:39:07 +0000 (03:39 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Thu, 15 Oct 2020 03:37:51 +0000 (03:37 +0000)]
[tx-robot] updated from transifex
Michael Schuster [Thu, 15 Oct 2020 00:15:42 +0000 (02:15 +0200)]
Update comments
Everyone uses their private mail, so ensure people can get in touch.
Signed-off-by: Michael Schuster <michael@schuster.ms>
Nextcloud bot [Wed, 14 Oct 2020 03:41:57 +0000 (03:41 +0000)]
[tx-robot] updated from transifex
Kevin Ottens [Tue, 13 Oct 2020 13:23:56 +0000 (15:23 +0200)]
Merge pull request #2534 from nextcloud/connection_wizard_improvements
Connection wizard improvements
Kevin Ottens [Tue, 13 Oct 2020 05:23:46 +0000 (07:23 +0200)]
Ensure we use the app name in the GUI
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Kevin Ottens [Thu, 8 Oct 2020 15:39:24 +0000 (17:39 +0200)]
Fix the secure lock label aspect
Make sure we got a fixed size for that label. Also ensure that the
pixmap we display there is properly scaled to fit while maintaining the
aspect ratio.
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Kevin Ottens [Thu, 8 Oct 2020 15:25:12 +0000 (17:25 +0200)]
Hide the slideshow when going to the login page
This is indeed very distracting otherwise.
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Kevin Ottens [Thu, 8 Oct 2020 15:17:01 +0000 (17:17 +0200)]
Add a label explaining the server address field
This is as discussed in #1160
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Kevin Ottens [Thu, 8 Oct 2020 15:13:01 +0000 (17:13 +0200)]
Improve wording on the wizard buttons
This is as discussed on #1158
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
Nextcloud bot [Tue, 13 Oct 2020 03:40:16 +0000 (03:40 +0000)]
[tx-robot] updated from transifex
Kevin Ottens [Mon, 12 Oct 2020 15:31:11 +0000 (17:31 +0200)]
Merge pull request #2543 from renyhp/patch-2
Update bookmarks location
renyhp [Sat, 10 Oct 2020 14:15:26 +0000 (16:15 +0200)]
Update bookmarks location
Signed-off-by: renyhp <renyhp@disroot.org>
Kevin Ottens [Mon, 12 Oct 2020 15:00:49 +0000 (17:00 +0200)]
Merge pull request #2542 from nicolasfella/puzzel
Avoid string translation puzzle
Nicolas Fella [Fri, 9 Oct 2020 22:26:18 +0000 (00:26 +0200)]
Avoid string translation puzzle
Combining translated strings like this makes them hard to translate since the order of words is different between languages.
Use proper placeholder strings instead.
Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
Kevin Ottens [Mon, 12 Oct 2020 13:33:38 +0000 (15:33 +0200)]
Merge pull request #2541 from nicolasfella/work/nullptrflags
Don't use nullptr for QFlags
Nicolas Fella [Fri, 9 Oct 2020 20:56:45 +0000 (22:56 +0200)]
Don't use nullptr for QFlags
This fixes some deprecation warnings
Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>