1
0
mirror of https://github.com/bitwarden/desktop.git synced 2024-11-24 11:55:50 +01:00

Merge branch 'master' of https://github.com/bitwarden/desktop into master

This commit is contained in:
Chad Scharf 2021-05-12 16:53:19 -04:00
commit dd683e8dad
7 changed files with 532 additions and 523 deletions

View File

@ -30,7 +30,7 @@ jobs:
- name: Set up Node - name: Set up Node
uses: actions/setup-node@v1 uses: actions/setup-node@v1
with: with:
node-version: '10.x' node-version: '14.x'
- name: Set Node options - name: Set Node options
run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
@ -114,7 +114,7 @@ jobs:
- name: Set up Node - name: Set up Node
uses: actions/setup-node@v1 uses: actions/setup-node@v1
with: with:
node-version: '10.x' node-version: '14.x'
- name: Set Node options - name: Set Node options
run: echo "NODE_OPTIONS=--max_old_space_size=4096" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append run: echo "NODE_OPTIONS=--max_old_space_size=4096" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
@ -245,7 +245,7 @@ jobs:
- name: Set up Node - name: Set up Node
uses: actions/setup-node@v1 uses: actions/setup-node@v1
with: with:
node-version: '10.x' node-version: '14.x'
- name: Set Node options - name: Set Node options
run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV

View File

@ -58,7 +58,7 @@ jobs:
- name: Set up Node - name: Set up Node
uses: actions/setup-node@v1 uses: actions/setup-node@v1
with: with:
node-version: '10.x' node-version: '14.x'
- name: Set Node options - name: Set Node options
run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
@ -104,7 +104,7 @@ jobs:
- name: Set up Node - name: Set up Node
uses: actions/setup-node@v1 uses: actions/setup-node@v1
with: with:
node-version: '10.x' node-version: '14.x'
- name: Set Node options - name: Set Node options
run: echo "NODE_OPTIONS=--max_old_space_size=4096" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append run: echo "NODE_OPTIONS=--max_old_space_size=4096" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
@ -199,7 +199,7 @@ jobs:
- name: Set up Node - name: Set up Node
uses: actions/setup-node@v1 uses: actions/setup-node@v1
with: with:
node-version: '10.x' node-version: '14.x'
- name: Set Node options - name: Set Node options
run: echo "NODE_OPTIONS=--max_old_space_size=4096" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append run: echo "NODE_OPTIONS=--max_old_space_size=4096" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
@ -269,7 +269,7 @@ jobs:
- name: Set up Node - name: Set up Node
uses: actions/setup-node@v1 uses: actions/setup-node@v1
with: with:
node-version: '10.x' node-version: '14.x'
- name: Set Node options - name: Set Node options
run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV

2
jslib

@ -1 +1 @@
Subproject commit 1b8f6aace247d226455f2ae510cd99eac91ff8b1 Subproject commit ba1a40af4e93c78b3312a1167e7cc16729910069

1019
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -250,7 +250,7 @@
"@ngtools/webpack": "^11.2.10", "@ngtools/webpack": "^11.2.10",
"@types/duo_web_sdk": "^2.7.0", "@types/duo_web_sdk": "^2.7.0",
"@types/lunr": "^2.3.3", "@types/lunr": "^2.3.3",
"@types/node": "^10.17.58", "@types/node": "^14.14.43",
"@types/node-forge": "^0.9.7", "@types/node-forge": "^0.9.7",
"@types/node-ipc": "^9.1.3", "@types/node-ipc": "^9.1.3",
"@types/papaparse": "^5.2.0", "@types/papaparse": "^5.2.0",
@ -263,7 +263,7 @@
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
"css-loader": "^5.2.4", "css-loader": "^5.2.4",
"del": "^6.0.0", "del": "^6.0.0",
"electron": "11.4.3", "electron": "11.4.5",
"electron-builder": "22.10.5", "electron-builder": "22.10.5",
"electron-notarize": "^1.0.0", "electron-notarize": "^1.0.0",
"electron-rebuild": "^2.3.5", "electron-rebuild": "^2.3.5",
@ -309,11 +309,11 @@
"big-integer": "1.6.48", "big-integer": "1.6.48",
"browser-hrtime": "^1.1.8", "browser-hrtime": "^1.1.8",
"duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git", "duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git",
"electron-log": "^4.3.4", "electron-log": "^4.3.5",
"electron-store": "8.0.0", "electron-store": "8.0.0",
"electron-updater": "^4.3.8", "electron-updater": "^4.3.9",
"forcefocus": "^1.1.0", "forcefocus": "^1.1.0",
"keytar": "^7.6.0", "keytar": "7.6.0",
"lunr": "^2.3.9", "lunr": "^2.3.9",
"ngx-infinite-scroll": "^10.0.1", "ngx-infinite-scroll": "^10.0.1",
"node-forge": "0.10.0", "node-forge": "0.10.0",
@ -326,5 +326,9 @@
"tslib": "^2.0.0", "tslib": "^2.0.0",
"zone.js": "^0.11.4", "zone.js": "^0.11.4",
"zxcvbn": "4.4.2" "zxcvbn": "4.4.2"
},
"engines": {
"node": "~14",
"npm": "~6"
} }
} }

View File

@ -38,7 +38,7 @@ export class AddEditComponent extends BaseAddEditComponent {
this.onCancelled.emit(this.send); this.onCancelled.emit(this.send);
} }
copyLinkToClipboard(link: string) { async copyLinkToClipboard(link: string) {
super.copyLinkToClipboard(link); super.copyLinkToClipboard(link);
this.platformUtilsService.showToast('success', null, this.platformUtilsService.showToast('success', null,
this.i18nService.t('valueCopied', this.i18nService.t('sendLink'))); this.i18nService.t('valueCopied', this.i18nService.t('sendLink')));

View File

@ -15,9 +15,9 @@
"@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4", "@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4",
"big-integer": "1.6.48", "big-integer": "1.6.48",
"browser-hrtime": "^1.1.8", "browser-hrtime": "^1.1.8",
"electron-log": "4.3.4", "electron-log": "4.3.5",
"electron-store": "8.0.0", "electron-store": "8.0.0",
"electron-updater": "4.3.8", "electron-updater": "4.3.9",
"forcefocus": "^1.1.0", "forcefocus": "^1.1.0",
"keytar": "7.6.0", "keytar": "7.6.0",
"node-ipc": "^9.1.4", "node-ipc": "^9.1.4",