Completed
Push — master ( 20e2b5...4e7d5c )
by Marcos
10:07
created
appinfo/routes.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -52,19 +52,19 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
controller/credentialcontroller.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 	/**
Please login to merge, or discard this patch.
controller/translationcontroller.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -140,8 +140,8 @@  discard block
 block discarded – undo
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
 			'selected.icon' => $this->trans->t('Selected icon'),
147 147
 
@@ -349,15 +349,15 @@  discard block
 block discarded – undo
349 349
 			'decline' => $this->trans->t('Decline'),
350 350
 			'session.time.left' => $this->trans->t('You have {{session_time}} left before logout.'),
351 351
 			'vault.locked' => $this->trans->t('Your vault has been locked for {{time}} because of {{tries}} failed attempts!'),
352
-            'vault.hint.hello' => $this->trans->t('Hello there!'),
353
-            'vault.hint.hello.add' => $this->trans->t('It does not seem that you have any passwords. Do you want to add one?'),
354
-            'vault.hint.list.nogood' => $this->trans->t('You don\'t have good credentials'),
355
-            'vault.hint.list.nomedium' => $this->trans->t('You don\'t have medium credentials'),
356
-            'vault.hint.list.nobad' => $this->trans->t('You don\'t have bad credentials'),
357
-            'vault.hint.list.noexpired' => $this->trans->t('You don\'t have expired credentials'),
358
-            'vault.hint.list.nodeleted' => $this->trans->t('You don\'t have deleted credentials'),
359
-            'vault.hint.list.notags' => $this->trans->t('There are no credentials with your selected tags'),
360
-            'vault.hint.list.nosearch' => $this->trans->t('There are no credentials matching'),
352
+			'vault.hint.hello' => $this->trans->t('Hello there!'),
353
+			'vault.hint.hello.add' => $this->trans->t('It does not seem that you have any passwords. Do you want to add one?'),
354
+			'vault.hint.list.nogood' => $this->trans->t('You don\'t have good credentials'),
355
+			'vault.hint.list.nomedium' => $this->trans->t('You don\'t have medium credentials'),
356
+			'vault.hint.list.nobad' => $this->trans->t('You don\'t have bad credentials'),
357
+			'vault.hint.list.noexpired' => $this->trans->t('You don\'t have expired credentials'),
358
+			'vault.hint.list.nodeleted' => $this->trans->t('You don\'t have deleted credentials'),
359
+			'vault.hint.list.notags' => $this->trans->t('There are no credentials with your selected tags'),
360
+			'vault.hint.list.nosearch' => $this->trans->t('There are no credentials matching'),
361 361
 
362 362
 
363 363
 			// templates/views/vaults.html
@@ -403,15 +403,15 @@  discard block
 block discarded – undo
403 403
 			'deleted.credentials' => $this->trans->t('Deleted credentials'),
404 404
 			'logout' => $this->trans->t('Logout'),
405 405
 			'donate' => $this->trans->t('Donate'),
406
-            'navigation.show.all' => $this->trans->t('Show All'),
407
-            'navigation.tags' => $this->trans->t('Tags'),
408
-            'navigation.tags.search' => $this->trans->t('Search Tags'),
409
-            'navigation.strength.good' => $this->trans->t('Good Strength'),
410
-            'navigation.strength.medium' => $this->trans->t('Medium Strength'),
411
-            'navigation.strength.bad' => $this->trans->t('Bad Strength'),
412
-            'navigation.expired' => $this->trans->t('Expired'),
413
-            'navigation.advanced.filter' => $this->trans->t('Filter Tags'),
414
-            'navigation.advanced.checkbox' => $this->trans->t('Simple Navigation'),
406
+			'navigation.show.all' => $this->trans->t('Show All'),
407
+			'navigation.tags' => $this->trans->t('Tags'),
408
+			'navigation.tags.search' => $this->trans->t('Search Tags'),
409
+			'navigation.strength.good' => $this->trans->t('Good Strength'),
410
+			'navigation.strength.medium' => $this->trans->t('Medium Strength'),
411
+			'navigation.strength.bad' => $this->trans->t('Bad Strength'),
412
+			'navigation.expired' => $this->trans->t('Expired'),
413
+			'navigation.advanced.filter' => $this->trans->t('Filter Tags'),
414
+			'navigation.advanced.checkbox' => $this->trans->t('Simple Navigation'),
415 415
 
416 416
 
417 417
 			// templates/public_share.php
Please login to merge, or discard this patch.
lib/Db/Credential.php 1 patch
Indentation   -3 removed lines patch added patch discarded remove patch
@@ -72,9 +72,6 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.