Commit graph

522 commits

Author SHA1 Message Date
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
brantje 111443cd81
Implement acl at showing item 2016-10-02 21:47:57 +02:00
brantje a09b0d8250
Fix shared credential tags 2016-10-02 21:43:53 +02:00
brantje 6655c8902e
Display of shared items work! 2016-10-02 21:34:05 +02:00
brantje 7d75266dc5
Load shared credentials after complete vault decryption 2016-10-02 21:21:32 +02:00
brantje 497198371e
Dislay of shared item (if user owns it) works 2016-10-02 21:17:17 +02:00
Marcos Zuriaga d6c85bffcc
Apply save shared item with the shared key
Bugfixes
2016-10-02 20:18:51 +02:00
brantje 206854a853
Try to decrypt shared credential 2016-10-02 19:43:54 +02:00
Marcos Zuriaga dcebd9f849
Remove owner's shared key from the answer,
not needed and a possible data leak
2016-10-02 19:42:50 +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 8c496d4804
Get shared items by vault id 2016-10-02 19:14:30 +02:00
brantje a99e6914b3
Add getSharedVaultItems 2016-10-02 19:09:50 +02:00
Marcos Zuriaga ca24caeb07
Change api endpoint name 2016-10-02 19:07:03 +02:00
Marcos Zuriaga 7252aa7f4a
Api endpoint to get items shared with a vault 2016-10-02 19:04:19 +02:00
brantje 01a0d8bf05
Rename is_shared to shared_key 2016-10-02 18:59:20 +02:00
brantje 5395566053
Send a notification on accept share request 2016-10-02 18:47:02 +02:00
brantje a7eb15d2d8
On accept share mark notification as read 2016-10-02 18:42:43 +02:00
brantje 211db43a12
Close dialog when there are no more sharing requests 2016-10-02 18:36:36 +02:00
brantje 93fee014b4
Remove share request when accepted 2016-10-02 18:30:53 +02:00
brantje 993fac55db
Merge branch 'sharing_no_groups' of github.com:nextcloud/passman into sharing_no_groups 2016-10-02 18:23:16 +02:00
brantje 173222971f
Send a notification when a user declines sharing 2016-10-02 18:22:12 +02:00
Marcos Zuriaga e0e7768dc8
Sharing action works 2016-10-02 18:22:10 +02:00
Marcos Zuriaga 29fc96eb6d
Made shared credential accept work 2016-10-02 18:06:53 +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 8e74ab471a
Active vault fixes 2016-10-02 17:26:38 +02:00
brantje 5024c1f313
Merge branch 'sharing_no_groups' of github.com:nextcloud/passman into sharing_no_groups 2016-10-02 17:19:16 +02:00
brantje a727fd814d
Decline sharing request 2016-10-02 17:19:12 +02:00
Marcos Zuriaga 38e1533b5e
Progress on the share accept 2016-10-02 17:15:50 +02:00
brantje b56bda459a
Add acceptShareRequest 2016-10-02 16:59:15 +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 ed7fa681ae
Merge branch 'sharing_no_groups' of github.com:nextcloud/passman into sharing_no_groups 2016-10-02 14:48:23 +02:00
brantje dac5fb1b63
Small grammer fix 2016-10-02 14:43:08 +02:00
brantje e8c60d579f
Send notification to user 2016-10-02 14:41:38 +02:00
Marcos Zuriaga ea997a1ce0
Added angularjs ShareService api methods
Fixed route method
2016-10-02 14:26:22 +02:00
Marcos Zuriaga ee919c1159
Missing coma 2016-10-02 14:02:38 +02:00
Marcos Zuriaga 8684c0140a Merge branch 'sharing_no_groups' of github.com:nextcloud/passman into sharing_no_groups 2016-10-02 13:49:06 +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 6c5df04774
Add link sharing settings 2016-10-02 13:35:49 +02:00
brantje 7f1783294f
Encrypt credential with shared key 2016-10-02 13:02:00 +02:00