Skip to content

Commit

Permalink
Merge branch 'main' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
ttalty authored Dec 15, 2023
2 parents 7ce62ff + 4d5c955 commit 333c073
Show file tree
Hide file tree
Showing 245 changed files with 2,375 additions and 572 deletions.
21 changes: 21 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,15 @@
"tailwindcss/no-contradicting-classname": "error"
}
},
{
"files": ["libs/admin-console/src/**/*.ts"],
"rules": {
"no-restricted-imports": [
"error",
{ "patterns": ["@bitwarden/admin-console/*", "src/**/*"] }
]
}
},
{
"files": ["libs/angular/src/**/*.ts"],
"rules": {
Expand All @@ -151,6 +160,12 @@
"no-restricted-imports": ["error", { "patterns": ["@bitwarden/auth/*", "src/**/*"] }]
}
},
{
"files": ["libs/billing/src/**/*.ts"],
"rules": {
"no-restricted-imports": ["error", { "patterns": ["@bitwarden/billing/*", "src/**/*"] }]
}
},
{
"files": ["libs/common/src/**/*.ts"],
"rules": {
Expand Down Expand Up @@ -184,6 +199,12 @@
"no-restricted-imports": ["error", { "patterns": ["@bitwarden/node/*", "src/**/*"] }]
}
},
{
"files": ["libs/platform/src/**/*.ts"],
"rules": {
"no-restricted-imports": ["error", { "patterns": ["@bitwarden/platform/*", "src/**/*"] }]
}
},
{
"files": ["libs/vault/src/**/*.ts"],
"rules": {
Expand Down
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,13 @@ apps/web/src/app/admin-console @bitwarden/team-admin-console-dev
bitwarden_license/bit-web/src/app/admin-console @bitwarden/team-admin-console-dev
libs/angular/src/admin-console @bitwarden/team-admin-console-dev
libs/common/src/admin-console @bitwarden/team-admin-console-dev
libs/admin-console @bitwarden/team-admin-console-dev

## Billing team files ##
apps/web/src/app/billing @bitwarden/team-billing-dev
libs/angular/src/billing @bitwarden/team-billing-dev
libs/common/src/billing @bitwarden/team-billing-dev
libs/billing @bitwarden/team-billing-dev

## Platform team files ##
apps/browser/src/platform @bitwarden/team-platform-dev
Expand All @@ -70,6 +72,7 @@ libs/angular/src/platform @bitwarden/team-platform-dev
libs/common/src/platform @bitwarden/team-platform-dev
libs/common/spec @bitwarden/team-platform-dev
libs/common/src/state-migrations @bitwarden/team-platform-dev
libs/platform @bitwarden/team-platform-dev
# Node-specifc platform files
libs/node @bitwarden/team-platform-dev
# Web utils used across app and connectors
Expand Down
3 changes: 3 additions & 0 deletions .github/whitelist-capital-letters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
./libs/angular/src/scss/webfonts/Open_Sans-normal-600.woff
./libs/angular/src/scss/webfonts/Open_Sans-normal-800.woff
./libs/angular/src/scss/webfonts/Open_Sans-normal-400.woff
./libs/admin-console/README.md
./libs/auth/README.md
./libs/billing/README.md
./libs/platform/README.md
./libs/tools/README.md
./libs/vault/README.md
./README.md
Expand Down
29 changes: 29 additions & 0 deletions .github/workflows/_cut_rc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
name: Cut RC Branch

on:
workflow_call:

jobs:
cut-rc:
name: Cut RC branch
runs-on: ubuntu-22.04
steps:
- name: Checkout Branch
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
ref: main

- name: Check if RC branch exists
run: |
remote_rc_branch_check=$(git ls-remote --heads origin rc | wc -l)
if [[ "${remote_rc_branch_check}" -gt 0 ]]; then
echo "Remote RC branch exists."
echo "Please delete current RC branch before running again."
exit 1
fi
- name: Cut RC branch
run: |
git switch --quiet --create rc
git push --quiet --set-upstream origin rc
33 changes: 10 additions & 23 deletions .github/workflows/version-bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,10 @@ on:
version_number:
description: "New version (example: '2024.1.0')"
required: true

workflow_call:
inputs:
bump_browser:
description: "Bump Browser?"
cut_rc_branch:
description: "Cut RC branch?"
default: true
type: boolean
default: false
bump_cli:
description: "Bump CLI?"
type: boolean
default: false
bump_desktop:
description: "Bump Desktop?"
type: boolean
default: false
bump_web:
description: "Bump Web?"
type: boolean
default: false
version_number:
description: "New version (example: '2024.1.0')"
required: true
type: string

jobs:
bump_version:
Expand All @@ -72,7 +53,6 @@ jobs:
with:
repository: bitwarden/clients
ref: main
token: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }}

