diff --git a/app/accounts/views/accountsLoginInfo.html b/app/accounts/views/accountsLoginInfo.html index f0abe6d2..cef70feb 100644 --- a/app/accounts/views/accountsLoginInfo.html +++ b/app/accounts/views/accountsLoginInfo.html @@ -35,7 +35,15 @@
\ No newline at end of file diff --git a/app/accounts/views/accountsOrganizationAccept.html b/app/accounts/views/accountsOrganizationAccept.html new file mode 100644 index 00000000..ae151ddf --- /dev/null +++ b/app/accounts/views/accountsOrganizationAccept.html @@ -0,0 +1,32 @@ +
+ +
+
+ Loading... +
+
+ Accepting invitation... +
+
+ +

{{state.params.email}}

+

+ You've been invited to join the organization listed above. + To accept the invitation, you need to log in or create a new bitwarden account. +

+
+
+
+ Log In +
+
+ Create Account +
+
+
+
+
diff --git a/app/accounts/views/accountsRegister.html b/app/accounts/views/accountsRegister.html index 5e3689f4..9dfae0a6 100644 --- a/app/accounts/views/accountsRegister.html +++ b/app/accounts/views/accountsRegister.html @@ -9,10 +9,14 @@

Account Created!

You may now log in to your new account.

- Ready to log in? + Ready to log in?
+
+

Create Organization, Step 1

+

Before creating your organization, you first need to create a free personal account.

+

Errors have occured

- Already have an account? + Already have an account?
+
+
+
+

Plan

+
+
+
+
+
+
Name
+
{{plan.name || '-'}}
+
Total Seats
+
{{plan.seats || '-'}}
+
+
+
+
+
Status
+
{{(subscription && subscription.status) || '-'}}
+
Next Charge
+
{{nextInvoice ? ((nextInvoice.date | date: format: mediumDate) + ', ' + (nextInvoice.amount | currency:'$')) : '-'}}
+
+
+
+
+
+ Details +
+ Loading... +
+
+ + + + + + + +
+ {{item.name}} {{item.qty > 1 ? '×' + item.qty : ''}} + @ {{item.amount | currency:'$'}} /{{item.interval}} + {{(item.qty * item.amount) | currency:'$'}} /{{item.interval}}
+
+
+
+
+
+ + + +
+
+
+
+

User Seats

+
+
+
+ Loading... +
+
+ You plan currently has a total of {{plan.seats}} seats. +
+
+
+ + +
+
+
+
+

Payment Method

+
+
+
+ Loading... +
+
+ No payment method on file. +
+
+ + {{paymentSource.description}} +
+
+
+ +
+
+
+
+

Charges

+
+
+
+ Loading... +
+
+ No charges. +
+
+ + + + + + + + + +
+ {{charge.date | date: format: mediumDate}} + + {{charge.paymentSource}} + + {{charge.status}} + + {{charge.amount | currency:'$'}} +
+
+
+
+ Note: Any charges will appears on your credit card statement as BITWARDEN. +
+
+ diff --git a/app/organization/views/organizationBillingAdjustSeats.html b/app/organization/views/organizationBillingAdjustSeats.html new file mode 100644 index 00000000..7913cba7 --- /dev/null +++ b/app/organization/views/organizationBillingAdjustSeats.html @@ -0,0 +1,46 @@ +
+ +

+ + {{add ? 'Add Seats' : 'Remove Seats'}} +

+
+ +
+
+

Note About Charges

+

+ Adding seats to your plan will result in adjustments to your billing totals and immediately charge your + payment method on file. The first charge will be prorated for the remainder of the current billing cycle. +

+
+
+

Note About Charges

+

+ Removing seats will result in adjustments to your billing totals that will be prorated as credits + to your next billing charge. +

+
+
+

Errors have occured

+
    +
  • {{e}}
    • +
