18935 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Claudio Cambra	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
Matthieu Gallien	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
Claudio Cambra	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
Claudio Cambra	8f2dcf4ca3	Remove monoIcons related things from configfile ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-25 12:56:26 +01:00
Claudio Cambra	0aee2bc2eb	Remove monoIcons-related functionality from theme ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-25 12:42:47 +01:00
Claudio Cambra	688126c003	Remove mono icons setting from generalsettings ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-25 12:32:06 +01:00
Claudio Cambra	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
Nextcloud bot	e4b2449030	Fix(l10n): 🔠 Update translations from Transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2023-01-25 09:12:03 +00:00
Claudio Cambra	8ffaf34484	Merge pull request #5167 from nextcloud/feature/disable-e2ee ... Add ability to disable E2EE	2023-01-24 17:35:19 +01:00
Claudio Cambra	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
Claudio Cambra	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
Claudio Cambra	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
Claudio Cambra	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
Claudio Cambra	b7311278a8	Fix folderman delete encrypted files test ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-24 17:00:16 +01:00
Claudio Cambra	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
Claudio Cambra	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
Claudio Cambra	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
Claudio Cambra	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
alex-z	ad258473c4	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>	2023-01-24 17:00:15 +01:00
Claudio Cambra	efcd23eb06	Ensure blacklisted e2ee files get deleted ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-24 17:00:15 +01:00
Claudio Cambra	b333310ffe	Clean up sync termination and restart procedure after file blacklisting done ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-24 17:00:15 +01:00
Claudio Cambra	fdaedc4914	Only add root-most encrypted folder to the blacklist ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-24 17:00:15 +01:00
Claudio Cambra	7d208ec06e	Make sure to add e2ee files to normal blacklist too ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-24 17:00:15 +01:00
Claudio Cambra	093810f6b9	Only shedule affected paths for remote discovery after disabling e2ee ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-24 17:00:15 +01:00
Claudio Cambra	1fc1e95161	Use e2ee folder blacklist instead of deleting folders directly ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-24 17:00:15 +01:00
Claudio Cambra	12b2673ac2	Add test for deleting encrypted files ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-24 17:00:15 +01:00
Claudio Cambra	c59ab85e22	Make accountstate fakeable for tests ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-24 17:00:14 +01:00
Claudio Cambra	b57b35e7a4	Delete E2EE files/folders for accounts that have had E2EE disabled ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-24 17:00:14 +01:00
Claudio Cambra	cc6bdc9bd5	Add ability to remove local encryption keys through settings ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-24 17:00:14 +01:00
Claudio Cambra	689dee6a16	Properly handle sensitive data deletion in ClientSideEncryption ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-24 17:00:14 +01:00
Claudio Cambra	f9fb03bdc9	Clean up declarations in AccountSettings ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-24 17:00:14 +01:00
Claudio Cambra	2c4dc7e231	Clean up declarations in ClientSideEncryption ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-24 17:00:14 +01:00
Claudio Cambra	bca3d9469a	Merge pull request #5266 from nextcloud/bugfix/fetch-more-fix ... Fix fetch more unified search result item not being clickable	2023-01-24 12:24:38 +01:00
Claudio Cambra	96cd78264d	Fix fetch more unified search result item not being clickable ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-24 12:24:01 +01:00
Claudio Cambra	d69583ba12	Merge pull request #5317 from nextcloud/bugfix/edit-locally-folder-lock ... Don't try to lock folders when editing locally	2023-01-23 18:41:46 +01:00
Claudio Cambra	0ab2bd849b	Don't try to lock folders when editing locally ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-23 17:46:43 +01:00
Claudio Cambra	c5c2e95cfb	Merge pull request #5322 from nextcloud/bugfix/old-migration-fix ... Fix migration from legacy client when override server url is set	2023-01-23 17:46:16 +01:00
Claudio Cambra	c496e73200	Correctly parse account server url when migration from legacy config ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-23 16:29:01 +01:00
Claudio Cambra	174a486428	Stop checking config to migrate at current path if could not read file ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-23 16:29:01 +01:00
Claudio Cambra	39914e5166	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>	2023-01-23 16:29:01 +01:00
Claudio Cambra	57a674c2b6	Merge pull request #5361 from nextcloud/bugfix/update-copyright-years ... Update legal notice to 2023	2023-01-23 16:28:39 +01:00
Claudio Cambra	dd4b7b6c26	Update legal notice text ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-23 15:37:56 +01:00
Claudio Cambra	706b1bd3a1	Update Windows shell integration rc copyright strings ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2023-01-23 15:37:56 +01:00
allexzander	636027a9b3	Merge pull request #5358 from nextcloud/bugfix/fix-bad-string-for-tr ... Fix bad string for translation.	2023-01-23 14:24:35 +01:00
alex-z	d8980a8567	Fix bad string for translation. ... Signed-off-by: alex-z <blackslayer4@gmail.com>	2023-01-23 13:07:41 +01:00
allexzander	593377a4cb	Merge pull request #5324 from nextcloud/bugfix/e2ee-vulnerability-random-initializationvectoor ... Always generate random initialization vector when uploading encrypted file	2023-01-18 12:21:18 +01:00
alex-z	75fd1d21be	Always generate random initialization vector when uploading encrypted file. ... Signed-off-by: alex-z <blackslayer4@gmail.com>	2023-01-18 11:54:13 +01:00
allexzander	14072703c4	Merge pull request #5323 from nextcloud/bugfix/e2ee-vulnerability-empty-metadatakeys ... Bugfix/e2ee vulnerability empty metadatakeys	2023-01-18 11:54:02 +01:00
alex-z	cdbdf8620d	remove unrelated changes ... Signed-off-by: alex-z <blackslayer4@gmail.com>	2023-01-18 11:41:55 +01:00
alex-z	4644581af9	remove unrelated changes ... Signed-off-by: alex-z <blackslayer4@gmail.com>	2023-01-18 11:41:55 +01:00