diff options
| author | brantje <brantje@gmail.com> | 2017-07-01 16:57:08 +0300 |
|---|---|---|
| committer | brantje <brantje@gmail.com> | 2017-07-01 16:57:08 +0300 |
| commit | 1b173e76a18ddbede577f5471d48e4f8cedc87e2 (patch) | |
| tree | 632d01f905b6f414ce890bfb053465833e3e3f5f /templates | |
| parent | 8cde638391f2abbd4610b7188811ced528ec32f1 (diff) | |
| parent | b0d52b6d293afbd55e49eb93ebb6c76476cd18de (diff) | |
Merge remote-tracking branch 'origin/master' into csv_export_fix
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/views/partials/forms/settings/general_settings.html | 3 | ||||
| -rw-r--r-- | templates/views/partials/forms/share_credential/basics.html | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/templates/views/partials/forms/settings/general_settings.html b/templates/views/partials/forms/settings/general_settings.html index d5885470..9792e5ec 100644 --- a/templates/views/partials/forms/settings/general_settings.html +++ b/templates/views/partials/forms/settings/general_settings.html @@ -12,8 +12,7 @@ <label>{{ 'old.vault.password' | translate}}</label> <input type="password" ng-model="oldVaultPass"> <label>{{ 'new.vault.password' | translate}}</label> - <password-gen ng-model="newVaultPass" - ></password-gen> + <input type="password" ng-model="newVaultPass" /> <ng-password-meter password="newVaultPass" score="vault_key_score"></ng-password-meter> <label>{{ 'new.vault.pw.r' | translate}}</label> <input type="password" ng-model="newVaultPass2"> diff --git a/templates/views/partials/forms/share_credential/basics.html b/templates/views/partials/forms/share_credential/basics.html index f3142d25..8774998d 100644 --- a/templates/views/partials/forms/share_credential/basics.html +++ b/templates/views/partials/forms/share_credential/basics.html @@ -17,7 +17,7 @@ <td> <button class="button" - ng-click="shareWith(inputSharedWith, selectedAccessLevel)"> + ng-click="shareWith(inputSharedWith)"> + </button> </td> |