From ab6b70c63ec5b284425750b7954e4a37bc5f09db Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Sat, 20 May 2017 09:06:23 -0400 Subject: [PATCH] Update 2017-05-20T13:06:17.455Z --- app/accounts/views/accountsLoginInfo.html | 2 +- .../views/accountsLoginTwoFactor.html | 2 +- app/accounts/views/accountsPasswordHint.html | 2 +- app/accounts/views/accountsRecover.html | 2 +- app/accounts/views/accountsRegister.html | 2 +- .../views/organizationBillingAdjustSeats.html | 2 +- .../organizationBillingChangePayment.html | 2 +- .../views/organizationBillingChangePlan.html | 5 +- .../views/organizationCollections.html | 5 - .../views/organizationCollectionsAdd.html | 69 ++++++++++++-- .../views/organizationCollectionsEdit.html | 69 ++++++++++++-- .../views/organizationCollectionsGroups.html | 10 -- .../views/organizationCollectionsUsers.html | 4 +- .../views/organizationDelete.html | 2 +- .../views/organizationGroups.html | 60 +++++++++++- .../views/organizationGroupsAdd.html | 95 +++++++++++++++++++ .../views/organizationGroupsEdit.html | 95 +++++++++++++++++++ .../views/organizationGroupsUsers.html | 55 +++++++++++ .../views/organizationPeople.html | 9 +- .../views/organizationPeopleEdit.html | 2 +- .../views/organizationPeopleGroups.html | 55 +++++++++++ .../views/organizationPeopleInvite.html | 7 +- .../views/organizationSettings.html | 2 +- .../organizationVaultLoginCollections.html | 2 +- app/settings/views/settings.html | 4 +- .../settingsAddEditEquivalentDomain.html | 2 +- app/settings/views/settingsChangeEmail.html | 2 +- .../views/settingsChangePassword.html | 2 +- .../views/settingsCreateOrganization.html | 63 +++++++++--- app/settings/views/settingsDelete.html | 2 +- app/settings/views/settingsSessions.html | 2 +- app/settings/views/settingsTwoFactor.html | 4 +- app/tools/views/toolsExport.html | 2 +- app/tools/views/toolsImport.html | 8 +- app/vault/views/vault.html | 8 +- app/vault/views/vaultAddFolder.html | 2 +- app/vault/views/vaultAddLogin.html | 2 +- app/vault/views/vaultEditFolder.html | 2 +- app/vault/views/vaultEditLogin.html | 2 +- app/vault/views/vaultLoginCollections.html | 2 +- app/vault/views/vaultShareLogin.html | 2 +- app/views/organizationLayout.html | 9 +- css/vault.min.css | 2 +- index.html | 16 ++-- js/app.min.js | 10 +- 45 files changed, 602 insertions(+), 106 deletions(-) delete mode 100644 app/organization/views/organizationCollectionsGroups.html create mode 100644 app/organization/views/organizationGroupsAdd.html create mode 100644 app/organization/views/organizationGroupsEdit.html create mode 100644 app/organization/views/organizationGroupsUsers.html create mode 100644 app/organization/views/organizationPeopleGroups.html diff --git a/app/accounts/views/accountsLoginInfo.html b/app/accounts/views/accountsLoginInfo.html index cef70feb..0aab7905 100644 --- a/app/accounts/views/accountsLoginInfo.html +++ b/app/accounts/views/accountsLoginInfo.html @@ -1,7 +1,7 @@

Log in to access your vault.

-

Errors have occured

+

Errors have occurred

  • {{e}}
diff --git a/app/accounts/views/accountsLoginTwoFactor.html b/app/accounts/views/accountsLoginTwoFactor.html index 7c31a106..0e332841 100644 --- a/app/accounts/views/accountsLoginTwoFactor.html +++ b/app/accounts/views/accountsLoginTwoFactor.html @@ -1,7 +1,7 @@
-

Errors have occured

+

Errors have occurred

  • {{e}}
diff --git a/app/accounts/views/accountsPasswordHint.html b/app/accounts/views/accountsPasswordHint.html index 7837a4d5..87b9757d 100644 --- a/app/accounts/views/accountsPasswordHint.html +++ b/app/accounts/views/accountsPasswordHint.html @@ -13,7 +13,7 @@
-

Errors have occured

+

Errors have occurred

  • {{e}}
diff --git a/app/accounts/views/accountsRecover.html b/app/accounts/views/accountsRecover.html index 3cf9d872..fea84739 100644 --- a/app/accounts/views/accountsRecover.html +++ b/app/accounts/views/accountsRecover.html @@ -13,7 +13,7 @@
-

Errors have occured

+

Errors have occurred

  • {{e}}
diff --git a/app/accounts/views/accountsRegister.html b/app/accounts/views/accountsRegister.html index 9dfae0a6..584a67a7 100644 --- a/app/accounts/views/accountsRegister.html +++ b/app/accounts/views/accountsRegister.html @@ -18,7 +18,7 @@

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

-

Errors have occured

+

Errors have occurred

  • {{e}}
diff --git a/app/organization/views/organizationBillingAdjustSeats.html b/app/organization/views/organizationBillingAdjustSeats.html index 7913cba7..5afc85ab 100644 --- a/app/organization/views/organizationBillingAdjustSeats.html +++ b/app/organization/views/organizationBillingAdjustSeats.html @@ -22,7 +22,7 @@

-

