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

.github/scripts/load-version.ps1

@@ -2,4 +2,4 @@
 $packageVersion = (Get-Content -Raw -Path $rootPath\src\package.json | ConvertFrom-Json).version;
 
 Write-Output "Setting package version to $packageVersion";
-Write-Output "::set-env name=PACKAGE_VERSION::$packageVersion";
+Write-Output "PACKAGE_VERSION=$packageVersion" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append;

.github/scripts/macos/increment-version.ps1

@@ -2,7 +2,7 @@
 $packagePath = "$rootPath\package.json";
 $buildNumber = 100 + [int]$env:GITHUB_RUN_NUMBER;
 Write-Output "Setting build number to $buildNumber";
-Write-Output "::set-env name=BUILD_NUMBER::$buildNumber";
+Write-Output "BUILD_NUMBER=$buildNumber" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append;
 $package = Get-Content -Raw -Path $packagePath | ConvertFrom-Json;
 $package.build | Add-Member -MemberType NoteProperty -Name buildVersion -Value "$buildNumber";
 $package | ConvertTo-Json -Depth 32 | Set-Content $packagePath;

.github/workflows/build.yml

@@ -36,7 +36,7 @@ jobs:
           node-version: '10.x'
 
       - name: Set Node options
-        run: echo "::set-env name=NODE_OPTIONS::--max_old_space_size=4096"
+        run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
 
       - name: Set up environment
         run: |
@@ -126,7 +126,8 @@ jobs:
           node-version: '10.x'
 
       - name: Set Node options
-        run: echo "::set-env name=NODE_OPTIONS::--max_old_space_size=4096"
+        run: echo "NODE_OPTIONS=--max_old_space_size=4096" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        shell: pwsh
 
       - name: Set up environment
         if: github.event_name == 'release'
@@ -232,7 +233,7 @@ jobs:
           node-version: '10.x'
 
       - name: Set Node options
-        run: echo "::set-env name=NODE_OPTIONS::--max_old_space_size=4096"
+        run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
 
       - name: Print environment
         run: |

src/app/accounts/register.component.html

@@ -41,7 +41,7 @@
                 {{'masterPassDesc' | i18n}}
             </div>
         </div>
-        <div class="box last">
+        <div class="box">
             <div class="box-content">
                 <div class="box-content-row box-content-row-flex" appBoxRow>
                     <div class="row-main">
@@ -66,6 +66,18 @@
                 {{'masterPassHintDesc' | i18n}}
             </div>
         </div>
+        <div class="box last" *ngIf="showTerms">
+            <div class="box-footer checkbox">
+                <input type="checkbox" id="acceptPolicies" [(ngModel)]="acceptPolicies" name="AcceptPolicies">
+                <label for="acceptPolicies">
+                    {{'acceptPolicies' | i18n}}<br>
+                    <a href="https://bitwarden.com/terms/" target="_blank"
+                        rel="noopener">{{'termsOfService' | i18n}}</a>,
+                    <a href="https://bitwarden.com/privacy/" target="_blank"
+                        rel="noopener">{{'privacyPolicy' | i18n}}</a>
+                </label>
+            </div>
+        </div>
         <div class="buttons">
             <button type="submit" class="btn primary block" [disabled]="form.loading" appBlurClick>
                 <b [hidden]="form.loading">{{'submit' | i18n}}</b>

src/locales/en/messages.json

@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Your new master password does not meet the policy requirements."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }