82 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	6dc3ddf63f	Revert "Scrutinizer Auto-Fixes" ... This reverts commit 33ef75ac2f.	2016-10-08 13:45:34 +02:00
Scrutinizer Auto-Fixer	33ef75ac2f	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2016-10-07 23:01:16 +00:00
brantje	41360eed89	Fix travis errors in SharingMapper	2016-10-08 00:04:12 +02:00
brantje	bbcee22431	Fix travis errors in share controller	2016-10-07 23:57:42 +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	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	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	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	00149bb912	Fixes some issues with the ACL queries	2016-10-04 20:46:59 +02:00
Marcos Zuriaga	2259f002be	Added pending requests to the acl api	2016-10-04 19:59:55 +02:00
Marcos Zuriaga	bca3cefd0c	Api endpoint logic to gather the ACL of a credential	2016-10-04 14:40:48 +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
brantje	96435011f8	Add expire_views	2016-10-03 23:32:30 +02:00
Marcos Zuriaga	eadcdcabb0	Api endpoint to get the public link credentials	2016-10-03 22:43:36 +02:00
brantje	de27612a58	Updating almost works	2016-10-03 21:36:39 +02:00
Marcos Zuriaga	0b2dff77eb	Started woking on some credential changes	2016-10-03 20:38:40 +02:00
Marcos Zuriaga	f8c86b9ea6	Added edited_by field to credential revisions	2016-10-03 19:50:03 +02:00
brantje	b90d6eb0c3	Fix shared_key after unsharing	2016-10-03 17:38:45 +02:00
Marcos Zuriaga	b4ed5e9c76	Added api endpoint to get revisions of shared items	2016-10-03 17:20:57 +02:00
brantje	28aa97bc57	Add backend for deleting share requests	2016-10-03 15:50:10 +02:00
brantje	ab7b2f7a4d	Revert "Unshare item. Reading shared credential broke?" ... This reverts commit 86d9910f74.	2016-10-03 15:47:00 +02:00
brantje	86d9910f74	Unshare item. Reading shared credential broke?	2016-10-03 15:40:46 +02:00
brantje	326f9dcac7	Merge branch 'sharing_no_groups' of github.com:nextcloud/passman into sharing_no_groups	2016-10-02 22:04:00 +02:00
Marcos Zuriaga	762b5e6af2	Added permission check just in case	2016-10-02 22:03:34 +02:00
brantje	82be2a19f4	Fix for vault challenge	2016-10-02 21:56:20 +02:00
Marcos Zuriaga	d6c85bffcc	Apply save shared item with the shared key ... Bugfixes	2016-10-02 20:18:51 +02:00
Marcos Zuriaga	1ad2745292	Added missing fields to jsonSerialize	2016-10-02 19:34:07 +02:00
brantje	2baae50691	Get shared items working	2016-10-02 19:29:06 +02:00
brantje	a4c1185fe8	Fix select statements	2016-10-02 19:18:40 +02:00
brantje	01a0d8bf05	Rename is_shared to shared_key	2016-10-02 18:59:20 +02:00
Marcos Zuriaga	e0e7768dc8	Sharing action works	2016-10-02 18:22:10 +02:00
brantje	14c2ec26fb	Fixes for cleanItemRequestsForUser	2016-10-02 18:01:41 +02:00
brantje	2978800c43	Merge branch 'sharing_no_groups' of github.com:nextcloud/passman into sharing_no_groups	2016-10-02 17:38:42 +02:00
brantje	bd7fc18896	Revert "Decline from notification works!" ... This reverts commit 5809b23811.	2016-10-02 17:38:19 +02:00
Marcos Zuriaga	519e41ab2e	Merge branch 'sharing_no_groups' of github.com:nextcloud/passman into sharing_no_groups	2016-10-02 17:38:02 +02:00
brantje	5809b23811	Decline from notification works!	2016-10-02 17:37:21 +02:00
Marcos Zuriaga	6698e5f29b	Merge branch 'sharing_no_groups' of github.com:nextcloud/passman into sharing_no_groups	2016-10-02 17:37:06 +02:00
Marcos Zuriaga	5fa439ee4d	Sharing API progress	2016-10-02 17:32:22 +02:00
brantje	a727fd814d	Decline sharing request	2016-10-02 17:19:12 +02:00
brantje	ca408ef0a3	Show dialog with incoming share requests	2016-10-02 16:10:04 +02:00
brantje	200a18a0e8	Begin to implement accept shared credential	2016-10-02 15:39:52 +02:00
Marcos Zuriaga	b828f7dbd1	Sharing api endpoints ... Sharing db interfacing logics Some minor db changes	2016-10-02 13:48:23 +02:00
brantje	49d5b15d25	Fix inserting share requests	2016-10-02 11:43:31 +02:00