Merge branch '1.0-develop' into patch-1

Author: nathanjosiah

TwoFactorAuth/view/adminhtml/web/template/authy/auth.html

@@ -70,8 +70,9 @@ <h3 data-bind='i18n: "Emergency methods:"'></h3>
                         id="tfa_code"
                         class="admin__control-text"
                         type="text"
+                        autocomplete="off"
                         data-bind='{value: tokenCode, enable: !waitingText()}'
-                        placeholder="Your code" />
+                        placeholder="Your code"/>
             </div>
         </div>
 

TwoFactorAuth/view/adminhtml/web/template/authy/configure/verify.html

@@ -24,6 +24,7 @@
                         id="tfa_authy_verify"
                         class="admin__control-text"
                         type="text"
+                        autocomplete="off"
                         autofocus
                         placeholder="Verification code"/>
             </div>

TwoFactorAuth/view/adminhtml/web/template/google/auth.html

@@ -22,8 +22,9 @@
                                 id="tfa_code"
                                 class="admin__control-text"
                                 type="text"
+                                autocomplete="off"
                                 autofocus
-                                placeholder="Your code'"/>
+                                placeholder="Your code"/>
                     </div>
                 </div>
 

TwoFactorAuth/view/adminhtml/web/template/google/configure.html

@@ -28,8 +28,9 @@
                                 id="tfa_code"
                                 class="admin__control-text"
                                 type="text"
+                                autocomplete="off"
                                 autofocus
-                                placeholder="Your code'"/>
+                                placeholder="Your code"/>
                     </div>
                 </div>