12187 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Roeland Jago Douma	3c084bb6eb	Bump drone image ... * Bump to 16.04 since 14.04 doesn't auto build here due to openssl fu * No more gcc7 since gcc5 is new enough Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-01-28 20:10:04 +01:00
Roeland Jago Douma	45eefb27cf	Bump AppImage Drone ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-01-28 20:04:42 +01:00
Tomaz Canabrava	e9a7a56359	[CSE] Store the encrypted file name on the SyncFilePtr	2018-01-28 18:37:01 +01:00
Tomaz Canabrava	a003d216a5	[CSE] Implementation of the setE2eRelation ... This call creates a new entry on the database for e2e.	2018-01-28 18:05:28 +01:00
Tomaz Canabrava	32eaaa0601	[CSE] GetMangledName implementation	2018-01-28 17:50:10 +01:00
Tomaz Canabrava	be817748f8	[CSE] Reset the new Queries on close	2018-01-28 17:46:20 +01:00
Tomaz Canabrava	b909bb6977	[CSE] Change the Database to handle Encrypted Files ... Create a table to hold the information between the real file name and the fake file name	2018-01-28 16:41:07 +01:00
István Váradi	72f629a7dc	Added secrets to .drone.yml	2018-01-27 08:50:28 +01:00
István Váradi	9ad6f1485e	Printing environment	2018-01-26 12:54:35 +01:00
István Váradi	459b6ab1e7	Trigger another build in the hope that it will see the previous commit	2018-01-26 12:41:27 +01:00
István Váradi	85140d3784	Reverting to upper-case key variable names	2018-01-26 12:28:14 +01:00
Roeland Jago Douma	040507fce6	Merge pull request #135 from nextcloud/oc_up ... Merge upstream changes	2018-01-25 20:31:35 +01:00
István Váradi	7a1f32894b	Try if the variables are lower-case	2018-01-25 17:21:02 +01:00
István Váradi	1acd7db5f8	Dummy commit to trigger a new build	2018-01-25 17:16:59 +01:00
Roeland Jago Douma	e2e99da446	Bump appimage drone image ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-01-25 14:31:14 +01:00
Julius Härtl	bcb9553925	Use Qt5DBus_FOUND instead of the old WITH_DBUS ... WITH_DBUS was removed in 257d8142b1 Signed-off-by: Julius Härtl <jus@bitgrid.net>	2018-01-25 14:18:03 +01:00
Roeland Jago Douma	aa7e47f525	Fix new icon naming ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-01-25 12:19:51 +01:00
Roeland Jago Douma	48bce4c6b0	Merge remote-tracking branch 'oc/master' into oc_up	2018-01-25 11:17:04 +01:00
Roeland Jago Douma	84b26e0d4d	Merge pull request #133 from nextcloud/fix-notification-dismiss-button ... Uses QString::number to get a string equivalent of the notification_id number	2018-01-24 19:29:21 +01:00
Julius Härtl	3d162745af	Merge pull request #131 from nextcloud/nextcloud_subdir ... If status.php fails check <server>/nextcloud/status.php	2018-01-24 17:59:48 +01:00
Camila San	7a69e19e4d	Uses QString::number to get a string equivalent of the notification_id number. ... This fixes the bug reported #117. Signed-off-by: Camila San <hello@camila.codes>	2018-01-24 17:29:45 +01:00
Olivier Goffart	02988229b1	FolderStatusModel: don't use deprecated QModelIndex::child ... Was deprecated in Qt 5.8. (IMHO this show that child can be usefull and I am not sure the deprecation was justified)	2018-01-24 10:23:03 +01:00
Roeland Jago Douma	4892b0ec43	Properly fill EncryptedFile ... * Add a mimetype (mobile clients need this) * Add the tag unencoded as we encode it when we send the metadata already Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-01-23 21:31:00 +01:00
Roeland Jago Douma	21d55c3321	No sharing in metadata yet and PEM as PKCS#8 ... * Don't store the metadata yet this crashes android - Yes android should be fixed but for now this is quicker ;) * QSslKey exports PEM as PKCS#1 - This is not handled properly on android so use PKCS#8 helper Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-01-23 21:02:52 +01:00
István Váradi	5e7f72b8df	Attempt to pass the key in the environment	2018-01-23 19:51:13 +01:00
István Váradi	ed9300f924	Commit to trigger build	2018-01-23 19:42:34 +01:00
Olivier Goffart	72b9beb79c	Merge remote-tracking branch 'origin/2.4' ... Conflicts: shell_integration/nautilus/syncstate.py	2018-01-23 14:08:15 +01:00
Olivier Goffart	883080b557	Windows shell extension: port to the new protocol	2018-01-23 14:02:56 +01:00
Christian Kamm	ebfac84c69	Shell integration: Make nautilus work with multiselections ... Previously no menu would ever be shown if more than one file is selected. Now the GET_MENU_ITEMS command is sent with all selected files as an argument - similar to what is done for the dolphin integration.	2018-01-23 14:02:56 +01:00
Christian Kamm	3c2622d2de	Shell integration: Update nautilus for GET_MENU_ITEMS	2018-01-23 14:02:56 +01:00
Olivier Goffart	982c591ec9	SocketApi: add a way to disable menu entries	2018-01-23 14:02:56 +01:00
Olivier Goffart	1782ae3c08	SocketAPI: Make it easier to add or remove item in the action menu ... By making it dynamic. So far only the dolphin shell extension have been ported	2018-01-23 14:02:56 +01:00
Roeland Jago Douma	7ce009ef49	If status.php fails check <server>/nextcloud/status.php ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-01-23 13:43:44 +01:00
Christian Kamm	72363155d8	Nautilus integration: Work with python2 and python3	2018-01-23 12:30:58 +01:00
Olivier Goffart	f254ee3211	Nautilus shell integration: Port to Python 3	2018-01-23 12:30:58 +01:00
Christian Kamm	59f2e0634e	Protocol: Correct sorting by size #6326 ... Previously we were sorting by size string, where "6 MB" < "3 KB".	2018-01-23 12:02:16 +01:00
Christian Kamm	32bb1e6763	ProtocolItem: Use accessors over magic numbers	2018-01-23 12:02:16 +01:00
Christian Kamm	497b327d43	ShareLinkWidget: Remove outdated signal connection ... Also convert the others to the new syntax to avoid similar errors in the future.	2018-01-23 12:01:22 +01:00
Christian Kamm	d831369f86	Protocol: Remove entries for auto resolved conflicts #6316	2018-01-23 12:01:22 +01:00
Roeland Jago Douma	a2b8724adf	Hacky way to drop duplicates (we should really use the fileid!) ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-01-23 11:58:05 +01:00
Roeland Jago Douma	bb85e2ab2c	Reuse existing EncryptedFile ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-01-23 11:36:15 +01:00
Jenkins for ownCloud	c1a1e55207	[tx-robot] updated from transifex	2018-01-23 02:18:36 +01:00
Olivier Goffart	c3dbb20ce3	Logger: --logdebug only show owncloud's debug message ... Recent Qt version show way too many debug messages, spamming the console. So filter only messages that comes from the client.	2018-01-22 21:13:15 +01:00
Roeland Jago Douma	33beb7aade	Don't generate values after we use them ... * Pregerenate IV * Pregenerate key * Pregenerate filename TODO: - Reuse existing file entries and update (we might need logic in the metadatahandling to do this properly).	2018-01-22 15:24:54 +01:00
Tomaz Canabrava	cae6bbc853	[CSE] Start the download process	2018-01-22 14:08:32 +01:00
Christian Kamm	e2b89c5afe	TextXmlParse: Add truncated-xml testcase #6317	2018-01-22 14:05:08 +01:00
Jenkins for ownCloud	ba4712c922	[tx-robot] updated from transifex	2018-01-22 02:18:54 +01:00
Tomaz Canabrava	cf2fa2ea35	[CSE] Get the tag of the encrypted file to feed the metadata ... Also, change the logging cattegory	2018-01-21 21:59:19 +01:00
Tomaz Canabrava	5d6817e165	[CSE] Save the tag while encrypting.	2018-01-21 21:49:24 +01:00
Tomaz Canabrava	261cedce3f	[CSE] Do not quit if encryption fails ... It's much more reasonable to return failure and handle it.	2018-01-21 21:40:53 +01:00