+
+
+
+
+ + +
+
+
+
+
+ + +
+ diff --git a/app/organization/views/organizationBillingChangePayment.html b/app/organization/views/organizationBillingChangePayment.html new file mode 100644 index 00000000..61317642 --- /dev/null +++ b/app/organization/views/organizationBillingChangePayment.html @@ -0,0 +1,364 @@ +
+ +

+ + {{existingPaymentMethod ? 'Change Payment Method' : 'Add Payment Method'}} +

+
+
+
+
+

Errors have occured

+
    +
  • {{e}}
    • +
+
+
+
+
+ + +
+
+
+
    +
    • +
    • +
    • +
    • +
    • +
    • +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+ + +
+
diff --git a/app/organization/views/organizationBillingChangePlan.html b/app/organization/views/organizationBillingChangePlan.html new file mode 100644 index 00000000..60c8e926 --- /dev/null +++ b/app/organization/views/organizationBillingChangePlan.html @@ -0,0 +1,13 @@ +
+ +

Change Plan

+
+
+
+ Coming soon. In the meantime, please contact us + if you would like to change your plan. +
+
+ +
+
diff --git a/app/organization/views/organizationCollections.html b/app/organization/views/organizationCollections.html new file mode 100644 index 00000000..4ae2033a --- /dev/null +++ b/app/organization/views/organizationCollections.html @@ -0,0 +1,75 @@ +
+

+ Collections + control what you share +

+
+
+
+
+   + +
+ +
+
+
+
+ Loading... +
+
+ No collections to list. +
+
+

There are no collections yet for your organization.

+ +
+
+ + + + + + + +
+
+ + +
+ 		+ + {{collection.name}} + +
+
+
+
+
diff --git a/app/organization/views/organizationCollectionsAdd.html b/app/organization/views/organizationCollectionsAdd.html new file mode 100644 index 00000000..d0537d3c --- /dev/null +++ b/app/organization/views/organizationCollectionsAdd.html @@ -0,0 +1,34 @@ +
+ +

Add New Collection

+
+
+
+
+

Errors have occured

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

Note

+

+ After creating the collection, you can associate a user to it by selecting a specific user on the "People" page. +

+

+ You can associate new logins to the collection from your organization's "Vault" or by sharing an existing + login from "My vault". +

+
+
+
+ + +
+
diff --git a/app/organization/views/organizationCollectionsEdit.html b/app/organization/views/organizationCollectionsEdit.html new file mode 100644 index 00000000..3a763420 --- /dev/null +++ b/app/organization/views/organizationCollectionsEdit.html @@ -0,0 +1,35 @@ +
+ +

Edit Collection

+
+
+
+
+

Errors have occured

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

Note

+

+ Select "Users" from the listing options to manage existing users for this collection. Associate new users by + editing the user's access on the "People" page. +

+

+ You can associate new logins to the collection from your organization's "Vault" or by sharing an existing + login from "My vault". +

+
+
+
+ + +
+
diff --git a/app/tools/views/toolsAudits.html b/app/organization/views/organizationCollectionsGroups.html similarity index 65% rename from app/tools/views/toolsAudits.html rename to app/organization/views/organizationCollectionsGroups.html index 7c1b284d..0d5b5d88 100644 --- a/app/tools/views/toolsAudits.html +++ b/app/organization/views/organizationCollectionsGroups.html @@ -1,9 +1,9 @@
- +

Groups {{collection.name}}

- Coming soon... + Groups are coming soon to bitwarden Enterprise organizations.
diff --git a/app/organization/views/organizationCollectionsUsers.html b/app/organization/views/organizationCollectionsUsers.html new file mode 100644 index 00000000..681a5d18 --- /dev/null +++ b/app/organization/views/organizationCollectionsUsers.html @@ -0,0 +1,64 @@ +
+ +

User Access {{collection.name}}

+
+
+
+ Loading... +
+
+

+ No users for this collection. You can associate a new user to this collection by + selecting a specific user on the "People" page. +

