chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-10-05 02:53:40 +02:00
Code Activity
14,674 Commits 4 Branches 173 Tags
v2.7.0-beta3
Commit Graph
14674 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Camila Ayres 4aeec032fe Merge branch 'master' into fix/osx/no_thead_local 2018-06-15 10:29:24 +02:00
Nextcloud bot 990af6be2f [tx-robot] updated from transifex 2018-06-15 00:49:45 +00:00
Roeland Jago Douma f7bf8c7577 Thread local storage don't work properly on OSX 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-14 21:26:07 +02:00
Roeland Jago Douma f71c74e5aa Merge pull request #418 from nextcloud/fix/nextcloud_sparkle_key 
Add our own dsa_pub.pem
 2018-06-14 21:06:17 +02:00
Roeland Jago Douma 8b96ef53b9 Add our own dsa_pub.pem 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-14 20:59:27 +02:00
Roeland Jago Douma 2ce79717b2 Merge pull request #412 from nextcloud/upstream/nsis 
NSIS: SVG imageformats plugin DLL
 2018-06-13 19:52:40 +02:00
Markus Goetz c04ae70cf5 NSIS: SVG imageformats plugin DLL #6515 2018-06-13 14:57:31 +02:00
Markus Goetz ae36f36d56 NSIS: SVG DLL #6515 2018-06-13 14:57:30 +02:00
Nextcloud bot 4ad2955a75 [tx-robot] updated from transifex 2018-06-12 00:55:30 +00:00
Roeland Jago Douma 26bf407d62 Merge pull request #400 from nextcloud/upstream/pr/6481 
SocketAPI: Allow opening share dialog if contents still syncing #4608
 2018-06-11 19:43:01 +02:00
Christian Kamm ca8f569371 SocketAPI: Remove SHARE_STATUS 
It was never used by a shell integration.
 2018-06-11 19:35:17 +02:00
Christian Kamm 2bec587d4d SocketAPI: Allow opening share dialog if contents still syncing #4608 
With the previous changes the "Share..." action was shown but it didn't
work yet.
 2018-06-11 19:35:16 +02:00
Roeland Jago Douma f31d4ba341 Merge pull request #392 from nextcloud/upstream/pr/6413 
Rename local discovery option for clarity
 2018-06-11 15:25:03 +02:00
Christian Kamm 16ba0cf47e Blacklist: Add unittest #6411 2018-06-11 14:50:01 +02:00
Christian Kamm d304fcbda7 Rename local discovery option for clarity 
It's using full relative filepaths, not just dir paths.
 2018-06-11 14:50:01 +02:00
Roeland Jago Douma 2cc94636cf Merge pull request #391 from nextcloud/upstream/pr/6417 
Conflicts: Change tags to be more user friendly #6365
 2018-06-11 14:48:47 +02:00
Christian Kamm 77fcff5bdf Conflicts: Change tags to be more user friendly #6365 
From "_conflict-user-yyyymmdd-hhmmss"
to   " (conflicted copy user yyyy-mm-dd hhmmss)"
 2018-06-11 14:40:40 +02:00
Nextcloud bot a9d633c7ef [tx-robot] updated from transifex 2018-06-11 00:48:08 +00:00
Olivier Goffart 1b6cc36a61 Fix make doc-man in shadow build 
Issue #6555
 2018-06-10 16:07:22 +02:00
Nextcloud bot e82fdee90c [tx-robot] updated from transifex 2018-06-10 00:49:25 +00:00
Nextcloud bot 0e00f9d0d3 [tx-robot] updated from transifex 2018-06-09 00:48:57 +00:00
Roeland Jago Douma dc41f8a16e Fix windows build 
* Reorder openssl header import
* not => !

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-08 16:53:56 +02:00
Roeland Jago Douma 7e98a1e802 Merge pull request #390 from nextcloud/upstream/pr/6377 
Notify if an explicitly excluded folder is created #6222
 2018-06-08 14:58:45 +02:00
Christian Kamm e65caee9cf Notify if an explicitly excluded folder is created #6222 2018-06-08 14:49:26 +02:00
Nextcloud bot 1ba96d779b [tx-robot] updated from transifex 2018-06-08 00:49:17 +00:00
Roeland Jago Douma d0a93ddfc4 Merge pull request #387 from nextcloud/upstream/accountwizard 
AccountWizard: Reserve space for error label #6546
 2018-06-07 15:39:55 +02:00
Christian Kamm a1d6af60f0 AccountWizard: Reserve space for error label #6546 2018-06-07 15:32:52 +02:00
Roeland Jago Douma a6179876c7 Merge pull request #385 from nextcloud/upstream/pr/6525 
Credentials: Retry fetching from the keychain in case the keychain is…
 2018-06-07 15:32:16 +02:00
