Matthieu Gallien [Wed, 9 Nov 2022 16:47:40 +0000 (17:47 +0100)]
do not run tests in parallel as we may get side effects
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Wed, 9 Nov 2022 15:36:38 +0000 (16:36 +0100)]
properly escape a path when creating a test file during tests
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
allexzander [Wed, 9 Nov 2022 19:14:48 +0000 (20:14 +0100)]
Merge pull request #5156 from nextcloud/backport/5092/stable-3.6
Backport/5092/stable 3.6
alex-z [Wed, 9 Nov 2022 18:11:18 +0000 (19:11 +0100)]
Fix compile error from [[nodiscard]].
Signed-off-by: alex-z <blackslayer4@gmail.com>
allexzander [Tue, 25 Oct 2022 13:49:56 +0000 (16:49 +0300)]
Fix accounts avatar issue when it becomes completely white due to non-changing account id member with changing account index in the list.
Signed-off-by: allexzander <blackslayer4@gmail.com>
alex-z [Mon, 24 Oct 2022 13:36:53 +0000 (16:36 +0300)]
Fix incorrect current user index when removing and adding an account.
Signed-off-by: alex-z <blackslayer4@gmail.com>
allexzander [Wed, 9 Nov 2022 18:02:29 +0000 (19:02 +0100)]
Merge pull request #5153 from nextcloud/backport/5067/stable-3.6
Backport/5067/stable 3.6
alex-z [Wed, 9 Nov 2022 15:01:17 +0000 (16:01 +0100)]
Do not use copy-assignment of QDialog.
Signed-off-by: alex-z <blackslayer4@gmail.com>
allexzander [Fri, 14 Oct 2022 15:47:46 +0000 (18:47 +0300)]
E2EE. Do not generate keypair without user request.
Signed-off-by: allexzander <blackslayer4@gmail.com>
allexzander [Wed, 9 Nov 2022 17:26:48 +0000 (18:26 +0100)]
Merge pull request #5155 from nextcloud/bugfix/stable-3.6-tray-fix
Fix bad backport of CustomButton changes in Stable-3.6
Claudio Cambra [Wed, 9 Nov 2022 17:09:15 +0000 (18:09 +0100)]
Fix bad backport of CustomButton changes in Stable-3.6
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
allexzander [Wed, 9 Nov 2022 17:26:27 +0000 (18:26 +0100)]
Merge pull request #5154 from nextcloud/bugfix/stable-3.6-mac-compile-fix
Fix stable-3.6 compile on macOS
Claudio Cambra [Wed, 9 Nov 2022 17:00:50 +0000 (18:00 +0100)]
Fix stable-3.6 compile on macOS
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Nextcloud bot [Wed, 9 Nov 2022 03:20:04 +0000 (03:20 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Nextcloud bot [Tue, 8 Nov 2022 03:21:10 +0000 (03:21 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
allexzander [Mon, 7 Nov 2022 14:16:03 +0000 (15:16 +0100)]
Merge pull request #5140 from nextcloud/backport/5136/stable-3.6
[stable-3.6] Use separate variable for cfg file name in CMAKE.
alex-z [Mon, 7 Nov 2022 09:00:23 +0000 (10:00 +0100)]
Use separate variable for cfg file name in CMAKE.
Signed-off-by: alex-z <blackslayer4@gmail.com>
Nextcloud bot [Mon, 7 Nov 2022 03:19:48 +0000 (03:19 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Nextcloud bot [Sun, 6 Nov 2022 03:21:38 +0000 (03:21 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Nextcloud bot [Sat, 5 Nov 2022 03:24:51 +0000 (03:24 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Nextcloud bot [Fri, 4 Nov 2022 13:34:35 +0000 (13:34 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Nextcloud bot [Fri, 4 Nov 2022 03:20:15 +0000 (03:20 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Nextcloud bot [Thu, 3 Nov 2022 03:19:15 +0000 (03:19 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Nextcloud bot [Wed, 2 Nov 2022 03:21:11 +0000 (03:21 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Nextcloud bot [Tue, 1 Nov 2022 03:20:19 +0000 (03:20 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Matthieu Gallien [Mon, 31 Oct 2022 17:32:54 +0000 (18:32 +0100)]
Merge pull request #5117 from nextcloud/backport/5116/stable-3.6
[stable-3.6] use new public API to open an edit locally URL
Matthieu Gallien [Mon, 31 Oct 2022 09:28:47 +0000 (10:28 +0100)]
use new public API to open an edit locally URL
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Mon, 31 Oct 2022 13:58:21 +0000 (14:58 +0100)]
Merge pull request #5111 from nextcloud/backport/5107/stable-3.6
[stable-3.6] Refactor FolderMan's "Edit Locally" capabilities as separate class
Matthieu Gallien [Mon, 31 Oct 2022 10:48:45 +0000 (11:48 +0100)]
remove use of attribute nodiscard
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Claudio Cambra [Sat, 29 Oct 2022 11:21:56 +0000 (13:21 +0200)]
Rename EditLocallyHandler to EditLocallyJob
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Fri, 28 Oct 2022 22:19:04 +0000 (00:19 +0200)]
Ensure the checkTokenJob object gets deallocated
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Fri, 28 Oct 2022 18:22:27 +0000 (20:22 +0200)]
Show edit locally loading dialog sooner, improve feedback for user
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Fri, 28 Oct 2022 17:40:06 +0000 (19:40 +0200)]
Refactor edit locally handler management away from application and into own class
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Fri, 28 Oct 2022 14:43:30 +0000 (16:43 +0200)]
Don't show the user any potenitally questionable remote data
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Fri, 28 Oct 2022 14:42:57 +0000 (16:42 +0200)]
Verify token before checking disk or modifying state
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Wed, 26 Oct 2022 18:13:38 +0000 (20:13 +0200)]
Refactor edit locally into its own class, rather than bolting onto FolderMan
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Wed, 26 Oct 2022 17:10:21 +0000 (19:10 +0200)]
Refactor large editFileLocally FolderMan method into smaller, clearer separate methods
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Nextcloud bot [Mon, 31 Oct 2022 03:19:06 +0000 (03:19 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Nextcloud bot [Sun, 30 Oct 2022 03:23:12 +0000 (03:23 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Claudio Cambra [Sat, 29 Oct 2022 15:16:31 +0000 (17:16 +0200)]
Merge pull request #5112 from nextcloud/backport/5105/stable-3.6
[stable-3.6] Fix compatibility with newer python3-nautilus
Nathan Pratta Teodosio [Fri, 26 Aug 2022 18:03:03 +0000 (15:03 -0300)]
Fix compatibility with newer python3-nautilus
Signed-off-by: Nathan Pratta Teodosio <nathan.teodosio@canonical.com>
Nextcloud bot [Sat, 29 Oct 2022 03:31:34 +0000 (03:31 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Claudio Cambra [Fri, 28 Oct 2022 11:43:53 +0000 (13:43 +0200)]
Merge pull request #5106 from nextcloud/backport/5093/stable-3.6
[stable-3.6] Validate and sanitise edit locally token and relpath before sending to server
Claudio Cambra [Thu, 27 Oct 2022 14:32:51 +0000 (16:32 +0200)]
Use addQueryParams for checkTokenForEditLocally SimpleApiJob
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Wed, 26 Oct 2022 14:07:59 +0000 (16:07 +0200)]
Make sure to check relPath and compare to canonical cleaned path
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Tue, 25 Oct 2022 17:19:43 +0000 (19:19 +0200)]
Make sure to encode the relPath
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Tue, 25 Oct 2022 13:56:53 +0000 (15:56 +0200)]
Validate edit locally token before sending to server
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Nextcloud bot [Fri, 28 Oct 2022 03:20:02 +0000 (03:20 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Claudio Cambra [Thu, 27 Oct 2022 14:48:48 +0000 (16:48 +0200)]
Merge pull request #5103 from nextcloud/backport/5102/stable-3.6
[stable-3.6] Fix macOS autoupdater settings
Claudio Cambra [Thu, 27 Oct 2022 12:30:33 +0000 (14:30 +0200)]
Fix macOS autoupdater settings
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Nextcloud bot [Thu, 27 Oct 2022 03:19:28 +0000 (03:19 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Nextcloud bot [Wed, 26 Oct 2022 03:21:02 +0000 (03:21 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Matthieu Gallien [Tue, 25 Oct 2022 09:03:35 +0000 (11:03 +0200)]
Merge pull request #5090 from nextcloud/backport/5087/stable-3.6
[stable-3.6] emit missing signal to update folder sync status icon
Matthieu Gallien [Mon, 24 Oct 2022 10:30:36 +0000 (12:30 +0200)]
emit missing signal to update folder sync status icon
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Nextcloud bot [Tue, 25 Oct 2022 03:24:36 +0000 (03:24 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Nextcloud bot [Mon, 24 Oct 2022 03:19:55 +0000 (03:19 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Nextcloud bot [Sun, 23 Oct 2022 03:19:57 +0000 (03:19 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Nextcloud bot [Sat, 22 Oct 2022 03:20:53 +0000 (03:20 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Nextcloud bot [Fri, 21 Oct 2022 03:28:15 +0000 (03:28 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Claudio Cambra [Thu, 20 Oct 2022 14:23:17 +0000 (16:23 +0200)]
Merge pull request #5075 from nextcloud/backport/5074/stable-3.6
[stable-3.6] Fix call notification dialog buttons
Claudio Cambra [Thu, 20 Oct 2022 12:11:10 +0000 (14:11 +0200)]
Fix call notification dialog buttons
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Nextcloud bot [Wed, 19 Oct 2022 03:23:36 +0000 (03:23 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Matthieu Gallien [Tue, 18 Oct 2022 10:16:17 +0000 (12:16 +0200)]
prepare relase 3.6.1
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Tue, 18 Oct 2022 10:13:02 +0000 (12:13 +0200)]
Merge pull request #5063 from nextcloud/backport/4960/stable-3.6
[stable-3.6] Ensure placeholder message in emoji picker wraps correctly
Claudio Cambra [Tue, 20 Sep 2022 16:40:34 +0000 (18:40 +0200)]
Ensure placeholder message in emoji picker wraps correctly
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
Matthieu Gallien [Tue, 18 Oct 2022 10:09:33 +0000 (12:09 +0200)]
Merge pull request #5061 from nextcloud/backport/4970/stable-3.6
[stable-3.6] Improve handling of file name clashes
Claudio Cambra [Wed, 21 Sep 2022 17:15:35 +0000 (19:15 +0200)]
Clicking on file name clash activities now opens file in web UI were the clash can be resolved
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
Claudio Cambra [Wed, 21 Sep 2022 17:13:54 +0000 (19:13 +0200)]
Categorise file name clash sync file issues as separate FileNameClash enum treated as warning
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
Matthieu Gallien [Tue, 18 Oct 2022 10:00:10 +0000 (12:00 +0200)]
Merge pull request #5059 from nextcloud/backport/4986/stable-3.6
[stable-3.6] Fix sync progress bar colours in dark mode
Claudio Cambra [Thu, 29 Sep 2022 17:21:49 +0000 (19:21 +0200)]
Fix sync progress bar colours in dark mode
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
Matthieu Gallien [Tue, 18 Oct 2022 09:59:24 +0000 (11:59 +0200)]
Merge pull request #5058 from nextcloud/backport/4987/stable-3.6
[stable-3.6] Fix predefined status text formatting
Claudio Cambra [Thu, 29 Sep 2022 17:37:55 +0000 (19:37 +0200)]
Fix predefined status text formatting
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
Matthieu Gallien [Tue, 18 Oct 2022 09:58:49 +0000 (11:58 +0200)]
Merge pull request #5053 from nextcloud/backport/4979/stable-3.6
[stable-3.6] use correct version copmparison on NSIS updater: fix update from rc
Matthieu Gallien [Wed, 28 Sep 2022 09:41:23 +0000 (11:41 +0200)]
fix review comments
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Tue, 27 Sep 2022 16:55:29 +0000 (18:55 +0200)]
use correct version copmparison on NSIS updater: fix update from rc
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Wed, 28 Sep 2022 09:37:37 +0000 (11:37 +0200)]
remove support for skipping an update: hard to understand for users
skiping an update is probably there for historical reasons to work
around broken updates in the past
this can lead to users not getting an update they should be getting
this can elad to user confusion and the current user interaction is
broken if you do not go read the settings file with a text editor
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Tue, 18 Oct 2022 09:50:51 +0000 (11:50 +0200)]
Merge pull request #5052 from nextcloud/backport/4989/stable-3.6
Backport/4989/stable 3.6
Camila [Fri, 30 Sep 2022 13:45:53 +0000 (15:45 +0200)]
Update tests.
Signed-off-by: Camila <hello@camila.codes>
Camila [Fri, 30 Sep 2022 12:31:24 +0000 (14:31 +0200)]
The dismiss button is now a CustomButton component.
Signed-off-by: Camila <hello@camila.codes>
Camila [Thu, 29 Sep 2022 19:26:20 +0000 (21:26 +0200)]
Fix the dismiss button: display it whenever possible.
Signed-off-by: Camila <hello@camila.codes>
Matthieu Gallien [Tue, 18 Oct 2022 09:41:51 +0000 (11:41 +0200)]
Merge pull request #5057 from nextcloud/backport/4961/stable-3.6
Fix two factor auth notification: activity item was disabled.
Camila [Tue, 20 Sep 2022 16:53:55 +0000 (18:53 +0200)]
Fix two factor auth notification: activity item was disabled.
User couldn't click on the links.
Signed-off-by: Camila <hello@camila.codes>
Matthieu Gallien [Tue, 18 Oct 2022 09:31:39 +0000 (11:31 +0200)]
Merge pull request #5056 from nextcloud/backport/5040/stable-3.6
Fix account not found when doing local file editing.
alex-z [Thu, 13 Oct 2022 08:24:16 +0000 (11:24 +0300)]
Fix account not found when doing local file editing.
Signed-off-by: alex-z <blackslayer4@gmail.com>
Matthieu Gallien [Tue, 18 Oct 2022 09:06:03 +0000 (11:06 +0200)]
Merge pull request #5055 from nextcloud/backport/5039/bugfix/checkTokenForEditLocallyRequests
Backport/5039/bugfix/check token for edit locally requests
Matthieu Gallien [Wed, 12 Oct 2022 16:01:15 +0000 (18:01 +0200)]
edit locally requires a valid token
check on server that the token received during a request to open a local
file is indeed a valid one
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Thu, 13 Oct 2022 10:14:22 +0000 (12:14 +0200)]
makes JsonApiJob share common code with SimpleApiJob
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Wed, 12 Oct 2022 16:02:26 +0000 (18:02 +0200)]
introduce a very simple network job to do API requests
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Tue, 18 Oct 2022 08:48:33 +0000 (10:48 +0200)]
Merge pull request #5054 from nextcloud/backport/4990/stable-3.6
Improve 'Handle local file editing' feature. Add loading popup. Add f…
alex-z [Wed, 28 Sep 2022 11:26:57 +0000 (14:26 +0300)]
Improve 'Handle local file editing' feature. Add loading popup. Add force sync before opening a file.'
Signed-off-by: alex-z <blackslayer4@gmail.com>
Claudio Cambra [Tue, 18 Oct 2022 08:46:58 +0000 (10:46 +0200)]
Merge pull request #5048 from nextcloud/backport/4982/stable-3.6
Claudio Cambra [Wed, 28 Sep 2022 10:26:37 +0000 (12:26 +0200)]
Fix link shares default expire date being enforced as maximum expire date even when maximum date enforcement is disabled on the server
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
Nextcloud bot [Tue, 18 Oct 2022 03:20:35 +0000 (03:20 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
allexzander [Mon, 17 Oct 2022 16:31:46 +0000 (19:31 +0300)]
Revert "Change CPP version to ++17"
This reverts commit
3af665a4d30aa2e603a3f54398000a3c06f782d6.
alex-z [Mon, 17 Oct 2022 13:36:18 +0000 (16:36 +0300)]
Change CPP version to ++17
Signed-off-by: alex-z <blackslayer4@gmail.com>
Nextcloud bot [Mon, 17 Oct 2022 03:19:18 +0000 (03:19 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Nextcloud bot [Sun, 16 Oct 2022 03:19:05 +0000 (03:19 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Nextcloud bot [Sat, 15 Oct 2022 03:19:12 +0000 (03:19 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Nextcloud bot [Fri, 14 Oct 2022 03:23:42 +0000 (03:23 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Nextcloud bot [Thu, 13 Oct 2022 03:18:48 +0000 (03:18 +0000)]
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
projects / nextcloud-desktop.git / log