Commit graph

187 commits

Author SHA1 Message Date
Marcos Zuriaga
61dbcedfa4
Removed unused var from mapper constructor 2016-10-12 19:23:12 +02:00
Marcos Zuriaga
5186648889
Added unit test for SharingACLMapper
Renamed some vars
Added launch_phpunit.sh to gitignore
2016-10-12 19:08:59 +02:00
Marcos Zuriaga
9c53219346
Removed unused method and variable 2016-10-11 23:15:45 +02:00
Marcos Zuriaga
1f30ccc963
Added Database testing base class
Added VaultMapper unit tests
Edited some VaultMapper docs and changed a function to use the Utils implementation
Added coverage phpunit annotations
2016-10-11 01:41:32 +02:00
Marcos Zuriaga
64930bb106
Create unit tests for Vault database model
Fix some typos in phpdoc of vault db model
2016-10-09 17:53:20 +02:00
Marcos Zuriaga
bc0f47a8e5
Unit tests for ShareRequest model
Fixes bug with asACLJson result data in sharerequest
2016-10-09 14:52:23 +02:00
Marcos Zuriaga
1e8d742c01
Utils class simplification of microtime method
utils unit tests
2016-10-08 18:24:30 +02:00
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
12764c5a4f
Remove ->__toString() call 2016-10-08 00:11:40 +02:00
brantje
fe690de354
Fix travis errors in Utility/PermissionEntity 2016-10-08 00:06:51 +02:00
brantje
724a3b33ff
Fix travis errors in ShareService 2016-10-08 00:05:43 +02:00
brantje
80289b1a71
Fix travis errors in CronService 2016-10-08 00:05:08 +02:00
brantje
ea8ee93efd
Fix travis errors in CredentialService 2016-10-08 00:04:36 +02:00
brantje
41360eed89
Fix travis errors in SharingMapper 2016-10-08 00:04:12 +02:00
brantje
1abe75c959
Fix travis errors in Activity class 2016-10-08 00:02:16 +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
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
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
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
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
brantje
23a02c84d9
Add todo 2016-10-04 00:35:30 +02:00
brantje
42c3e1dee0
Add todo 2016-10-04 00:34:16 +02:00
Marcos Zuriaga
62b54aee8e
Behave as if no item was found if public user has no read permission 2016-10-04 00:21:27 +02:00
Marcos Zuriaga
1ba859269f
Add missing data to the public api response 2016-10-04 00:14:20 +02:00
Marcos Zuriaga
4ded0d8e0b
Don't return an array on public api 2016-10-04 00:13:38 +02:00
brantje
96435011f8
Add expire_views 2016-10-03 23:32:30 +02:00
Marcos Zuriaga
eada39c2bd
Sharing public link creation API endpoint 2016-10-03 22:55:33 +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
8a218344c5
Permissions check on credential update api 2016-10-03 21:18:28 +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
Marcos Zuriaga
5cfd481e63
Fix bitwise not 2016-10-03 18:55:34 +02:00
brantje
5f337e323a
Merge branch 'sharing_no_groups' of github.com:nextcloud/passman into sharing_no_groups 2016-10-03 17:57:20 +02:00
Marcos Zuriaga
fca2d01de0
Added documentation 2016-10-03 17:38:57 +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
b8028dd640
Fix merge conflict 2016-10-03 15:54:15 +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
167ffd4644
Merge branch 'sharing_no_groups' of github.com:nextcloud/passman into sharing_no_groups 2016-10-03 15:42:36 +02:00
brantje
86d9910f74
Unshare item. Reading shared credential broke? 2016-10-03 15:40:46 +02:00
Marcos Zuriaga
4844aa1ce0
Remove files field from sharing response if user does not have permission to see files 2016-10-03 15:01:30 +02:00
Marcos Zuriaga
68cf16c10b
Add new permissions 2016-10-03 14:56:05 +02:00
Marcos Zuriaga
0516fdbce4
Fix ui permissions 2016-10-03 13:58:53 +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
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