Errors have occured

+

Errors have occurred

  • {{e}}
diff --git a/app/organization/views/organizationBillingChangePayment.html b/app/organization/views/organizationBillingChangePayment.html index 61317642..331787a4 100644 --- a/app/organization/views/organizationBillingChangePayment.html +++ b/app/organization/views/organizationBillingChangePayment.html @@ -8,7 +8,7 @@
-

Errors have occured

+

Errors have occurred

  • {{e}}
diff --git a/app/organization/views/organizationBillingChangePlan.html b/app/organization/views/organizationBillingChangePlan.html index 60c8e926..4c741a1e 100644 --- a/app/organization/views/organizationBillingChangePlan.html +++ b/app/organization/views/organizationBillingChangePlan.html @@ -4,8 +4,9 @@
- Coming soon. In the meantime, please contact us - if you would like to change your plan. + You can contact us + if you would like to change your plan. Please ensure that you have an active payment + method on file.
diff --git a/app/organization/views/organizationCollections.html b/app/organization/views/organizationCollections.html index 4ae2033a..d53fe4a3 100644 --- a/app/organization/views/organizationCollections.html +++ b/app/organization/views/organizationCollections.html @@ -48,11 +48,6 @@ Users -
  • - - Groups - -
  • Delete diff --git a/app/organization/views/organizationCollectionsAdd.html b/app/organization/views/organizationCollectionsAdd.html index d0537d3c..b574cf6e 100644 --- a/app/organization/views/organizationCollectionsAdd.html +++ b/app/organization/views/organizationCollectionsAdd.html @@ -4,16 +4,6 @@
    • -
    -

    Errors have occured

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

    Note

    @@ -24,6 +14,65 @@ login from "My vault".

    +
    +

    Errors have occurred

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

    Group Access

    +
    + Loading groups... +
    +
    +

    No groups for your organization.

    +
    +
    + + + + + + + + + + + + + + + +
    + + NameRead Only
    + + + {{group.name}} + + + +
    +
    +
    -
    -

    Errors have occured

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

    Note

    @@ -25,6 +15,65 @@ login from "My vault".

    +
    +

    Errors have occurred

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

    Group Access

    +
    + Loading groups... +
    +
    +

    No groups for your organization.

    +
    +
    + + + + + + + + + + + + + + + +
    + + NameRead Only
    + + + {{group.name}} + + + +
    +
    +
    -

    Groups {{collection.name}}

    -
    -
    - Groups are coming soon to bitwarden Enterprise organizations. -
    -
    - -
    diff --git a/app/organization/views/organizationCollectionsUsers.html b/app/organization/views/organizationCollectionsUsers.html index 681a5d18..5ff99e1b 100644 --- a/app/organization/views/organizationCollectionsUsers.html +++ b/app/organization/views/organizationCollectionsUsers.html @@ -22,12 +22,12 @@
      -
    • +
    • Remove
      • -
    • +
    • No options... diff --git a/app/organization/views/organizationDelete.html b/app/organization/views/organizationDelete.html index 2a41f232..8183a112 100644 --- a/app/organization/views/organizationDelete.html +++ b/app/organization/views/organizationDelete.html @@ -14,7 +14,7 @@ Deleting this organization is permanent. It cannot be undone.
    -

    Errors have occured

    +

    Errors have occurred

    • {{e}}
    diff --git a/app/organization/views/organizationGroups.html b/app/organization/views/organizationGroups.html index 6d56307f..ac0daec0 100644 --- a/app/organization/views/organizationGroups.html +++ b/app/organization/views/organizationGroups.html @@ -7,10 +7,64 @@
    -

    Coming soon...

    +   + +
    + +
    -
    -

    Groups are coming soon to bitwarden Enterprise organizations.

    +
    +
    + Loading... +
    +
    + No groups to list. +
    +
    +

    There are no groups yet for your organization.

    + +
    +
    + + + + + + + +
    +
    + + +
    +     		+ + {{group.name}} + +
    +
    diff --git a/app/organization/views/organizationGroupsAdd.html b/app/organization/views/organizationGroupsAdd.html new file mode 100644 index 00000000..8231b294 --- /dev/null +++ b/app/organization/views/organizationGroupsAdd.html @@ -0,0 +1,95 @@ +
    + +

    Add New Group

    +
    + +
    +
    +

    Note

    +

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

    +
    +
    +

    Errors have occurred

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

    Access

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

    No collections for your organization.

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

    Edit Group

    +
    +
    +
    +
    +

    Note

    +

    + Select "Users" from the listing options to manage existing users for this group. Associate new users by + selecting "Groups" the "People" page for a specific user. +

    +
    +
    +

    Errors have occurred

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

    Access

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

    No collections for your organization.

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

    User Access {{group.name}}

    +
    +
    +
    + Loading... +
    +
    +

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

    +
    +
    + + + + + + + + + + +
    +
    + + +
    +     		+ + + {{user.email}} +
    {{user.name}}
    +     		+ {{user.type | enumName: 'OrgUserType'}} + + + {{user.status | enumName: 'OrgUserStatus'}} + +
    +
    +
    +
    + +
    diff --git a/app/organization/views/organizationPeople.html b/app/organization/views/organizationPeople.html index 04a9a7c8..b4fba999 100644 --- a/app/organization/views/organizationPeople.html +++ b/app/organization/views/organizationPeople.html @@ -37,10 +37,15 @@