+
+
+ + + + + + + + + + + +
+
+ + +
+ 		+ + + {{user.email}} +
{{user.name}}
+ 		+ + + + {{user.type | enumName: 'OrgUserType'}} + + + {{user.status | enumName: 'OrgUserStatus'}} + +
+
+
+
+ +
diff --git a/app/organization/views/organizationDashboard.html b/app/organization/views/organizationDashboard.html new file mode 100644 index 00000000..843d3659 --- /dev/null +++ b/app/organization/views/organizationDashboard.html @@ -0,0 +1,32 @@ +
+

+ Dashboard + {{orgProfile.name}} +

+
+
+
+

Organization Disabled

+

+ This organization is currently disabled. Users will not see your shared logins or collections. + Contact us if you would like to reinstate this organization. +

+ + Contact Us + +
+
+
+

Let's Get Started!

+
+
+

Dashboard features are coming soon. Get started by inviting users and creating your collections.

+ + Invite Users + + + Manage Collections + +
+
+
diff --git a/app/organization/views/organizationDelete.html b/app/organization/views/organizationDelete.html new file mode 100644 index 00000000..2a41f232 --- /dev/null +++ b/app/organization/views/organizationDelete.html @@ -0,0 +1,34 @@ +
+ +

Delete Organization

+
+
+
+

+ Continue below to delete this organization and all associated data. This data includes any collections and + their associated logins. Individual user accounts will remain, though they will not be associated to this + organization anymore. +

+
+

Warning

+ Deleting this organization is permanent. It cannot be undone. +
+
+

Errors have occured

+
    +
  • {{e}}
    • +
+
+
+ + +
+
+
+ + +
+
diff --git a/app/organization/views/organizationGroups.html b/app/organization/views/organizationGroups.html new file mode 100644 index 00000000..6d56307f --- /dev/null +++ b/app/organization/views/organizationGroups.html @@ -0,0 +1,16 @@ +
+

+ Groups + organize your users +

+
+
+
+
+

Coming soon...

+
+
+

Groups are coming soon to bitwarden Enterprise organizations.

+
+
+
diff --git a/app/organization/views/organizationPeople.html b/app/organization/views/organizationPeople.html new file mode 100644 index 00000000..04a9a7c8 --- /dev/null +++ b/app/organization/views/organizationPeople.html @@ -0,0 +1,85 @@ +
+

+ People + users for your organization +

+
+
+
+
+   + +
+ +
+
+
+
+ Loading... +
+
+ + + + + + + + + + +
+
+ + +
+ 		+ + + {{user.email}} + +
{{user.name}}
+ 		+ {{user.type | enumName: 'OrgUserType'}} + + + {{user.status | enumName: 'OrgUserStatus'}} + +
+
+
+
+
diff --git a/app/organization/views/organizationPeopleEdit.html b/app/organization/views/organizationPeopleEdit.html new file mode 100644 index 00000000..570a7435 --- /dev/null +++ b/app/organization/views/organizationPeopleEdit.html @@ -0,0 +1,101 @@ +
+ +

Edit User {{email}}

+
+
+
+
+

Errors have occured

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

User Type

+
+
+ +
+
+ +
+
+ +
+
+

Access

+
+ +
+
+ +
+
+
+ Loading collections... +
+
+

No collections for your organization.

+
+
+ + + + + + + + + + + + + + + +
+ + NameRead Only
+ + + {{collection.name}} + + +
+
+
+
+
+ + +
+
diff --git a/app/organization/views/organizationPeopleInvite.html b/app/organization/views/organizationPeopleInvite.html new file mode 100644 index 00000000..ba24e301 --- /dev/null +++ b/app/organization/views/organizationPeopleInvite.html @@ -0,0 +1,109 @@ +
+ +

Invite User

+
+
+
+

