diff --git a/README.md b/README.md index a2ed65117a..3f1fbe9891 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ [![appveyor build](https://ci.appveyor.com/api/projects/status/github/bitwarden/web?branch=master&svg=true)](https://ci.appveyor.com/project/bitwarden/web) [![DockerHub](https://img.shields.io/docker/pulls/bitwarden/web.svg)](https://hub.docker.com/u/bitwarden/) [![Join the chat at https://gitter.im/bitwarden/Lobby](https://badges.gitter.im/bitwarden/Lobby.svg)](https://gitter.im/bitwarden/Lobby) -# bitwarden Web +# Bitwarden Web Vault -The bitwarden Web project is an AngularJS application that powers the web vault (https://vault.bitwarden.com/). +The Bitwarden web project is an AngularJS application that powers the web vault (https://vault.bitwarden.com/). diff --git a/src/app/accounts/views/accountsOrganizationAccept.html b/src/app/accounts/views/accountsOrganizationAccept.html index ae151ddfa1..d66e6068ea 100644 --- a/src/app/accounts/views/accountsOrganizationAccept.html +++ b/src/app/accounts/views/accountsOrganizationAccept.html @@ -14,7 +14,7 @@

{{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. + To accept the invitation, you need to log in or create a new Bitwarden account.

diff --git a/src/app/accounts/views/accountsRecoverDelete.html b/src/app/accounts/views/accountsRecoverDelete.html index 7e3ad4dc24..fb97049c87 100644 --- a/src/app/accounts/views/accountsRecoverDelete.html +++ b/src/app/accounts/views/accountsRecoverDelete.html @@ -3,7 +3,7 @@ bitwarden
-

Enter your email address below to recover & delete your bitwarden account.

+

Enter your email address below to recover & delete your Bitwarden account.

If your account exists ({{model.email}}) we've sent you an email with further instructions. diff --git a/src/app/accounts/views/accountsVerifyRecoverDelete.html b/src/app/accounts/views/accountsVerifyRecoverDelete.html index a4589b0b15..0821995c18 100644 --- a/src/app/accounts/views/accountsVerifyRecoverDelete.html +++ b/src/app/accounts/views/accountsVerifyRecoverDelete.html @@ -12,7 +12,7 @@ This will permanently delete your account. This cannot be undone.

- You have requested to delete your bitwarden account ({{email}}). + You have requested to delete your Bitwarden account ({{email}}). Click the button below to confirm and proceed.

diff --git a/src/app/directives/pageTitleDirective.js b/src/app/directives/pageTitleDirective.js index 78c7a05f1e..a5fc2bdd5e 100644 --- a/src/app/directives/pageTitleDirective.js +++ b/src/app/directives/pageTitleDirective.js @@ -6,7 +6,7 @@ angular link: function (scope, element) { var listener = function (event, toState, toParams, fromState, fromParams) { // Default title - var title = 'bitwarden Web Vault'; + var title = 'Bitwarden Web Vault'; if (toState.data && toState.data.pageTitle) { title = toState.data.pageTitle + ' - ' + title; } diff --git a/src/app/organization/organizationSettingsImportController.js b/src/app/organization/organizationSettingsImportController.js index 44e15be102..0c783446af 100644 --- a/src/app/organization/organizationSettingsImportController.js +++ b/src/app/organization/organizationSettingsImportController.js @@ -11,7 +11,7 @@ $scope.options = [ { id: 'bitwardencsv', - name: 'bitwarden (csv)', + name: 'Bitwarden (csv)', featured: true, sort: 1, instructions: $sce.trustAsHtml('Export using the web vault (vault.bitwarden.com). ' + diff --git a/src/app/organization/views/organizationPeopleInvite.html b/src/app/organization/views/organizationPeopleInvite.html index d78e3fdbaf..5541d8d676 100644 --- a/src/app/organization/views/organizationPeopleInvite.html +++ b/src/app/organization/views/organizationPeopleInvite.html @@ -5,8 +5,8 @@

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

diff --git a/src/app/settings/settingsTwoStepAuthenticatorController.js b/src/app/settings/settingsTwoStepAuthenticatorController.js index 0bedfc3d3b..18fcdf04e6 100644 --- a/src/app/settings/settingsTwoStepAuthenticatorController.js +++ b/src/app/settings/settingsTwoStepAuthenticatorController.js @@ -4,7 +4,7 @@ .controller('settingsTwoStepAuthenticatorController', function ($scope, apiService, $uibModalInstance, cryptoService, authService, $q, toastr, $analytics, constants, $timeout) { $analytics.eventTrack('settingsTwoStepAuthenticatorController', { category: 'Modal' }); - var _issuer = 'bitwarden', + var _issuer = 'Bitwarden', _profile = null, _masterPasswordHash, _key = null; diff --git a/src/app/settings/settingsTwoStepRecoverController.js b/src/app/settings/settingsTwoStepRecoverController.js index fa34bb0a02..4c2b4dd83f 100644 --- a/src/app/settings/settingsTwoStepRecoverController.js +++ b/src/app/settings/settingsTwoStepRecoverController.js @@ -28,7 +28,7 @@ $analytics.eventTrack('Print Recovery Code'); var w = window.open(); - w.document.write('

bitwarden two-step login recovery code:

' + + w.document.write('

Bitwarden two-step login recovery code:

' + '' + $scope.code + '' + '

' + new Date() + '

'); w.print(); diff --git a/src/app/settings/settingsUpdateKeyController.js b/src/app/settings/settingsUpdateKeyController.js index ef89443f05..5111460449 100644 --- a/src/app/settings/settingsUpdateKeyController.js +++ b/src/app/settings/settingsUpdateKeyController.js @@ -23,7 +23,7 @@ }, function (e) { throw e ? e : 'Error occurred.'; }).then(function () { - toastr.success('Please log back in. If you are using other bitwarden applications, ' + + toastr.success('Please log back in. If you are using other Bitwarden applications, ' + 'log out and back in to those as well.', 'Key Updated', { timeOut: 10000 }); }); }; diff --git a/src/app/settings/views/settingsDomains.html b/src/app/settings/views/settingsDomains.html index c092682297..9bfe501ce9 100644 --- a/src/app/settings/views/settingsDomains.html +++ b/src/app/settings/views/settingsDomains.html @@ -4,7 +4,7 @@

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. + "Global" domains are ones already created for you by Bitwarden.

diff --git a/src/app/settings/views/settingsTwoStep.html b/src/app/settings/views/settingsTwoStep.html index b1823dd4e9..799f6571e7 100644 --- a/src/app/settings/views/settingsTwoStep.html +++ b/src/app/settings/views/settingsTwoStep.html @@ -8,7 +8,7 @@
The recovery code allows you to access your account in the event that you can no longer use your normal - two-step login provider (ex. you lose your device). bitwarden support will not be able to assist you if you lose + two-step login provider (ex. you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place.
diff --git a/src/app/settings/views/settingsTwoStepDuo.html b/src/app/settings/views/settingsTwoStepDuo.html index 98bdc427ba..b93cbcd069 100644 --- a/src/app/settings/views/settingsTwoStepDuo.html +++ b/src/app/settings/views/settingsTwoStepDuo.html @@ -48,7 +48,7 @@
  • {{e}}
    • -

    Enter the bitwarden application information from your Duo Admin panel:

    +

    Enter the Bitwarden application information from your Duo Admin panel:

    Warning

    - Due to platform limitations, FIDO U2F cannot be used on all bitwarden applications. You should enable + Due to platform limitations, FIDO U2F cannot be used on all Bitwarden applications. You should enable another two-step login provider so that you can access your account when FIDO U2F cannot be used.

    Supported platforms:

    diff --git a/src/app/settings/views/settingsTwoStepYubi.html b/src/app/settings/views/settingsTwoStepYubi.html index 16feae1f88..d9e9200400 100644 --- a/src/app/settings/views/settingsTwoStepYubi.html +++ b/src/app/settings/views/settingsTwoStepYubi.html @@ -33,7 +33,7 @@

    Warning

    - Due to platform limitations, YubiKeys cannot be used on all bitwarden applications. You should enable + Due to platform limitations, YubiKeys cannot be used on all Bitwarden applications. You should enable another two-step login provider so that you can access your account when YubiKeys cannot be used.

    Supported platforms:

    diff --git a/src/app/settings/views/settingsUpdateKey.html b/src/app/settings/views/settingsUpdateKey.html index fb78e10c88..d72523f0e4 100644 --- a/src/app/settings/views/settingsUpdateKey.html +++ b/src/app/settings/views/settingsUpdateKey.html @@ -21,7 +21,7 @@

    Warning

    - After updating your encryption key, you are required to log out and back in to all bitwarden applications that you + After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however it may be delayed. diff --git a/src/app/tools/toolsImportController.js b/src/app/tools/toolsImportController.js index 5473a3bb45..f2e575ac37 100644 --- a/src/app/tools/toolsImportController.js +++ b/src/app/tools/toolsImportController.js @@ -11,7 +11,7 @@ $scope.options = [ { id: 'bitwardencsv', - name: 'bitwarden (csv)', + name: 'Bitwarden (csv)', featured: true, sort: 1, instructions: $sce.trustAsHtml('Export using the web vault (vault.bitwarden.com). ' + @@ -243,7 +243,7 @@ 'python script by Luke Plant to your desktop as pw_helper.py. Open terminal and run ' + 'chmod +rx Desktop/pw_helper.py and then ' + 'python Desktop/pw_helper.py export Desktop/my_passwords.json. Then upload ' + - 'the resulting my_passwords.json file here to bitwarden.') + 'the resulting my_passwords.json file here to Bitwarden.') } ]; diff --git a/src/app/vault/views/vaultShareCipher.html b/src/app/vault/views/vaultShareCipher.html index ae80cbb07b..99938443e2 100644 --- a/src/app/vault/views/vaultShareCipher.html +++ b/src/app/vault/views/vaultShareCipher.html @@ -14,7 +14,7 @@

    Loading...

    No Organizations

    -

    You do not belong to any organizations. Organizations allow you to share items with other bitwarden users.

    +

    You do not belong to any organizations. Organizations allow you to share items with other Bitwarden users.

    Create an Organization diff --git a/src/app/views/apps.html b/src/app/views/apps.html index f35c9e4364..6705ee8d57 100644 --- a/src/app/views/apps.html +++ b/src/app/views/apps.html @@ -33,6 +33,11 @@ Microsoft Edge +
  • + + Safari + +
    • diff --git a/src/index.html b/src/index.html index 33e40f9886..25282408fe 100644 --- a/src/index.html +++ b/src/index.html @@ -31,7 +31,7 @@ - bitwarden Web Vault + Bitwarden Web Vault