Commit Graph

18195 Commits

Author SHA1 Message Date
alex-z 2a703f26b7 prepare relase 3.6.2
Signed-off-by: alex-z <blackslayer4@gmail.com>
2022-11-10 09:44:49 +01:00
Nextcloud bot eeb1185e10
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-10 03:30:04 +00:00
Matthieu Gallien 0b10612f2d
Merge pull request #5158 from nextcloud/backport/5151/stable-3.6
[stable-3.6] properly escape a path when creating a test file during tests
2022-11-09 23:30:03 +01:00
Matthieu Gallien b88a71b852 do not run tests in parallel as we may get side effects
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2022-11-09 21:50:20 +00:00
Matthieu Gallien b414d43c23 properly escape a path when creating a test file during tests
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2022-11-09 21:50:20 +00:00
allexzander c3bbe146e7
Merge pull request #5156 from nextcloud/backport/5092/stable-3.6
Backport/5092/stable 3.6
2022-11-09 20:14:48 +01:00
alex-z 8b45ed1f0f Fix compile error from [[nodiscard]].
Signed-off-by: alex-z <blackslayer4@gmail.com>
2022-11-09 19:16:39 +01:00
allexzander 3f96462a50 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>
2022-11-09 19:15:04 +01:00
alex-z edf7ee1a47 Fix incorrect current user index when removing and adding an account.
Signed-off-by: alex-z <blackslayer4@gmail.com>
2022-11-09 19:13:54 +01:00
allexzander ceb2d893d1
Merge pull request #5153 from nextcloud/backport/5067/stable-3.6
Backport/5067/stable 3.6
2022-11-09 19:02:29 +01:00
alex-z 8a80055c1c Do not use copy-assignment of QDialog.
Signed-off-by: alex-z <blackslayer4@gmail.com>
2022-11-09 18:31:41 +01:00
allexzander 2aa48773ab E2EE. Do not generate keypair without user request.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2022-11-09 18:31:40 +01:00
allexzander c70466b4c6
Merge pull request #5155 from nextcloud/bugfix/stable-3.6-tray-fix
Fix bad backport of CustomButton changes in Stable-3.6
2022-11-09 18:26:48 +01:00
Claudio Cambra f977c08544 Fix bad backport of CustomButton changes in Stable-3.6
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-11-09 18:26:40 +01:00
allexzander b73a17d574
Merge pull request #5154 from nextcloud/bugfix/stable-3.6-mac-compile-fix
Fix stable-3.6 compile on macOS
2022-11-09 18:26:27 +01:00
Claudio Cambra 4bd72748c8
Fix stable-3.6 compile on macOS
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-11-09 18:00:50 +01:00
Nextcloud bot dd14fcdb55
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-09 03:20:04 +00:00
Nextcloud bot f0213c1b79
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-08 03:21:10 +00:00
allexzander 39e16c5a8f
Merge pull request #5140 from nextcloud/backport/5136/stable-3.6
[stable-3.6] Use separate variable for cfg file name in CMAKE.
2022-11-07 15:16:03 +01:00
alex-z 872857f204 Use separate variable for cfg file name in CMAKE.
Signed-off-by: alex-z <blackslayer4@gmail.com>
2022-11-07 14:15:07 +00:00
Nextcloud bot 5b121930f5
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-07 03:19:48 +00:00
Nextcloud bot 0f622ccc61
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-06 03:21:38 +00:00
Nextcloud bot 407b6e5f52
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-05 03:24:51 +00:00
Nextcloud bot 2491050ec4
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-04 13:34:35 +00:00
Nextcloud bot d9db3f5af5
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-04 03:20:15 +00:00
Nextcloud bot aeef02dfa1
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-03 03:19:15 +00:00
Nextcloud bot 68adb7532a
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-02 03:21:11 +00:00
Nextcloud bot 41164063db
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-01 03:20:19 +00:00
Matthieu Gallien ddeee8e0d6
Merge pull request #5117 from nextcloud/backport/5116/stable-3.6
[stable-3.6] use new public API to open an edit locally URL
2022-10-31 18:32:54 +01:00
Matthieu Gallien fe5909d5e4 use new public API to open an edit locally URL
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2022-10-31 14:58:44 +01:00
Matthieu Gallien 9c52bd8570
Merge pull request #5111 from nextcloud/backport/5107/stable-3.6
[stable-3.6] Refactor FolderMan's "Edit Locally" capabilities as separate class
2022-10-31 14:58:21 +01:00
Matthieu Gallien 13b7043163
remove use of attribute nodiscard
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2022-10-31 11:48:45 +01:00
Claudio Cambra bbc35b359e Rename EditLocallyHandler to EditLocallyJob
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-10-31 09:37:10 +01:00
Claudio Cambra 3777abac9d Ensure the checkTokenJob object gets deallocated
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-10-31 09:37:10 +01:00
Claudio Cambra 7df2cdba33 Show edit locally loading dialog sooner, improve feedback for user
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-10-31 09:37:10 +01:00
Claudio Cambra 376b978cfd Refactor edit locally handler management away from application and into own class
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-10-31 09:37:10 +01:00
Claudio Cambra f093e1cfab Don't show the user any potenitally questionable remote data
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-10-31 09:37:10 +01:00
Claudio Cambra 311dd8ee00 Verify token before checking disk or modifying state
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-10-31 09:37:10 +01:00
Claudio Cambra 52ee260700 Refactor edit locally into its own class, rather than bolting onto FolderMan
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-10-31 09:37:10 +01:00
Claudio Cambra 2421003841 Refactor large editFileLocally FolderMan method into smaller, clearer separate methods
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-10-31 09:37:10 +01:00
Nextcloud bot dc64a7b3f6
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-10-31 03:19:06 +00:00
Nextcloud bot 15e478feed
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-10-30 03:23:12 +00:00
Claudio Cambra 0cff22c759
Merge pull request #5112 from nextcloud/backport/5105/stable-3.6
[stable-3.6] Fix compatibility with newer python3-nautilus
2022-10-29 17:16:31 +02:00
Nathan Pratta Teodosio 812b5bd240 Fix compatibility with newer python3-nautilus
Signed-off-by: Nathan Pratta Teodosio <nathan.teodosio@canonical.com>
2022-10-29 13:54:53 +00:00
Nextcloud bot e3c17a30f5
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-10-29 03:31:34 +00:00
Claudio Cambra 6fa2e60bba
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
2022-10-28 13:43:53 +02:00
Claudio Cambra 67ecebf4f6 Use addQueryParams for checkTokenForEditLocally SimpleApiJob
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-10-28 11:12:31 +00:00
Claudio Cambra 1806113e23 Make sure to check relPath and compare to canonical cleaned path
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-10-28 11:12:31 +00:00
Claudio Cambra e8f62f3b1c Make sure to encode the relPath
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-10-28 11:12:31 +00:00
Claudio Cambra c0cf965d1f Validate edit locally token before sending to server
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-10-28 11:12:31 +00:00