diff --git a/.github/secrets/appstore-app-cert.p12.gpg b/.github/secrets/appstore-app-cert.p12.gpg index 0591712090a..d5ed237a505 100644 Binary files a/.github/secrets/appstore-app-cert.p12.gpg and b/.github/secrets/appstore-app-cert.p12.gpg differ diff --git a/.github/secrets/appstore-installer-cert.p12.gpg b/.github/secrets/appstore-installer-cert.p12.gpg index 7bf0edd4544..93c2e7a6a07 100644 Binary files a/.github/secrets/appstore-installer-cert.p12.gpg and b/.github/secrets/appstore-installer-cert.p12.gpg differ diff --git a/.github/secrets/bitwarden-desktop-key.p12.gpg b/.github/secrets/bitwarden-desktop-key.p12.gpg index e64f2873924..cc4ef3fdc08 100644 Binary files a/.github/secrets/bitwarden-desktop-key.p12.gpg and b/.github/secrets/bitwarden-desktop-key.p12.gpg differ diff --git a/.github/secrets/bitwarden_desktop_appstore.provisionprofile.gpg b/.github/secrets/bitwarden_desktop_appstore.provisionprofile.gpg index bd7d01850f2..dc7a50981e6 100644 Binary files a/.github/secrets/bitwarden_desktop_appstore.provisionprofile.gpg and b/.github/secrets/bitwarden_desktop_appstore.provisionprofile.gpg differ diff --git a/.github/secrets/devid-app-cert.p12.gpg b/.github/secrets/devid-app-cert.p12.gpg index c445724ce9a..8e2e2146e23 100644 Binary files a/.github/secrets/devid-app-cert.p12.gpg and b/.github/secrets/devid-app-cert.p12.gpg differ diff --git a/.github/secrets/devid-installer-cert.p12.gpg b/.github/secrets/devid-installer-cert.p12.gpg index 7afdb2167da..f379fc214fe 100644 Binary files a/.github/secrets/devid-installer-cert.p12.gpg and b/.github/secrets/devid-installer-cert.p12.gpg differ diff --git a/.github/secrets/macdev-cert.p12.gpg b/.github/secrets/macdev-cert.p12.gpg index 3d9bd88d89b..bc1fff2e0b1 100644 Binary files a/.github/secrets/macdev-cert.p12.gpg and b/.github/secrets/macdev-cert.p12.gpg differ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 812793b7681..82072d6e499 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -198,42 +198,42 @@ jobs: choco pack ./dist/chocolatey/bitwarden.nuspec --version "$env:PACKAGE_VERSION" --out ./dist/chocolatey - name: Upload portable exe artifact - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' uses: actions/upload-artifact@v2 with: name: Bitwarden-Portable-${{ env.PACKAGE_VERSION }}.exe path: ./dist/Bitwarden-Portable-${{ env.PACKAGE_VERSION }}.exe - name: Upload installer exe artifact - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' uses: actions/upload-artifact@v2 with: name: Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe path: ./dist/nsis-web/Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe - name: Upload store appx ia32 artifact - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' uses: actions/upload-artifact@v2 with: name: Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx - name: Upload store appx x64 artifact - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' uses: actions/upload-artifact@v2 with: name: Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx - name: Upload store appx ARM64 artifact - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' uses: actions/upload-artifact@v2 with: name: Bitwarden-${{ env.PACKAGE_VERSION }}-arm64-store.appx path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-arm64-store.appx - name: Upload nupkg artifact - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' uses: actions/upload-artifact@v2 with: name: bitwarden.${{ env.PACKAGE_VERSION }}.nupkg @@ -300,66 +300,66 @@ jobs: run: npm run lint - name: Create Safari directory - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' shell: pwsh run: New-Item ./dist-safari -ItemType Directory -ea 0 - name: Checkout browser extension - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' uses: actions/checkout@v2 with: repository: 'bitwarden/browser' path: 'dist-safari/browser' - name: Build Safari extension - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' shell: pwsh run: ./scripts/safari-build.ps1 -skipcheckout -skipoutcopy - name: Load Safari extension for .dmg - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' shell: pwsh run: ./scripts/safari-build.ps1 -copyonly - name: Build application (dev) - if: github.ref != 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref != 'refs/heads/master' || github.ref == 'refs/heads/rc' run: npm run build - name: Build application (dist) - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' run: npm run dist:mac env: APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }} APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} - name: Upload .zip artifact - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' uses: actions/upload-artifact@v2 with: name: Bitwarden-${{ env.PACKAGE_VERSION }}-mac.zip path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-mac.zip - name: Upload .dmg artifact - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' uses: actions/upload-artifact@v2 with: name: Bitwarden-${{ env.PACKAGE_VERSION }}.dmg path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}.dmg - name: Load Safari extension for App Store - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' shell: pwsh run: ./scripts/safari-build.ps1 -mas -copyonly - name: Build application for App Store - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' run: npm run dist:mac:mas env: APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }} APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} - name: Upload .pkg artifact - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' uses: actions/upload-artifact@v2 with: name: Bitwarden-${{ env.PACKAGE_VERSION }}.pkg diff --git a/jslib b/jslib index 3942868cf48..f80e89465ff 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 3942868cf488ed8c1983ffadab2c8900b8c78410 +Subproject commit f80e89465ffc004705d2941301c0ffb6bfd71d1a diff --git a/resources/entitlements.mas.plist b/resources/entitlements.mas.plist index 7105330dc38..b237c81fe39 100644 --- a/resources/entitlements.mas.plist +++ b/resources/entitlements.mas.plist @@ -12,6 +12,7 @@ /Library/Application Support/Mozilla/NativeMessagingHosts/ /Library/Application Support/Google/Chrome/NativeMessagingHosts/ + /Library/Application Support/Microsoft Edge/NativeMessagingHosts/ diff --git a/src/app/send/add-edit.component.html b/src/app/send/add-edit.component.html index 24845b0d3bd..7e13e7bb001 100644 --- a/src/app/send/add-edit.component.html +++ b/src/app/send/add-edit.component.html @@ -15,45 +15,43 @@ +
+ +
+ + +
+
+
+ + +
+
+ +
{{send.file.fileName}} ({{send.file.sizeName}})
+
+
+ + +
+ + + -
+
- -
- -
- - -
-
-
- - -
{{'sendFileDesc' | i18n}} {{'maxFileSize' | i18n}}
-
-
- -
- - -
-
- -
- - -
{{'sendTextDesc' | i18n}}
-
-
- - -
-
+
+ + +
@@ -73,13 +71,13 @@ -
{{'deletionDateDesc' | i18n}}
+ {{'deletionDateDesc' | i18n}}
-
{{'deletionDateDesc' | i18n}}
+ {{'deletionDateDesc' | i18n}}
@@ -87,13 +85,13 @@ -
{{'expirationDateDesc' | i18n}}
+ {{'expirationDateDesc' | i18n}}
-
{{'expirationDateDesc' | i18n}}
+ {{'expirationDateDesc' | i18n}}
@@ -102,13 +100,15 @@
-
{{'maxAccessCountDesc' | i18n}}
-
-
- -
+ +
@@ -116,7 +116,6 @@
-
{{'sendPasswordDesc' | i18n}}
+
@@ -135,9 +137,11 @@
- {{'sendNotesDesc' | i18n}}
+
@@ -177,8 +181,7 @@ diff --git a/src/app/send/send.component.html b/src/app/send/send.component.html index 63a6a182531..3eb7d781e0e 100644 --- a/src/app/send/send.component.html +++ b/src/app/send/send.component.html @@ -42,7 +42,7 @@