Merge branch 'main' into auth/pm-15987/web-back-button-doesnt-properl…

…y-reset-state
bitwarden · Dec 30, 2024 · a1f46e4 · a1f46e4
2 parents 6f8648f + 77a2b24
commit a1f46e4
Show file tree

Hide file tree

Showing 46 changed files with 385 additions and 633 deletions.
diff --git a/.github/workflows/repository-management.yml b/.github/workflows/repository-management.yml
@@ -490,6 +490,7 @@ jobs:
               git cherry-pick --strategy-option=theirs -x $SOURCE_COMMIT
               git push -u origin $destination_branch
             fi
+          }
 
           # Cherry-pick from 'main' into 'rc'
           cherry_pick browser main rc

diff --git a/apps/browser/package.json b/apps/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bitwarden/browser",
-  "version": "2024.12.3",
+  "version": "2025.1.0",
   "scripts": {
     "build": "npm run build:chrome",
     "build:chrome": "cross-env BROWSER=chrome MANIFEST_VERSION=3 webpack",

diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
@@ -1004,6 +1004,9 @@
   "showIdentitiesCurrentTabDesc": {
     "message": "List identity items on the Tab page for easy autofill."
   },
+  "clickToAutofillOnVault": {
+    "message": "Click items to autofill on Vault view"
+  },
   "clearClipboard": {
     "message": "Clear clipboard",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."