17820 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matthieu Gallien	f4669285f9	Merge pull request #4329 from nextcloud/buigfix/linecount-tray-activity ... Increase maximum text line count in tray activity items to two lines	2022-03-15 12:31:36 +01:00
Claudio Cambra	ead4cc6fe3	Increase max line of text in activity item text to two ... Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>	2022-03-15 09:22:11 +00:00
Nextcloud bot	b010e545dd	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-03-15 04:19:23 +00:00
Matthieu Gallien	351d50ede6	Merge pull request #4326 from nextcloud/bugfix/fileactivitydialog-center ... Ensure file activity dialog appears in centre of screen	2022-03-14 09:47:38 +01:00
Claudio Cambra	2f795df701	Ensure file activity dialog appears in centre of screen ... Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>	2022-03-13 22:11:26 +00:00
Nextcloud bot	124a6e0526	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-03-11 03:56:55 +00:00
Matthieu Gallien	58d24453db	Merge pull request #4340 from nextcloud/bugfix/preventOpenGLContextLosses ... properly ask Qt to create qml opengl surface with proper options	2022-03-10 18:16:40 +01:00
Matthieu Gallien	11e7ebd5fa	properly ask Qt to create qml opengl surface with proper options ... should prevent context losses error with some opengl drivers should prevent corruptions to occur with come opengl drivers Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2022-03-10 14:19:46 +00:00
Nextcloud bot	0f14e16268	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-03-10 03:59:56 +00:00
Claudio Cambra	8ebdd5bd8c	Merge pull request #3714 from nextcloud/ci/bumpCmakeVersionRequirement ... require cmake 3.16	2022-03-09 15:35:07 +01:00
Matthieu Gallien	75bcc9a24e	require cmake 3.16 ... close #3572 Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2022-03-09 13:07:48 +00:00
Matthieu Gallien	4e5ef728bc	Merge pull request #4292 from nextcloud/bugfix/group-folder-files-erased-when-rename-or-delete-folder ... Do not remove files from a Group folder and its nested folders when it is renamed or removed while not allowed.	2022-03-09 11:43:08 +01:00
alex-z	01eb050cd8	Do not remove files from a Group folder and its nested folders whe it is renamed or removed while not allowed. ... Signed-off-by: alex-z <blackslayer4@gmail.com>	2022-03-09 10:54:39 +02:00
Nextcloud bot	c347b4713a	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-03-09 03:53:25 +00:00
Nextcloud bot	f0a3563f11	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-03-08 03:56:47 +00:00
Nextcloud bot	bc3278377f	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-03-07 03:53:53 +00:00
Nextcloud bot	75a7cf15b5	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-03-06 03:53:27 +00:00
Nextcloud bot	7a620d640a	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-03-05 03:53:09 +00:00
rakekniven	57c3ffa6d2	Merge pull request #4320 from nextcloud/rakekniven-patch-1	2022-03-04 14:16:06 +01:00
rakekniven	8aa3ab3d37	Merge branch 'master' into rakekniven-patch-1	2022-03-04 12:22:31 +01:00
Nextcloud bot	8885a264a0	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-03-04 03:54:38 +00:00
Camila	8d65f225d1	Merge pull request #4322 from nextcloud/bugfix/help ... Add 'Help' action back.	2022-03-03 15:30:41 +01:00
Camila	2c20f81a53	Add 'Help' action back. ... I think it was a mistake that caused this. Signed-off-by: Camila <hello@camila.codes>	2022-03-03 11:16:09 +00:00
Nextcloud bot	a6f2112732	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-03-03 03:54:19 +00:00
Claudio Cambra	fe3011cefd	Merge pull request #4279 from nextcloud/bugfix/simplify-current-screen ... Simplify currentScreen in systray.cpp	2022-03-02 14:44:59 +01:00
Claudio Cambra	f6b377ab17	Simplify currentScreen ... Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>	2022-03-02 13:37:30 +00:00
Claudio Cambra	f45acc3986	Merge pull request #4247 from nextcloud/bugfix/mac-notch-height ... No longer assume status bar height, calculate, fixing notch borking	2022-03-02 13:37:37 +01:00
Claudio Cambra	655a2e1c39	No longer assume status bar height, calculate, fixing notch borking ... Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>	2022-03-02 13:22:55 +01:00
Nextcloud bot	be21f036ff	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-03-02 04:16:36 +00:00
rakekniven	9174eeec57	Merge branch 'master' into rakekniven-patch-1	2022-03-01 16:10:48 +01:00
Nextcloud bot	23e96a80f3	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-03-01 03:53:23 +00:00
rakekniven	5045394b43	l10n: Changed spelling ... Reported at Transifex. Fix for #4004 Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com>	2022-02-28 18:40:26 +01:00
Nextcloud bot	8bcb472cd6	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-02-28 04:12:21 +00:00
Nextcloud bot	96be372ad5	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-02-27 03:51:51 +00:00
Nextcloud bot	04a1ebf474	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-02-26 03:52:35 +00:00
Matthieu Gallien	108ff4e111	Merge pull request #4268 from nextcloud/bugfix/new-files-removed-with-parent-dir-removal ... Do not remove a folder that has files that were not uploaded yet during propagation	2022-02-25 16:51:24 +01:00
alex-z	bf80efc7ab	Fix review comments from Matthieu. Using curent reverse iterator when searching for parent. ... Signed-off-by: alex-z <blackslayer4@gmail.com>	2022-02-25 15:31:26 +00:00
alex-z	37168fce9f	Fix review comments. ... Signed-off-by: alex-z <blackslayer4@gmail.com>	2022-02-25 15:31:26 +00:00
alex-z	1a300d0d56	Unit tests for new files restore logic when the parent folder is removed on the server. ... Signed-off-by: alex-z <blackslayer4@gmail.com>	2022-02-25 15:31:26 +00:00
alex-z	6c690a1b09	Do not remove a folder that has files that were not uploaded yet during propagation. ... Signed-off-by: alex-z <blackslayer4@gmail.com>	2022-02-25 15:31:26 +00:00
Nextcloud bot	687a4dd666	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-02-25 03:52:43 +00:00
Nextcloud bot	b0df2a64b9	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-02-24 03:55:16 +00:00
allexzander	00d958ef75	Merge pull request #4303 from nextcloud/feature/rollback-local-move-on-server-move-failure ... Rollback local move on server move failure	2022-02-23 18:14:28 +02:00
alex-z	3443de4388	Rollback local move when server move has failed. ... Signed-off-by: alex-z <blackslayer4@gmail.com>	2022-02-23 16:53:26 +02:00
Nextcloud bot	6715450600	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-02-22 03:54:55 +00:00
Nextcloud bot	b9c5175dbf	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-02-21 03:54:37 +00:00
Nextcloud bot	6e8f71079b	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-02-20 03:54:00 +00:00
Nextcloud bot	cdd0b0e1ac	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-02-19 03:54:30 +00:00
Nextcloud bot	f233e6f21a	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-02-17 03:54:03 +00:00
Nextcloud bot	8b755bfbc9	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-02-16 03:53:22 +00:00