1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-10-26 06:42:48 +02:00
Commit Graph

16738 Commits

Author SHA1 Message Date
Nextcloud bot
e0dd06b978
[tx-robot] updated from transifex 2021-05-08 03:56:52 +00:00
Felix Weilbach
85df5d35cb
Merge pull request #3285 from nextcloud/feature/git-ignore-convert-exe
Git ignore convert.exe and .dir-locals.el
2021-05-07 12:28:04 +02:00
Felix Weilbach
690bc199c6 Git ignore convert.exe and .dir-locals.el
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-05-07 12:17:42 +02:00
Nextcloud bot
3ee831884f
[tx-robot] updated from transifex 2021-05-07 04:00:14 +00:00
Matthieu Gallien
05543d8b87
Merge pull request #3267 from nextcloud/feature/autoUpdatePlatforms
send OS name and version to auto updater to allow selective upgrades
2021-05-06 12:13:48 +02:00
Matthieu Gallien
86dda5675f send OS name and version to auto updater to allow selective upgrades
in order to be able to suuport legacy OS, also sends the OS name and
version

will be used to detect Windows 8.1 and similar legacy versions

Signed-off-by: Matthieu Gallien <matthieu_gallien@yahoo.fr>
2021-05-06 09:32:09 +00:00
Matthieu Gallien
8f7646d93f
Merge pull request #3260 from nextcloud/fix/cherryPickFixes
Fix/cherry pick fixes
2021-05-06 09:55:04 +02:00
Hannah von Reth
17a1a630a4 Use the http logger with the unittests
This allow better debugging of the tests

Signed-off-by: Matthieu Gallien <matthieu_gallien@yahoo.fr>
2021-05-06 07:35:59 +00:00
Hannah von Reth
bff386e5c1 Fix int uint warning
Signed-off-by: Matthieu Gallien <matthieu_gallien@yahoo.fr>
2021-05-06 07:35:59 +00:00
Hannah von Reth
98655ef28b Fix warning by using qsizetype instead of size_t
Signed-off-by: Matthieu Gallien <matthieu_gallien@yahoo.fr>
2021-05-06 07:35:59 +00:00
Hannah von Reth
ea3d78aecf Fix warning by using QByteArrayLiteral
Signed-off-by: Matthieu Gallien <matthieu_gallien@yahoo.fr>
2021-05-06 07:35:59 +00:00
Hannah von Reth
e04c6abcd5 Fix placeholder detection for cfapi
Fixes: #8326
Signed-off-by: Matthieu Gallien <matthieu_gallien@yahoo.fr>
2021-05-06 07:35:59 +00:00
Hannah von Reth
adb56178b9 GetLastError() needs to be called when the error happens
qDebug might clear it already

Signed-off-by: Matthieu Gallien <matthieu_gallien@yahoo.fr>
2021-05-06 07:35:59 +00:00
allexzander
539b45a346
Merge pull request #3246 from nextcloud/bugfix/vfs-allow-dyhadration-of-readonly-files
VFS. Allow dehydartion of readonly files. Preserve 'readonly' flag when creating a placeholder.
2021-05-06 09:26:17 +03:00
allexzander
d754bb7102 Fix review comments.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-05-06 06:17:36 +00:00
allexzander
ef89256d39 VFS. Allow dehydartion of readonly files. Preserve 'readonly' flag when creating a placeholder.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-05-06 06:17:36 +00:00
Nextcloud bot
49e68d7234
[tx-robot] updated from transifex 2021-05-06 04:00:08 +00:00
allexzander
f66add825d
Merge pull request #3239 from nextcloud/bugfix/vfs-local-name-clash-error
VFS. Display local file name clash error when syncing in VFS mode.
2021-05-05 20:43:40 +03:00
allexzander
19522210ac VFS. Display local file name clash error when syncing in VFS mode.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-05-05 17:34:59 +00:00
Matthieu Gallien
361bd6fdb4
Merge pull request #3265 from nextcloud/rakekniven-patch-1
Changed copyright year to 2021
2021-05-05 14:56:43 +02:00
rakekniven
6d23e93d31
Changed copyright year to 2021
Fix for #3258 

Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com>
2021-05-05 13:37:31 +02:00
Felix Weilbach
6d22da9a4b
Merge pull request #3263 from nextcloud/bugfix/dont-crash-if-screen-under-pointer-not-found
Fallback to primary screen if screen under pointer not found
2021-05-05 12:10:10 +02:00
Felix Weilbach
aadee15008 Fallback to primary screen if screen under pointer not found
Fixes #3252

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-05-05 11:56:46 +02:00
Matthieu Gallien
8716877e61
Merge pull request #3261 from nextcloud/ci/staleBot
increase number of operations per run to go through old issues
2021-05-05 11:45:21 +02:00
Matthieu Gallien
1e267f1781 increase number of operations per run to go through old issues
Signed-off-by: Matthieu Gallien <matthieu_gallien@yahoo.fr>
2021-05-05 11:20:08 +02:00
Nextcloud bot
3062595022
[tx-robot] updated from transifex 2021-05-05 04:08:32 +00:00
Felix Weilbach
0bf725be3a
Merge pull request #3255 from nextcloud/bug/fixMissingTranslation
add missing call to tr to get a translated string
2021-05-04 12:44:15 +02:00
Matthieu Gallien
23ba193102 add missing call to tr to get a translated string
Fix #3250

