13663 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kilian Pfeiffer	faf64958ec	changed paths of logfiles	2018-04-17 15:54:05 +02:00
Tomaz Canabrava	7432d6a814	Merge branch 'master' into clientSideEncryptionV4	2018-04-10 16:18:58 +02:00
Daniel Nicoletti	16aa54ed64	Do not create new db entries when the remote tree does not have proper values	2018-04-09 13:23:52 +02:00
Daniel Nicoletti	3e05bd1da0	Do not detach encrypted files vector	2018-04-09 13:23:52 +02:00
Daniel Nicoletti	3eb3535d0f	Fix downloading NEW encrypted files	2018-04-09 13:23:52 +02:00
Daniel Nicoletti	defe2d7631	Fix matching encrypted data for downloading	2018-04-09 13:23:52 +02:00
Daniel Nicoletti	b12066f1aa	Properly remove encryption data from JSON of deleted file	2018-04-09 13:23:52 +02:00
Daniel Nicoletti	a9208f6581	Remove unused encrypted property	2018-04-09 13:23:52 +02:00
Daniel Nicoletti	6e63a538b7	Make sure bool _currentLockingInProgress is first defined to false	2018-04-09 13:23:52 +02:00
Daniel Nicoletti	a7a8de8787	Fix matching encrypted file for download	2018-04-09 13:23:52 +02:00
Daniel Nicoletti	d93f7269b8	Properly mark encrypted files for removal	2018-04-09 13:23:52 +02:00
Daniel Nicoletti	d3b6aacf3f	Fix merging remote and local trees when e2e files are involved ... When populating the tree from the filesystem we need to fill the e2eMangledName from DB and we when trying to find another match on the oposite tree we need to take in account that names don't match and search with the mangled name information	2018-04-09 13:23:52 +02:00
Daniel Nicoletti	c0ef36b8fa	Use QUuid to generate random names	2018-04-09 13:23:52 +02:00
Daniel Nicoletti	60fc5d6dd4	Fix upload of existing encrypted files by matching only filename	2018-04-09 13:23:52 +02:00
Daniel Nicoletti	d5ab642e46	Fix sync status running when encryption data is missing ... When a file on the server of an encrypted folder do not have a matching entry on the JSON metadata, we need to report an error and be done with the job so that Sync status is not "running". This eventually should cause the file to be removed from the server as it can not be recovered anymore.	2018-04-09 13:23:52 +02:00
Tomaz Canabrava	b4b3e422de	Handle gracefully failures in file decryption	2018-03-27 09:18:54 +02:00
Tomaz Canabrava	ed6f56257e	Dont use new with QFiles.	2018-03-26 22:18:07 +02:00
Tomaz Canabrava	461aeca200	Do not crash when failing to decrypt the metadata	2018-03-26 22:02:46 +02:00
Tomaz Canabrava	6c88367ac6	Do not crash if there was an error encrypting the file.	2018-03-26 21:44:46 +02:00
Tomaz Canabrava	5fe9717598	Potentially fix crash acessing a deleted pointer.	2018-03-26 21:37:13 +02:00
Tomaz Canabrava	ec28465e01	Correctly handle systems without client side encryption	2018-03-26 20:51:14 +02:00
Tomaz Canabrava	11684682e6	Return empty metadata in case of error, Display error to the user.	2018-03-25 22:31:49 +02:00
Tomaz Canabrava	96115be0c6	Unlock folder in case of error	2018-03-25 21:54:08 +02:00
Roeland Jago Douma	4c40789dca	Merge pull request #140 from nextcloud/appimage_drone_bump ... Bump AppImage Drone	2018-03-23 15:36:33 +01:00
Roeland Jago Douma	a2815dac12	Merge pull request #224 from nextcloud/fix-documentation-cmake ... Remove configure_file for non-existing documentation config file	2018-03-23 15:36:13 +01:00
Julius Härtl	16f53da9ae	Remove configure_file for non-existing documentation config file ... Signed-off-by: Julius Härtl <jus@bitgrid.net>	2018-03-22 19:30:05 +01:00
Camila Ayres	08b33c6f4b	Merge pull request #197 from nextcloud/fix-notifications ... Improves notifications: - Display the actual response text from the notification API in the popups. - Do not display sync activities messages like how many files were downloaded, only errors. - Make the notifications section above the activity feed also clickable. e.g open the call, the file that was shared, open the calendar event etc - Changes "Show desktop notifications" setting to "Show server notifications" - Show notifications on startup and then show only NEW notifications: uses If-None-Match check to only retrieve notifications once there are new notifications.	2018-03-13 13:30:44 +01:00
Camila Ayres	eb3b3f02a0	Merge pull request #195 from nextcloud/apps-external-sites-menu ... Adds apps and external sites to menu.	2018-03-09 11:48:14 +01:00
Camila San	11d178ce1d	Adds absolute=true param to navigation/apps request. ... Signed-off-by: Camila San <hello@camila.codes>	2018-03-03 23:11:11 +01:00
Camila San	2e4472a4db	Enables server notifications by default. ... Signed-off-by: Camila San <hello@camila.codes>	2018-03-03 22:44:24 +01:00
Camila San	3c778980df	Makes sure JsonApiJob::finished won't throw a JSON error when status code is 304. ... Signed-off-by: Camila San <hello@camila.codes>	2018-03-03 22:24:16 +01:00
Camila San	621596f45a	Saves notifications ETag response header to use to request only new notifications. ... Signed-off-by: Camila San <hello@camila.codes>	2018-03-01 22:19:04 +01:00
Camila Ayres	cb5bc61a44	Merge pull request #163 from nextcloud/edit-system-exclude-list ... Edit system exclude list.	2018-03-01 19:32:18 +01:00
Camila San	d42401e36a	Changes notifications api endpoint to v2. ... Signed-off-by: Camila San <hello@camila.codes>	2018-03-01 15:20:36 +01:00
Camila San	6bf9f65fd3	Only notify users of new notifications and only shows them all on startup. ... Signed-off-by: Camila San <hello@camila.codes>	2018-02-27 23:05:18 +01:00
Camila San	56709f3cff	Removes string 'Created' from notifications time. ... Signed-off-by: Camila San <hello@camila.codes>	2018-02-26 12:56:02 +01:00
Camila San	112c5e10b6	Removes Server Activities option from General settings. ... Signed-off-by: Camila San <hello@camila.codes>	2018-02-26 12:02:34 +01:00
Camila San	09a92a518a	Align text and changes spacing in notification widget.	2018-02-26 00:03:29 +01:00
Camila San	0f9d8e15a0	Only uses 'More information' text in button for notification link. ... Signed-off-by: Camila San <hello@camila.codes>	2018-02-26 00:02:09 +01:00
Camila San	44f299eba2	Removes debug messages. ... Signed-off-by: Camila San <hello@camila.codes>	2018-02-26 00:00:42 +01:00
Camila San	d71438f181	Adds host and scheme to activity link so it can be opened in the ... browser. - Removes debug messages. - Removes Activity data _appName - not used anymore. Signed-off-by: Camila San <hello@camila.codes>	2018-02-25 23:58:28 +01:00
Camila San	71f4760215	Do not display user account when there is only one user in popup message. ... Signed-off-by: Camila San <hello@camila.codes>	2018-02-25 23:57:44 +01:00
Camila San	4a6a8ca6c6	Removes _appName from Activity data. ... Signed-off-by: Camila San <hello@camila.codes>	2018-02-25 23:56:54 +01:00
Camila San	e33d2bf7f7	Removes (s) from time strings. ... Signed-off-by: Camila San <hello@camila.codes>	2018-02-25 23:55:04 +01:00
Camila San	4c79059146	Changes notification icon bell size. ... Signed-off-by: Camila San <hello@camila.codes>	2018-02-25 23:54:04 +01:00
Daniel Hansson	eec728eab8	Merge pull request #196 from ivaradi/master ... Recommends relation to libgnome-keyring0	2018-02-24 21:46:09 +01:00
Daniel Hansson	d21ea9ed10	Merge pull request #174 from ivaradi/correct-dolphin-plugin-path ... Dolphin plugin path correction	2018-02-24 21:45:47 +01:00
István Váradi	99add9f00d	Recommend libgnome-keyring0 on Debian too	2018-02-24 10:33:19 +01:00
István Váradi	0b3129f366	Added a Recommends relation to libgnome-keyring0	2018-02-24 10:19:01 +01:00
Camila San	1a0edc1cd0	Sync activities notifications are never shown unless there is an error. Server activities and notifications are off by default. ... Signed-off-by: Camila San <hello@camila.codes>	2018-02-23 12:08:37 +01:00