From 8ef27713f14a07cfcd628341c3b1aa09b35ccbda Mon Sep 17 00:00:00 2001 From: Robyn MacCallum Date: Wed, 25 May 2022 10:18:00 -0400 Subject: [PATCH 1/4] [SG-345] Switch in-line "+" add org button to more explicit version (#1703) * switch in-line plus add org button to more explicit version * Add spaces to line up text better --- .../organization-filter.component.html | 35 +++++++++---------- src/scss/vault-filters.scss | 8 ----- 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/src/app/modules/vault-filter/components/organization-filter.component.html b/src/app/modules/vault-filter/components/organization-filter.component.html index e45db370..0c4bf90e 100644 --- a/src/app/modules/vault-filter/components/organization-filter.component.html +++ b/src/app/modules/vault-filter/components/organization-filter.component.html @@ -14,7 +14,7 @@ - {{ "newOrganization" | i18n }} +  {{ "newOrganization" | i18n }} @@ -45,14 +45,6 @@ >  {{ organizationGrouping.name | i18n }} - - - @@ -110,15 +110,6 @@ >  {{ organizationGrouping.name | i18n }} - - - diff --git a/src/scss/vault-filters.scss b/src/scss/vault-filters.scss index 292eff57..301497ea 100644 --- a/src/scss/vault-filters.scss +++ b/src/scss/vault-filters.scss @@ -14,14 +14,6 @@ font-size: $font-size-base; } - a.create-organization-link { - &:hover { - @include themify($themes) { - color: themed("iconHover") !important; - } - } - } - button { @extend .no-btn; } From 42cd1716854c4705abc2d8246ca650dda3f6cc35 Mon Sep 17 00:00:00 2001 From: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com> Date: Wed, 25 May 2022 15:10:13 -0500 Subject: [PATCH 2/4] Swap to heading tags on presented headings (#1707) --- src/app/accounts/register.component.html | 2 +- src/app/send/access.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/accounts/register.component.html b/src/app/accounts/register.component.html index d86e0a43..970c2c13 100644 --- a/src/app/accounts/register.component.html +++ b/src/app/accounts/register.component.html @@ -101,7 +101,7 @@
-

{{ "createAccount" | i18n }}

+

{{ "createAccount" | i18n }}

-

Bitwarden Send

+

Bitwarden Send

{{ "sendCreatorIdentifier" | i18n: creatorIdentifier }}

From eefcda7e419537e528dceebfebe33790ba2fba8d Mon Sep 17 00:00:00 2001 From: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Date: Thu, 26 May 2022 07:00:59 +1000 Subject: [PATCH 3/4] [EC-177] Update Key Connector error message (#1705) * Update Key Connector error message * Update jslib --- jslib | 2 +- src/locales/en/messages.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jslib b/jslib index 3cb94623..a6fe5c79 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 3cb94623e2c6a3ac6cf6dbcd516ba23b03a7aee7 +Subproject commit a6fe5c79002370d7ac8e52f2ff16154b853b7974 diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json index bb37b09b..1b62eec2 100644 --- a/src/locales/en/messages.json +++ b/src/locales/en/messages.json @@ -4674,8 +4674,8 @@ "removeSponsorshipSuccess": { "message": "Sponsorship Removed" }, - "ssoKeyConnectorUnavailable": { - "message": "Unable to reach the Key Connector, try again later." + "ssoKeyConnectorError": { + "message": "Key Connector error: make sure Key Connector is available and working correctly." }, "keyConnectorUrl": { "message": "Key Connector URL" From f195aee90c49f0d6f122e1bee23af4b3e2389146 Mon Sep 17 00:00:00 2001 From: Gbubemi Smith Date: Thu, 26 May 2022 10:05:36 +0100 Subject: [PATCH 4/4] Revert "[ps-136] Igonre accented characters in vault search (#1690)" (#1706) This reverts commit 58d9ac5ebcba8651dcf63cc71ffc59dd1ad2c624. --- src/app/modules/vault-filter/vault-filter.component.ts | 2 +- src/app/settings/billing-sync-key.component.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/modules/vault-filter/vault-filter.component.ts b/src/app/modules/vault-filter/vault-filter.component.ts index 56b72172..4442e0ab 100644 --- a/src/app/modules/vault-filter/vault-filter.component.ts +++ b/src/app/modules/vault-filter/vault-filter.component.ts @@ -25,7 +25,7 @@ export class VaultFilterComponent extends BaseVaultFilterComponent { } searchTextChanged() { - this.onSearchTextChanged.emit(this.searchText.normalize("NFD").replace(/[\u0300-\u036f]/g, "")); + this.onSearchTextChanged.emit(this.searchText); } async initCollections() { diff --git a/src/app/settings/billing-sync-key.component.ts b/src/app/settings/billing-sync-key.component.ts index 929d8aaf..9b80037c 100644 --- a/src/app/settings/billing-sync-key.component.ts +++ b/src/app/settings/billing-sync-key.component.ts @@ -3,6 +3,7 @@ import { Component } from "@angular/core"; import { ApiService } from "jslib-common/abstractions/api.service"; import { LogService } from "jslib-common/abstractions/log.service"; import { OrganizationConnectionType } from "jslib-common/enums/organizationConnectionType"; +import { Utils } from "jslib-common/misc/utils"; import { BillingSyncConfigApi } from "jslib-common/models/api/billingSyncConfigApi"; import { BillingSyncConfigRequest } from "jslib-common/models/request/billingSyncConfigRequest"; import { OrganizationConnectionRequest } from "jslib-common/models/request/organizationConnectionRequest";