- name: Import GPG key
uses: crazy-max/ghaction-import-gpg@82a020f1f7f605c65dd2449b392a52c3fcfef7ef # v6.0.0
Expand Down Expand Up @@ -313,3 +293,10 @@ jobs:
GH_TOKEN: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }}
PR_NUMBER: ${{ steps.create-pr.outputs.pr_number }}
run: gh pr merge $PR_NUMBER --squash --auto --delete-branch

cut_rc:
name: Cut RC Branch
if: ${{ inputs.cut_rc_branch == true }}
needs: bump_version
uses: ./.github/workflows/_cut_rc.yml
secrets: inherit
1 change: 1 addition & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const config: StorybookConfig = {
"@storybook/addon-essentials",
"@storybook/addon-a11y",
"@storybook/addon-designs",
"@storybook/addon-interactions",
{
name: "@storybook/addon-docs",
options: {
Expand Down
9 changes: 6 additions & 3 deletions apps/browser/src/_locales/ar/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,9 @@
"length": {
"message": "الطول"
},
"passwordMinLength": {
"message": "Minimum password length"
},
"uppercase": {
"message": "أحرف كبيرة (من A إلى Z)"
},
Expand Down Expand Up @@ -366,7 +369,7 @@
"message": "أعدنّ طريقة إلغاء القُفْل لتغيير إجراء مهلة المخزن الخاص بك."
},
"unlockMethodNeeded": {
"message": "Set up an unlock method in Settings"
"message": "إعداد طريقة إلغاء القفل في الإعدادات"
},
"rateExtension": {
"message": "قيِّم هذه الإضافة"
Expand Down Expand Up @@ -409,7 +412,7 @@
"message": "إقفل الآن"
},
"lockAll": {
"message": "Lock all"
"message": "قفل الكل"
},
"immediately": {
"message": "حالاً"
Expand Down Expand Up @@ -626,7 +629,7 @@
"message": "اطلب إضافة عنصر إذا لم يُعثر عليه في خزنتك."
},
"addLoginNotificationDescAlt": {
"message": "Ask to add an item if one isn't found in your vault. Applies to all logged in accounts."
"message": "اطلب إضافة عنصر إذا لم يتم العثور على عنصر في المخزن الخاص بك. ينطبق على جميع حسابات تسجيل الدخول."
},
"showCardsCurrentTab": {
"message": "أظهر البطاقات في صفحة التبويبات"
Expand Down
7 changes: 5 additions & 2 deletions apps/browser/src/_locales/az/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,9 @@
"length": {
"message": "Uzunluq"
},
"passwordMinLength": {
"message": "Minimal parol uzunluğu"
},
"uppercase": {
"message": "Böyük hərf (A-Z)"
},
Expand Down Expand Up @@ -1034,10 +1037,10 @@
"message": "Giriş etmiş bütün hesablara aiddir."
},
"turnOffBrowserBuiltInPasswordManagerSettings": {
"message": "Turn off your browser’s built in password manager settings to avoid conflicts."
"message": "Ziddiyyətləri önləmək üçün brauzerinizin daxili parol meneceri ayarlarını söndürün."
},
"turnOffBrowserBuiltInPasswordManagerSettingsLink": {
"message": "Edit browser settings."
"message": "Brauzer ayarlarına düzəliş et."
},
"autofillOverlayVisibilityOff": {
"message": "Bağlı",
Expand Down
3 changes: 3 additions & 0 deletions apps/browser/src/_locales/be/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,9 @@
"length": {
"message": "Даўжыня"
},
"passwordMinLength": {
"message": "Minimum password length"
},
"uppercase": {
"message": "Вялікія літары (A-Z)"
},
Expand Down
7 changes: 5 additions & 2 deletions apps/browser/src/_locales/bg/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,9 @@
"length": {
"message": "Дължина"
},
"passwordMinLength": {
"message": "Минимална дължина на паролата"
},
"uppercase": {
"message": "Главни букви (A-Z)"
},
Expand Down Expand Up @@ -1034,10 +1037,10 @@
"message": "Прилага се за всички регистрации, в които сте вписан(а)."
},
"turnOffBrowserBuiltInPasswordManagerSettings": {
"message": "Turn off your browser’s built in password manager settings to avoid conflicts."
"message": "Изключете вграденото управление на пароли на браузъра си, за да избегнете конфликтите."
},
"turnOffBrowserBuiltInPasswordManagerSettingsLink": {
"message": "Edit browser settings."
"message": "Редактиране на настройките на браузъра."
},
"autofillOverlayVisibilityOff": {
"message": "Изключено",
Expand Down
3 changes: 3 additions & 0 deletions apps/browser/src/_locales/bn/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,9 @@
"length": {
"message": "দৈর্ঘ্য"
},
"passwordMinLength": {
"message": "Minimum password length"
},
"uppercase": {
"message": "Uppercase (A-Z)"
},
Expand Down
3 changes: 3 additions & 0 deletions apps/browser/src/_locales/bs/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,9 @@
"length": {
"message": "Length"
},
"passwordMinLength": {
"message": "Minimum password length"
},
"uppercase": {
"message": "Uppercase (A-Z)"
},
Expand Down
33 changes: 18 additions & 15 deletions apps/browser/src/_locales/ca/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,9 @@
"length": {
"message": "Longitud"
},
"passwordMinLength": {
"message": "Longitud mínima de la contrasenya"
},
"uppercase": {
"message": "Majúscula (A-Z)"
},
Expand Down Expand Up @@ -366,7 +369,7 @@
"message": "Configura un mètode de desbloqueig per canviar l'acció del temps d'espera de la caixa forta."
},
"unlockMethodNeeded": {
"message": "Set up an unlock method in Settings"
"message": "Configura un mètode de desbloqueig a Configuració"
},
"rateExtension": {
"message": "Valora aquesta extensió"
Expand Down Expand Up @@ -409,7 +412,7 @@
"message": "Bloqueja ara"
},
"lockAll": {
"message": "Lock all"
"message": "Bloqueja-ho tot"
},
"immediately": {
"message": "Immediatament"
Expand Down Expand Up @@ -1034,10 +1037,10 @@
"message": "S'aplica a tots els comptes connectats."
},
"turnOffBrowserBuiltInPasswordManagerSettings": {
"message": "Turn off your browser’s built in password manager settings to avoid conflicts."
"message": "Desactiveu la configuració integrada del gestor de contrasenyes del vostre navegador per evitar conflictes."
},
"turnOffBrowserBuiltInPasswordManagerSettingsLink": {
"message": "Edit browser settings."
"message": "Edita la configuració del navegador."
},
"autofillOverlayVisibilityOff": {
"message": "Desactivat",
Expand Down Expand Up @@ -1144,7 +1147,7 @@
"message": "Mostra una imatge reconeixible al costat de cada inici de sessió."
},
"faviconDescAlt": {
"message": "Show a recognizable image next to each login. Applies to all logged in accounts."
"message": "Mostra una imatge reconeixible al costat de cada sessió. S'aplica a tots els comptes connectats."
},
"enableBadgeCounter": {
"message": "Mostra el comptador insígnia"
Expand Down Expand Up @@ -2789,33 +2792,33 @@
"message": "Inseriu la YubiKey associada al compte del LastPass al port USB de l'ordinador i, després, toqueu-ne el botó."
},
"switchAccount": {
"message": "Switch account"
"message": "Canvia de compte"
},
"switchAccounts": {
"message": "Switch accounts"
"message": "Canvia de comptes"
},
"switchToAccount": {
"message": "Switch to account"
"message": "Canvia al compte"
},
"activeAccount": {
"message": "Active account"
"message": "Activa el compte"
},
"accountLimitReached": {
"message": "Account limit reached. Log out of an account to add another."
"message": "S'ha arribat al límit del compte. Tanqueu la sessió d'un compte per afegir-ne un altre."
},
"active": {
"message": "active"
"message": "activa"
},
"locked": {
"message": "locked"
"message": "bloquejat"
},
"unlocked": {
"message": "unlocked"
"message": "desbloquejat"
},
"server": {
"message": "server"
"message": "servidor"
},
"hostedAt": {
"message": "hosted at"
"message": "allotjat a"
}
}
3 changes: 3 additions & 0 deletions apps/browser/src/_locales/cs/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,9 @@
"length": {
"message": "Délka"
},
"passwordMinLength": {
"message": "Minimální délka hesla"
},
"uppercase": {
"message": "Velká písmena (A-Z)"
},
Expand Down
3 changes: 3 additions & 0 deletions apps/browser/src/_locales/cy/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,9 @@
"length": {
"message": "Hyd"
},
"passwordMinLength": {
"message": "Minimum password length"
},
"uppercase": {
"message": "Priflythrennau (A-Z)"
},
Expand Down
Loading

0 comments on commit 333c073

Please sign in to comment.