bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-27 21:53:25 +00:00
Code Issues Releases Wiki Activity

Merge branch 'EC-598-beeep-properly-store-passkeys-in-bitwarden' into PM-2207

Browse Source
This commit is contained in:
gbubemismith
2023-08-15 15:48:15 -04:00
parent 15ceb2b212 abe16005f6
commit 905ac1987c
12 changed files with 265 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/browser/src/background/main.background.ts
View File

@@ -396,7 +396,7 @@ export default class MainBackground {
// AuthService should send the messages to the background not popup.
send = (subscriber: string, arg: any = {}) => {
const message = Object.assign({}, { command: subscriber }, arg);
that.runtimeBackground.processMessage(message, that as any, null);
that.runtimeBackground.processMessage(message, that as any);
};
})();
this.authService = new AuthService(

4
apps/web/src/locales/en/messages.json
View File

@@ -5454,8 +5454,8 @@
"exportingOrganizationVaultTitle": {
"message": "Exporting organization vault"
},
"exportingPersonalVaultDescription": {
"message": "Only the individual vault items associated with $EMAIL$ will be exported. Organization vault items will not be included. Only vault item information will be exported and will not include associated password history or attachments.",
"exportingIndividualVaultDescription": {
"message": "Only the individual vault items associated with $EMAIL$ will be exported. Organization vault items will not be included. Only vault item information will be exported and will not include associated attachments.",
"placeholders": {
"email": {
"content": "$1",