+ Invite a new user to your organization by entering their bitwarden account email address below. If they do not have + a bitwarden account already, they will be prompted to create a new account. +

+
+

Errors have occured

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

User Type

+
+
+ +
+
+ +
+
+ +
+
+

Access

+
+ +
+
+ +
+
+
+ Loading collections... +
+
+

No collections for your organization.

+
+
+ + + + + + + + + + + + + + + +
+ + NameRead Only
+ + + {{collection.name}} + + +
+
+
+
+
+ + +
+
diff --git a/app/organization/views/organizationSettings.html b/app/organization/views/organizationSettings.html new file mode 100644 index 00000000..629bd986 --- /dev/null +++ b/app/organization/views/organizationSettings.html @@ -0,0 +1,65 @@ +
+

+ Settings + manage your organization +

+
+
+
+
+

General

+
+
+
+
+
+
+

Errors have occured

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

Danger Zone

+
+
+ Careful, these actions are not reversible! +
+
+ +
+
+
diff --git a/app/organization/views/organizationVault.html b/app/organization/views/organizationVault.html new file mode 100644 index 00000000..2fecfe60 --- /dev/null +++ b/app/organization/views/organizationVault.html @@ -0,0 +1,78 @@ +
+

+ Org Vault + + , + + +

+
+
+

Loading...

+
+
+

+ + {{collection.name}} + +

+
+ +
+
+
+
No logins in this collection.
+
No unassigned logins.
+
+ + + + + + + +
+
+ + +
+ 		+ {{login.name}} +
{{login.username}}
+
+
+
+
+
diff --git a/app/organization/views/organizationVaultLoginCollections.html b/app/organization/views/organizationVaultLoginCollections.html new file mode 100644 index 00000000..bbb60506 --- /dev/null +++ b/app/organization/views/organizationVaultLoginCollections.html @@ -0,0 +1,52 @@ +
+ +

Collections {{cipher.name}}

+
+
+
+

Edit the collections that this login is being shared with.

+
+

Errors have occured

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

There are no collections yet for your organization.

+
+
+ + + + + + + + + + + + + +
+ + Name
+ + + {{collection.name}} +
+
+
+
+ + +
+
\ No newline at end of file diff --git a/app/settings/views/settings.html b/app/settings/views/settings.html index f910842a..d53d1029 100644 --- a/app/settings/views/settings.html +++ b/app/settings/views/settings.html @@ -36,12 +36,9 @@
- - User Image - - Update Photo +
@@ -109,6 +106,41 @@ +
+
+

Organizations

+
+
+ No organizations yet for your account. +
+
+
+
+ + +
+ + + {{org.name}} + DISABLED + +
+
+
+ + Create an Organization + +
+

Danger Zone

diff --git a/app/settings/views/settingsCreateOrganization.html b/app/settings/views/settingsCreateOrganization.html new file mode 100644 index 00000000..6436964a --- /dev/null +++ b/app/settings/views/settingsCreateOrganization.html @@ -0,0 +1,535 @@ +
+

Create Organization

+
+
+

+ Organizations allow you to share parts of your vault with others as well as manage related users + for a specific entity (such as a family, small team, or large company). +

+
+
+
+

General Information

+
+
+
+

Errors have occured

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

Choose Your Plan

+
+
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+
+
+

Additional Users (Seats)

+
+
+

+ Your plan comes with {{plans[model.plan].baseSeats}} users (seats). You can add additional users + + (up to {{plans[model.plan].maxAdditionalSeats}} more) + + for {{plans[model.plan].seatPrice | currency:'$'}} per user /month. +

+
+
+
+ + +
+
+
+
+
+
+
+

Billing Summary

+
+
+
+ +
+
+ +
+
+
+

+ Total: + {{totalPrice() | currency:"USD $":2}} /{{model.interval}} +

+ Your plan comes with a free 7 day trial. Your card will not be charged until the trial has ended. + You may cancel at any time. +
+
+
+
+

Payment Information

