18664 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Claudio Cambra	70468be5e5	Differentiate between E2EE not being enabled at all vs. E2EE being enabled already through another device in account settings message ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2022-12-01 11:50:18 +01:00
Nextcloud bot	19a8018622	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-12-01 03:31:52 +00:00
Matthieu Gallien	ba6537d710	Merge pull request #5224 from nextcloud/bugfix/caseCashConflictsShouldNotTerminateSync ... Bugfix/case cash conflicts should not terminate sync	2022-11-30 13:44:44 +01:00
Matthieu Gallien	1725055346	a case clash error is a case clash error ... Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2022-11-30 11:49:35 +01:00
Matthieu Gallien	af49e1079a	fix test and code to not stop on case clash errors ... Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2022-11-30 11:49:35 +01:00
Matthieu Gallien	b68754827c	case clash should not prevent full propagation ... Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2022-11-30 11:49:35 +01:00
Nextcloud bot	4b5186d2bb	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-11-30 03:31:40 +00:00
Claudio Cambra	744e39e7cd	Merge pull request #5227 from nextcloud/bugfix/update-macosx-shell-integration-deployment-targets ... Update macOS shell integration deployment targets	2022-11-29 11:42:34 +01:00
Claudio Cambra	46381f5ddc	Update macOS shell integration deployment targets ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2022-11-29 11:35:35 +01:00
Nextcloud bot	e26e5cd575	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-11-29 03:31:24 +00:00
Claudio Cambra	ceb998f896	Merge pull request #5163 from nextcloud/feature/encryption-ux ... Remove close/dismiss button from encryption message	2022-11-28 18:54:09 +01:00
Claudio Cambra	0262c77d27	Remove close/dismiss button from encryption message ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2022-11-28 18:24:40 +01:00
Claudio Cambra	5d0c97e214	Merge pull request #5223 from nextcloud/bugfix/prevent-encryption-folder-if-e2e-unsetup ... Prevent bad encrypting of folder if E2EE has not been correctly set up	2022-11-28 18:22:36 +01:00
Claudio Cambra	a243f7c4d1	Prevent bad encrypting of folder if E2EE has not been correctly set up ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2022-11-28 17:48:53 +01:00
Claudio Cambra	06937cbd09	Merge pull request #5220 from nextcloud/rakekniven-patch-1 ... l10n: Fixed grammar	2022-11-28 14:37:38 +01:00
rakekniven	5353f4f92d	l10n: Fixed grammar ... Reported at Transifex. Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com> Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com>	2022-11-28 14:37:24 +01:00
Nextcloud bot	0ca63f59b0	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-11-28 03:32:10 +00:00
Nextcloud bot	b5345a616c	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-11-27 03:29:53 +00:00
Nextcloud bot	c3889d345e	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-11-26 03:29:39 +00:00
allexzander	681e3b592e	Merge pull request #5209 from nextcloud/bugfix/tests-cfapihshellext ... Fix CfApiShellExtensionsIPCTest	2022-11-25 16:33:17 +01:00
alex-z	16153b33b7	Fix CfApiShellExtensionsIPCTest. ... Signed-off-by: alex-z <blackslayer4@gmail.com>	2022-11-25 15:03:24 +01:00
Claudio Cambra	39876c4388	Merge pull request #5164 from nextcloud/feature/e2ee-wording ... Clearly tell user that E2EE has been enabled for an account	2022-11-25 14:10:36 +01:00
Claudio Cambra	2459a3a9f3	Rename 'Enable encryption' button to 'Setup encryption' ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2022-11-25 11:53:41 +01:00
Claudio Cambra	5a0d253187	Fix capitalisation of End-to-end ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2022-11-25 11:53:41 +01:00
Claudio Cambra	719a8f38bf	Use material icons for lock and state-info ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2022-11-25 11:53:41 +01:00
Claudio Cambra	f6687c491d	Change the colour of the encryption message box when encryption enabled ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2022-11-25 11:53:41 +01:00
Claudio Cambra	c1d6482c69	Add info icon when encryption not yet enabled ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2022-11-25 11:53:41 +01:00
Claudio Cambra	ef97200ac0	Show tick icon when encryption is enabled for account ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2022-11-25 11:53:41 +01:00
Claudio Cambra	89a66a98d8	Clearly tell user that E2EE has been enabled for an account ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2022-11-25 11:53:41 +01:00
Matthieu Gallien	30589c7686	Merge pull request #5206 from nextcloud/ci/doNotOverrideConfigurationFile ... Ci/do not override configuration file	2022-11-25 10:37:21 +01:00
Matthieu Gallien	04b4354535	fix include style to always use "" for files from the project ... the use of #include <> is only for system headers and not headers from the project Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2022-11-25 09:07:02 +01:00
Matthieu Gallien	e7605d505d	avoid modifying real configuration file: use temp folder ... Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2022-11-25 09:07:02 +01:00
Nextcloud bot	ccc12ab68c	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-11-25 03:35:10 +00:00
Claudio Cambra	4f21aa537b	Merge pull request #5189 from nextcloud/bugfix/custom-buttons-alignments ... Fix bad custom button alignments, sizings, etc.	2022-11-24 17:46:33 +01:00
Claudio Cambra	d24a40012e	Fix bad custom button alignments, sizings, etc. ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2022-11-24 17:46:20 +01:00
Matthieu Gallien	f78373c11b	Merge pull request #5201 from nextcloud/ci/fixVfsRegressions ... fix regressions on pinState management when doing renames	2022-11-24 16:31:58 +01:00
Matthieu Gallien	60566eec00	fix regressions on pinState management when doing renames ... Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2022-11-24 15:26:15 +01:00
Claudio Cambra	0fcd7f76b3	Merge pull request #5202 from nextcloud/bugfix/tray-window-margins ... Fix tray window margins, stop cutting into window border	2022-11-24 15:04:34 +01:00
Claudio Cambra	9a01480fcc	Fix tray window margins, stop cutting into window border ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2022-11-24 15:02:37 +01:00
Claudio Cambra	42d410f6f3	Merge pull request #5199 from marv/cmake-pkg_get_variable ... cmake: Use FindPkgConfig's pkg_get_variable instead of custom macro	2022-11-24 13:20:25 +01:00
Marvin Schmidt	7f72678d32	cmake: Use FindPkgConfig's pkg_get_variable instead of custom macro ... Commit b34a901838 ("Use FindPkgConfig to find libcloudproviders and related libs") introduced the usage of cmake's FindPkgConfig module which provides `pkg_get_variable` since version 3.4 that can be used instead of the custom `PKGCONFIG_GETVAR` macro Signed-off-by: Marvin Schmidt <marv@exherbo.org>	2022-11-24 12:04:54 +01:00
Matthieu Gallien	30a4006c78	Merge pull request #5200 from nextcloud/ci/doNotModifyConfigurationFileDuringtests ... Ci/do not modify configuration file duringtests	2022-11-23 17:34:14 +01:00
Matthieu Gallien	6050d4f0fb	fix code format ... Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2022-11-23 17:34:05 +01:00
Matthieu Gallien	1e12fc951d	prevents modifying real user config file ... Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2022-11-23 17:34:05 +01:00
Claudio Cambra	a9c5842dcc	Merge pull request #5192 from ivaradi/modernize-dolphin-plugin ... Modernize the Dolphin action plugin	2022-11-23 17:23:34 +01:00
István Váradi	2002c98b68	Modernize the Dolphin action plugin ... Instead of installing a .desktop file, it is now converted to JSON and compiled into the plugin itself. The plugin is also installed into a different directory. Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>	2022-11-23 13:35:49 +01:00
Claudio Cambra	1e17fecafd	Merge pull request #5124 from nextcloud/feature/end-to-end-tests ... Add end-to-end tests to our CI	2022-11-23 13:24:46 +01:00
Claudio Cambra	dfcf97654c	Always build E2E tests, but only add to test suite if enabled ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2022-11-23 08:40:46 +01:00
Claudio Cambra	da6724be8c	Add a file transfer e2e test ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2022-11-23 08:40:46 +01:00
Claudio Cambra	55cd79f4ef	Add a test to check e2e server test setup ... Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>	2022-11-23 08:40:46 +01:00