1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-18 00:42:45 +01:00
Commit Graph

16161 Commits

Author SHA1 Message Date
Roeland Jago Douma
3a1dc44ec8
Merge pull request #320 from nextcloud/upstream/issue/6403
propagateuploadv1: don't finalize after a done()
2018-06-04 17:12:52 +02:00
Roeland Jago Douma
3c3f3541d4
Merge pull request #291 from nextcloud/fixEncryptionDecryptionNonEmptyFolder
Forbid to encrypt or decrypt a non-empty folder.
2018-06-04 16:03:25 +02:00
Roeland Jago Douma
c49597d9d8
Merge pull request #319 from nextcloud/upstream/issue/4424
Folder: normalize the local path.
2018-06-04 16:02:49 +02:00
Roeland Jago Douma
321e8c0264
Merge pull request #317 from nextcloud/upstream/issue/3146
SslButton: Add HTTP/2 info #3146
2018-06-04 16:01:44 +02:00
Roeland Jago Douma
092063d348
Merge pull request #316 from nextcloud/upstream/pr/6384
CSync Errors cleanup
2018-06-04 15:59:45 +02:00
Olivier Goffart
393f6c2310
SyncEngine: remove the "CSync" wording from the error messages
They are confusing for the user.
Example in issue #6274
2018-06-04 15:41:38 +02:00
Olivier Goffart
5f30177bfc
CSync: Remove unused error codes
None of the removed ERRNO code were ever set.
So none of the removed error hapenned anymore
2018-06-04 15:41:38 +02:00
Olivier Goffart
15e93c8a31
CSync: reconcile never returns an error 2018-06-04 15:41:38 +02:00
Olivier Goffart
be29fc2f69
csync: remove CSYNC_PARAM_ERROR
It does not make sense to report such error to the user.
Its goal was to show invalid use of the csync API, but this is now done
with asserts.
2018-06-04 15:41:38 +02:00
Olivier Goffart
0443f8dd4d
csync: Simplify csync_walk_local_tree/csync_walk_remote_tree
Small refactoring
2018-06-04 15:41:38 +02:00
Tomaz Canabrava
9b74a596c6
Forbid to encrypt or decrypt a non-empty folder.
The specs forbid the encryption or decryption of a
non empty folder. so...
1 - check for the sync status, if it's not synced return

as there's no way that I can say that there's items on the
server right now without waiting for the sync to finish

2 - verify if the folder is empty locally

as the user could have send some files to the folder.
2018-06-04 15:33:01 +02:00
Julius Härtl
5df1af79c5
Merge pull request #377 from nextcloud/bugfix/noid/cloudprovidesr_314
Fix cloudproviders after merging #314
2018-06-04 15:32:36 +02:00
Morris Jobke
d35ea29ad2
Merge pull request #388 from nextcloud/documentation/macos-osx
[documentation] Mac OS X is now macOS
2018-06-04 14:10:55 +02:00
Marius Blüm
78bfae45ae
Mac OS X is now macOS
Signed-off-by: Marius Blüm <marius@lineone.io>
2018-06-04 11:44:03 +02:00
Markus Goetz
ab34f36836
owncloudsynclog: 1 MB -> 10 MB #6420 2018-06-03 23:09:23 +02:00
Roeland Jago Douma
f96206705a
Merge pull request #315 from nextcloud/upstream/pr/6379
Discovery: Error if properties are missing #6317
2018-06-03 19:58:21 +02:00
Nextcloud bot
70d4c64d99
[tx-robot] updated from transifex 2018-06-03 00:48:45 +00:00
Roeland Jago Douma
4b1c6bb833
Fix cloudproviders after merging #314
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-02 20:46:10 +02:00
Roeland Jago Douma
1262cbf4ef
Merge pull request #314 from nextcloud/upstream/pr/6373
Make sure ignored and conflict files show up in the issues tab even with partial local discovery
2018-06-02 20:20:19 +02:00
Nextcloud bot
b2433c8961
[tx-robot] updated from transifex 2018-06-02 00:46:48 +00:00
Julius Härtl
c9634d65aa
Merge pull request #313 from nextcloud/upstream/pr/6380
ConnectionValidator: change the minimum server version
2018-06-01 15:43:19 +02:00
Julius Härtl
fc4f8fb2d5
Merge pull request #372 from nextcloud/upstream/pr/6488
ShareDialog: macOS grey odditiy #5774
2018-06-01 15:42:26 +02:00
Julius Härtl
4be565c56f
Merge pull request #369 from nextcloud/upstream/issue/6406
Nautilus shell integration: Print python version on startup #6406
2018-06-01 15:40:23 +02:00
Julius Härtl
e4981931ac
Merge pull request #373 from nextcloud/upstream/pr/6490
Nautilus: Fix Python3 and remove many debug
2018-06-01 15:39:56 +02:00
Olivier Goffart
5f969580ac
Nautilus: Fix Python3 and remove many debug
Use b'\n' in the call to rfind, as the _remainder is bytes, not a string.