+
+
+
+
+
+ + +
+
+
+ +
    +
    • +
    • +
    • +
    • +
    • +
    • +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+ +
+
+
+
diff --git a/app/settings/views/settingsDomains.html b/app/settings/views/settingsDomains.html index f2dc816a..b40f8d72 100644 --- a/app/settings/views/settingsDomains.html +++ b/app/settings/views/settingsDomains.html @@ -9,25 +9,36 @@
-

Custom Equivalent Domains

-
-
- +
- @@ -51,28 +62,40 @@
-

Global Equivalent Domains

+

Global

-
- - + +
+ + +
{{customDomain}}
+
- - + diff --git a/app/settings/views/settingsTwoFactor.html b/app/settings/views/settingsTwoFactor.html index 010dd672..67389751 100644 --- a/app/settings/views/settingsTwoFactor.html +++ b/app/settings/views/settingsTwoFactor.html @@ -2,9 +2,13 @@ - +
-

Two-step log in is already enabled on your account. To access your two-step settings 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

@@ -14,7 +18,8 @@
- +
@@ -24,10 +29,17 @@
- +
-

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

+
+

Enabled

+

+ Two-step log in is enabled on your account. Incase you need to add it to another device, below is the QR + code (or key) required by your verification app. +

+

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

@@ -35,10 +47,29 @@

1. Download a two-step verification app

+

These apps are recommended, however, other authenticator apps will also work.

2. Scan this QR code with your verification app

@@ -46,7 +77,10 @@

QR

-

Can't scan the code? You can add the code to your application manually using the following details:

+

+ Can't scan the code? You can add the code to your application manually using the + following details: +

  • Key: {{twoFactorModel.key}}
  • Account: {{account}}
    • @@ -56,12 +90,12 @@
-
+

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. + 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

  • {{e}}
-
-

Want to disable? 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 log in, 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. +

-
-
-
-
-

Export

-
-
- Export all of your vault data in .csv format. -
-
@@ -36,12 +29,4 @@ Password generator is currently available in all other client applications. Coming soon to the web vault! -
-
-

Audits

-
-
- Coming soon! -
-
diff --git a/app/tools/views/toolsImport.html b/app/tools/views/toolsImport.html index af39fe68..e5474021 100644 --- a/app/tools/views/toolsImport.html +++ b/app/tools/views/toolsImport.html @@ -2,21 +2,33 @@ - +
+
+

Errors have occured

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

{{source.name}} Instructions

- + +
+
+ +
diff --git a/app/vault/views/vault.html b/app/vault/views/vault.html index efb587bc..94d891aa 100644 --- a/app/vault/views/vault.html +++ b/app/vault/views/vault.html @@ -1,56 +1,177 @@

My Vault - {{folders.length > 0 ? folders.length - 1 : 0}} folders, {{logins.length}} logins + + , + +

-
+

Loading...

-
+
-

{{folder.name}} {{folderLogins.length}} logins

-
- + +
+ - - -
+
+
+
+

No favorite logins.

+ +
+
+
- - - + +
+ + +
{{globalDomain.domains}}{{::globalDomain.domains}}
+ + + + + + +
+
+ + +
+ 		+ {{login.name}} + +
{{login.username}}
+
+
+
+
+
+
+

+ + {{folder.name}} + +

+
+
+ + +
+
-
-

Loading logins...

-
-
+

No logins in this folder.

- - - - - - - - +
NameUsername
- - + + - -
- - +
+
+ + +
+ 		+ {{login.name}} + + +
{{login.username}}
{{login.name}} {{login.username}}
diff --git a/app/vault/views/vaultAddLogin.html b/app/vault/views/vaultAddLogin.html index 389c6e96..1c0b3749 100644 --- a/app/vault/views/vaultAddLogin.html +++ b/app/vault/views/vaultAddLogin.html @@ -17,7 +17,7 @@
-
+
-
+