Matthieu Gallien [Thu, 2 Feb 2023 07:58:58 +0000 (08:58 +0100)]
Merge pull request #5388 from nextcloud/backport/5385/stable-3.7
Backport/5385/stable 3.7
Camila [Wed, 1 Feb 2023 20:58:25 +0000 (21:58 +0100)]
Update code style.
Signed-off-by: Camila <hello@camila.codes>
Camila [Wed, 1 Feb 2023 19:56:34 +0000 (20:56 +0100)]
Fix: if the config did not exist, overrideserverurl had no effect.
When the client runs for the first time, setting the value was done before
the config file was created. It had no effect.
Signed-off-by: Camila <hello@camila.codes>
Camila [Wed, 1 Feb 2023 19:25:49 +0000 (20:25 +0100)]
Do not exit application when overrideserverurl param is a valid url.
Signed-off-by: Camila <hello@camila.codes>
Camila [Wed, 1 Feb 2023 18:58:45 +0000 (19:58 +0100)]
Only accept folder setup page if overrideLocalDir is set.
Fix for #5383.
Signed-off-by: Camila <hello@camila.codes>
Matthieu Gallien [Thu, 2 Feb 2023 07:44:56 +0000 (08:44 +0100)]
Merge pull request #5386 from nextcloud/backport/5384/stable-3.7
[stable-3.7] Improve config upgrade warning dialog
Camila [Wed, 1 Feb 2023 16:25:24 +0000 (17:25 +0100)]
By default do not display warning about backups made of the config file.
Use the setting showConfigBackupWarning to change the default value.
Signed-off-by: Camila <hello@camila.codes>
Camila [Wed, 1 Feb 2023 15:21:25 +0000 (16:21 +0100)]
Improve warning message code readability.
Signed-off-by: Camila <hello@camila.codes>
Matthieu Gallien [Tue, 31 Jan 2023 17:43:57 +0000 (18:43 +0100)]
use QVersionNumber to compare versions and improve upgrade warning
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Tue, 31 Jan 2023 17:41:43 +0000 (18:41 +0100)]
fix wrong detectiion of current config file as a config migration
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Nextcloud bot [Thu, 2 Feb 2023 03:40:04 +0000 (03:40 +0000)]
Fix(l10n): 🔠Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Nextcloud bot [Wed, 1 Feb 2023 03:42:56 +0000 (03:42 +0000)]
Fix(l10n): 🔠Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Claudio Cambra [Tue, 31 Jan 2023 17:42:05 +0000 (18:42 +0100)]
Merge pull request #5380 from nextcloud/backport/5379/stable-3.7
[stable-3.7] Fix displaying of file details button for local syncfileitem activities
Claudio Cambra [Tue, 31 Jan 2023 12:03:52 +0000 (13:03 +0100)]
Fix displaying of file details button for local syncfileitem activities
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Nextcloud bot [Tue, 31 Jan 2023 03:47:12 +0000 (03:47 +0000)]
Fix(l10n): 🔠Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Matthieu Gallien [Mon, 30 Jan 2023 15:50:51 +0000 (16:50 +0100)]
prepare for 3.7.0-rc1 release
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Mon, 30 Jan 2023 15:46:50 +0000 (16:46 +0100)]
Merge pull request #5370 from nextcloud/feature/e2ee-folders-unlock-always
Always unlock E2EE folders, even when network failure or crash.
alex-z [Wed, 25 Jan 2023 17:09:37 +0000 (18:09 +0100)]
Always unlock E2EE folders, even when network failure or crash.
Signed-off-by: alex-z <blackslayer4@gmail.com>
Nextcloud bot [Mon, 30 Jan 2023 10:24:32 +0000 (10:24 +0000)]
Fix(l10n): 🔠Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Matthieu Gallien [Mon, 30 Jan 2023 09:01:01 +0000 (10:01 +0100)]
Merge pull request #5362 from nextcloud/bugfix/migrate
Migrate old configs
Camila [Mon, 23 Jan 2023 16:30:59 +0000 (16:30 +0000)]
Address PR comments.
Signed-off-by: Camila <hello@camila.codes>
Camila [Mon, 23 Jan 2023 16:01:49 +0000 (16:01 +0000)]
Fix rename.
Signed-off-by: Camila <hello@camila.codes>
Camila [Tue, 27 Dec 2022 21:19:17 +0000 (22:19 +0100)]
Backup all config files in the config folder if there was a version change of the client.
Signed-off-by: Camila <hello@camila.codes>
Camila [Tue, 27 Dec 2022 20:25:40 +0000 (21:25 +0100)]
Extend config backup method to make a copy of any given config file.
Signed-off-by: Camila <hello@camila.codes>
Camila [Tue, 27 Dec 2022 17:25:23 +0000 (18:25 +0100)]
Look for a previous config file with a different name.
Signed-off-by: Camila <hello@camila.codes>
Camila [Tue, 27 Dec 2022 17:24:41 +0000 (18:24 +0100)]
Update code style.
Signed-off-by: Camila <hello@camila.codes>
Camila [Tue, 27 Dec 2022 16:27:09 +0000 (17:27 +0100)]
Remove obsolete QDesktopServices::storageLocation.
Use QStandardPaths::writableLocation instead.
Signed-off-by: Camila <hello@camila.codes>
Matthieu Gallien [Mon, 30 Jan 2023 08:43:41 +0000 (09:43 +0100)]
Merge pull request #4684 from nextcloud/bugfix/issue-519
Open calendar notifications in the browser.
Camila [Wed, 2 Nov 2022 17:18:50 +0000 (18:18 +0100)]
Update tests for ActivityData.
Signed-off-by: Camila <hello@camila.codes>
Camila [Wed, 29 Jun 2022 15:44:59 +0000 (17:44 +0200)]
Open calendar notifications in the browser.
Signed-off-by: Camila <hello@camila.codes>
Claudio Cambra [Fri, 27 Jan 2023 12:16:22 +0000 (13:16 +0100)]
Merge pull request #5372 from nextcloud/bugfix/revert-mono-config-delete
Revert "Merge pull request #5366 from nextcloud/bugfix/remove-mono-icons-setting"
Claudio Cambra [Fri, 27 Jan 2023 11:00:40 +0000 (12:00 +0100)]
Revert "Merge pull request #5366 from nextcloud/bugfix/remove-mono-icons-setting"
This reverts commit
5c42da4de5facbea9b06cf7086bee17005be59b2, reversing
changes made to
e4b24490307f4337b390b6b484e8d77befffaf1b.
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
allexzander [Thu, 26 Jan 2023 17:35:51 +0000 (18:35 +0100)]
Merge pull request #5371 from nextcloud/bugfix/do-not-lock-if-lock-is-not-available
Edit locally. Do not lock if locking is disabled on the server.
alex-z [Thu, 26 Jan 2023 16:00:14 +0000 (17:00 +0100)]
Edit locally. Do not lock if locking is disabled on the server.
Signed-off-by: alex-z <blackslayer4@gmail.com>
Matthieu Gallien [Thu, 26 Jan 2023 08:05:57 +0000 (09:05 +0100)]
Merge pull request #5232 from nextcloud/feature/syncWithCaseClashNames
Feature/sync with case clash names
Matthieu Gallien [Tue, 24 Jan 2023 21:35:52 +0000 (22:35 +0100)]
use auto
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Tue, 24 Jan 2023 21:31:32 +0000 (22:31 +0100)]
use #pragma once instead of include guards
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Tue, 24 Jan 2023 21:31:09 +0000 (22:31 +0100)]
fix copyright notice of new files
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Tue, 24 Jan 2023 21:25:10 +0000 (22:25 +0100)]
fix wrong code style
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Tue, 24 Jan 2023 21:24:30 +0000 (22:24 +0100)]
simplify code
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Tue, 24 Jan 2023 21:23:24 +0000 (22:23 +0100)]
remove some not needed debug logs
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Tue, 24 Jan 2023 20:27:50 +0000 (21:27 +0100)]
simplify code
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Tue, 24 Jan 2023 20:21:34 +0000 (21:21 +0100)]
move some void returning methods to be slots
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Claudio Cambra [Wed, 14 Dec 2022 19:25:07 +0000 (20:25 +0100)]
Improve wording in the case clash resolution dialog
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Wed, 14 Dec 2022 19:17:24 +0000 (20:17 +0100)]
Display both files and some metadata in the case clash conflict resolution dialog
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 5 Dec 2022 13:52:07 +0000 (14:52 +0100)]
Fix case clash dialog sizing issues
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 5 Dec 2022 13:28:33 +0000 (14:28 +0100)]
Clarify letter casing message in case clash conflict dialog
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 5 Dec 2022 12:54:11 +0000 (13:54 +0100)]
Display action button for conflict files in activity
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Matthieu Gallien [Wed, 30 Nov 2022 09:34:49 +0000 (10:34 +0100)]
handle case clash conflicts in a similar way to content conflicts
introduce a new type of conflict for case clash filename conflicts
add proper handling including a new utility class to solve them and a
new dialog for the user to pick a fix
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Claudio Cambra [Wed, 25 Jan 2023 14:22:21 +0000 (15:22 +0100)]
Merge pull request #5366 from nextcloud/bugfix/remove-mono-icons-setting
Remove unused monochrome icons setting
Claudio Cambra [Wed, 25 Jan 2023 11:56:26 +0000 (12:56 +0100)]
Remove monoIcons related things from configfile
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Wed, 25 Jan 2023 11:42:47 +0000 (12:42 +0100)]
Remove monoIcons-related functionality from theme
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Wed, 25 Jan 2023 11:32:06 +0000 (12:32 +0100)]
Remove mono icons setting from generalsettings
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Wed, 25 Jan 2023 11:27:42 +0000 (12:27 +0100)]
Remove 'Use monochrome icons' checkbox from settings UI
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Nextcloud bot [Wed, 25 Jan 2023 09:12:03 +0000 (09:12 +0000)]
Fix(l10n): 🔠Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Claudio Cambra [Tue, 24 Jan 2023 16:35:19 +0000 (17:35 +0100)]
Merge pull request #5167 from nextcloud/feature/disable-e2ee
Add ability to disable E2EE
Claudio Cambra [Tue, 24 Jan 2023 15:59:43 +0000 (16:59 +0100)]
Don't shadow rec variable in removeLocalE2eFiles
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 23 Jan 2023 20:38:46 +0000 (21:38 +0100)]
Remove faulty else statement from TestFolderman that would erroneously cause failure
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 23 Jan 2023 20:37:57 +0000 (21:37 +0100)]
Ensure mocked database entries are correct in TestFolderMan
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 23 Jan 2023 20:36:48 +0000 (21:36 +0100)]
Make encrypted folder paths to delete non-relative when checking if they are encrypted
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 9 Jan 2023 14:51:26 +0000 (15:51 +0100)]
Fix folderman delete encrypted files test
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 9 Jan 2023 13:06:14 +0000 (14:06 +0100)]
Replace use of deprecated QSet::toList() with QSet::values()
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Tue, 3 Jan 2023 18:44:04 +0000 (19:44 +0100)]
Ensure blacklists get updated when removing folder sync
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Tue, 3 Jan 2023 18:03:21 +0000 (19:03 +0100)]
Don't use foreach in Folder::removeLocalE2eFiles
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Tue, 3 Jan 2023 18:01:24 +0000 (19:01 +0100)]
Split if statement conditions in enqueueDirectoryToDelete into separate lines
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
alex-z [Fri, 30 Dec 2022 12:59:50 +0000 (13:59 +0100)]
Fix issue of e2ee folders not disappearing when disabling the e2e. Properly process blacklisted e2ee folders instead of ignoring them.
Signed-off-by: alex-z <blackslayer4@gmail.com>
Claudio Cambra [Tue, 20 Dec 2022 19:16:06 +0000 (20:16 +0100)]
Ensure blacklisted e2ee files get deleted
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Tue, 20 Dec 2022 17:29:24 +0000 (18:29 +0100)]
Clean up sync termination and restart procedure after file blacklisting done
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Tue, 20 Dec 2022 12:26:27 +0000 (13:26 +0100)]
Only add root-most encrypted folder to the blacklist
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Tue, 20 Dec 2022 11:40:42 +0000 (12:40 +0100)]
Make sure to add e2ee files to normal blacklist too
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 19 Dec 2022 18:00:19 +0000 (19:00 +0100)]
Only shedule affected paths for remote discovery after disabling e2ee
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 19 Dec 2022 17:58:37 +0000 (18:58 +0100)]
Use e2ee folder blacklist instead of deleting folders directly
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Wed, 16 Nov 2022 19:56:34 +0000 (20:56 +0100)]
Add test for deleting encrypted files
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Wed, 16 Nov 2022 19:55:53 +0000 (20:55 +0100)]
Make accountstate fakeable for tests
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Fri, 11 Nov 2022 17:32:12 +0000 (18:32 +0100)]
Delete E2EE files/folders for accounts that have had E2EE disabled
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Fri, 11 Nov 2022 15:01:04 +0000 (16:01 +0100)]
Add ability to remove local encryption keys through settings
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Fri, 11 Nov 2022 14:54:13 +0000 (15:54 +0100)]
Properly handle sensitive data deletion in ClientSideEncryption
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Fri, 11 Nov 2022 12:43:00 +0000 (13:43 +0100)]
Clean up declarations in AccountSettings
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Fri, 11 Nov 2022 12:11:33 +0000 (13:11 +0100)]
Clean up declarations in ClientSideEncryption
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Tue, 24 Jan 2023 11:24:38 +0000 (12:24 +0100)]
Merge pull request #5266 from nextcloud/bugfix/fetch-more-fix
Fix fetch more unified search result item not being clickable
Claudio Cambra [Mon, 12 Dec 2022 13:32:03 +0000 (14:32 +0100)]
Fix fetch more unified search result item not being clickable
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 23 Jan 2023 17:41:46 +0000 (18:41 +0100)]
Merge pull request #5317 from nextcloud/bugfix/edit-locally-folder-lock
Don't try to lock folders when editing locally
Claudio Cambra [Mon, 9 Jan 2023 16:11:33 +0000 (17:11 +0100)]
Don't try to lock folders when editing locally
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 23 Jan 2023 16:46:16 +0000 (17:46 +0100)]
Merge pull request #5322 from nextcloud/bugfix/old-migration-fix
Fix migration from legacy client when override server url is set
Claudio Cambra [Wed, 11 Jan 2023 18:22:56 +0000 (19:22 +0100)]
Correctly parse account server url when migration from legacy config
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Wed, 11 Jan 2023 17:17:03 +0000 (18:17 +0100)]
Stop checking config to migrate at current path if could not read file
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Wed, 11 Jan 2023 15:58:48 +0000 (16:58 +0100)]
More concisely clean paths of trailing slash URLs in restore old config migration method of AccountManager
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 23 Jan 2023 15:28:39 +0000 (16:28 +0100)]
Merge pull request #5361 from nextcloud/bugfix/update-copyright-years
Update legal notice to 2023
Claudio Cambra [Mon, 23 Jan 2023 14:33:29 +0000 (15:33 +0100)]
Update legal notice text
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 23 Jan 2023 14:31:44 +0000 (15:31 +0100)]
Update Windows shell integration rc copyright strings
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
allexzander [Mon, 23 Jan 2023 13:24:35 +0000 (14:24 +0100)]
Merge pull request #5358 from nextcloud/bugfix/fix-bad-string-for-tr
Fix bad string for translation.
alex-z [Mon, 23 Jan 2023 12:05:55 +0000 (13:05 +0100)]
Fix bad string for translation.
Signed-off-by: alex-z <blackslayer4@gmail.com>
allexzander [Wed, 18 Jan 2023 11:21:18 +0000 (12:21 +0100)]
Merge pull request #5324 from nextcloud/bugfix/e2ee-vulnerability-random-initializationvectoor
Always generate random initialization vector when uploading encrypted file
alex-z [Wed, 11 Jan 2023 18:56:34 +0000 (19:56 +0100)]
Always generate random initialization vector when uploading encrypted file.
Signed-off-by: alex-z <blackslayer4@gmail.com>
allexzander [Wed, 18 Jan 2023 10:54:02 +0000 (11:54 +0100)]
Merge pull request #5323 from nextcloud/bugfix/e2ee-vulnerability-empty-metadatakeys
Bugfix/e2ee vulnerability empty metadatakeys
alex-z [Thu, 12 Jan 2023 10:15:34 +0000 (11:15 +0100)]
remove unrelated changes
Signed-off-by: alex-z <blackslayer4@gmail.com>
alex-z [Thu, 12 Jan 2023 10:14:36 +0000 (11:14 +0100)]
remove unrelated changes
Signed-off-by: alex-z <blackslayer4@gmail.com>
alex-z [Wed, 11 Jan 2023 18:46:01 +0000 (19:46 +0100)]
Fix memory leak.
Signed-off-by: alex-z <blackslayer4@gmail.com>
alex-z [Wed, 11 Jan 2023 17:25:01 +0000 (18:25 +0100)]
Fix security vulnerability when receiving empty metadataKeys from the server.
Signed-off-by: alex-z <blackslayer4@gmail.com>
allexzander [Tue, 17 Jan 2023 17:18:13 +0000 (18:18 +0100)]
Merge pull request #5329 from nextcloud/feature/allow-forceoverrideurl-via-command-line
Feature/allow forceoverrideurl via command line
projects / nextcloud-desktop.git / log