Commit graph

286 commits

Author SHA1 Message Date
brantje bd7fc18896
Revert "Decline from notification works!"
This reverts commit 5809b23811.
2016-10-02 17:38:19 +02:00
brantje 5809b23811
Decline from notification works! 2016-10-02 17:37:21 +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
brantje aff63a5f77
Fix encrypting shared credentials 2016-10-02 13:00:52 +02:00
brantje b5d7ed9418
Add encryptSharedCredential and decryptSharedCredential 2016-10-02 12:35:27 +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
brantje 966b74651d
Remove group search, check if an user has vaults 2016-10-02 10:53:15 +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
Marcos Zuriaga 54e4b9435f Merge branch 'master' into sharing_no_groups 2016-10-01 20:18:14 +02:00
Marcos Zuriaga 973746389d Sharing settings improvements
More sharing logic benchmarking and tests
2016-10-01 19:04:05 +02:00
brantje 3dc19d2371
Change warning bar z-index 2016-10-01 18:07:44 +02:00
brantje 1048365e95
Fix "only variables should be passed by reference" 2016-10-01 18:04:29 +02:00
brantje 0113217b3c
Merge branch 'cronFix' 2016-10-01 18:04:04 +02:00
brantje 03a90e9020
Fix action title 2016-10-01 17:53:32 +02:00
brantje 9e8b23679c
More loggin for the cron, less strict checking 2016-10-01 17:52:53 +02:00
brantje c907bb540d
Merge branch 'bookmarklet' 2016-10-01 17:31:16 +02:00
brantje 6411351068
Add bookmarklet 2016-10-01 17:21:24 +02:00
Marcos Zuriaga 38299973d0
Removed group sharing logics
Added user sharing crypto times to the UI
2016-10-01 15:18:22 +02:00
Marcos Zuriaga 739098ce39
More sharing logic 2016-10-01 01:20:41 +02:00
Marcos Zuriaga 76d9a16797
DB Sharing update 2016-10-01 00:30:34 +02:00
brantje c4da0742df
Merge branch 'httpWarning' 2016-09-30 22:33:13 +02:00
brantje 8b26873159
Add warning for http connections 2016-09-30 22:31:46 +02:00
brantje 899eff73f2
Merge branch 'fixColorTabs' 2016-09-30 22:11:31 +02:00
brantje 1956512f76
Implemented use-theme at tabs 2016-09-30 22:10:34 +02:00
brantje e790d37b01
Add code review section to readme 2016-09-30 21:58:26 +02:00
brantje eae47eaa38
Merge branch 'replaceApply' 2016-09-30 21:58:06 +02:00
brantje 089b0e13d7
Replace all scope.apply with digest 2016-09-30 21:51:38 +02:00
brantje 4a074958f5
Implement new updated progressbar to templates 2016-09-30 21:47:46 +02:00
brantje 89c4644ff3
Make sharing page more pretty 2016-09-30 21:43:55 +02:00
Marcos Zuriaga cbd10de133 Merge branch 'master' of github.com:nextcloud/passman 2016-09-30 21:27:28 +02:00
Marcos Zuriaga d682df4806 Progressbar on share action for cypher
TODO: add a progressbar of the upload and the actual upload
2016-09-30 21:26:55 +02:00
brantje 2899d24a2d
Merge branch 'renameVault' 2016-09-30 21:25:57 +02:00
brantje 4f1dd1da88
Clean up 2016-09-30 21:17:34 +02:00
brantje ae49c9e149
Implement renaming vault 2016-09-30 21:15:28 +02:00