diff --git a/app/organization/views/organizationBilling.html b/app/organization/views/organizationBilling.html index b479e7c9..31fe781c 100644 --- a/app/organization/views/organizationBilling.html +++ b/app/organization/views/organizationBilling.html @@ -201,6 +201,11 @@ + diff --git a/app/organization/views/organizationSettings.html b/app/organization/views/organizationSettings.html index 6688302b..45d66ef2 100644 --- a/app/organization/views/organizationSettings.html +++ b/app/organization/views/organizationSettings.html @@ -25,15 +25,28 @@ +
+ + +
-
- - +
+
+ Tax Information +
{{model.businessAddress1}}
+
{{model.businessAddress2}}
+
{{model.businessAddress3}}
+
{{model.businessCountry}}
+
{{model.businessTaxNumber}}
+

+ Please contact support + to provide (or update) tax information for your invoices. +

diff --git a/app/organization/views/organizationVault.html b/app/organization/views/organizationVault.html index 4a0d81d2..05817682 100644 --- a/app/organization/views/organizationVault.html +++ b/app/organization/views/organizationVault.html @@ -5,7 +5,7 @@ , - + @@ -13,12 +13,12 @@

Loading...

+ ng-show="collections.length && (!main.searchVaultText || collectionCiphers.length)">

{{collection.name}} - +

-
-
No logins in this collection.
-
No unassigned logins.
-
+
+
No items in this collection.
+
No unassigned items.
+
+ + + + {{charge.date | date: 'mediumDate'}}
- + + diff --git a/app/organization/views/organizationVaultLoginCollections.html b/app/organization/views/organizationVaultCipherCollections.html similarity index 96% rename from app/organization/views/organizationVaultLoginCollections.html rename to app/organization/views/organizationVaultCipherCollections.html index f14c78a3..b251cbb4 100644 --- a/app/organization/views/organizationVaultLoginCollections.html +++ b/app/organization/views/organizationVaultCipherCollections.html @@ -4,7 +4,7 @@
-

Edit the collections that this login is being shared with.

+

Edit the collections that this item is being shared with.

Errors have occurred

+
+
+

Web Vault Options

+
+
+
+
+ +

Website Icons provide a recognizable image next to each login item in your vault.

+
+
+
+ +
+ +

Organizations

@@ -129,10 +150,13 @@ Careful, these actions are not reversible!
- - +
diff --git a/app/settings/views/settingsPurge.html b/app/settings/views/settingsPurge.html new file mode 100644 index 00000000..e2e1165d --- /dev/null +++ b/app/settings/views/settingsPurge.html @@ -0,0 +1,33 @@ +
+ +

Purge Vault

+
+
+
+

+ Continue below to delete all items in your vault. Items that belong to an organization that you share + with will not be deleted. +

+
+

Warning

+ Purging your vault is permanent. It cannot be undone. +
+
+

Errors have occurred

+
    +
  • {{e}}
    • +
+
+
+ + +
+
+
+ + +
+ diff --git a/app/vault/views/vault.html b/app/vault/views/vault.html index b20652cb..07a19536 100644 --- a/app/vault/views/vault.html +++ b/app/vault/views/vault.html @@ -30,7 +30,7 @@ , - + @@ -39,12 +39,12 @@

Loading...

+ ng-show="vaultFolders.length && folderIdFilter === undefined && (!main.searchVaultText || favoriteCiphers.length)">

Favorites - +

@@ -53,8 +53,8 @@ @@ -65,16 +65,16 @@
-
-
-

No favorite logins.

- +
+
+

No favorite items.

+
-
+
+ + + - {{login.name}} -
{{login.username}}
+ {{cipher.name}} + +
{{cipher.subTitle}}
- + - + @@ -134,12 +139,12 @@
+ ng-show="vaultFolders.length && (!main.searchVaultText || folderCiphers.length)">

{{folder.name}} - +

@@ -148,8 +153,8 @@
-
-
-

No logins in this folder.

- +
+
+

No items in this folder.

+
-
+
- + + + + + - {{login.name}} - {{cipher.name}} + -
- {{login.username}} + {{cipher.subTitle}}
- + + @@ -254,19 +264,53 @@ +

+ Types +

+
+ +

Folders

Loading...

- +
+ +
diff --git a/app/vault/views/vaultAddCipher.html b/app/vault/views/vaultAddCipher.html new file mode 100644 index 00000000..a59632e0 --- /dev/null +++ b/app/vault/views/vaultAddCipher.html @@ -0,0 +1,583 @@ +
+ +

Add New Item

+
+ +
+
+

Errors have occurred

+ +
+
+
+
+ + +
+
+
+
+
+
+ * + +
+
+
+
+ + +
+
+
+ +
+
+ +
+ + + + + + + +
+
+
+
+
+ +
+ + + + +
+
+
+
+
+
+ + +
+ +
+ + + + +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ + + {{fromOrg ? 'UPGRADE' : 'PREMIUM'}} + +
+
+
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+ +
+ + + + +
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+ +
+ + + + +
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+ +
+ + + + +
+
+
+
+
+ +
+ + + + +
+
+
+
+
+ +
+ + + + +
+
+
+
+
+
+
+ +
+ + + + +
+
+
+
+
+ +
+ + + + +
+
+
+
+
+
+
+ +
+ + + + +
+
+
+
+
+ +
+ + + + +
+
+
+
+
+ +
+ + + + +
+
+
+
+
+
+
+ +
+ + + + +
+
+
+
+
+ +
+ + + + +
+
+
+
+
+
+
+ +
+ + + + +
+
+
+
+
+ +
+ + + + +
+
+
+
+
+
+
+ +
+ + + + +
+
+
+
+
+ +
+ + + + +
+
+
+
+
+
+
+ +
+ + + + +
+
+
+
+
+ +
+ + + + +
+
+
+
+
+
+
+ +
+ + + + +
+
+
+
+
+
+ +
+ +
+ + +
+
+

