11546 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Tomaz Canabrava	8c4928d9f6	Merge branch 'uploadImprovements' into clientSideEncryptionV3	2017-12-03 18:15:33 +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
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
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	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
Roeland Jago Douma	9cbe795045	Move more encryption functions to encryption helper ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-11-25 21:43:15 +01:00
Roeland Jago Douma	e0fbdfe175	Remove obsolete encryption functions ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-11-25 15:50:47 +01:00
Roeland Jago Douma	12adff76e2	Properly decrypt private key and send it to the server ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-11-24 22:10:28 +01:00
Roeland Jago Douma	6d145a676b	Added EncryptionHelper ... This is to move generic encryption methods out of the main code and into small helper functions. So we don't scatter the encryption code all over the place. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-11-24 21:05:21 +01:00
Tomaz Canabrava	45d9323653	[CSE] Update encryption status when folder is updated	2017-11-23 16:55:12 +01:00
Tomaz Canabrava	57e0d7abcb	[CSE] Fix pointer to e2e ... Qt expects things to be pointers even if they are stack variables.	2017-11-23 16:54:45 +01:00
Christian Kamm	8c94601ef2	User shares: Further avatar tweaks	2017-11-21 16:33:03 +01:00
Christian Kamm	f27ceb7fab	User shares: Use background color, remove permission frame #6176	2017-11-21 16:33:03 +01:00
Christian Kamm	60bde048c6	User shares: Fix missing label when there are only link shares ... The "not shared with users or groups" label only appeared if there were no shares at all.	2017-11-21 16:33:03 +01:00
Christian Kamm	3b961204e1	Avatars in user share dialog: Minor tweaks	2017-11-21 16:33:03 +01:00
Christian Kamm	e9907bc8ae	AvatarJob improvements ... * Drop AvatarJob2 * Allow AvatarJob to retrieve different sizes and users * Make creating a circular avatar into a function (maybe all avatars should be made into that shape in the first place)	2017-11-21 16:33:03 +01:00
Roeland Jago Douma	6b9b5252de	User shares: Show avatars ... [Sharing] Show placeholders for avatars Just like on the web show placeholders for avatars in the sharing dialog [Sharing] Show avatars! [Sharing] Show same avatar placeholder for group/federated shares as on web	2017-11-21 16:33:03 +01:00
Christian Kamm	d949ec6877	Protocol: Introduce context menu with "open in browser" #6121 ... To do this conveniently a bunch of functionality that's common to IssueWidget and ProtocolWidget is moved to ProtocolItem. Also the convenience function to asynchronously retrieve the private link url is moved from the socket api to the network jobs.	2017-11-21 12:42:10 +01:00
Tomaz Canabrava	a118419f0c	[CSE] buildfix, use the correct type.	2017-11-21 09:55:44 +01:00
Tomaz Canabrava	d31aa7836a	[CSE] Add job to find what folders are encrypted. ... This still needs to be correctly setuped in the call chain. The job returns a QVariantMap with the folder-webdav-url and the encrypted status.	2017-11-20 21:38:17 +01:00
Jürgen Weigert	0abe7a77fb	Update release_template.md	2017-11-20 18:12:18 +01:00
Jürgen Weigert	ad408c5717	post release checks added ... this fixes https://github.com/owncloud/client/issues/5836	2017-11-20 18:12:18 +01:00
Tomaz Canabrava	34e6534813	Merge branch 'clientSideEncryptionV3' of github.com:nextcloud/client into clientSideEncryptionV3	2017-11-20 18:01:48 +01:00
Tomaz Canabrava	6d464d9dc6	Merge branch 'master-nextcloud' into clientSideEncryptionV3	2017-11-20 18:00:58 +01:00
Roeland Jago Douma	2236d05d25	Merge pull request #49 from nextcloud/nc_theme ... Nextcloud theme	2017-11-20 16:47:31 +01:00
Roeland Jago Douma	f0537b20d1	Update with NC icons ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-11-20 16:14:40 +01:00
Roeland Jago Douma	9878559002	Move to NC theme ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-11-20 15:46:18 +01:00
Roeland Jago Douma	6b3006b325	OwnCloudCPack.cmake to NextcloudCPack.cmake ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-11-20 14:12:52 +01:00
Roeland Jago Douma	5dc73ffd8b	OWNCLOUD.cmake => NEXTCLOUD.cmake ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-11-20 14:12:52 +01:00
Roeland Jago Douma	b835bdc55b	Merge pull request #48 from nextcloud/oc_master ... Bump to oc master	2017-11-20 13:43:34 +01:00
Roeland Jago Douma	725be9ff54	Merge branch 'master' of https://github.com/owncloud/client into oc_master	2017-11-20 13:29:59 +01:00
Christian Kamm	aafe7c4732	Merge remote-tracking branch 'origin/2.4'	2017-11-20 11:54:56 +01:00
Christian Kamm	86c2e9e825	Tray: Fix 'Open folder' action creation ... It looks like the action was created but not added to the menu. Did this work with previous Qt versions?	2017-11-20 11:48:55 +01:00
Olivier Goffart	480932a58a	Checksum: Ignore unkown OC-Checksum header when downloading... ... And if there are several checksums, pick the "best" one. The case of several checksum was reported in https://github.com/nextcloud/client_theming/issues/213	2017-11-20 10:51:15 +01:00
Jenkins for ownCloud	529bcab009	[tx-robot] updated from transifex	2017-11-20 02:18:34 +01:00
Jenkins for ownCloud	9a4871abeb	[tx-robot] updated from transifex	2017-11-19 02:18:36 +01:00
Jenkins for ownCloud	40665c05ac	[tx-robot] updated from transifex	2017-11-18 02:18:36 +01:00
Michael Stingl	d832312acc	Add 2.3.3 System Requirements to client repo (#5996) ... I would like to maintain the System Requirements in the client repo.	2017-11-17 15:05:42 +01:00
Jenkins for ownCloud	63cf0e347b	[tx-robot] updated from transifex	2017-11-17 02:18:37 +01:00