Lock vault after 3 wrong attempts (Fixes #197)

    Fix share button, fix shared_key not added to storedCredential after sharing (Fixes #249)
    Add password app importer. Fixes #248
    Fix version check via proxy. Fixes #237
    Fix activity app not filtering. Fixes #246
    Add EnPass txt importer. Fixes #159
    Fix for disabled share button
    Require vault key for export. Fixes #199
    Indicate that sharing only works with users that have 1 or more vaults.
    Fixes #242
    Reset tags on logout. Fixes #245
    Ability to enter OTP secret manually. Fixes #198
    Create teampass importer. Fixes #244

4 files changed, 43 insertions, 14 deletions

diff --git a/templates/views/partials/forms/edit_credential/otp.html b/templates/views/partials/forms/edit_credential/otp.html
index 5c0fc261..07a4635d 100644
--- a/templates/views/partials/forms/edit_credential/otp.html
+++ b/templates/views/partials/forms/edit_credential/otp.html
@@ -1,18 +1,24 @@
 <div class="row">
 	<div class="col-xs-12">
-		<div class="col-xs-2 nopadding">
-			{{ 'upload.qr' | translate}}
+		<div class="col-xs-4 nopadding">
+			<span class="otpText">{{ 'upload.qr' | translate}}</span>
+			<select ng-model="otpType">
+				<option value="qrcode">Upload QR code</option>
+				<option value="secret">Enter secret</option>
+			</select>
 		</div>
 		<div class="col-xs-6 nopadding">
 			<input type="file" qrread on-read="parseQR(qrdata)"
 				   class="input_secret"
-				   on-read="parseQR(qrdata)"/>
+				   on-read="parseQR(qrdata)" ng-show="otpType === 'qrcode'"/>
+			<input type="text" ng-model="storedCredential.otp.secret" ng-show="otpType === 'secret'">
 		</div>
 	</div>
 </div>
 
 <div class="row">
-	<div class="col-xs-12" ng-if="storedCredential.otp">{{ 'current.qr' | translate}}
+	<div class="col-xs-12" ng-if="storedCredential.otp">
+		<b>{{ 'current.qr' | translate}}</b>
 	</div>
 </div>
 <div class="row">
@@ -22,23 +28,23 @@
 	<div class="col-sm-4 col-sm-5 col-md-5">
 		<table ng-show="storedCredential.otp">
 			<tr ng-show="storedCredential.otp.type">
-				<td>{{ 'type' | translate}}:</td>
+				<td>{{ 'type' | translate}}: </td>
 				<td>{{storedCredential.otp.type}}</td>
 			</tr>
 			<tr ng-show="storedCredential.otp.label">
-				<td>{{ 'label' | translate}}:</td>
+				<td>{{ 'label' | translate}}: </td>
 				<td>{{storedCredential.otp.label}}</td>
 			</tr>
 			<tr ng-show="storedCredential.otp.issuer">
-				<td>{{ 'issuer' | translate}}:</td>
+				<td>{{ 'issuer' | translate}}: </td>
 				<td>{{storedCredential.otp.issuer}}</td>
 			</tr>
 			<tr ng-show="storedCredential.otp.secret">
-				<td>{{ 'secret' | translate}}:</td>
+				<td>{{ 'secret' | translate}}: </td>
 				<td>{{storedCredential.otp.secret}}</td>
 			</tr>
 			<tr ng-show="storedCredential.otp.secret">
-				<td>{{ 'otp' | translate}}:</td>
+				<td>{{ 'otp' | translate}}: </td>
 				<td><span otp-generator
 						  secret="storedCredential.otp.secret"></span>
 				</td>
diff --git a/templates/views/partials/forms/settings/export.html b/templates/views/partials/forms/settings/export.html
index 2ede0a7d..f39c22f9 100644
--- a/templates/views/partials/forms/settings/export.html
+++ b/templates/views/partials/forms/settings/export.html
@@ -10,13 +10,26 @@
 					</option>
 				</select></label>
 			<div><b>{{selectedExporter.description}}</b></div>
-			<button class="button" ng-click="startExport()"
-					ng-if="selectedExporter">{{ 'export' | translate}}
-			</button>
+
+			<div ng-show="selectedExporter" class="col-xs-3 nopadding">
+				<label>{{ 'export.confirm.text' | translate }}</label>
+				<input type="password" ng-model="confirm_key">
+				<br />
+				<div class="alert alert-warning" ng-show="error">
+					{{error}}
+				</div>
+			</div>
+			<div class="clearfix">
+				<button class=" button" ng-click="startExport()"
+						ng-if="selectedExporter">{{ 'export' | translate}}
+				</button>
+			</div>
 		</div>
+
 		<div class="col-xs-6">
 			<div ng-if="log" class="import_log">
-				<textarea id="import_log" auto-scroll="log">{{log.join('\n')}}</textarea>
+				<textarea id="import_log"
+						  auto-scroll="log">{{log.join('\n')}}</textarea>
 			</div>
 		</div>
 	</div>
diff --git a/templates/views/partials/forms/settings/import.html b/templates/views/partials/forms/settings/import.html
index d0f69be4..3e66d8d2 100644
--- a/templates/views/partials/forms/settings/import.html
+++ b/templates/views/partials/forms/settings/import.html
@@ -9,7 +9,12 @@
 						{{importer.name}}
 					</option>
 				</select></label>
-			<div><b>{{selectedImporter.description}}</b></div>
+			<div ng-show="selectedImporter">
+				<b>{{ 'import.steps' | translate }}</b>
+				<ul class="import-steps">
+					<li ng-repeat="step in selectedImporter.exportSteps">{{step}}</li>
+				</ul>
+			</div>
 			<input ng-if="selectedImporter" type="file" file-select
 				   success="fileLoaded" error="fileLoadError"
 				   progress="fileSelectProgress"><br/>
diff --git a/templates/views/partials/forms/share_credential/basics.html b/templates/views/partials/forms/share_credential/basics.html
index 539bc8d8..f3142d25 100644
--- a/templates/views/partials/forms/share_credential/basics.html
+++ b/templates/views/partials/forms/share_credential/basics.html
@@ -22,6 +22,11 @@
 						</button>
 					</td>
 				</tr>
+				<tr>
+					<td colspan="2">
+						<small>{{ 'search.result.missing' | translate}}</small>
+					</td>
+				</tr>
 				</thead>
 			</table>