Merge branch 'stefan0xC-change-pagetitle'

patches/v2022.11.1.patch

@@ -71,6 +71,19 @@ index 75089529f..969d81a8a 100644
        this.environmentService.setUrls(urls);
  
        setTimeout(() => this.notificationsService.init(), 3000);
+diff --git a/apps/web/src/app/core/router.service.ts b/apps/web/src/app/core/router.service.ts
+index aa9041875..680936375 100644
+--- a/apps/web/src/app/core/router.service.ts
++++ b/apps/web/src/app/core/router.service.ts
+@@ -23,7 +23,7 @@ export class RouterService {
+       .subscribe((event: NavigationEnd) => {
+         this.currentUrl = event.url;
+ 
+-        let title = i18nService.t("pageTitle", "Bitwarden");
++        let title = i18nService.t("pageTitle", "Vaultwarden");
+         let child = this.activatedRoute.firstChild;
+         while (child.firstChild) {
+           child = child.firstChild;
 diff --git a/apps/web/src/app/core/web-platform-utils.service.ts b/apps/web/src/app/core/web-platform-utils.service.ts
 index 115d53401..e62638e35 100644
 --- a/apps/web/src/app/core/web-platform-utils.service.ts
@@ -113,9 +126,17 @@ index d737bc9f0..6a312c0b1 100644
    {{ "versionNumber" | i18n: version }}
  </div>
 diff --git a/apps/web/src/app/layouts/navbar.component.html b/apps/web/src/app/layouts/navbar.component.html
-index b7e5a69fb..2a0d9fc8b 100644
+index b7e5a69fb..ed0df9e29 100644
 --- a/apps/web/src/app/layouts/navbar.component.html
 +++ b/apps/web/src/app/layouts/navbar.component.html
+@@ -1,6 +1,6 @@
+ <nav class="navbar navbar-expand navbar-dark" [ngClass]="{ 'nav-background-alt': selfHosted }">
+   <div class="container">
+-    <a class="navbar-brand" routerLink="/" appA11yTitle="{{ 'pageTitle' | i18n: 'Bitwarden' }}">
++    <a class="navbar-brand" routerLink="/" appA11yTitle="{{ 'pageTitle' | i18n: 'Vaultwarden' }}">
+       <i class="bwi bwi-shield" aria-hidden="true"></i>
+     </a>
+     <div class="collapse navbar-collapse">
 @@ -67,7 +67,7 @@
                <i class="bwi bwi-fw bwi-user" aria-hidden="true"></i>
                {{ "accountSettings" | i18n }}
@@ -217,6 +238,24 @@ index 2a2fc4d27..26053e486 100644
 +    this.hideSubscription = true;
    }
  }
+diff --git a/apps/web/src/app/settings/two-factor-authenticator.component.ts b/apps/web/src/app/settings/two-factor-authenticator.component.ts
+index 652ee24a1..5a63562cc 100644
+--- a/apps/web/src/app/settings/two-factor-authenticator.component.ts
++++ b/apps/web/src/app/settings/two-factor-authenticator.component.ts
+@@ -98,11 +98,11 @@ export class TwoFactorAuthenticatorComponent
+       new window.QRious({
+         element: document.getElementById("qr"),
+         value:
+-          "otpauth://totp/Bitwarden:" +
++          "otpauth://totp/Vaultwarden:" +
+           encodeURIComponent(email) +
+           "?secret=" +
+           encodeURIComponent(this.key) +
+-          "&issuer=Bitwarden",
++          "&issuer=Vaultwarden",
+         size: 160,
+       });
+     }, 100);
 diff --git a/apps/web/src/app/vault/vault.component.ts b/apps/web/src/app/vault/vault.component.ts
 index 9f9c0d378..fcb85250b 100644
 --- a/apps/web/src/app/vault/vault.component.ts
