b1673e8668
disable our code for network timeout
...
seems we have an issue with Windows and QTimer instances used to detect
network timeout
workaround, find cause of https://github.com/nextcloud/desktop/issues/7184
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-09-26 15:14:37 +02:00
e843fa44d3
Merge pull request #7213 from nextcloud/backport/7208/stable-3.14
...
[stable-3.14] Bugfix/missing unlock command
2024-09-26 12:00:50 +02:00
d011a0f93a
lock token should be sent via webdav only for token lock type
...
to be able to modify a locked file using token lock, we must sent it
with webdav requests
this must not be sent if the file is locked but the lock type is not a
token lock
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-09-26 08:56:47 +00:00
59568ad29d
clarify when desktop client should offer to unlock a file
...
a file can be unlocked when:
* the lock is an user lock from the current user
* the lock is a token lock from the current desktop files client
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-09-26 08:56:47 +00:00
2ffbc6a1a3
Merge pull request #7207 from nextcloud/backport/7167/stable-3.14
...
[stable-3.14] Use version of linuxdeploy-plugin-qt from PR in the project.
2024-09-25 18:43:43 +02:00
f965c7cffe
Use version of linuxdeploy-plugin-qt from PR in the project.
...
Fix for #7128 .
See https://github.com/linuxdeploy/linuxdeploy-plugin-qt/pull/186 .
Signed-off-by: Camila Ayres <hello@camilasan.com>
2024-09-25 17:53:40 +02:00
0b31df678e
Merge pull request #7206 from nextcloud/backport/7199/stable-3.14
...
[stable-3.14] Bugfix/startup qml on windows
2024-09-25 17:45:11 +02:00
653f8d0788
add seemingly needed qml import path
...
will hopefuly make the qml engine search inside install dir within qml
sub folder
Close #7156
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-09-25 14:43:34 +00:00
8114caaffc
rename our Window component to MainWindow to not use an existing name
...
we import QtQuick module that also define Window component name
to avoid any ambiguity, just use a different name on our side
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-09-25 14:43:33 +00:00
cc5f7b7ee7
change the order of imports in Window.qml
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-09-25 14:43:33 +00:00
b6211ff082
Merge pull request #7201 from nextcloud/backport/7193/stable-3.14
...
[stable-3.14] Bugfix/fix upload locked files
2024-09-25 15:56:30 +02:00
15c90c25f7
provide LOCK token when uploading a single file via PUT
...
for simple webDAV upload via PUT verb, provide the needed lock token
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-09-25 13:07:07 +00:00
dbbd49ac47
if a file is locked/ provide token during upload
...
will add needed lock token in final move headers for chunk upload
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-09-25 13:07:07 +00:00
27d8ecbf44
receive and decode tokens for locks
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-09-25 13:07:07 +00:00
c8e8172034
store lock tokens in database
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-09-25 13:07:07 +00:00
c5bf4a4ce8
Merge pull request #7197 from nextcloud/backport/7160/stable-3.14
...
[stable-3.14] Add ability to provide multiple hardcoded server URLs via CMake define
2024-09-25 07:24:01 +02:00
f4085e2ae3
Ensure we hide the combo box for multiple override servers by default
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 12:15:37 +00:00
aa986ea6c2
Use a raw string in config.h.in for application server url
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 12:15:37 +00:00
18383909b7
Display server URL in multi-server enforced combo box
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 12:15:37 +00:00
f6c1f1ed47
Do not automatically validate server URL when enforced servers is active but have multiple servers
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 12:15:37 +00:00
3ec48b4062
Use url method instead of text field contents as url when deciding on error string in setup page
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 12:15:37 +00:00
91552ea184
If using multi-server override url and forcing it then provide combo box selection url as url in setup page
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 12:15:37 +00:00
54f595bb1d
Accept combo box selection as completed state in setup page
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 12:15:37 +00:00
237b58d042
Show or hide multi-server overrides or text field depending on type of override url
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 12:15:37 +00:00
eb843d7c64
Do not apply override server url as account url if this is a multi-server JSON string
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 12:15:37 +00:00
a3fe1a7fab
Add property for detecting of application override server url is in fact a JSON array string describing multiple servers
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 12:15:37 +00:00
f1d3d5e0be
Add combo box to setup page UI
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 12:15:37 +00:00
db6c297425
Merge pull request #7189 from nextcloud/backport/7172/stable-3.14
...
[stable-3.14] Fix issues with minimum system versions and deployment targets on macOS
2024-09-24 14:39:10 +08:00
f2deed5492
Remove now unneeded deployment target checks in CMake
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 10:19:30 +08:00
4e3129f4f4
Downgrade deployment target variables to 11.0 as 12.0 is not necessary
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 10:19:30 +08:00
2ea96f1398
Bump up minimum system version to 11.0 on macOS (required by Qt 6)
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 10:19:30 +08:00
b46d9bcc4b
Merge pull request #7186 from nextcloud/backport/7173/stable-3.14
...
[stable-3.14] Add packaging capability to Mac Crafter
2024-09-24 10:18:13 +08:00
48c991d2e5
Add note about packaging tooling in mac crafter
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 10:17:46 +08:00
7de3d54d90
Add package command for mac crafter
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 10:17:46 +08:00
6a6c53cb8d
Make specific step functions for packaging fileprivate in mac crafter
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 10:17:46 +08:00
8a50024b54
Move packaging procedures into a single function in mac crafter
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 10:17:45 +08:00
a73e26a70b
Create convenience function to convert architecture string to craft target string
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 10:17:45 +08:00
5d21a294ad
Fix work build path used in mac crafter packaging stage
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 10:17:45 +08:00
57b1e12c16
Remove unused sparkleFile var
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 10:17:45 +08:00
1e4edd39fc
Use appName for packaging step in mac-crafter
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 10:17:45 +08:00
1e7328d25e
Add logging to packaging procedures in mac-crafter
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 10:17:45 +08:00
4ca57e10bc
Add ability to build and sign sparkle tbz from mac-crafter
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 10:17:45 +08:00
8f2061da95
Add ability to notarise package from mac-crafter
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 10:17:45 +08:00
1b747fa134
Add ability to sign pkg from mac-crafter
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 10:17:44 +08:00
4438836ade
Add flag to build pkg in mac-crafter
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 10:17:43 +08:00
1c8b2ac4b5
Add buildPackage function to mac crafter
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 10:16:59 +08:00
d3cd7bb4ae
Merge pull request #7122 from nextcloud/backport/6921/stable-3.14
...
[stable-3.14] Add additional options to make cross-compiling client feasible with Mac Crafter
2024-09-24 10:14:43 +08:00
149e7d8676
Add option to set product path in mac-crafter
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-09-24 10:10:25 +08:00
1a91e4fa2a
Merge pull request #7192 from nextcloud/backport/7182/stable-3.14
...
[stable-3.14] Revert always enable http2
2024-09-24 10:09:32 +08:00
0bba8027e6
Revert "Merge pull request #6986 from nextcloud/feature/alwaysEnableHttp2"
...
This reverts commit 5baec6f128ab06ecbc4d
2024-09-23 14:24:46 +00:00
Matthieu Gallien
Camila Ayres
Matthieu Gallien
Tobias Kaminsky
Claudio Cambra