diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7e978b16..8d8bb965 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -63,7 +63,7 @@ jobs: echo "::set-output name=branch-name::$BRANCH_NAME" - name: Download all artifacts - uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783 + uses: bitwarden/gh-actions/download-artifacts@c1fa8e09871a860862d6bbe36184b06d2c7e35a8 with: workflow: build.yml workflow_conclusion: success @@ -142,7 +142,7 @@ jobs: run: mkdir dist - name: Download Snap artifact - uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783 + uses: bitwarden/gh-actions/download-artifacts@c1fa8e09871a860862d6bbe36184b06d2c7e35a8 with: workflow: build.yml workflow_conclusion: success @@ -179,7 +179,7 @@ jobs: run: New-Item -ItemType directory -Path ./dist - name: Download choco artifact - uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783 + uses: bitwarden/gh-actions/download-artifacts@c1fa8e09871a860862d6bbe36184b06d2c7e35a8 with: workflow: build.yml workflow_conclusion: success diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7dc1739c..a083eedb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,7 +10,7 @@ Here is how you can get involved: - **Write code for a new feature:** Make a new post in the [Github Contributions category](https://community.bitwarden.com/c/github-contributions/) of the Community Forums. Include a description of your proposed contribution, screeshots, and links to any relevant feature requests. This helps get feedback from the community and Bitwarden team members before you start writing code - **Report a bug or submit a bugfix:** Use Github issues and pull requests - **Write documentation:** Submit a pull request to the [Bitwarden help repository](https://github.com/bitwarden/help) -- **Help other users:** Go to the [User-to-User Support category](https://community.bitwarden.com/c/support/) on the Community Forums +- **Help other users:** Go to the [Ask the Bitwarden Community category](https://community.bitwarden.com/c/support/) on the Community Forums - **Translate:** See the localization (l10n) section below ## Contributor Agreement @@ -31,6 +31,6 @@ We use a translation tool called [Crowdin](https://crowdin.com) to help manage o If you are interested in helping translate the Bitwarden desktop app into another language (or make a translation correction), please register an account at Crowdin and join our project here: https://crowdin.com/project/bitwarden-desktop -If the language that you are interested in translating is not already listed, create a new account on Crowdin, join the project, and contact the project owner (https://crowdin.com/profile/kspearrin). +If the language that you are interested in translating is not already listed, create a new account on Crowdin, join the project, and contact the project owner (https://crowdin.com/profile/dwbit). You can read Crowdin's getting started guide for translators here: https://support.crowdin.com/crowdin-intro/ diff --git a/jslib b/jslib index f3a4fde5..6bcadc4f 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit f3a4fde513dc16779e85597bd00027b160671db7 +Subproject commit 6bcadc4f408db2c150753f53a07d6f8888b6e9ff diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 037117f4..3cd8197d 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -83,7 +83,7 @@ import { AppRoutingModule } from "./app-routing.module"; import { AppComponent } from "./app.component"; import { PasswordRepromptComponent } from "./components/password-reprompt.component"; import { SetPinComponent } from "./components/set-pin.component"; -import { VerifyMasterPasswordComponent } from "./components/verify-master-password.component"; +import { UserVerificationComponent } from "./components/user-verification.component"; import { AccountSwitcherComponent } from "./layout/account-switcher.component"; import { HeaderComponent } from "./layout/header.component"; import { NavComponent } from "./layout/nav.component"; @@ -212,9 +212,9 @@ registerLocaleData(localeZhTw, "zh-TW"); TwoFactorComponent, TwoFactorOptionsComponent, UpdateTempPasswordComponent, + UserVerificationComponent, VaultComponent, VaultTimeoutInputComponent, - VerifyMasterPasswordComponent, ViewComponent, ViewCustomFieldsComponent, ], diff --git a/src/app/components/verify-master-password.component.html b/src/app/components/user-verification.component.html similarity index 100% rename from src/app/components/verify-master-password.component.html rename to src/app/components/user-verification.component.html diff --git a/src/app/components/verify-master-password.component.ts b/src/app/components/user-verification.component.ts similarity index 55% rename from src/app/components/verify-master-password.component.ts rename to src/app/components/user-verification.component.ts index 56b36505..dc12c94a 100644 --- a/src/app/components/verify-master-password.component.ts +++ b/src/app/components/user-verification.component.ts @@ -2,16 +2,16 @@ import { animate, style, transition, trigger } from "@angular/animations"; import { Component } from "@angular/core"; import { NG_VALUE_ACCESSOR } from "@angular/forms"; -import { VerifyMasterPasswordComponent as BaseComponent } from "jslib-angular/components/verify-master-password.component"; +import { UserVerificationComponent as BaseComponent } from "jslib-angular/components/user-verification.component"; @Component({ - selector: "app-verify-master-password", - templateUrl: "verify-master-password.component.html", + selector: "app-user-verification", + templateUrl: "user-verification.component.html", providers: [ { provide: NG_VALUE_ACCESSOR, multi: true, - useExisting: VerifyMasterPasswordComponent, + useExisting: UserVerificationComponent, }, ], animations: [ @@ -20,4 +20,4 @@ import { VerifyMasterPasswordComponent as BaseComponent } from "jslib-angular/co ]), ], }) -export class VerifyMasterPasswordComponent extends BaseComponent {} +export class UserVerificationComponent extends BaseComponent {} diff --git a/src/app/vault/export.component.html b/src/app/vault/export.component.html index f733a845..26325a02 100644 --- a/src/app/vault/export.component.html +++ b/src/app/vault/export.component.html @@ -21,8 +21,8 @@ - - + +
-
- +
+
-
- +