Commit graph

152 commits

Author SHA1 Message Date
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
Marcos Zuriaga
29fc96eb6d
Made shared credential accept work 2016-10-02 18:06:53 +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
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
ea997a1ce0
Added angularjs ShareService api methods
Fixed route method
2016-10-02 14:26:22 +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
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
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
brantje
8b26873159
Add warning for http connections 2016-09-30 22:31:46 +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
4f1dd1da88
Clean up 2016-09-30 21:17:34 +02:00
brantje
ae49c9e149
Implement renaming vault 2016-09-30 21:15:28 +02:00
brantje
9dd4a86ec4
Remove temp var 2016-09-30 20:46:06 +02:00
brantje
0ff6065f4b
Implement a challenge password 2016-09-30 20:43:20 +02:00
Marcos Zuriaga
288e6f19c0 Fixes undefined bug 2016-09-30 20:06:31 +02:00
Marcos Zuriaga
10b1762c72 Debug changes 2016-09-30 19:47:22 +02:00
brantje
484a88b7ac
Fix loading password preferences at password creation 2016-09-30 18:48:25 +02:00
brantje
04b0261cd3
Merge branch 'master' of github.com:nextcloud/passman 2016-09-30 17:44:37 +02:00
brantje
05e20cceb0
Small bugfixes 2016-09-30 17:44:21 +02:00
Marcos Zuriaga
1bcaef4405 Merge branch 'master' of github.com:nextcloud/passman 2016-09-29 01:13:08 +02:00
Marcos Zuriaga
dac5c17360 Some more sharing logic 2016-09-29 01:12:39 +02:00
brantje
101f137db5
Merge branch 'vaultSettings' 2016-09-28 23:40:53 +02:00
brantje
2af885265e
Fix bugs 2016-09-28 23:40:33 +02:00
Sander
b317fe4359 Merge pull request #37 from nextcloud/vaultSettings
Vault implement settings
2016-09-28 23:24:14 +02:00
brantje
fc99d93f86
Finish up vault settings 2016-09-28 23:23:24 +02:00
Marcos Zuriaga
e4032f6a95 Store vault data on the user once we have it
Useful for further sharing process and progress calculation
2016-09-28 22:16:15 +02:00
brantje
3394d78d36
Save work 2016-09-28 22:15:03 +02:00
brantje
8920a36ea7
Save work 2016-09-28 22:05:09 +02:00
Marcos Zuriaga
b45d5b3634 Sharing RSA cypher async 2016-09-28 21:56:54 +02:00
brantje
ab07f2b9bd
Use patch 2016-09-28 21:21:58 +02:00
brantje
9df4e53856
Add tags_raw 2016-09-28 21:05:29 +02:00
brantje
4463fa7d3c
Update files to reflect the api change 2016-09-28 20:28:34 +02:00