mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-22 13:44:34 +03:00
Code Issues Projects Releases Packages Wiki Activity
22100 commits 486 branches 258 tags 464 MiB
Commit graph

22100 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthieu Gallien
c77562022d
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 09:25:34 +02:00
Matthieu Gallien
202be8a081
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 09:25:32 +02:00
Nextcloud bot
1defd32790
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-09-26 02:50:47 +00:00
Matthieu Gallien
84661db846
Merge pull request #7167 from nextcloud/bugfix/appimage 
Use version of linuxdeploy-plugin-qt from PR in the project.
 2024-09-25 16:44:12 +02:00
Camila Ayres
ffc9cf2ab5 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 16:43:51 +02:00
Matthieu Gallien
ea27b29788
Merge pull request #7199 from nextcloud/bugfix/startupQmlOnWindows 
Bugfix/startup qml on windows
 2024-09-25 16:43:12 +02:00
Matthieu Gallien
92f7247bc6 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 16:43:04 +02:00
Matthieu Gallien
97d1cfb1d1 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 16:43:04 +02:00
Matthieu Gallien
c67456b5b7 change the order of imports in Window.qml 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-09-25 16:43:04 +02:00
Matthieu Gallien
ca7c7cb925
Merge pull request #7193 from nextcloud/bugfix/fixUploadLockedFiles 
Bugfix/fix upload locked files
 2024-09-25 15:06:40 +02:00
Matthieu Gallien
b1352ecd98 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 15:06:29 +02:00
Matthieu Gallien
afaaf308aa 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 15:06:29 +02:00
Matthieu Gallien
451faaf0e1 receive and decode tokens for locks 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-09-25 15:06:29 +02:00
Matthieu Gallien
948a3716c6 store lock tokens in database 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2024-09-25 15:06:29 +02:00
Nextcloud bot
66a1ddabdd
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-09-25 02:48:10 +00:00
Andy Scherzinger
377b28485b
Merge pull request #7196 from nextcloud/nickvergessen-patch-1 
Update issue template config.yml
 2024-09-24 14:07:45 +02:00
Joas Schilling
5755fc8659
Update config.yml 
Signed-off-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
 2024-09-24 13:28:14 +02:00
Matthieu Gallien
ab38bbf10e
Merge pull request #7144 from nextcloud/update/mds 
Update README.
 2024-09-24 10:40:37 +02:00
Camila Ayres
fe4c461b8b Update README. 
Signed-off-by: Camila Ayres <hello@camilasan.com>
 2024-09-24 10:40:29 +02:00
Matthieu Gallien
432369a504
Merge pull request #7160 from nextcloud/feature/hard-coded-servers 
Add ability to provide multiple hardcoded server URLs via CMake define
 2024-09-24 10:39:54 +02:00
Claudio Cambra
c16b6205f1 Ensure we hide the combo box for multiple override servers by default 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-09-24 10:39:45 +02:00
Claudio Cambra
f13bdb3aa9 Use a raw string in config.h.in for application server url 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-09-24 10:39:45 +02:00
Claudio Cambra
72fe0d8818 Display server URL in multi-server enforced combo box 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-09-24 10:39:45 +02:00
Claudio Cambra
d84ede3ef2 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 10:39:45 +02:00
Claudio Cambra
0663120f4f 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 10:39:45 +02:00
Claudio Cambra
5c08e45019 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 10:39:45 +02:00
Claudio Cambra
6358f00263 Accept combo box selection as completed state in setup page 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-09-24 10:39:45 +02:00
Claudio Cambra
1decedd56f 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 10:39:45 +02:00
Claudio Cambra
e3979ea52f 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 10:39:45 +02:00
Claudio Cambra
a2c818e157 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 10:39:45 +02:00
Claudio Cambra
c65b544757 Add combo box to setup page UI 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-09-24 10:39:45 +02:00
Matthieu Gallien
3edc2094d4
Merge pull request #7195 from nextcloud/dependabot/github_actions/cpp-linter/cpp-linter-action-2.13.1 
Bump cpp-linter/cpp-linter-action from 2.13.0 to 2.13.1
 2024-09-24 10:02:45 +02:00
dependabot[bot]
69cd7ba775 Bump cpp-linter/cpp-linter-action from 2.13.0 to 2.13.1 
Bumps [cpp-linter/cpp-linter-action](https://github.com/cpp-linter/cpp-linter-action) from 2.13.0 to 2.13.1.
- [Release notes](https://github.com/cpp-linter/cpp-linter-action/releases)
- [Commits](https://github.com/cpp-linter/cpp-linter-action/compare/v2.13.0...v2.13.1)

---
updated-dependencies:
- dependency-name: cpp-linter/cpp-linter-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-09-24 10:02:36 +02:00
Nextcloud bot
0b2f1f5fc4
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-09-24 02:46:04 +00:00
Matthieu Gallien
0c3f0a0556
Merge pull request #7182 from nextcloud/bugfix/revert-always-use-http2 
Revert always enable http2
 2024-09-23 16:24:35 +02:00
Claudio Cambra
389d6536e5 Revert "Merge pull request #6986 from nextcloud/feature/alwaysEnableHttp2" 
This reverts commit 5baec6f128, reversing
changes made to ab06ecbc4d.

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-09-23 13:19:22 +02:00
Matthieu Gallien
0eb0774423
Merge pull request #7172 from nextcloud/bugfix/min-version-macos 
Fix issues with minimum system versions and deployment targets on macOS
 2024-09-23 11:47:48 +02:00
Claudio Cambra
9455dcfd8a Remove now unneeded deployment target checks in CMake 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-09-23 10:32:34 +02:00
Claudio Cambra
f2f16a5f24 Downgrade deployment target variables to 11.0 as 12.0 is not necessary 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-09-23 10:32:34 +02:00
Claudio Cambra
93c1485dd7 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-23 10:32:34 +02:00
Claudio Cambra
59501ac524
Merge pull request #7173 from nextcloud/feature/mac-crafter-package 
Add packaging capability to Mac Crafter
 2024-09-23 16:31:22 +08:00
Claudio Cambra
c405ce34d6 Add note about packaging tooling in mac crafter 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-09-23 16:30:10 +08:00
Claudio Cambra
a77aca3ab2 Add package command for mac crafter 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-09-23 16:30:10 +08:00
Claudio Cambra
facec09fa8 Make specific step functions for packaging fileprivate in mac crafter 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-09-23 16:30:10 +08:00
Claudio Cambra
0b588b8db4 Move packaging procedures into a single function in mac crafter 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-09-23 16:30:10 +08:00
Claudio Cambra
b1ad91d7cb Create convenience function to convert architecture string to craft target string 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-09-23 16:30:10 +08:00
Claudio Cambra
1e61986f17 Fix work build path used in mac crafter packaging stage 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-09-23 16:30:10 +08:00
Claudio Cambra
3b635c263b Remove unused sparkleFile var 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-09-23 16:30:10 +08:00
Claudio Cambra
b5ace6055b Use appName for packaging step in mac-crafter 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-09-23 16:30:10 +08:00
Claudio Cambra
d195186332 Add logging to packaging procedures in mac-crafter 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2024-09-23 16:30:10 +08:00