Commit graph

74 commits

Author SHA1 Message Date
Marcos Zuriaga 762b5e6af2
Added permission check just in case 2016-10-02 22:03:34 +02:00
Marcos Zuriaga d6c85bffcc
Apply save shared item with the shared key
Bugfixes
2016-10-02 20:18:51 +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
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 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
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
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 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
brantje c41439b0c2
Fix table name in ShareRequestMapper 2016-10-02 11:22:19 +02:00
Marcos Zuriaga 42b73148e6
Sharing action api
Some db changes for sharing
Sharing route added
Other minor changes
2016-10-02 01:56:36 +02:00
brantje 1048365e95
Fix "only variables should be passed by reference" 2016-10-01 18:04:29 +02:00
brantje 9e8b23679c
More loggin for the cron, less strict checking 2016-10-01 17:52:53 +02:00
brantje 3af9e39488
Clean up code 2016-09-30 20:56:17 +02:00
brantje 0ff6065f4b
Implement a challenge password 2016-09-30 20:43:20 +02:00
brantje 8920a36ea7
Save work 2016-09-28 22:05:09 +02:00
brantje 30213a8fd2
Add getById 2016-09-28 20:29:50 +02:00
brantje d2c02ce32b
Add settings to vault table 2016-09-28 20:26:59 +02:00
brantje 07b7aa8787
Add is_shared to credential update route 2016-09-28 19:46:54 +02:00
brantje 2e6de5c3a7 Add is_shared property to api 2016-09-28 19:42:12 +02:00
brantje 106cf3bf5b Fix error 500 2016-09-26 21:23:24 +02:00
brantje c9309f9866 Add service to dep injection 2016-09-26 21:21:02 +02:00
brantje b1728da8e2 Add function to get sharing keys 2016-09-25 22:02:58 +02:00
brantje 1aae11b6bf Fix sharing keys not returned from api 2016-09-25 21:40:18 +02:00
brantje 3126cf865f Include sharing keys in response 2016-09-25 21:18:58 +02:00
brantje 2d19e38e8a Save sharing keys to db 2016-09-25 18:34:33 +02:00
Marcos Zuriaga a45cc45f5a Add missing files from last sharing commit
Aadded npm-debug.log to the gitignore
2016-09-25 15:23:46 +02:00
brantje 41837d2c7d Add field for sharing keys generated time 2016-09-24 17:03:18 +02:00
brantje 9aefb98584 Added sharing keys to vault table 2016-09-24 17:01:11 +02:00
brantje da0412406f Fix searching users / groups 2016-09-24 15:58:02 +02:00
brantje aa34b462ea Add new line, add rename icon to activity 2016-09-24 13:09:17 +02:00
brantje 8b9e29702a Able to restore revisions 2016-09-24 12:59:19 +02:00