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 01/17] [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 3cb94623e2..a6fe5c7900 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 bb37b09b96..1b62eec2be 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 02/17] 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 56b721721b..4442e0abc6 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 929d8aaf69..9b80037c2d 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";
From b98b39128363baf5da7eb891ce27d060438081ee Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Fri, 27 May 2022 13:11:41 +1000
Subject: [PATCH 03/17] Update jslib (#1710)
---
jslib | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jslib b/jslib
index a6fe5c7900..77ca5762e1 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit a6fe5c79002370d7ac8e52f2ff16154b853b7974
+Subproject commit 77ca5762e10d1892ee09186bccec2f3a025977f6
From dfb03a53c088b4be34997229fb5005e4a095a925 Mon Sep 17 00:00:00 2001
From: Gbubemi Smith
Date: Fri, 27 May 2022 17:28:16 +0100
Subject: [PATCH 04/17] sync jslib master (#1711)
---
jslib | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jslib b/jslib
index 77ca5762e1..1ea2824c24 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 77ca5762e10d1892ee09186bccec2f3a025977f6
+Subproject commit 1ea2824c24aeb7188046d3cc4313b3550c90bb07
From bde9a28f2b1af4cc182733b6fe0e7fc821066918 Mon Sep 17 00:00:00 2001
From: Gbubemi Smith
Date: Mon, 30 May 2022 10:56:14 +0100
Subject: [PATCH 05/17] sync jslib master (#1712)
---
jslib | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jslib b/jslib
index 1ea2824c24..0d658ba26d 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 1ea2824c24aeb7188046d3cc4313b3550c90bb07
+Subproject commit 0d658ba26dfb539f15e33f396e597e6727070bc2
From 5d09ddbc8d9e14c9db93202276abe281e925a080 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 31 May 2022 15:41:37 -0700
Subject: [PATCH 06/17] Bumped version to 2022.05.0 (#1715)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
package-lock.json | 4 ++--
package.json | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 1106cb2e18..8e68936355 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "@bitwarden/web-vault",
- "version": "2.28.1",
+ "version": "2022.05.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@bitwarden/web-vault",
- "version": "2.28.1",
+ "version": "2022.05.0",
"hasInstallScript": true,
"license": "GPL-3.0",
"dependencies": {
diff --git a/package.json b/package.json
index 29da731891..9fe29fcd9c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@bitwarden/web-vault",
- "version": "2.28.1",
+ "version": "2022.05.0",
"license": "GPL-3.0",
"repository": "https://github.com/bitwarden/web",
"scripts": {
From b8aa25b9818473a0fe152365ee05bc7d663e5c1a Mon Sep 17 00:00:00 2001
From: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com>
Date: Tue, 31 May 2022 16:11:26 -0700
Subject: [PATCH 07/17] Updating the version check to the new Github action
(#1714)
* Updating the version check to the new Github action
* Update .github/workflows/release.yml
Co-authored-by: Micaiah Martin <77340197+mimartin12@users.noreply.github.com>
* switching action branch tag to commit tag
Co-authored-by: Micaiah Martin <77340197+mimartin12@users.noreply.github.com>
---
.github/workflows/release.yml | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 97b43a218d..fb788f14c8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -38,20 +38,11 @@ jobs:
- name: Check Release Version
id: version
- run: |
- version=$( jq -r ".version" package.json)
- previous_release_tag_version=$(
- curl -sL https://api.github.com/repos/$GITHUB_REPOSITORY/releases/latest | jq -r ".tag_name"
- )
-
- if [ "v$version" == "$previous_release_tag_version" ] && \
- [ "${{ github.event.inputs.release_type }}" == "Initial Release" ]; then
- echo "[!] Already released v$version. Please bump version to continue"
- exit 1
- fi
-
- echo "::set-output name=package::$version"
- echo "::set-output name=tag::v$version"
+ uses: bitwarden/gh-actions@ea9fab01d76940267b4147cc1c4542431246b9f6
+ with:
+ release-type: ${{ github.event.inputs.release_type }}
+ project-type: ts
+ file: package.json
- name: Get branch name
id: branch
From 8fe9504cd13227cdedf35efdc247a4c29c8f7ee5 Mon Sep 17 00:00:00 2001
From: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com>
Date: Tue, 31 May 2022 17:48:59 -0700
Subject: [PATCH 08/17] Updating the path for the Release Version Check (#1716)
---
.github/workflows/release.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fb788f14c8..7dc7ec91c2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -38,7 +38,7 @@ jobs:
- name: Check Release Version
id: version
- uses: bitwarden/gh-actions@ea9fab01d76940267b4147cc1c4542431246b9f6
+ uses: bitwarden/gh-actions/release-version-check@ea9fab01d76940267b4147cc1c4542431246b9f6
with:
release-type: ${{ github.event.inputs.release_type }}
project-type: ts
From ad0512e344d24ab4232a6a3d3fd88f904f99003b Mon Sep 17 00:00:00 2001
From: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com>
Date: Tue, 31 May 2022 18:08:32 -0700
Subject: [PATCH 09/17] Version check typo (#1717)
* fixing dumb issue
* Fixing another dumb mistake
---
.github/workflows/release.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7dc7ec91c2..af81eb7398 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,8 +19,8 @@ jobs:
name: Setup
runs-on: ubuntu-20.04
outputs:
- release_version: ${{ steps.version.outputs.package }}
- tag_version: ${{ steps.version.outputs.tag }}
+ release_version: ${{ steps.version.outputs.version }}
+ tag_version: ${{ steps.version.outputs.version }}
branch_name: ${{ steps.branch.outputs.branch_name }}
steps:
- name: Branch check
From 95d177da38309faf0fa30332ffbbac24cdce21be Mon Sep 17 00:00:00 2001
From: Daniel James Smith
Date: Wed, 1 Jun 2022 14:46:48 +0200
Subject: [PATCH 10/17] Fix expanding/collapsing of nested collections (#1722)
---
.../vault-filter/components/collection-filter.component.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/modules/vault-filter/components/collection-filter.component.html b/src/app/modules/vault-filter/components/collection-filter.component.html
index 436cda99c7..24463dca19 100644
--- a/src/app/modules/vault-filter/components/collection-filter.component.html
+++ b/src/app/modules/vault-filter/components/collection-filter.component.html
@@ -31,7 +31,7 @@
-
+
{{ "backToReports" | i18n }}
diff --git a/src/app/send/send.component.html b/src/app/send/send.component.html
index db38850c79..eed3cdfa56 100644
--- a/src/app/send/send.component.html
+++ b/src/app/send/send.component.html
@@ -23,7 +23,7 @@
-
-
+
{{ "allSends" | i18n }}
@@ -38,7 +38,7 @@
-
-
+
{{ "copySendLink" | i18n }}
-
+
{{ "removePassword" | i18n }}
-
+
{{ "delete" | i18n }}
diff --git a/src/app/settings/account.component.html b/src/app/settings/account.component.html
index 1881498373..c88fc1ece0 100644
--- a/src/app/settings/account.component.html
+++ b/src/app/settings/account.component.html
@@ -14,13 +14,13 @@
{{ "dangerZoneDesc" | i18n }}
-
+
{{ "deauthorizeSessions" | i18n }}
-
+
{{ "purgeVault" | i18n }}
-
+
{{ "deleteAccount" | i18n }}
diff --git a/src/app/settings/change-kdf.component.html b/src/app/settings/change-kdf.component.html
index e389958643..f5eae39be4 100644
--- a/src/app/settings/change-kdf.component.html
+++ b/src/app/settings/change-kdf.component.html
@@ -71,7 +71,7 @@
-
+
{{ "changeKdf" | i18n }}
diff --git a/src/app/settings/change-password.component.html b/src/app/settings/change-password.component.html
index f8a4dd4c58..990d950604 100644
--- a/src/app/settings/change-password.component.html
+++ b/src/app/settings/change-password.component.html
@@ -87,7 +87,7 @@
-
+
{{ "changeMasterPassword" | i18n }}
diff --git a/src/app/settings/payment-method.component.html b/src/app/settings/payment-method.component.html
index aca7b11568..bae22bf4cf 100644
--- a/src/app/settings/payment-method.component.html
+++ b/src/app/settings/payment-method.component.html
@@ -3,7 +3,7 @@
{{ "paymentMethod" | i18n }}
{{ creditOrBalance | currency: "$" }}
{{ "creditAppliedDesc" | i18n }}
-
+
{{ "addCredit" | i18n }}
-
+
{{ (paymentSource ? "changePaymentMethod" : "addPaymentMethod") | i18n }}
{{ "paymentChargedAnnually" | i18n }}
-
+
{{ "submit" | i18n }}
diff --git a/src/app/settings/security-keys.component.html b/src/app/settings/security-keys.component.html
index 9c9b8df5e0..58201014be 100644
--- a/src/app/settings/security-keys.component.html
+++ b/src/app/settings/security-keys.component.html
@@ -8,10 +8,10 @@
{{ "userApiKeyDesc" | i18n }}
-
+
{{ "viewApiKey" | i18n }}
-
+
{{ "rotateApiKey" | i18n }}
diff --git a/src/app/settings/two-factor-setup.component.html b/src/app/settings/two-factor-setup.component.html
index 549636f842..27fc2990e6 100644
--- a/src/app/settings/two-factor-setup.component.html
+++ b/src/app/settings/two-factor-setup.component.html
@@ -5,7 +5,7 @@
{{ "twoStepLoginOrganizationDesc" | i18n }}
{{ "twoStepLoginRecoveryWarning" | i18n }}
-
+
{{ "viewRecoveryCode" | i18n }}
@@ -45,7 +45,7 @@
{{ "subscriptionPendingCanceled" | i18n }}
{{ "status" | i18n }}
{{ (subscription && subscription.status) || "-" }}
- {{
+ {{
"pendingCancellation" | i18n
}}
@@ -96,11 +96,11 @@
-
+
{{ "updateLicense" | i18n }}
-
+
{{ "addStorage" | i18n }}
-
+
{{ "copyUsername" | i18n }}
@@ -77,24 +77,24 @@
{{ "copyPassword" | i18n }}
{{ "copyVerificationCode" | i18n }}
-
+
{{ "launch" | i18n }}
-
+
{{ "attachments" | i18n }}
@@ -102,26 +102,26 @@
{{ "clone" | i18n }}
{{ "moveToOrganization" | i18n }}
-
+
{{ "collections" | i18n }}
-
+
{{ "eventLogs" | i18n }}
-
+
{{ "restore" | i18n }}
-
+
{{ (c.isDeleted ? "permanentlyDelete" : "delete") | i18n }}
From e1ffca07ba889fbd67874a82a6904f96d52e02bf Mon Sep 17 00:00:00 2001
From: Oscar Hinton
Date: Thu, 2 Jun 2022 15:09:08 +0200
Subject: [PATCH 17/17] Add archive notice (#1724)
---
README.md | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 1b8dfe7726..609cf5dd57 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
-> **Repository Reorganization in Progress**
+> **Archived**
>
-> We are currently migrating some projects over to a mono repository. For existing PR's we will be providing documentation on how to move/migrate them. To minimize the overhead we are actively reviewing open PRs. If possible please ensure any pending comments are resolved as soon as possible.
->
-> New pull requests created during this transition period may not get addressed —if needed, please create a new PR after the reorganization is complete.
+> This repository is archived, please go to https://github.com/bitwarden/clients for future development.