Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-03-02 03:41:09 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into soft-delete

Browse Source
This commit is contained in:
Chad Scharf 2020-05-08 09:32:59 -04:00
commit ec3ee8fbb3
10 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit e9db844285e21525f5152e782063f04e02543553
Subproject commit 0092aac275e8efca66838a8c266eec1d455883aa

6
package-lock.json generated
View File

@ -661,9 +661,9 @@
"dev": true
},
"@types/lunr": {
"version": "2.1.6",
"resolved": "https://registry.npmjs.org/@types/lunr/-/lunr-2.1.6.tgz",
"integrity": "sha512-Bz6fUhX1llTa7ygQJN3ttoVkkrpW7xxSEP7D7OYFO/FCBKqKqruRUZtJzTtYA0GkQX13lxU5u+8LuCviJlAXkQ==",
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/@types/lunr/-/lunr-2.3.3.tgz",
"integrity": "sha512-09sXZZVsB3Ib41U0fC+O1O+4UOZT1bl/e+/QubPxpqDWHNEchvx/DEb1KJMOwq6K3MTNzZFoNSzVdR++o1DVnw==",
"dev": true
},
"@types/node": {

4
package.json
View File

@ -1,6 +1,8 @@
{
"name": "bitwarden-web",
"version": "2.13.2",
"license": "GPL-3.0",
"repository": "https://github.com/bitwarden/web",
"scripts": {
"sub:init": "git submodule update --init --recursive",
"sub:update": "git submodule update --remote",
@ -29,7 +31,7 @@
"@angular/compiler-cli": "^7.2.11",
"@ngtools/webpack": "^7.2.2",
"@types/jquery": "^3.3.6",
"@types/lunr": "^2.1.6",
"@types/lunr": "^2.3.3",
"@types/node-forge": "^0.7.5",
"@types/papaparse": "^4.5.3",
"@types/webcrypto": "^0.0.28",

2
src/app/organizations/manage/people.component.ts
View File

@ -122,7 +122,7 @@ export class PeopleComponent implements OnInit {
}
get allCount() {
return this.allUsers.length;
return this.allUsers != null ? this.allUsers.length : 0;
}
get invitedCount() {

9
src/app/settings/options.component.ts
View File

@ -70,6 +70,15 @@ export class OptionsComponent implements OnInit {
}
async submit() {
if (this.vaultTimeoutAction === 'logOut') {
const confirmed = await this.platformUtilsService.showDialog(
this.i18nService.t('vaultTimeoutLogOutConfirmation'),
this.i18nService.t('vaultTimeoutLogOutConfirmationTitle'),
this.i18nService.t('yes'), this.i18nService.t('cancel'), 'warning');
if (!confirmed) {
return;
}
}
await this.vaultTimeoutService.setVaultTimeoutOptions(this.vaultTimeout != null ? this.vaultTimeout : null,
this.vaultTimeoutAction);
await this.storageService.save(ConstantsService.disableFaviconKey, this.disableIcons);

2
src/browserconfig.xml
View File

@ -3,7 +3,7 @@
<msapplication>
<tile>
<square150x150logo src="images/icons/mstile-150x150.png"/>
<TileColor>#3c8dbc</TileColor>
<TileColor>#175DDC</TileColor>
</tile>
</msapplication>
</browserconfig>

4
src/index.html
View File

@ -4,14 +4,14 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=1010">
<meta name="theme-color" content="#3c8dbc">
<meta name="theme-color" content="#175DDC">
<title page-title>Bitwarden Web Vault</title>
<link rel="apple-touch-icon" sizes="180x180" href="images/icons/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="images/icons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="images/icons/favicon-16x16.png">
<link rel="mask-icon" href="images/icons/safari-pinned-tab.svg" color="#3c8dbc">
<link rel="mask-icon" href="images/icons/safari-pinned-tab.svg" color="#175DDC">
<link rel="manifest" href="manifest.json">
</head>

6
src/locales/en/messages.json
View File

@ -3135,5 +3135,11 @@
"example": "Google"
}
}
},
"vaultTimeoutLogOutConfirmation": {
"message": "Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?"
},
"vaultTimeoutLogOutConfirmationTitle": {
"message": "Timeout Action Confirmation"
}
}

6
src/manifest.json
View File

@ -12,6 +12,6 @@
"type": "image/png"
}
],
"theme_color": "#3c8dbc",
"background_color": "#3c8dbc"
}
"theme_color": "#175DDC",
"background_color": "#175DDC"
}

6
src/scss/styles.scss
View File

@ -1,9 +1,9 @@
@import "../css/webfonts.css";
$primary: #3c8dbc;
$primary-accent: #286090;
$primary: #175DDC;
$primary-accent: #1252A3;
$secondary: #ced4da;
$secondary-alt: #2c3e50;
$secondary-alt: #1A3B66;
$success: #00a65a;
$info: #555555;
$warning: #bf7e16;