Merge commit '02fe7159034b04d763a61fcf0200869e3209fa33' into PS-589-add-2fa-new-device-login-settings-flag

# Conflicts: # apps/web/src/app/modules/vault-filter/organization-vault-filter.component.ts # jslib
2022-06-06 15:16:00 -03:00 · 2022-06-06 15:16:00 -03:00 · 65cef08f7b
parent 73c42af1f9 02fe715903
commit 65cef08f7b
619 changed files with 2 additions and 6 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,4 +0,0 @@
-[submodule "jslib"]
-	path = jslib
-	url = https://github.com/bitwarden/jslib.git
-	branch = master
--- a/apps/web/.dockerignore
+++ b/apps/web/.dockerignore
--- a/apps/web/.editorconfig
+++ b/apps/web/.editorconfig
--- a/apps/web/.eslintignore
+++ b/apps/web/.eslintignore
--- a/apps/web/.eslintrc.json
+++ b/apps/web/.eslintrc.json
--- a/apps/web/.git-blame-ignore-revs
+++ b/apps/web/.git-blame-ignore-revs
--- a/apps/web/.gitattributes
+++ b/apps/web/.gitattributes
--- a/apps/web/.github/ISSUE_TEMPLATE/bug.yml
+++ b/apps/web/.github/ISSUE_TEMPLATE/bug.yml
--- a/apps/web/.github/ISSUE_TEMPLATE/config.yml
+++ b/apps/web/.github/ISSUE_TEMPLATE/config.yml
--- a/apps/web/.github/PULL_REQUEST_TEMPLATE.md
+++ b/apps/web/.github/PULL_REQUEST_TEMPLATE.md
--- a/apps/web/.github/workflows/build.yml
+++ b/apps/web/.github/workflows/build.yml
--- a/apps/web/.github/workflows/crowdin-pull.yml
+++ b/apps/web/.github/workflows/crowdin-pull.yml
--- a/apps/web/.github/workflows/enforce-labels.yml
+++ b/apps/web/.github/workflows/enforce-labels.yml
--- a/apps/web/.github/workflows/qa-deploy.yml
+++ b/apps/web/.github/workflows/qa-deploy.yml
--- a/apps/web/.github/workflows/release.yml
+++ b/apps/web/.github/workflows/release.yml
--- a/apps/web/.github/workflows/version-bump.yml
+++ b/apps/web/.github/workflows/version-bump.yml
--- a/apps/web/.github/workflows/workflow-linter.yml
+++ b/apps/web/.github/workflows/workflow-linter.yml
--- a/apps/web/.gitignore
+++ b/apps/web/.gitignore
--- a/apps/web/.husky/pre-commit
+++ b/apps/web/.husky/pre-commit
--- a/apps/web/.prettierignore
+++ b/apps/web/.prettierignore
@ -2,7 +2,7 @@
 build
 dist

-jslib
+#jslib

 # External libraries / auto synced locales
 src/locales