Olivier Goffart 7c9ec4a55a Credentials: Retry fetching from the keychain in case the keychain is still starting 
When owncloud is restored, at boot time, it might be started before the
crendential manager. So if we detect an error, wait 10 seconds and hopefully
it'd be loaded by then.

Issues: #4274, #6522
 2018-06-07 15:18:40 +02:00
Roeland Jago Douma 81b0cdc9d2 Merge pull request #386 from nextcloud/upstream/owncloudsynclog 
owncloudsynclog: 1 MB -> 10 MB #6420
 2018-06-07 15:01:34 +02:00
Julius Härtl 689ab5b8b3 Merge branch 'master' into upstream/owncloudsynclog 2018-06-07 14:38:49 +02:00
Roeland Jago Douma 2a60141ef2 Merge pull request #383 from nextcloud/upstream/pr/6526 
macOS: Don't use WAL for sqlite3 in /Volumes
 2018-06-07 10:36:57 +02:00
Markus Goetz 3cd21e258e macOS: Don't use WAL for sqlite3 in /Volumes 
For #6049
 2018-06-07 10:22:07 +02:00
Roeland Jago Douma a01c78a4ce Merge pull request #382 from nextcloud/upstream/pr/6530 
SyncJournal: Check file existence even for open dbs #6049
 2018-06-07 10:21:07 +02:00
Christian Kamm 8147963b24 SyncJournal: Explain added file-exists check 2018-06-07 09:50:09 +02:00
Christian Kamm cc04ce9fe4 SyncJournal: Check file existence even for open dbs #6049 
With WAL mode sqlite seems to occasionally crash when the
underlying filesystem goes away.
 2018-06-07 09:50:09 +02:00
Roeland Jago Douma a348ff3134 Merge pull request #381 from nextcloud/upstream/pr/6532 
Upload: Adjust timeout for final job based on size #6527
 2018-06-07 09:49:25 +02:00
Christian Kamm 5f793c151c Upload: Adjust timeout for final job based on size #6527 
Some servers have virus scanners and the like that can delay the
response of the final chunked upload assembly significantly, often
breaking the current 5min (!) timeout. See owncloud/enterprise#2480
for details.
 2018-06-07 09:38:16 +02:00
Roeland Jago Douma b2a8eea875 Merge pull request #380 from nextcloud/upstream/pr/6533 
Propagation: Connection closed is a normal error #6516
 2018-06-07 09:35:32 +02:00
Christian Kamm 4fa762b5ce Propagation: Connection closed is a normal error #6516 
Because it sometimes appears in conjunction with server bugs and we
don't want to halt all syncing for other files in these cases.
 2018-06-07 09:12:46 +02:00
Roeland Jago Douma f540c37ad3 Merge pull request #375 from nextcloud/upstream/pr/6523 
PropagateUpload: Remove unused PropagateUploadFileCommon::abort
 2018-06-07 09:11:45 +02:00
Olivier Goffart 14ff3534a8 Fix compilation warning 
propagateuploadng.cpp:500:10: warning: lambda capture 'this' is not used [-Wunused-lambda-capture]
 2018-06-07 08:53:12 +02:00
Christian Kamm 3556482bce TestChunkingNG: Remove unneeded test code 2018-06-07 08:53:12 +02:00
Christian Kamm d9640dd79e PropagateUpload: Fix miscount in abort() #6516 
Previously it tried to abort even jobs that had already finished, which
was not going to work as they wouldn't emit finished() again.

Also, in some cases the abortCount would never go to zero and that case
wasn't well documented.
 2018-06-07 08:53:12 +02:00
Christian Kamm 96126a53d3 PropagateUpload: Remove unused PropagateUploadFileCommon::abort 2018-06-07 08:53:10 +02:00
Nextcloud bot e043840fd0 [tx-robot] updated from transifex 2018-06-07 00:47:40 +00:00
Christian Kamm 797b40237e Partial local discovery: Fix scheduling logic 
A recent patch that touched the condition for deciding whether a
periodic full local discovery is necessary accidentally inverted the
condition.
 2018-06-06 22:49:50 +02:00
Roeland Jago Douma 448b0ebf63 Merge pull request #374 from nextcloud/upstream/pr/6519 
ShareLink: Preserve password when unrelated ui changes #6512
 2018-06-06 21:01:51 +02:00
Christian Kamm 898a530ba5 ShareLink: Preserve password when unrelated ui changes #6512 2018-06-06 20:56:34 +02:00
Roeland Jago Douma 04930768ee Merge pull request #370 from nextcloud/upstream/pr/6238 
update supported linux platforms
 2018-06-06 20:56:03 +02:00