943e1746a8
prepare for 3.7.0-rc1 release
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-01-30 16:50:51 +01:00
bfc80d2cb9
Merge pull request #5370 from nextcloud/feature/e2ee-folders-unlock-always
...
Always unlock E2EE folders, even when network failure or crash.
2023-01-30 16:46:50 +01:00
bd9eb0c89f
Always unlock E2EE folders, even when network failure or crash.
...
Signed-off-by: alex-z <blackslayer4@gmail.com>
2023-01-30 16:01:19 +01:00
2a64fc782b
Fix(l10n): 🔠 Update translations from Transifex
...
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-30 10:24:32 +00:00
a7013c51e6
Merge pull request #5362 from nextcloud/bugfix/migrate
...
Migrate old configs
2023-01-30 10:01:01 +01:00
a3e08aae3b
Address PR comments.
...
Signed-off-by: Camila <hello@camila.codes>
2023-01-30 09:44:17 +01:00
9a3f2efa58
Fix rename.
...
Signed-off-by: Camila <hello@camila.codes>
2023-01-30 09:44:17 +01:00
ea903b1316
Backup all config files in the config folder if there was a version change of the client.
...
Signed-off-by: Camila <hello@camila.codes>
2023-01-30 09:44:17 +01:00
85b4c19b7b
Extend config backup method to make a copy of any given config file.
...
Signed-off-by: Camila <hello@camila.codes>
2023-01-30 09:44:17 +01:00
dbce267feb
Look for a previous config file with a different name.
...
Signed-off-by: Camila <hello@camila.codes>
2023-01-30 09:44:17 +01:00
bf258542cd
Update code style.
...
Signed-off-by: Camila <hello@camila.codes>
2023-01-30 09:44:17 +01:00
e68b4595e7
Remove obsolete QDesktopServices::storageLocation.
...
Use QStandardPaths::writableLocation instead.
Signed-off-by: Camila <hello@camila.codes>
2023-01-30 09:44:17 +01:00
908fe5cba4
Merge pull request #4684 from nextcloud/bugfix/issue-519
...
Open calendar notifications in the browser.
2023-01-30 09:43:41 +01:00
b4882ae5c7
Update tests for ActivityData.
...
Signed-off-by: Camila <hello@camila.codes>
2023-01-27 12:30:01 +00:00
b525de8a97
Open calendar notifications in the browser.
...
Signed-off-by: Camila <hello@camila.codes>
2023-01-27 12:30:01 +00:00
9cb1609896
Merge pull request #5372 from nextcloud/bugfix/revert-mono-config-delete
...
Revert "Merge pull request #5366 from nextcloud/bugfix/remove-mono-icons-setting"
2023-01-27 13:16:22 +01:00
68c785e25c
Revert "Merge pull request #5366 from nextcloud/bugfix/remove-mono-icons-setting"
...
This reverts commit 5c42da4de5e4b2449030
2023-01-27 12:23:11 +01:00
e332929ffe
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.
2023-01-26 18:35:51 +01:00
bb8bdab19c
Edit locally. Do not lock if locking is disabled on the server.
...
Signed-off-by: alex-z <blackslayer4@gmail.com>
2023-01-26 17:00:14 +01:00
aa74448f75
Merge pull request #5232 from nextcloud/feature/syncWithCaseClashNames
...
Feature/sync with case clash names
2023-01-26 09:05:57 +01:00
fbb0a33eb7
use auto
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-01-25 16:37:37 +01:00
eb9a496f41
use #pragma once instead of include guards
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-01-25 16:37:37 +01:00
07c292eaf5
fix copyright notice of new files
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-01-25 16:37:37 +01:00
3b6e5555d1
fix wrong code style
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-01-25 16:37:36 +01:00
b028024b08
simplify code
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-01-25 16:37:36 +01:00
7091b7f889
remove some not needed debug logs
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-01-25 16:37:36 +01:00
8dee66f84e
simplify code
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-01-25 16:37:36 +01:00
9a9e73cdce
move some void returning methods to be slots
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-01-25 16:37:36 +01:00
4c4e8707da
Improve wording in the case clash resolution dialog
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-01-25 16:37:36 +01:00
64e585e5a2
Display both files and some metadata in the case clash conflict resolution dialog
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-01-25 16:37:36 +01:00
2359c80c13
Fix case clash dialog sizing issues
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-01-25 16:37:36 +01:00
cf6794c180
Clarify letter casing message in case clash conflict dialog
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-01-25 16:37:36 +01:00
5908ac4176
Display action button for conflict files in activity
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-01-25 16:37:35 +01:00
602b8db5e2
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>
2023-01-25 16:37:35 +01:00
5c42da4de5
Merge pull request #5366 from nextcloud/bugfix/remove-mono-icons-setting
...
Remove unused monochrome icons setting
2023-01-25 15:22:21 +01:00
8f2dcf4ca3
Remove monoIcons related things from configfile
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-01-25 12:56:26 +01:00
0aee2bc2eb
Remove monoIcons-related functionality from theme
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-01-25 12:42:47 +01:00
688126c003
Remove mono icons setting from generalsettings
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-01-25 12:32:06 +01:00
6df08af61a
Remove 'Use monochrome icons' checkbox from settings UI
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-01-25 12:27:42 +01:00
e4b2449030
Fix(l10n): 🔠 Update translations from Transifex
...
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-25 09:12:03 +00:00
8ffaf34484
Merge pull request #5167 from nextcloud/feature/disable-e2ee
...
Add ability to disable E2EE
2023-01-24 17:35:19 +01:00
3e00df4732
Don't shadow rec variable in removeLocalE2eFiles
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-01-24 17:00:16 +01:00
e993684775
Remove faulty else statement from TestFolderman that would erroneously cause failure
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-01-24 17:00:16 +01:00
352c660363
Ensure mocked database entries are correct in TestFolderMan
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-01-24 17:00:16 +01:00
95aa3ee53b
Make encrypted folder paths to delete non-relative when checking if they are encrypted
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-01-24 17:00:16 +01:00
b7311278a8
Fix folderman delete encrypted files test
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-01-24 17:00:16 +01:00
6f4c7849f3
Replace use of deprecated QSet::toList() with QSet::values()
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-01-24 17:00:16 +01:00
4c1a9f787a
Ensure blacklists get updated when removing folder sync
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-01-24 17:00:16 +01:00
d93fc8eb3d
Don't use foreach in Folder::removeLocalE2eFiles
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-01-24 17:00:15 +01:00
8c556287b8
Split if statement conditions in enqueueDirectoryToDelete into separate lines
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-01-24 17:00:15 +01:00
Matthieu Gallien