Custom Fields

+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+ +
+ +
+ + + + +
+
+ +
+
+
+
+ + + + Remove Custom Field + +
+
+
+
+ + New Custom Field + +
+
+ + + +
+ diff --git a/app/vault/views/vaultAddLogin.html b/app/vault/views/vaultAddLogin.html deleted file mode 100644 index 176c41f1..00000000 --- a/app/vault/views/vaultAddLogin.html +++ /dev/null @@ -1,171 +0,0 @@ -
- - -
- -
-
-

Errors have occurred

- -
-
-
-
- * - -
-
-
-
- - -
-
-
-
- -
- - - - -
-
-
-
-
- -
- - - - -
-
-
-
-
-
- - -
- -
- - - - - -
-
-
-
-
-
-
-
- - -
-
-
-
-
- - {{fromOrg ? 'UPGRADE' : 'PREMIUM'}} -
-
-
-
- - -
-
-

Custom Fields

-
-
-
-
- - -
-
-
-
- - -
-
-
-
-
- -
- -
- - - - -
-
- -
-
-
-
- - - - Remove Custom Field - -
-
-
-
- - New Custom Field - -
-
- - - -
- diff --git a/app/vault/views/vaultAttachments.html b/app/vault/views/vaultAttachments.html index 623ecafb..e05648eb 100644 --- a/app/vault/views/vaultAttachments.html +++ b/app/vault/views/vaultAttachments.html @@ -1,7 +1,7 @@

- Secure Attachments {{login.name}} + Secure Attachments {{cipher.name}}

@@ -9,13 +9,13 @@
Loading...
-
- There are no attachments for this login. +
+ There are no attachments for this item.
-
+
- + + + + - {{login.name}} - - {{cipher.name}} + + -
- {{login.username}} + {{cipher.subTitle}}
- +
-

Collections {{login.name}}

+

Collections {{cipher.name}}

-

Edit the collections that this login is being shared with.

+

Edit the collections that this item is being shared with.

Errors have occurred

    diff --git a/app/vault/views/vaultEditCipher.html b/app/vault/views/vaultEditCipher.html new file mode 100644 index 00000000..1e206336 --- /dev/null +++ b/app/vault/views/vaultEditCipher.html @@ -0,0 +1,584 @@ +
    + +

    + Item Information {{cipher.name}} +

    +
    + +
    +
    +

    Errors have occurred

    +
      +
    • {{e}}
      • +
    +
    +
    +
    +
    + * + +
    +
    +
    +
    + + +
    +
    +
    + +
    +
    + +
    + + + + + + + +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    +
    + + +
    + +
    + + + + +
    +
    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + {{fromOrg ? 'UPGRADE' : 'PREMIUM'}} + +
    +
    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    +
    + +
    + +
    + + +
    +
    +
    +

    Custom Fields

    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + +
    + +
    + + + + +
    +
    + +
    +
    +
    +
    + + + + Remove Custom Field + +
    +
    +
    +
    + + New Custom Field + +
    +
    + + + + +
    + diff --git a/app/vault/views/vaultEditLogin.html b/app/vault/views/vaultEditLogin.html deleted file mode 100644 index b7ed3de1..00000000 --- a/app/vault/views/vaultEditLogin.html +++ /dev/null @@ -1,192 +0,0 @@ -
    - - -
    -
    -
    -
    -

    Errors have occurred

    -
      -
    • {{e}}
      • -
    -
    -
    -
    -
    - * - -
    -
    -
    -
    - - -
    -
    -
    -
    - -
    - - - - - - - -
    -
    -
    -
    -
    - -
    - - - - -
    -
    -
    -
    -
    -
    - - -
    - -
    - - - - -
    -
    -
    -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -
    - - {{fromOrg ? 'UPGRADE' : 'PREMIUM'}} -
    -
    -
    -
    - - -
    -
    -
    -

    Custom Fields

    -
    -
    -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    -
    - -
    - -
    - - - - -
    -
    - -
    -
    -
    -
    - - - - Remove Custom Field - -
    -
    -
    -
    - - New Custom Field - -
    -
    - - - - -
    -
    diff --git a/app/vault/views/vaultMoveLogins.html b/app/vault/views/vaultMoveCiphers.html similarity index 90% rename from app/vault/views/vaultMoveLogins.html rename to app/vault/views/vaultMoveCiphers.html index 224d4ee0..89bd3a96 100644 --- a/app/vault/views/vaultMoveLogins.html +++ b/app/vault/views/vaultMoveCiphers.html @@ -1,7 +1,7 @@

    - Move Logins + Move Items

    @@ -14,7 +14,7 @@

Select a folder that you would like to move the {{count}} selected - to. + to.

diff --git a/app/vault/views/vaultShareLogin.html b/app/vault/views/vaultShareCipher.html similarity index 95% rename from app/vault/views/vaultShareLogin.html rename to app/vault/views/vaultShareCipher.html index 592627a5..ae80cbb0 100644 --- a/app/vault/views/vaultShareLogin.html +++ b/app/vault/views/vaultShareCipher.html @@ -1,10 +1,10 @@
-

Share Login {{login.name}}

+

Share Item {{cipher.name}}

-

Choose an organization that you wish to share this login with.

+

Choose an organization that you wish to share this item with.

Errors have occurred