Remove most of the debug message which happens during normal operation.
They are mostly spamming the nautilus console, and can also cause bug
as they may throw exception in case of wrong encoding.

Relates to issue: #6406
2018-06-01 13:35:19 +02:00
Markus Goetz
b8b9b93a6e
ShareDialog: macOS grey odditiy #5774 2018-06-01 13:31:22 +02:00
Olivier Goffart
4d7617d64b
Propagator: remove a bunch of code related to the 'Shared' directory
This no longer exists since the owncloud server 7.0 which we no longer
allow to connect to
2018-06-01 13:17:20 +02:00
Olivier Goffart
8484b493e4
ConnectionValidator: change the minimum server version
Forbit connection with server older than 7.0. These server did not have
permission.

Also warn for anything older than 9.1. 9.0 is end of life according to
https://github.com/owncloud/core/wiki/Maintenance-and-Release-Schedule
2018-06-01 13:17:11 +02:00
Christian Kamm
70f0792d4a
Nautilus shell integration: Print python version on startup #6406 2018-06-01 13:02:13 +02:00
Roeland Jago Douma
335298f4e2
Merge pull request #312 from nextcloud/upstream/pr/6374
Move ClientProxy and and ConnectionValidator out of libsync
2018-06-01 11:08:20 +02:00
Olivier Goffart
1b587a1241
ConnectionValidator::Status use Q_ENUM
So no need to have a manual conversion to QString
This is only used in debug message anyway.
2018-05-31 21:56:55 +02:00
Olivier Goffart
311307e8cb
Move ClientProxy and ConnecitonValidator to gui
They are using the ConfigFile and are used to control
when to sync rather than for the sync itself
2018-05-31 21:56:55 +02:00
Olivier Goffart
7e05e1e411
owncloudcmd: Do not overwrite the http timeout for json jobs
The AbstractNetworkJob already has a sensible timeout that depends
on an environment variable.
No need to overwrite that with some arbitrary value. (The connection
validator does that because it could cause problems if two connection
validator were to run at the same time. Not a problem here)
2018-05-31 21:56:55 +02:00
Olivier Goffart
204cb470b4
owncloudcmd: Do not read the proxy settings from the gui's config file
The proxy settings for the owncloudcmd client can be set via the
--httpproxy command line argument. owncloudcmd should not depends
on the gui's config
2018-05-31 21:56:55 +02:00
Olivier Goffart
9fe8713bdc
Folder: remove unused member 2018-05-31 21:56:44 +02:00
Nextcloud bot
08024f69c8
[tx-robot] updated from transifex 2018-05-31 00:48:48 +00:00
Roeland Jago Douma
c6ef8eec0a
Merge pull request #305 from nextcloud/upstream/pr/6363
SyncEngine: Use separate state for two unicode conversions
2018-05-30 08:04:05 +02:00
Roeland Jago Douma
86741de622
Merge pull request #299 from nextcloud/upstream/pr/6349
Don't delete contents behind directory junctions #6322
2018-05-30 08:03:04 +02:00
Roeland Jago Douma
c6c42c3c70
Merge pull request #311 from nextcloud/upstream/pr/6371
Utility::fsCasePreserving: remove UNIT_TESTING ifdef
2018-05-29 20:33:34 +02:00
Roeland Jago Douma
d410b8e057
Merge pull request #310 from nextcloud/upstream/version-cmake
VERSION.cmake: This is 2.4.2 now
2018-05-29 20:32:27 +02:00
Markus Goetz
68601240f8
VERSION.cmake: This is 2.4.2 now 2018-05-29 20:19:42 +02:00
Roeland Jago Douma
6ebcc638e0
Merge pull request #300 from nextcloud/upstream/pr/6351
SettingsDialogMac: Also start timer for notifications
2018-05-29 20:19:03 +02:00
Markus Goetz
13b2e51dfe
Notifications: Immediately request when getting account online 2018-05-29 20:09:08 +02:00
Markus Goetz
00d8343e76
SettingsDialogMac: Also start timer for notifications 2018-05-29 20:09:06 +02:00
Nextcloud bot
4089456bc6
[tx-robot] updated from transifex 2018-05-28 00:49:03 +00:00
Roeland Jago Douma
1b756ac80f
Merge pull request #318 from nextcloud/upstream/pr/6402
Dolphin plugin: fall back if $XDG_RUNTIME_DIR is empty
2018-05-26 21:33:45 +02:00
Roeland Jago Douma
bb1b86b087
Merge pull request #307 from nextcloud/upstream/pr/6366
test/testsyncengine: testNoLocalEncoding is for Linux
2018-05-26 21:30:21 +02:00
Nextcloud bot
e9be7fc18a
[tx-robot] updated from transifex 2018-05-26 00:54:16 +00:00
Nextcloud bot
37cac61f49
[tx-robot] updated from transifex 2018-05-25 00:55:04 +00:00
Nextcloud bot
c2e0a4a73c
[tx-robot] updated from transifex 2018-05-23 16:56:31 +00:00