From 111e78cbe168f318a862ad631d2b1616ef5db508 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Sat, 11 Feb 2017 18:23:56 -0500 Subject: [PATCH] Update 2017-02-11T23:23:52.689Z --- app/settings/views/settings.html | 92 ++++++++-- .../settingsAddEditEquivalentDomain.html | 8 +- app/settings/views/settingsDomains.html | 173 ++++++++++-------- app/settings/views/settingsTwoFactor.html | 37 ++-- app/views/backendLayout.html | 30 +-- index.html | 16 +- js/app.min.js | 6 +- js/lib.min.js | 19 +- 8 files changed, 219 insertions(+), 162 deletions(-) diff --git a/app/settings/views/settings.html b/app/settings/views/settings.html index fe302ce1..f910842a 100644 --- a/app/settings/views/settings.html +++ b/app/settings/views/settings.html @@ -9,33 +9,28 @@

General

-
+
-
+

Errors have occured

    -
  • {{e}}
    • +
  • {{e}}
-
-
- - -
-
@@ -51,10 +46,83 @@
- +
+
+
+

Master Password

+
+
+
+
+
+
+

Errors have occured

+
    +
  • {{e}}
    • +
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+

Two-step Log In

+
+
+

+ Current Status: + ENABLED + DISABLED +

+

+ Two-step login helps keep your account more secure by requiring a code provided by an app on your mobile device + while logging in (in addition to your master password). +

+
+
+ +
+
+
+
+

Danger Zone

+
+
+ Careful, these actions are not reversible! +
+
+ + +
+
\ No newline at end of file diff --git a/app/settings/views/settingsAddEditEquivalentDomain.html b/app/settings/views/settingsAddEditEquivalentDomain.html index a02f83ce..1142d316 100644 --- a/app/settings/views/settingsAddEditEquivalentDomain.html +++ b/app/settings/views/settingsAddEditEquivalentDomain.html @@ -17,10 +17,12 @@ * -

- Only "base" domains are allowed. Do not enter subdomains. - For example, enter "google.com" instead of "www.google.com". + Only "base" domains are allowed. Do not enter subdomains. For example, enter "google.com" instead of + "www.google.com". +

+

+ You can also enter "androidapp://package.name" to associate an android app with other website domains.

diff --git a/app/settings/views/settingsDomains.html b/app/settings/views/settingsDomains.html index 5f38053d..f2dc816a 100644 --- a/app/settings/views/settingsDomains.html +++ b/app/settings/views/settingsDomains.html @@ -1,83 +1,94 @@ -
- -

Domain Rules

-
-
-
-

- If you have the same login across multiple different website domains, you can mark the website as "equivalent". - "Global" domains are ones created for you by bitwarden. -

-
- - - - - - - - - - - - - - - - - -
Global Equivalent Domains
- - - - {{globalDomain.domains}}
No domains to list.
+
+

Domain Rules

+
+
+

+ If you have the same login across multiple different website domains, you can mark the website as "equivalent". + "Global" domains are ones already created for you by bitwarden. +

+ +
+
+

Custom Equivalent Domains

+
+ +
+
+
+
+ + + + + + + + + + + + +
+ + + {{customDomain}}
No domains to list.
+
+
+
+ +
-
- - - - - - - - - - - - - - - - - -
- Custom Equivalent Domains - - Add New - -
- - - {{customDomain}}
No domains to list.
+ + +
+
+
+

Global Equivalent Domains

+
+
+
+ + + + + + + + + + + + +
+ + + + {{globalDomain.domains}}
No domains to list.
+
+
+
+ +
-
-
- - -
- + +
+ diff --git a/app/settings/views/settingsTwoFactor.html b/app/settings/views/settingsTwoFactor.html index fd4e5c90..010dd672 100644 --- a/app/settings/views/settingsTwoFactor.html +++ b/app/settings/views/settingsTwoFactor.html @@ -1,13 +1,11 @@
- +
-

Current Status: ENABLEDDISABLED

-

Two-step login helps keep your account more secure by requiring a code provided by an app on your mobile device while logging in (in addition to your master password).

-

Two-step login is already enabled on your account. To access your two-step settings enter your master password below.

-

To get started with two-step login enter your master password below.

+

Two-step log in is already enabled on your account. To access your two-step settings enter your master password below.

+

To get started with two-step log in enter your master password below.

Errors have occured

    @@ -29,7 +27,7 @@
    -

    Two-step login is enabled on your account. Below is the code required by your verification app.

    +

    Two-step log in is enabled on your account. Below is the code required by your verification app.

    Need a two-step verification app? Download one of the following:

    @@ -58,17 +56,18 @@
    -

    Recovery Code

    -

    - The recovery code allows you to access your account in the event that you lose your authenticator app. - bitwarden support won't be able to assist you if you lose access to your account. We recommend you write down or - print the recovery code below and keep it in a safe place. -

    -
      -
    • - Recovery Code: {{twoFactorModel.recovery}} -
      • -
    +
    +

    Recovery Code

    +

    + The recovery code allows you to access your account in the event that you lose your authenticator app. + bitwarden support won't be able to assist you if you lose access to your account. We recommend you write down or + print the recovery code below and keep it in a safe place. +

    +

    Recovery Code: {{twoFactorModel.recovery}}

    + +

    Errors have occured

    @@ -77,12 +76,12 @@
-

3. Enter the resulting verification code from the app

+

Want to disable? 3. Enter the resulting verification code from the app

-

NOTE: After enabling two-step login, you will be required to enter the current code generated by your verification app each time you log in.

+

NOTE: After enabling two-step log in, you will be required to enter the current code generated by your verification app each time you log in.