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
12,609 Commits 4 Branches 173 Tags
v2.5.0-beta2
Commit Graph
12609 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Kamm 7ab127ad53 Excludes: Refactor for pending improvements 
Make ExcludedFiles something that is instantiated outside of
the CSYNC context and then given to it as a hook.

ExcludedFiles still lives in csync_exclude and the internal
workings haven't been touched.
 2017-12-07 14:38:21 +01:00
Olivier Goffart dd91f4a86e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/csync/csync.cpp
 2017-12-07 09:37:50 +01:00
Olivier Goffart 3485109125 Jenkinsfile: Fix compilation 
Add a CMAKE_PREFIX_PATH so it finds the right QtKeychain
 2017-12-07 09:35:04 +01:00
Jenkins for ownCloud a1136e7695 [tx-robot] updated from transifex 2017-12-07 02:18:34 +01:00
Hefee 32f38dc5f8 fix typo error: occured-> occurred 2017-12-06 20:02:53 +01:00
Christian Kamm ceac18c554 Reconcile: Rename maps are consistent with update phase #6212 
For duplicate file ids the update phase and reconcile phase determined
the rename mappings independently. If they disagreed (due to different
order of processing), complicated misbehavior would result.

This patch fixes it by letting reconcile try to use the mapping that the
update phase has computed first.
 2017-12-06 16:42:11 +01:00
Christian Kamm 99f32dcb99 Clear csync rename mappings after reconcile 
They were being preserved *across sync runs*.
 2017-12-06 16:42:11 +01:00
Christian Kamm 79fe71db58 Hide selective sync buttons while disconnected #5809 
The choices or big folder warnings will pop up again on reconnection.
 2017-12-06 16:41:28 +01:00
Jenkins for ownCloud ac937030f0 [tx-robot] updated from transifex 2017-12-06 02:18:35 +01:00
Olivier Goffart ed5385faa3 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libsync/connectionvalidator.cpp
     	src/libsync/networkjobs.cpp
 2017-12-05 15:58:13 +01:00
Markus Goetz fe234499dd Update release_template.md 2017-12-05 09:22:23 +01:00
Jenkins for ownCloud 67d77dd6ce [tx-robot] updated from transifex 2017-12-05 02:18:35 +01:00
Tomaz Canabrava 66aecb9626 [CSE] Handle normal uploads in CSE enabled instances 2017-12-04 22:45:10 +01:00
Tomaz Canabrava 6f35cbff6b [CSE] Fetch the Folder information for encryption status 2017-12-04 22:27:13 +01:00
Tomaz Canabrava 387737d908 [CSE] Start to create the upload logic. 2017-12-04 21:33:43 +01:00
Markus Goetz 755ef0119a ChangeLog: More 2.4.0 changes up to now 2017-12-04 13:18:29 +01:00
Hefee 1a1ab92ed9 make doc-man working again. 2017-12-04 12:37:30 +01:00
Michael Stingl b29e9b931d move man rst files to separate dir 2017-12-04 12:37:30 +01:00
Markus Goetz 0479322c1d fstack-protector: Improve previous commit 2017-12-04 12:37:03 +01:00
Klaas Freitag 0be7b6fe1f Only enable -fstack-protector-strong compiler flag for gcc > 4.9 
On older/other compilers this flag is not understood.
 2017-12-04 12:37:03 +01:00
Olivier Goffart ee98daf9ea Shibboleth: Upgrade to OAuth2 When the server supports it 
If the server support both Shibboleth and OAuth2, upgrades to OAuth2

Issue #6198
 2017-12-04 08:09:34 +01:00
Jenkins for ownCloud f2beaba3e9 [tx-robot] updated from transifex 2017-12-04 02:18:34 +01:00
Tomaz Canabrava 8c4928d9f6 Merge branch 'uploadImprovements' into clientSideEncryptionV3 2017-12-03 18:15:33 +01:00
Jenkins for ownCloud 823c7469e1 [tx-robot] updated from transifex 2017-12-03 02:18:34 +01:00
Jenkins for ownCloud 10efe1faee [tx-robot] updated from transifex 2017-12-02 02:18:34 +01:00
Olivier Goffart e0954b0999 test/syncenginetestutils.h: Don't use toTimeZone only to get the UTC 2017-12-01 13:18:09 +01:00
Jenkins for ownCloud 5ff3e448f5 [tx-robot] updated from transifex 2017-12-01 02:18:34 +01:00
Jenkins for ownCloud 58bcbba841 [tx-robot] updated from transifex 2017-11-30 02:18:34 +01:00
Roeland Jago Douma 18b456ea2c Merge pull request #77 from nextcloud/bump_drone 
Bump drone images to contain WebEngine
 2017-11-29 12:51:59 +01:00
