From da1437a268240c925c6f08da74905e8f7e6861ae Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 14 Apr 2020 15:55:22 -0400 Subject: [PATCH 1/6] update lunr types (#514) --- jslib | 2 +- package-lock.json | 6 +++--- package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jslib b/jslib index 72e3893f8e..8438cafbd0 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 72e3893f8eee79f1e3678839aa194f1096c343ea +Subproject commit 8438cafbd08c1c9b1440e0c5385e15e8fb5ac524 diff --git a/package-lock.json b/package-lock.json index 1a8eeeb332..26f03eca2c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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": { diff --git a/package.json b/package.json index 546f12ea31..4b7c13f31d 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,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", From ded886591468a8fdbf5cc217284660b8d7fd5c72 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 20 Apr 2020 00:17:06 -0400 Subject: [PATCH 2/6] Null check `allUsers` (#515) --- jslib | 2 +- src/app/organizations/manage/people.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jslib b/jslib index 8438cafbd0..2de8c5ed16 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 8438cafbd08c1c9b1440e0c5385e15e8fb5ac524 +Subproject commit 2de8c5ed165f00e5d3a2b1dd92763176d6150782 diff --git a/src/app/organizations/manage/people.component.ts b/src/app/organizations/manage/people.component.ts index a112612db9..9733e4b378 100644 --- a/src/app/organizations/manage/people.component.ts +++ b/src/app/organizations/manage/people.component.ts @@ -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() { From aa1e5a11ad2c3887ec13ada612c93a04fc44ee77 Mon Sep 17 00:00:00 2001 From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com> Date: Sat, 25 Apr 2020 08:13:30 -0500 Subject: [PATCH 3/6] [Auto Logout] Added warning dialog for log out action (#518) * Added warning dialog for log out timeout action * Reverting testing service module endpoints --- src/app/settings/options.component.ts | 9 +++++++++ src/locales/en/messages.json | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/src/app/settings/options.component.ts b/src/app/settings/options.component.ts index d388286046..8c33388618 100644 --- a/src/app/settings/options.component.ts +++ b/src/app/settings/options.component.ts @@ -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); diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json index c3251097d3..3bd7ce2e28 100644 --- a/src/locales/en/messages.json +++ b/src/locales/en/messages.json @@ -3053,5 +3053,11 @@ "lock": { "message": "Lock", "description": "Verb form: to make secure or inaccesible by" + }, + "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" } } From 858f86d9df07600198cf2dc587abf6182508a7a4 Mon Sep 17 00:00:00 2001 From: Srdjan Milic Date: Fri, 1 May 2020 18:21:23 +0200 Subject: [PATCH 4/6] fix: package.json info (#523) --- package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package.json b/package.json index 4b7c13f31d..baa34fa982 100644 --- a/package.json +++ b/package.json @@ -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", From 5bb61c0730b440485faa6e2b652ce5a8db9fe16f Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 5 May 2020 16:32:45 -0400 Subject: [PATCH 5/6] color updates + jslib --- jslib | 2 +- src/scss/styles.scss | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jslib b/jslib index 2de8c5ed16..0092aac275 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 2de8c5ed165f00e5d3a2b1dd92763176d6150782 +Subproject commit 0092aac275e8efca66838a8c266eec1d455883aa diff --git a/src/scss/styles.scss b/src/scss/styles.scss index 80951953bb..d85b084f8b 100644 --- a/src/scss/styles.scss +++ b/src/scss/styles.scss @@ -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; From 96208d37600ee43d23b0fc3a619fea4c138c0ab6 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 5 May 2020 16:59:33 -0400 Subject: [PATCH 6/6] brand color updates --- src/browserconfig.xml | 2 +- src/index.html | 4 ++-- src/manifest.json | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/browserconfig.xml b/src/browserconfig.xml index 320299fafb..ea394e344f 100644 --- a/src/browserconfig.xml +++ b/src/browserconfig.xml @@ -3,7 +3,7 @@ - #3c8dbc + #175DDC diff --git a/src/index.html b/src/index.html index 8170d0469a..3c663967f4 100644 --- a/src/index.html +++ b/src/index.html @@ -4,14 +4,14 @@ - + Bitwarden Web Vault - + diff --git a/src/manifest.json b/src/manifest.json index e09dc0ca19..92a1204c60 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -12,6 +12,6 @@ "type": "image/png" } ], - "theme_color": "#3c8dbc", - "background_color": "#3c8dbc" -} \ No newline at end of file + "theme_color": "#175DDC", + "background_color": "#175DDC" +}