@@ -234,6 +273,39 @@ index 9f9c0d378..fcb85250b 100644
  
      // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
      this.route.queryParams.pipe(first()).subscribe(async (params) => {
+diff --git a/apps/web/src/index.html b/apps/web/src/index.html
+index 63d4e72c0..68b6ada00 100644
+--- a/apps/web/src/index.html
++++ b/apps/web/src/index.html
+@@ -5,7 +5,7 @@
+     <meta name="viewport" content="width=1010" />
+     <meta name="theme-color" content="#175DDC" />
+ 
+-    <title page-title>Bitwarden Web Vault</title>
++    <title page-title>Vaultwarden Web Vault</title>
+ 
+     <link rel="apple-touch-icon" sizes="180x180" href="images/icons/apple-touch-icon.png" />
+     <link rel="icon" type="image/png" sizes="32x32" href="images/icons/favicon-32x32.png" />
+diff --git a/apps/web/src/manifest.json b/apps/web/src/manifest.json
+index 92a1204c6..5a10dc9ae 100644
+--- a/apps/web/src/manifest.json
++++ b/apps/web/src/manifest.json
+@@ -1,5 +1,5 @@
+ {
+-  "name": "Bitwarden Vault",
++  "name": "Vaultwarden Web Vault",
+   "icons": [
+     {
+       "src": "images/icons/android-chrome-192x192.png",
+@@ -12,6 +12,6 @@
+       "type": "image/png"
+     }
+   ],
+-  "theme_color": "#175DDC",
+-  "background_color": "#175DDC"
++  "theme_color": "#ffffff",
++  "background_color": "#ffffff"
+ }
 diff --git a/apps/web/src/scss/styles.scss b/apps/web/src/scss/styles.scss
 index 0003f521c..41d6fca76 100644
 --- a/apps/web/src/scss/styles.scss

resources/safari-pinned-tab.svg

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="700.000000pt" height="700.000000pt" viewBox="0 0 700.000000 700.000000"
+ preserveAspectRatio="xMidYMid meet">
+<g transform="translate(0.000000,700.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M3455 6988 c-26 -15 -34 -27 -135 -193 l-85 -140 -49 -3 c-27 -2 -51 1
+-55 6 -7 11 -154 173 -212 234 -34 36 -54 43 -104 38 -41 -4 -71 -52 -120 -195
+-63 -185 -67 -192 -113 -204 -20 -6 -40 -11 -44 -11 -4 0 -60 40 -125 88 -198 147
+-224 157 -280 105 -26 -25 -31 -40 -48 -153 -10 -69 -19 -135 -21 -147 -10 -91 -14
+-99 -59 -121 l-43 -21 -49 23 c-151 73 -260 124 -278 130 -35 10 -79 -9 -103 -44
+-24 -35 -24 -69 -7 -341 4 -55 2 -59 -31 -88 -19 -17 -38 -31 -42 -31 -4 0 -86 20
+-182 44 -96 23 -184 40 -195 37 -39 -12 -56 -28 -69 -64 -11 -33 -9 -51 25 -184 56
+-225 55 -206 19 -246 l-31 -36 -102 6 c-56 4 -144 7 -194 7 -87 1 -94 -1 -119 -25
+-44 -45 -39 -76 48 -257 l78 -163 -21 -42 c-12 -23 -22 -43 -23 -44 -2 -2 -110 -19
+-181 -29 -27 -3 -59 -8 -70 -10 -11 -2 -40 -7 -64 -10 -58 -7 -77 -18 -96 -54 -18
+-35 -19 -64 -3 -93 9 -18 87 -127 116 -162 4 -5 27 -38 51 -72 44 -61 44 -61 31
+-105 l-13 -44 -151 -53 c-83 -29 -168 -63 -188 -74 -63 -34 -69 -104 -15 -159 38
+-39 225 -210 238 -219 5 -3 8 -27 8 -53 -3 -55 7 -47 -184 -161 -133 -80 -150 -94
+-161 -132 -11 -40 17 -100 51 -114 6 -2 74 -42 151 -89 l141 -85 1 -50 1 -50 -85
+-75 c-170 -150 -194 -175 -195 -206 -2 -43 1 -55 19 -79 16 -22 50 -36 263 -111
+l106 -37 11 -48 12 -49 -83 -112 c-45 -62 -84 -115 -87 -118 -3 -3 -16 -20 -29 -38
+-18 -26 -22 -42 -18 -73 8 -63 32 -82 118 -94 24 -3 55 -8 69 -10 46 -8 86 -15 126
+-20 108 -13 109 -14 132 -60 l21 -44 -49 -101 c-28 -55 -50 -103 -50 -106 0 -3 -13
+-32 -29 -64 -34 -69 -33 -111 5 -150 23 -23 31 -25 117 -24 50 0 138 3 194 6 l103
+6 30 -34 c34 -39 34 -45 0 -166 -10 -37 -17 -68 -15 -68 2 0 -3 -19 -11 -42 -8 -24
+-17 -59 -20 -78 -3 -19 -7 -37 -9 -38 -8 -9 21 -69 39 -82 39 -28 58 -29 156 -5 8
+2 69 18 135 34 66 17 123 31 127 31 4 0 23 -14 42 -31 34 -30 35 -32 31 -92 -2 -34
+-6 -119 -10 -189 l-6 -127 29 -32 c46 -51 78 -46 268 45 l160 76 42 -22 c43 -24 45
+-28 57 -133 4 -27 8 -57 10 -65 2 -8 7 -37 10 -65 18 -141 32 -170 91 -181 45 -8
+62 -1 156 69 46 34 100 73 121 87 20 14 37 28 37 33 0 4 7 7 15 7 8 0 15 5 15 10 0
+13 15 13 63 -1 44 -12 45 -14 114 -208 49 -143 81 -191 123 -193 65 -3 54 -11 220
+171 47 51 87 97 88 102 5 14 86 11 104 -3 9 -7 56 -78 103 -158 48 -79 94 -150 103
+-157 42 -32 99 -28 132 10 23 26 170 266 170 277 0 20 40 40 80 40 32 0 47 -6 62
+-23 25 -29 164 -182 205 -225 25 -26 39 -33 70 -34 44 0 77 16 92 47 6 11 33 85 61
+165 28 80 54 152 59 160 4 8 29 21 54 28 l46 13 135 -101 c157 -116 173 -125 219
+-116 57 11 76 47 92 176 4 30 8 64 10 75 2 11 9 54 15 96 l12 76 43 21 43 21 44
+-21 c309 -150 326 -154 377 -104 25 25 26 31 25 129 -1 56 -4 144 -7 194 l-5 92 34
+31 c19 16 38 30 42 30 4 0 86 -20 182 -44 180 -44 198 -45 243 -12 35 27 36 64 1
+201 -18 72 -35 141 -37 155 -3 14 -8 37 -12 51 -5 21 0 34 25 62 l31 36 102 -6 c56
+-3 144 -6 194 -7 88 -1 94 0 120 26 49 50 44 68 -105 377 l-21 43 21 42 c11 22 21
+42 22 43 1 2 80 14 174 28 192 28 213 34 236 67 38 54 25 81 -131 291 -65 88 -73
+103 -68 131 9 40 32 76 48 76 8 0 80 25 162 54 148 55 192 82 195 121 7 65 -8 83
+-202 253 l-78 67 3 50 2 50 144 87 c79 48 155 96 167 107 43 37 44 102 2 141 -12
+11 -69 48 -128 82 -184 108 -186 110 -189 162 -2 51 -12 39 126 162 159 143 159
+143 154 209 -4 38 -54 70 -191 118 -200 71 -195 68 -209 121 l-11 46 104 140 c58
+77 108 150 111 161 10 30 -2 84 -23 102 -20 17 -73 32 -152 42 -30 4 -64 9 -75 11
+-11 2 -40 6 -65 9 -102 12 -107 14 -126 58 -11 23 -18 47 -16 54 2 7 35 79 74 160
+81 170 88 207 45 251 -26 26 -32 27 -120 26 -50 0 -138 -3 -194 -6 l-103 -6 -30 34
+c-35 40 -35 33 15 228 42 163 44 183 21 222 -33 56 -61 57 -257 8 -96 -24 -177 -44
+-181 -44 -4 0 -23 14 -42 30 l-35 31 6 112 c4 62 7 149 7 194 1 77 -1 84 -26 110
+-44 43 -81 37 -250 -45 -81 -39 -153 -72 -161 -74 -7 -2 -31 5 -54 16 -44 19 -45
+23 -58 131 -16 132 -45 269 -61 286 -22 24 -79 35 -110 20 -14 -6 -86 -57 -161
+-112 l-135 -101 -45 13 c-52 14 -49 9 -122 213 -52 145 -78 186 -121 188 -48 2 -59
+-2 -92 -34 -38 -37 -210 -225 -219 -240 -3 -5 -28 -8 -55 -6 l-49 3 -96 158 c-53
+87 -100 162 -105 167 -16 16 -88 21 -109 8z m133 -642 c121 -64 148 -234 50 -322
+-111 -101 -291 -53 -329 88 -37 138 72 266 214 252 22 -3 51 -11 65 -18z m-377
+-505 c143 -143 189 -182 223 -194 52 -18 111 -15 154 7 17 9 110 95 206 191 168
+168 178 176 209 171 193 -33 436 -116 649 -222 l107 -53 -11 -38 c-6 -21 -30 -92
+-53 -158 -24 -66 -88 -248 -143 -405 -55 -157 -112 -319 -127 -360 -14 -41 -71
+-201 -125 -355 -54 -154 -144 -410 -200 -570 -56 -159 -131 -371 -165 -470 -35 -99
+-116 -328 -180 -510 -105 -298 -237 -686 -248 -732 -3 -15 -5 -15 -9 -3 -3 8 -51
+150 -106 315 -55 165 -130 386 -167 490 -37 105 -84 240 -105 300 -21 61 -66 189
+-100 285 -34 96 -93 263 -130 370 -38 107 -83 236 -100 285 -18 50 -63 178 -100
+285 -38 107 -96 274 -130 370 -34 96 -65 186 -70 200 -4 14 -31 90 -60 170 -28 80
+-62 177 -75 215 -13 39 -42 121 -64 184 -23 62 -41 119 -41 125 0 11 172 99 275
+141 140 58 421 141 483 144 17 1 69 -45 203 -178z m-1550 -1206 c166 -464 225 -628
+298 -832 28 -76 118 -329 201 -563 83 -234 173 -486 200 -560 27 -74 117 -326 200
+-560 200 -563 248 -695 270 -755 50 -134 130 -368 127 -372 -17 -16 -516 152 -550
+186 -8 8 -10 18 -22 91 -3 25 -9 59 -12 75 -2 17 -6 39 -8 50 -25 176 -45 277 -62
+312 -20 43 -83 90 -132 99 -29 6 -205 -13 -306 -32 -20 -4 -55 -10 -110 -19 -121
+-20 -117 -20 -161 27 -203 218 -403 550 -508 843 -24 69 -74 231 -82 270 -7 34 -33
+168 -39 200 -3 17 -8 48 -10 70 -2 22 -7 72 -12 110 -8 73 -7 425 1 460 2 11 5 37
+5 57 l1 37 216 108 c223 112 273 147 300 211 30 74 20 109 -103 352 l-115 224 17
+36 c23 48 87 148 164 254 60 83 65 87 73 65 5 -13 77 -213 159 -444z m3972 290 c41
+-60 84 -129 97 -153 l24 -42 -114 -223 c-112 -217 -114 -224 -115 -289 0 -58 4 -71
+31 -109 34 -47 45 -54 312 -188 132 -67 181 -96 180 -109 0 -9 3 -48 8 -87 14 -125
+7 -471 -11 -560 -2 -11 -7 -38 -9 -60 -28 -216 -128 -529 -239 -750 -93 -186 -258
+-430 -378 -559 l-56 -60 -109 18 c-60 10 -116 20 -125 21 -9 2 -40 6 -70 10 -30 4
+-72 11 -94 16 -72 16 -138 11 -186 -14 -67 -35 -94 -85 -114 -202 -20 -121 -23
+-139 -30 -190 -3 -22 -8 -51 -10 -65 -3 -14 -8 -42 -11 -64 -9 -57 -12 -75 -18 -84
+-3 -5 -36 -21 -73 -36 -37 -16 -81 -34 -98 -41 -79 -33 -373 -120 -381 -112 -4 4
+10 54 26 92 7 16 100 276 198 555 11 30 88 246 172 480 176 493 507 1420 651 1825
+55 154 104 290 109 302 5 12 21 57 35 100 14 43 30 87 34 98 19 46 54 144 142 393
+l94 263 27 -33 c15 -18 61 -82 101 -143z m-4557 -437 c118 -80 112 -261 -10 -333
+-83 -48 -175 -37 -242 30 -62 62 -76 153 -37 229 55 107 189 141 289 74z m5054 8
+c127 -63 140 -251 23 -334 -154 -109 -365 45 -306 224 19 56 76 111 132 128 56 16
+92 12 151 -18z m-960 -2983 c19 -11 49 -41 65 -68 25 -40 30 -58 29 -105 -5 -252
+-374 -262 -392 -11 -12 162 154 264 298 184z m-3152 8 c164 -84 142 -323 -34 -370
+-135 -35 -259 69 -249 211 8 131 165 219 283 159z"/>
+</g>
+</svg>

scripts/apply_patches.sh

@@ -19,6 +19,14 @@ cp -vf ../resources/logo-dark@2x.png ./apps/web/src/images/logo-dark@2x.png
 cp -vf ../resources/logo-white@2x.png ./apps/web/src/images/logo-white@2x.png
 cp -vf ../resources/icon-white.png ./apps/web/src/images/icon-white.png
 
+cp -vf ../resources/android-chrome-192x192.png ./apps/web/src/images/icons/android-chrome-192x192.png
+cp -vf ../resources/android-chrome-512x512.png ./apps/web/src/images/icons/android-chrome-512x512.png
+cp -vf ../resources/apple-touch-icon.png ./apps/web/src/images/icons/apple-touch-icon.png
+cp -vf ../resources/favicon-16x16.png ./apps/web/src/images/icons/favicon-16x16.png
+cp -vf ../resources/favicon-32x32.png ./apps/web/src/images/icons/favicon-32x32.png
+cp -vf ../resources/mstile-150x150.png ./apps/web/src/images/icons/mstile-150x150.png
+cp -vf ../resources/safari-pinned-tab.svg ./apps/web/src/images/icons/safari-pinned-tab.svg
+
 echo "Using patch: ${PATCH_NAME}"
 git apply "../patches/${PATCH_NAME}" --reject
 

scripts/generate_patch_file.sh

@@ -28,6 +28,13 @@ if [ "$(git status --porcelain | wc -l)" -ge 1 ]; then
       ':!apps/web/src/images/logo-dark@2x.png' \
       ':!apps/web/src/images/logo-white@2x.png' \
       ':!apps/web/src/images/icon-white.png' \
+      ':!apps/web/src/images/icons/android-chrome-192x192.png' \
+      ':!apps/web/src/images/icons/android-chrome-512x512.png' \
+      ':!apps/web/src/images/icons/apple-touch-icon.png' \
+      ':!apps/web/src/images/icons/favicon-16x16.png' \
+      ':!apps/web/src/images/icons/favicon-32x32.png' \
+      ':!apps/web/src/images/icons/mstile-150x150.png' \
+      ':!apps/web/src/images/icons/safari-pinned-tab.svg' \
       > "../patches/${PATCH_FILENAME}"
     echo "Patch has been created here: patches/${PATCH_FILENAME}"
 else