Roeland Jago Douma 529442e0f8 Bump drone images 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-29 12:34:34 +01:00
Olivier Goffart 30e3932af8 FolderWizard: Fix minimum size 
There are several bugs in QWizard that needs to be worked around for the minimum
size of the widget to take effect.

Issue #4280
 2017-11-29 08:03:06 +01:00
Jenkins for ownCloud e86937e2e2 [tx-robot] updated from transifex 2017-11-29 02:18:34 +01:00
Tomaz Canabrava 35eb071874 [uploadImprovements] use the new struct on PropagateUploadNg 
use the new struct on PropagateUploadNg to make the algorithm
more future proof.
 2017-11-28 22:58:52 +01:00
Tomaz Canabrava a64bd6059b [uploadImprovements] fix struct hole 2017-11-28 22:22:37 +01:00
Tomaz Canabrava a623b14209 [uploadImprovements] use the new struct info in PropagateUploadV1 
Add a new member for the UploadFileInfo in PropagateUploadCommon
to hold the full file path - as it can change if we use a temporary
file to upload.

Adapt propagateuploadv1 to use the new calls.
 2017-11-28 22:17:29 +01:00
Tomaz Canabrava f609336bfc Split file to upload from the file on disk 
They can be conceptually equal - I can upload the file
on disk, and that's what I do right now. But if we want
to accept filters in the future, filters that change
the file on disk like shrinking an image, the current
information used is wrong and we need a way to separate those.

This patch introduces a new struct that holds the *actual*
file that will be uploaded, be it a temporary one or
the original file.
 2017-11-28 21:28:06 +01:00
Tomaz Canabrava 2cacf2547e Merge branch 'master' into clientSideEncryptionV3 2017-11-28 20:12:57 +01:00
Markus Goetz 6276d9290d utility_mac: Check for NULL from LSSharedFileListItemResolve #6123 
Possibly also #6074
 2017-11-28 13:35:15 +01:00
Roeland Jago Douma 0f60deb043 Store and retrieve keys in keychain 
* Store privatekey, certificate and mnemonic in keychain
* Retrieve private + public key from server
  - ask for mnemonic to decrypt private key

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-28 12:36:35 +01:00
Markus Goetz cde6589af8 owncloudcmd: Don't need Qt Sql module 2017-11-28 10:18:01 +01:00
Jenkins for ownCloud 482d538559 [tx-robot] updated from transifex 2017-11-28 02:18:53 +01:00
Tomaz Canabrava c4d3d0987d [CSE] Find the start of the upload 2017-11-27 22:20:24 +01:00
Tomaz Canabrava 47b5cd0fbb [CSE] Shows correctly Encrypt / Decrypt in the menu 2017-11-27 21:19:54 +01:00
Tomaz Canabrava dd903d447f [CSE] Store the encryption status without the webdav url 
The Folder information on the desktop client doesn't
knows about the webdav layout aparently.
 2017-11-27 21:09:13 +01:00
Tomaz Canabrava d2d2df4c75 [CSE] Try to find the webdav url of a folder. 2017-11-27 21:06:38 +01:00
Roeland Jago Douma 8c411b32f7 Merge pull request #67 from edent/patch-3 
Update ownCloud references to NextCloud
 2017-11-27 20:40:01 +01:00
Roeland Jago Douma ccd050455a Merge pull request #62 from bceverly/master 
Added build support for FreeBSD
 2017-11-27 20:39:19 +01:00
Roeland Jago Douma ffb9f69cf6 Start with moving data to the keychain 
* Check for cert + privateKey in keychain
* Work with QSslKey and QSslCertificate
* Abstract reading the BIO's a bit more

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-27 16:21:53 +01:00
Roeland Jago Douma 74c4d27ea0 Indent 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-27 16:12:56 +01:00
Tomaz Canabrava e3050f7456 [CSE] Pass by reference, return by value. 
Also, Do not create variables in the heap to change it's value
via reference, prefer an aggregation value. use a Typedef to
fully specify what you want in return.
 2017-11-27 15:21:29 +01:00