--- a/apps/web/.prettierrc.json
+++ b/apps/web/.prettierrc.json
--- a/apps/web/CONTRIBUTING.md
+++ b/apps/web/CONTRIBUTING.md
--- a/apps/web/Dockerfile
+++ b/apps/web/Dockerfile
--- a/apps/web/LICENSE.txt
+++ b/apps/web/LICENSE.txt
--- a/apps/web/LICENSE_BITWARDEN.txt
+++ b/apps/web/LICENSE_BITWARDEN.txt
--- a/apps/web/LICENSE_GPL.txt
+++ b/apps/web/LICENSE_GPL.txt
--- a/apps/web/README.md
+++ b/apps/web/README.md
--- a/apps/web/SECURITY.md
+++ b/apps/web/SECURITY.md
--- a/apps/web/config.js
+++ b/apps/web/config.js
--- a/apps/web/config/base.json
+++ b/apps/web/config/base.json
--- a/apps/web/config/cloud.json
+++ b/apps/web/config/cloud.json
--- a/apps/web/config/development.json
+++ b/apps/web/config/development.json
--- a/apps/web/config/qa.json
+++ b/apps/web/config/qa.json
--- a/apps/web/config/selfhosted.json
+++ b/apps/web/config/selfhosted.json
--- a/apps/web/crowdin.yml
+++ b/apps/web/crowdin.yml
--- a/apps/web/dev-server.shared.pem
+++ b/apps/web/dev-server.shared.pem
--- a/apps/web/entrypoint.sh
+++ b/apps/web/entrypoint.sh
--- a/apps/web/package-lock.json
+++ b/apps/web/package-lock.json
--- a/apps/web/package.json
+++ b/apps/web/package.json
--- a/apps/web/postcss.config.js
+++ b/apps/web/postcss.config.js
--- a/apps/web/scripts/optimize.js
+++ b/apps/web/scripts/optimize.js
--- a/apps/web/src/.nojekyll
+++ b/apps/web/src/.nojekyll
--- a/apps/web/src/404.html
+++ b/apps/web/src/404.html
--- a/apps/web/src/404/bootstrap.min.css
+++ b/apps/web/src/404/bootstrap.min.css
--- a/apps/web/src/404/styles.css
+++ b/apps/web/src/404/styles.css
--- a/apps/web/src/abstractions/state.service.ts
+++ b/apps/web/src/abstractions/state.service.ts
--- a/apps/web/src/app-id.json
+++ b/apps/web/src/app-id.json
--- a/apps/web/src/app/accounts/accept-emergency.component.html
+++ b/apps/web/src/app/accounts/accept-emergency.component.html
--- a/apps/web/src/app/accounts/accept-emergency.component.ts
+++ b/apps/web/src/app/accounts/accept-emergency.component.ts
--- a/apps/web/src/app/accounts/accept-organization.component.html
+++ b/apps/web/src/app/accounts/accept-organization.component.html
--- a/apps/web/src/app/accounts/accept-organization.component.ts
+++ b/apps/web/src/app/accounts/accept-organization.component.ts
--- a/apps/web/src/app/accounts/hint.component.html
+++ b/apps/web/src/app/accounts/hint.component.html
--- a/apps/web/src/app/accounts/hint.component.ts
+++ b/apps/web/src/app/accounts/hint.component.ts
--- a/apps/web/src/app/accounts/lock.component.html
+++ b/apps/web/src/app/accounts/lock.component.html
--- a/apps/web/src/app/accounts/lock.component.ts
+++ b/apps/web/src/app/accounts/lock.component.ts
--- a/apps/web/src/app/accounts/login.component.html
+++ b/apps/web/src/app/accounts/login.component.html
--- a/apps/web/src/app/accounts/login.component.ts
+++ b/apps/web/src/app/accounts/login.component.ts
--- a/apps/web/src/app/accounts/recover-delete.component.html
+++ b/apps/web/src/app/accounts/recover-delete.component.html
--- a/apps/web/src/app/accounts/recover-delete.component.ts
+++ b/apps/web/src/app/accounts/recover-delete.component.ts
--- a/apps/web/src/app/accounts/recover-two-factor.component.html
+++ b/apps/web/src/app/accounts/recover-two-factor.component.html
--- a/apps/web/src/app/accounts/recover-two-factor.component.ts
+++ b/apps/web/src/app/accounts/recover-two-factor.component.ts
--- a/apps/web/src/app/accounts/register.component.html
+++ b/apps/web/src/app/accounts/register.component.html
--- a/apps/web/src/app/accounts/register.component.ts
+++ b/apps/web/src/app/accounts/register.component.ts
--- a/apps/web/src/app/accounts/remove-password.component.html
+++ b/apps/web/src/app/accounts/remove-password.component.html
--- a/apps/web/src/app/accounts/remove-password.component.ts
+++ b/apps/web/src/app/accounts/remove-password.component.ts
--- a/apps/web/src/app/accounts/set-password.component.html
+++ b/apps/web/src/app/accounts/set-password.component.html
--- a/apps/web/src/app/accounts/set-password.component.ts
+++ b/apps/web/src/app/accounts/set-password.component.ts
--- a/apps/web/src/app/accounts/sso.component.html
+++ b/apps/web/src/app/accounts/sso.component.html
--- a/apps/web/src/app/accounts/sso.component.ts
+++ b/apps/web/src/app/accounts/sso.component.ts
--- a/apps/web/src/app/accounts/two-factor-options.component.html
+++ b/apps/web/src/app/accounts/two-factor-options.component.html
--- a/apps/web/src/app/accounts/two-factor-options.component.ts
+++ b/apps/web/src/app/accounts/two-factor-options.component.ts
--- a/apps/web/src/app/accounts/two-factor.component.html
+++ b/apps/web/src/app/accounts/two-factor.component.html
--- a/apps/web/src/app/accounts/two-factor.component.ts
+++ b/apps/web/src/app/accounts/two-factor.component.ts
--- a/apps/web/src/app/accounts/update-password.component.html
+++ b/apps/web/src/app/accounts/update-password.component.html
--- a/apps/web/src/app/accounts/update-password.component.ts
+++ b/apps/web/src/app/accounts/update-password.component.ts
--- a/apps/web/src/app/accounts/update-temp-password.component.html
+++ b/apps/web/src/app/accounts/update-temp-password.component.html
--- a/apps/web/src/app/accounts/update-temp-password.component.ts
+++ b/apps/web/src/app/accounts/update-temp-password.component.ts
--- a/apps/web/src/app/accounts/verify-email-token.component.html
+++ b/apps/web/src/app/accounts/verify-email-token.component.html
--- a/apps/web/src/app/accounts/verify-email-token.component.ts
+++ b/apps/web/src/app/accounts/verify-email-token.component.ts
--- a/apps/web/src/app/accounts/verify-recover-delete.component.html
+++ b/apps/web/src/app/accounts/verify-recover-delete.component.html
--- a/apps/web/src/app/accounts/verify-recover-delete.component.ts
+++ b/apps/web/src/app/accounts/verify-recover-delete.component.ts
--- a/apps/web/src/app/app.component.html
+++ b/apps/web/src/app/app.component.html
--- a/apps/web/src/app/app.component.ts
+++ b/apps/web/src/app/app.component.ts
--- a/apps/web/src/app/app.module.ts
+++ b/apps/web/src/app/app.module.ts
--- a/apps/web/src/app/common/base.accept.component.ts
+++ b/apps/web/src/app/common/base.accept.component.ts
--- a/apps/web/src/app/common/base.events.component.ts
+++ b/apps/web/src/app/common/base.events.component.ts
--- a/apps/web/src/app/common/base.people.component.ts
+++ b/apps/web/src/app/common/base.people.component.ts
--- a/apps/web/src/app/components/nested-checkbox.component.html
+++ b/apps/web/src/app/components/nested-checkbox.component.html
--- a/apps/web/src/app/components/nested-checkbox.component.ts
+++ b/apps/web/src/app/components/nested-checkbox.component.ts
--- a/apps/web/src/app/components/organization-switcher.component.html
+++ b/apps/web/src/app/components/organization-switcher.component.html
--- a/apps/web/src/app/components/organization-switcher.component.ts
+++ b/apps/web/src/app/components/organization-switcher.component.ts
--- a/apps/web/src/app/components/password-reprompt.component.html
+++ b/apps/web/src/app/components/password-reprompt.component.html
--- a/apps/web/src/app/components/password-reprompt.component.ts
+++ b/apps/web/src/app/components/password-reprompt.component.ts
--- a/apps/web/src/app/components/password-strength.component.html
+++ b/apps/web/src/app/components/password-strength.component.html
--- a/apps/web/src/app/components/password-strength.component.ts
+++ b/apps/web/src/app/components/password-strength.component.ts
--- a/apps/web/src/app/components/premium-badge.component.ts
+++ b/apps/web/src/app/components/premium-badge.component.ts
--- a/apps/web/src/app/guards/home.guard.ts
+++ b/apps/web/src/app/guards/home.guard.ts
--- a/apps/web/src/app/layouts/footer.component.html
+++ b/apps/web/src/app/layouts/footer.component.html
--- a/apps/web/src/app/layouts/footer.component.ts
+++ b/apps/web/src/app/layouts/footer.component.ts
--- a/apps/web/src/app/layouts/frontend-layout.component.html
+++ b/apps/web/src/app/layouts/frontend-layout.component.html
--- a/Show More
+++ b/Show More