Claudio Cambra
|
31876926ac
|
Only request mnemonic when user explicitly wants to enable E2EE
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
|
2022-12-09 12:12:37 +01:00 |
|
Matthieu Gallien
|
7a3d30a047
|
Merge pull request #5256 from nextcloud/bugfix/doNotBulkUploadE2EE
do not use bulk upload for e2ee files
|
2022-12-09 12:07:49 +01:00 |
|
Matthieu Gallien
|
be9d7d724f
|
do not use bulk upload for e2ee files
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
|
2022-12-09 08:57:31 +01:00 |
|
Nextcloud bot
|
ba5fa13e7a
|
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
|
2022-12-09 03:46:30 +00:00 |
|
Claudio Cambra
|
9f7592f5d8
|
Merge pull request #5214 from nextcloud/bugfix/user-status-selector-text-input-sizing
Explicitly size and align user status selector text input to avoid bugs with alternate QtQuick styles
|
2022-12-08 13:30:34 +01:00 |
|
Claudio Cambra
|
cc159e0117
|
Explicitly size and align user status selector text input to avoid bugs with alternate QtQuick styles
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
|
2022-12-08 13:07:55 +01:00 |
|
Claudio Cambra
|
948cd1e0b6
|
Merge pull request #5216 from nextcloud/bugfix/basic-combo-internal-layout
Fix BasicComboBox internal layout
|
2022-12-08 13:04:37 +01:00 |
|
Claudio Cambra
|
1cf2b59be2
|
Fix BasicComboBox internal layout, take proper account of insets
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
|
2022-12-08 12:21:28 +01:00 |
|
Matthieu Gallien
|
34d5b82fa8
|
Merge pull request #5253 from nextcloud/bugfix/editLocallyShouldWork
do not create GUI from a random thread and show error on real error
|
2022-12-08 11:00:48 +01:00 |
|
Matthieu Gallien
|
2c94490b9c
|
do not create GUI from a random thread and show error on real error
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
|
2022-12-08 10:58:58 +01:00 |
|
Nextcloud bot
|
0f23fa49dd
|
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
|
2022-12-08 03:31:17 +00:00 |
|
Matthieu Gallien
|
17ce113167
|
Merge pull request #5247 from nextcloud/bugfix/plainify-qlabels
Format some QLabels as plain text
|
2022-12-07 17:53:45 +01:00 |
|
Claudio Cambra
|
135cab152b
|
Format some QLabels as plain text
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
|
2022-12-07 17:18:57 +01:00 |
|
Claudio Cambra
|
120476e93b
|
Merge pull request #5226 from nextcloud/feature/lock-file-edit-locally
Lock file when editing locally
|
2022-12-07 14:42:54 +01:00 |
|
Claudio Cambra
|
58f91072a5
|
Remove redundant openUrl variable
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
|
2022-12-07 13:48:51 +01:00 |
|
Claudio Cambra
|
7eb31c31e5
|
Fix loss of integer precision in parameters for fileLockTimeRemainingMinutes
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
|
2022-12-07 13:47:48 +01:00 |
|
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 |
|