Signed-off-by: Matthieu Gallien <matthieu_gallien@yahoo.fr>
2021-05-04 12:16:10 +02:00
Felix Weilbach
c37a4a6452
Merge pull request #3193 from nextcloud/bugfix/pn-reconnect-forever-if-possible
Push notifications: reconnect forever if possible
2021-05-04 10:17:37 +02:00
Felix Weilbach
7112d2aa78 Push Notifications: Reconnect forever if capabilities allow it
Fixes #3115

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-05-04 10:05:19 +02:00
Felix Weilbach
aea867c445 Refactor push notification tests
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-05-04 07:27:06 +00:00
Felix Weilbach
d21df33a50 Add missing copyright headers for push notifications
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-05-04 07:27:06 +00:00
Nextcloud bot
9372b6827c
[tx-robot] updated from transifex 2021-05-04 03:57:20 +00:00
Nextcloud bot
b27c9ae9bc
[tx-robot] updated from transifex 2021-05-03 03:55:12 +00:00
Nextcloud bot
9b0c57cdea
[tx-robot] updated from transifex 2021-05-02 03:54:12 +00:00
Nextcloud bot
cee697e781
[tx-robot] updated from transifex 2021-05-01 03:58:05 +00:00
rakekniven
0d5e4a1ba2
Merge pull request #3241 from nextcloud/rakekniven-patch-2
No need to translate ellipsis
2021-04-30 14:50:28 +02:00
rakekniven
33ef3a1d1e
Merge branch 'master' into rakekniven-patch-2 2021-04-30 14:38:23 +02:00
rakekniven
ecd88832b8
Merge pull request #3242 from nextcloud/Valdnet-patch-3
l10n: Translation of ellipse
2021-04-30 14:37:56 +02:00
Valdnet
dc6518a4ee
l10n: Translation of ellipse
Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
2021-04-30 13:57:02 +02:00
rakekniven
0e12b0323e
No need to translate ellipsis
Here another PR for the same code line as #3238 

Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com>
2021-04-30 13:27:18 +02:00
Felix Weilbach
a97c083c98
Merge pull request #3238 from nextcloud/Valdnet-patch-3
l10n: Change to an ellipsis
2021-04-30 11:07:06 +02:00
Valdnet
f431649bad l10n: Change to an ellipsis
Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
2021-04-30 08:19:25 +00:00
Matthieu Gallien
741c2f0bd3
Merge pull request #3233 from nextcloud/doc/updateDocumentationVersion
update version of documentation to the latest release (v3.2.1)
2021-04-30 10:07:14 +02:00
Matthieu Gallien
55f91e2cb7 update version of documentation to the latest release (v3.2.1)
Signed-off-by: Matthieu Gallien <matthieu_gallien@yahoo.fr>
2021-04-30 07:28:58 +00:00
Nextcloud bot
e973dd8c39
[tx-robot] updated from transifex 2021-04-30 03:59:29 +00:00
allexzander
14843b7a62
Merge pull request #3186 from nextcloud/feature/share-obey-enforced-password-for-share-by-mail
Obey enforced password for share by email.
2021-04-29 11:21:24 +03:00
allexzander
e72013fed1 Fix Felix's comments.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-04-29 07:43:21 +00:00
allexzander
19e2d70c53 Final corrections and refactoring.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-04-29 07:43:21 +00:00
allexzander
deb9ba89f0 Only show password option for email shares.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-04-29 07:43:21 +00:00