Commit graph

18992 commits

Author SHA1 Message Date
Claudio Cambra
1b5b30d222
Make fileLockTimeRemainingMinutes a static method
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-12-07 13:46:21 +01:00
Claudio Cambra
4e508d0276
Run locking procedure on main thread, open file after file has been locked remotely
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-12-07 12:45:32 +01:00
Claudio Cambra
d3fa0066d0
Ensure we are using up-to-date item ptr instead of potentially un-update file record when checking lock state in fileLockSuccess, separate case with lock already pre-existing
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-12-07 12:45:32 +01:00
Claudio Cambra
6dbdcccb0f
Ensure we are using folder relative paths for synced folders that are not root to work correctly
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-12-07 12:45:31 +01:00
Claudio Cambra
3f20f192e9
Ensure we are checking lock state once file has been synced after setting lock
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-12-07 12:45:31 +01:00
Claudio Cambra
10746d8441
Notify user when file is locked when local editing begins
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-12-07 12:45:31 +01:00
Claudio Cambra
ff6ab38826
Lock file when editing locally
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-12-07 12:45:31 +01:00
Nextcloud bot
d02e2f4417
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-07 03:31:40 +00:00
allexzander
adbd41e773
Merge pull request #5241 from nextcloud/bugfix/edit-locally-ci-errors
Fix CI errors for Edit Locally.
2022-12-06 16:13:32 +01:00
alex-z
838817239a Fix CI errors for Edit Locally.
Signed-off-by: alex-z <blackslayer4@gmail.com>
2022-12-06 15:31:24 +01:00
allexzander
f6ac52bcd7
Merge pull request #5175 from nextcloud/feature/edit-file-locally-restart-sync
Feature/edit file locally restart sync
2022-12-06 10:02:29 +01:00
alex-z
b673ab996e Edit locally job will only sync a specific file by modifying the state of the Sync Engine. All other running syncs will get terminated. Syncing is now optimized to run faster and it checks if the file has changed on the server before syncing it.
Signed-off-by: alex-z <blackslayer4@gmail.com>
2022-12-06 09:37:03 +01:00
Nextcloud bot
a5483dc339
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-06 03:39:02 +00:00
Claudio Cambra
98e6ab2c64
Merge pull request #5233 from nextcloud/bugfix/enforce-plain-text-qml-labels
Make use of plain text-enforcing qml labels
2022-12-05 16:18:57 +01:00
Claudio Cambra
19afb905c0
Only perform Label check on QML files
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-12-05 16:06:15 +01:00
Claudio Cambra
2e3768278d Add QML label check to CI
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-12-05 15:21:09 +01:00
Claudio Cambra
2ec1da22ed Remove now redundant use of textFormat
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-12-05 15:21:09 +01:00
Claudio Cambra
6c4070e786 Introduce EnforcedPlainTextLabel, convert all Label or Text labels to use this
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-12-05 15:21:09 +01:00
Nextcloud bot
8604761699
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-05 03:27:11 +00:00
Nextcloud bot
6249310173
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-04 03:26:37 +00:00
Nextcloud bot
53b983e7d5
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-03 03:26:47 +00:00
Nextcloud bot
ffe8b35b91
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-02 03:28:01 +00:00
Claudio Cambra
182512b269
Merge pull request #5221 from nextcloud/Valdnet-patch-4
l10n: Correct spelling
2022-12-01 22:14:32 +01:00
Valdnet
e2ff8715f4 l10n: Correct spelling
Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
2022-12-01 15:33:15 +01:00
Matthieu Gallien
d2d7b45353
Merge pull request #5231 from nextcloud/bugfix/more-plain-text
Ensure more QML text components are rendering things as plain text
2022-12-01 15:22:07 +01:00
Claudio Cambra
00fcb6e01d Ensure more QML text components are rendering things as plain text
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-12-01 14:20:15 +01:00
Claudio Cambra
d39aac0cb8
Merge pull request #5179 from nextcloud/feature/clear-e2e-enabled-on-other-device-message
Differentiate between E2EE not being enabled at all vs. E2EE being enabled already through another device in account settings message
2022-12-01 12:54:13 +01:00
Claudio Cambra
83fd752981 Address capitalisation of End-to-end
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-12-01 11:50:18 +01:00
Claudio Cambra
70468be5e5 Differentiate between E2EE not being enabled at all vs. E2EE being enabled already through another device in account settings message
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-12-01 11:50:18 +01:00
Nextcloud bot
19a8018622
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-01 03:31:52 +00:00
Matthieu Gallien
ba6537d710
Merge pull request #5224 from nextcloud/bugfix/caseCashConflictsShouldNotTerminateSync
Bugfix/case cash conflicts should not terminate sync
2022-11-30 13:44:44 +01:00
Matthieu Gallien
1725055346 a case clash error is a case clash error
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2022-11-30 11:49:35 +01:00
Matthieu Gallien
af49e1079a fix test and code to not stop on case clash errors
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2022-11-30 11:49:35 +01:00
Matthieu Gallien
b68754827c case clash should not prevent full propagation
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2022-11-30 11:49:35 +01:00
Nextcloud bot
4b5186d2bb
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-30 03:31:40 +00:00
Claudio Cambra
744e39e7cd
Merge pull request #5227 from nextcloud/bugfix/update-macosx-shell-integration-deployment-targets
Update macOS shell integration deployment targets
2022-11-29 11:42:34 +01:00
Claudio Cambra
46381f5ddc Update macOS shell integration deployment targets
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-11-29 11:35:35 +01:00
Nextcloud bot
e26e5cd575
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-29 03:31:24 +00:00
Claudio Cambra
ceb998f896
Merge pull request #5163 from nextcloud/feature/encryption-ux
Remove close/dismiss button from encryption message
2022-11-28 18:54:09 +01:00
Claudio Cambra
0262c77d27 Remove close/dismiss button from encryption message
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-11-28 18:24:40 +01:00
Claudio Cambra
5d0c97e214
Merge pull request #5223 from nextcloud/bugfix/prevent-encryption-folder-if-e2e-unsetup
Prevent bad encrypting of folder if E2EE has not been correctly set up
2022-11-28 18:22:36 +01:00
Claudio Cambra
a243f7c4d1 Prevent bad encrypting of folder if E2EE has not been correctly set up
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2022-11-28 17:48:53 +01:00
Claudio Cambra
06937cbd09
Merge pull request #5220 from nextcloud/rakekniven-patch-1
l10n: Fixed grammar
2022-11-28 14:37:38 +01:00
rakekniven
5353f4f92d l10n: Fixed grammar
Reported at Transifex.

Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com>

Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com>
2022-11-28 14:37:24 +01:00
Nextcloud bot
0ca63f59b0
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-28 03:32:10 +00:00
Nextcloud bot
b5345a616c
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-27 03:29:53 +00:00
Nextcloud bot
c3889d345e
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-26 03:29:39 +00:00
allexzander
681e3b592e
Merge pull request #5209 from nextcloud/bugfix/tests-cfapihshellext
Fix CfApiShellExtensionsIPCTest
2022-11-25 16:33:17 +01:00
alex-z
16153b33b7 Fix CfApiShellExtensionsIPCTest.
Signed-off-by: alex-z <blackslayer4@gmail.com>
2022-11-25 15:03:24 +01:00
Claudio Cambra
39876c4388
Merge pull request #5164 from nextcloud/feature/e2ee-wording
Clearly tell user that E2EE has been enabled for an account
2022-11-25 14:10:36 +01:00