@@ -52,19 +52,19 @@ |
||
52 | 52 | //Sharing stuff |
53 | 53 | ['name' => 'share#search', 'url' => '/api/v2/sharing/search', 'verb' => 'POST'], |
54 | 54 | ['name' => 'share#getVaultsByUser', 'url' => '/api/v2/sharing/vaults/{user_id}', 'verb' => 'GET'], |
55 | - ['name' => 'share#applyIntermediateShare', 'url' => '/api/v2/sharing/share', 'verb' => 'POST'], |
|
56 | - ['name' => 'share#savePendingRequest', 'url' => '/api/v2/sharing/save', 'verb' => 'POST'], |
|
57 | - ['name' => 'share#getPendingRequests', 'url' => '/api/v2/sharing/pending', 'verb' => 'GET'], |
|
58 | - ['name' => 'share#deleteShareRequest', 'url' => '/api/v2/sharing/decline/{share_request_id}', 'verb' => 'DELETE'], |
|
59 | - ['name' => 'share#getVaultItems', 'url' => '/api/v2/sharing/vault/{vault_guid}/get', 'verb' => 'GET'], |
|
60 | - ['name' => 'share#createPublicShare', 'url' => '/api/v2/sharing/public', 'verb' => 'POST'], |
|
61 | - ['name' => 'share#getPublicCredentialData', 'url' => '/api/v2/sharing/credential/{credential_guid}/public', 'verb' => 'GET'], |
|
62 | - ['name' => 'share#unshareCredential', 'url' => '/api/v2/sharing/credential/{item_guid}', 'verb' => 'DELETE'], |
|
63 | - ['name' => 'share#unshareCredentialFromUser', 'url' => '/api/v2/sharing/credential/{item_guid}/{user_id}', 'verb' => 'DELETE'], |
|
64 | - ['name' => 'share#getRevisions', 'url' => '/api/v2/sharing/credential/{item_guid}/revisions', 'verb' => 'GET'], |
|
65 | - ['name' => 'share#getItemAcl', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'GET'], |
|
66 | - ['name' => 'share#getFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file/{file_guid}', 'verb' => 'GET'], |
|
67 | - ['name' => 'share#updateSharedCredentialACL', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'PATCH'], |
|
55 | + ['name' => 'share#applyIntermediateShare', 'url' => '/api/v2/sharing/share', 'verb' => 'POST'], |
|
56 | + ['name' => 'share#savePendingRequest', 'url' => '/api/v2/sharing/save', 'verb' => 'POST'], |
|
57 | + ['name' => 'share#getPendingRequests', 'url' => '/api/v2/sharing/pending', 'verb' => 'GET'], |
|
58 | + ['name' => 'share#deleteShareRequest', 'url' => '/api/v2/sharing/decline/{share_request_id}', 'verb' => 'DELETE'], |
|
59 | + ['name' => 'share#getVaultItems', 'url' => '/api/v2/sharing/vault/{vault_guid}/get', 'verb' => 'GET'], |
|
60 | + ['name' => 'share#createPublicShare', 'url' => '/api/v2/sharing/public', 'verb' => 'POST'], |
|
61 | + ['name' => 'share#getPublicCredentialData', 'url' => '/api/v2/sharing/credential/{credential_guid}/public', 'verb' => 'GET'], |
|
62 | + ['name' => 'share#unshareCredential', 'url' => '/api/v2/sharing/credential/{item_guid}', 'verb' => 'DELETE'], |
|
63 | + ['name' => 'share#unshareCredentialFromUser', 'url' => '/api/v2/sharing/credential/{item_guid}/{user_id}', 'verb' => 'DELETE'], |
|
64 | + ['name' => 'share#getRevisions', 'url' => '/api/v2/sharing/credential/{item_guid}/revisions', 'verb' => 'GET'], |
|
65 | + ['name' => 'share#getItemAcl', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'GET'], |
|
66 | + ['name' => 'share#getFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file/{file_guid}', 'verb' => 'GET'], |
|
67 | + ['name' => 'share#updateSharedCredentialACL', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'PATCH'], |
|
68 | 68 | ['name' => 'internal#getAppVersion', 'url' => '/api/v2/version', 'verb' => 'GET'], |
69 | 69 | |
70 | 70 | //Settings |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | $link, $this->userId, Activity::TYPE_ITEM_ACTION); |
106 | 106 | } |
107 | 107 | |
108 | - return new JSONResponse($this->credentialService->getCredentialByGUID($credential->getGuid())); |
|
108 | + return new JSONResponse($this->credentialService->getCredentialByGUID($credential->getGuid())); |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | /** |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | |
260 | 260 | $credential = $this->credentialService->updateCredential($credential); |
261 | 261 | |
262 | - return new JSONResponse($this->credentialService->getCredentialByGUID($credential->getGuid())); |
|
262 | + return new JSONResponse($this->credentialService->getCredentialByGUID($credential->getGuid())); |
|
263 | 263 | } |
264 | 264 | |
265 | 265 | /** |
@@ -140,8 +140,8 @@ discard block |
||
140 | 140 | 'password.r' => $this->trans->t('Repeat password'), |
141 | 141 | 'add.tag' => $this->trans->t('Add tag'), |
142 | 142 | 'pick.icon' => $this->trans->t('Pick an icon'), |
143 | - 'pick.icon.search' => $this->trans->t('Search icons'), |
|
144 | - 'pick.icon.custom.label' => $this->trans->t('Upload a custom icon:'), |
|
143 | + 'pick.icon.search' => $this->trans->t('Search icons'), |
|
144 | + 'pick.icon.custom.label' => $this->trans->t('Upload a custom icon:'), |
|
145 | 145 | 'use.icon' => $this->trans->t('Use this icon'), |
146 | 146 | 'use.icon.delete' => $this->trans->t('Delete current icon'), |
147 | 147 | 'use.icon.refresh' => $this->trans->t('Get icon from page'), |
@@ -351,15 +351,15 @@ discard block |
||
351 | 351 | 'decline' => $this->trans->t('Decline'), |
352 | 352 | 'session.time.left' => $this->trans->t('You have {{session_time}} left before logout.'), |
353 | 353 | 'vault.locked' => $this->trans->t('Your vault has been locked for {{time}} because of {{tries}} failed attempts!'), |
354 | - 'vault.hint.hello' => $this->trans->t('Hello there!'), |
|
355 | - 'vault.hint.hello.add' => $this->trans->t('It does not seem that you have any passwords. Do you want to add one?'), |
|
356 | - 'vault.hint.list.nogood' => $this->trans->t('You don\'t have good credentials'), |
|
357 | - 'vault.hint.list.nomedium' => $this->trans->t('You don\'t have medium credentials'), |
|
358 | - 'vault.hint.list.nobad' => $this->trans->t('You don\'t have bad credentials'), |
|
359 | - 'vault.hint.list.noexpired' => $this->trans->t('You don\'t have expired credentials'), |
|
360 | - 'vault.hint.list.nodeleted' => $this->trans->t('You don\'t have deleted credentials'), |
|
361 | - 'vault.hint.list.notags' => $this->trans->t('There are no credentials with your selected tags'), |
|
362 | - 'vault.hint.list.nosearch' => $this->trans->t('There are no credentials matching'), |
|
354 | + 'vault.hint.hello' => $this->trans->t('Hello there!'), |
|
355 | + 'vault.hint.hello.add' => $this->trans->t('It does not seem that you have any passwords. Do you want to add one?'), |
|
356 | + 'vault.hint.list.nogood' => $this->trans->t('You don\'t have good credentials'), |
|
357 | + 'vault.hint.list.nomedium' => $this->trans->t('You don\'t have medium credentials'), |
|
358 | + 'vault.hint.list.nobad' => $this->trans->t('You don\'t have bad credentials'), |
|
359 | + 'vault.hint.list.noexpired' => $this->trans->t('You don\'t have expired credentials'), |
|
360 | + 'vault.hint.list.nodeleted' => $this->trans->t('You don\'t have deleted credentials'), |
|
361 | + 'vault.hint.list.notags' => $this->trans->t('There are no credentials with your selected tags'), |
|
362 | + 'vault.hint.list.nosearch' => $this->trans->t('There are no credentials matching'), |
|
363 | 363 | |
364 | 364 | |
365 | 365 | // templates/views/vaults.html |
@@ -405,15 +405,15 @@ discard block |
||
405 | 405 | 'deleted.credentials' => $this->trans->t('Deleted credentials'), |
406 | 406 | 'logout' => $this->trans->t('Logout'), |
407 | 407 | 'donate' => $this->trans->t('Donate'), |
408 | - 'navigation.show.all' => $this->trans->t('Show All'), |
|
409 | - 'navigation.tags' => $this->trans->t('Tags'), |
|
410 | - 'navigation.tags.search' => $this->trans->t('Search Tags'), |
|
411 | - 'navigation.strength.good' => $this->trans->t('Good Strength'), |
|
412 | - 'navigation.strength.medium' => $this->trans->t('Medium Strength'), |
|
413 | - 'navigation.strength.bad' => $this->trans->t('Bad Strength'), |
|
414 | - 'navigation.expired' => $this->trans->t('Expired'), |
|
415 | - 'navigation.advanced.filter' => $this->trans->t('Filter Tags'), |
|
416 | - 'navigation.advanced.checkbox' => $this->trans->t('Simple Navigation'), |
|
408 | + 'navigation.show.all' => $this->trans->t('Show All'), |
|
409 | + 'navigation.tags' => $this->trans->t('Tags'), |
|
410 | + 'navigation.tags.search' => $this->trans->t('Search Tags'), |
|
411 | + 'navigation.strength.good' => $this->trans->t('Good Strength'), |
|
412 | + 'navigation.strength.medium' => $this->trans->t('Medium Strength'), |
|
413 | + 'navigation.strength.bad' => $this->trans->t('Bad Strength'), |
|
414 | + 'navigation.expired' => $this->trans->t('Expired'), |
|
415 | + 'navigation.advanced.filter' => $this->trans->t('Filter Tags'), |
|
416 | + 'navigation.advanced.checkbox' => $this->trans->t('Simple Navigation'), |
|
417 | 417 | |
418 | 418 | |
419 | 419 | // templates/public_share.php |
@@ -72,9 +72,6 @@ |
||
72 | 72 | * @method string getSharedKey() |
73 | 73 | * @method void setCompromised(bool $value) |
74 | 74 | * @method bool getCompromised() |
75 | - |
|
76 | - |
|
77 | - |
|
78 | 75 | */ |
79 | 76 | |
80 | 77 |