137 commits

Author	SHA1	Message	Date
brantje	adb7dd582b	Remove comment ... Fix if statement Add return Add return Remove assignment	2016-10-08 15:00:07 +02:00
brantje	e96911e50f	Revert "Scrutinizer Auto-Fixes" ... This reverts commit ae73bff5c4.	2016-10-08 13:45:44 +02:00
brantje	8f6ab6cacf	fix conflicts	2016-10-08 12:28:29 +02:00
Scrutinizer Auto-Fixer	ae73bff5c4	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2016-10-07 22:59:30 +00:00
brantje	74575abf7c	Remove comment	2016-10-08 00:24:53 +02:00
brantje	3afc3c9c9c	Fix OC_App - private class must not be instantiated	2016-10-08 00:20:02 +02:00
brantje	2c40097036	OC_App - Static method of private class must not be called	2016-10-08 00:13:40 +02:00
brantje	bbcee22431	Fix travis errors in share controller	2016-10-07 23:57:42 +02:00
brantje	a63d32d1c8	Fix travis errors in internal controller	2016-10-07 23:56:00 +02:00
brantje	ce588f1be7	Fix travis errors in credential controller	2016-10-07 23:54:16 +02:00
brantje	3357c02da0	Return jsonreponse	2016-10-07 21:33:23 +02:00
brantje	62aa51dfe9	Create tests for page controller	2016-10-07 21:27:57 +02:00
brantje	59eafb2505	Add skip_revision param	2016-10-07 18:26:53 +02:00
brantje	4f12b4f8df	Fix bookmarklet	2016-10-07 17:55:00 +02:00
Marcos Zuriaga	5a0f158137	Return 404 if vault is not found	2016-10-07 17:04:26 +02:00
brantje	9586a23c21	Small error 500 fix	2016-10-07 15:52:09 +02:00
brantje	e7bf4f8533	Delete users from share list	2016-10-07 13:41:08 +02:00
brantje	6672cfa2a8	Remove double if check	2016-10-07 13:01:57 +02:00
brantje	c94df47a9f	Vault use guids	2016-10-07 12:58:41 +02:00
brantje	8e80bb529a	Credentials use guids	2016-10-07 12:45:11 +02:00
brantje	53c55d5fd6	Fix some bugs	2016-10-05 22:34:34 +02:00
brantje	1c55e6dfa9	Fix unsharing	2016-10-05 20:07:13 +02:00
brantje	7d3d67c896	Fix for api change	2016-10-05 19:56:46 +02:00
brantje	4ecbcd9efa	Fix editing shared credentials	2016-10-05 19:27:24 +02:00
brantje	836946e164	Restore revisions works	2016-10-05 19:02:27 +02:00
brantje	4ef465b7d0	Use guid	2016-10-05 18:55:12 +02:00
brantje	94c418bd5c	Fix error 500	2016-10-05 18:52:14 +02:00
Marcos Zuriaga	77587e5598	Added capability on the api revisions endpoint to get shared item revisions by target user	2016-10-05 18:47:25 +02:00
brantje	5ff5414f2c	Fix merge conflict	2016-10-05 18:27:56 +02:00
brantje	a77ae301f5	Stared to work on revisions	2016-10-05 18:24:36 +02:00
Marcos Zuriaga	d0fbc485d0	Improved pending request permissions update ... PHP doc improvements and additions Changes on the utility class	2016-10-05 18:24:22 +02:00
brantje	e6aef00193	Downloading shared files works	2016-10-05 16:58:19 +02:00
brantje	75dd4cfe34	Remove todo	2016-10-05 14:55:01 +02:00
brantje	f80263dff0	Add route to update revisions	2016-10-05 14:30:28 +02:00
brantje	b01afb4f3d	Add route for updating file	2016-10-05 14:09:15 +02:00
brantje	35d6d3777c	Add activity support for sharing	2016-10-05 13:46:25 +02:00
brantje	13197c583c	Format file	2016-10-05 12:49:43 +02:00
brantje	995348e36b	Format file	2016-10-05 12:49:32 +02:00
brantje	4bc90d904e	Setting permission on share requests works	2016-10-05 12:48:59 +02:00
brantje	eb915e065e	Dont create new requests for a credential, when target user has pending requests for that credential	2016-10-05 12:11:43 +02:00
Marcos Zuriaga	2259f002be	Added pending requests to the acl api	2016-10-04 19:59:55 +02:00
brantje	713013caa7	Catch some errors	2016-10-04 18:15:40 +02:00
brantje	d058028c54	Fix updating shared credential	2016-10-04 16:20:55 +02:00
Marcos Zuriaga	9ce540f057	Fix user code completion on sharecontroller	2016-10-04 15:00:24 +02:00
brantje	99c7f4d4c2	Fix get acl	2016-10-04 14:55:50 +02:00
Marcos Zuriaga	f26416233d	Return 404 on most sharing api calls if the data is not found instead of errors	2016-10-04 14:51:13 +02:00
Marcos Zuriaga	bca3cefd0c	Api endpoint logic to gather the ACL of a credential	2016-10-04 14:40:48 +02:00
brantje	5c9aac9495	Expire shared items after a certain date	2016-10-04 14:15:34 +02:00
brantje	dbbe383bf9	Expire link shared credential after x views	2016-10-04 13:11:37 +02:00
brantje	e71a82218e	Fix for unsharing password	2016-10-04 12:57:41 +02:00