Skip to content

Commit

Permalink
Merge branch 'main' into PM-6413-add-http-loophole-for-localhost
Browse files Browse the repository at this point in the history
  • Loading branch information
coroiu authored Jun 17, 2024
2 parents 24d3695 + 18b56c0 commit 691299a
Show file tree
Hide file tree
Showing 559 changed files with 17,378 additions and 6,515 deletions.
41 changes: 0 additions & 41 deletions .github/workflows/brew-bump-cli.yml

This file was deleted.

11 changes: 2 additions & 9 deletions .github/workflows/build-browser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -186,17 +186,10 @@ jobs:
# path: browser-source/apps/browser/dist/dist-opera-mv3.zip
# if-no-files-found: error

- name: Upload Chrome artifact
- name: Upload Chrome MV3 artifact
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
with:
name: dist-chrome-${{ env._BUILD_NUMBER }}.zip
path: browser-source/apps/browser/dist/dist-chrome.zip
if-no-files-found: error

- name: Upload Chrome MV3 artifact (DO NOT USE FOR PROD)
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
with:
name: DO-NOT-USE-FOR-PROD-dist-chrome-MV3-${{ env._BUILD_NUMBER }}.zip
name: dist-chrome-MV3-${{ env._BUILD_NUMBER }}.zip
path: browser-source/apps/browser/dist/dist-chrome-mv3.zip
if-no-files-found: error

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-browser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ jobs:
PACKAGE_VERSION: ${{ needs.setup.outputs.release-version }}
run: |
mv browser-source.zip browser-source-$PACKAGE_VERSION.zip
mv dist-chrome.zip dist-chrome-$PACKAGE_VERSION.zip
mv dist-chrome-mv3.zip dist-chrome-$PACKAGE_VERSION.zip
mv dist-opera.zip dist-opera-$PACKAGE_VERSION.zip
mv dist-firefox.zip dist-firefox-$PACKAGE_VERSION.zip
mv dist-edge.zip dist-edge-$PACKAGE_VERSION.zip
Expand Down
33 changes: 23 additions & 10 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
name: Run tests
name: Testing

on:
workflow_dispatch:
Expand All @@ -9,17 +8,19 @@ on:
- "rc"
- "hotfix-rc-*"
pull_request:

defaults:
run:
shell: bash
types: [opened, synchronize]

jobs:
test:
name: Run tests
runs-on: ubuntu-22.04
permissions:
checks: write
contents: read
pull-requests: write

steps:
- name: Checkout repo
- name: Check out repo
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Get Node Version
Expand Down Expand Up @@ -64,14 +65,26 @@ jobs:
reporter: jest-junit
fail-on-error: true

- name: Check for Codecov secret
id: check-codecov-secret
run: |
if [ "${{ secrets.CODECOV_TOKEN }}" != '' ]; then
echo "available=true" >> $GITHUB_OUTPUT;
else
echo "available=false" >> $GITHUB_OUTPUT;
fi
- name: Upload to codecov.io
uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0
if: steps.check-codecov-secret.outputs.available == 'true'
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

rust:
name: rust - ${{ matrix.os }}
name: Run Rust tests on ${{ matrix.os }}
runs-on: ${{ matrix.os || 'ubuntu-latest' }}
permissions:
contents: read

strategy:
matrix:
Expand All @@ -81,7 +94,7 @@ jobs:
- windows-latest

steps:
- name: Rust version check
- name: Check Rust version
run: rustup --version

- name: Install gnome-keyring
Expand All @@ -90,7 +103,7 @@ jobs:
sudo apt-get update
sudo apt-get install -y gnome-keyring dbus-x11
- name: Checkout repo
- name: Check out repo
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Build
Expand Down
2 changes: 1 addition & 1 deletion apps/browser/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bitwarden/browser",
"version": "2024.6.0",
"version": "2024.6.1",
"scripts": {
"build": "cross-env MANIFEST_VERSION=3 webpack",
"build:mv2": "webpack",
Expand Down
51 changes: 31 additions & 20 deletions apps/browser/src/_locales/ar/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1434,6 +1434,24 @@
"typeIdentity": {
"message": "الهوية"
},
"newItemHeader": {
"message": "New $TYPE$",
"placeholders": {
"type": {
"content": "$1",
"example": "Login"
}
}
},
"editItemHeader": {
"message": "Edit $TYPE$",
"placeholders": {
"type": {
"content": "$1",
"example": "Login"
}
}
},
"passwordHistory": {
"message": "سجل كلمة المرور"
},
Expand Down Expand Up @@ -3305,16 +3323,6 @@
"clearFiltersOrTryAnother": {
"message": "Clear filters or try another search term"
},
"copyInfoLabel": {
"message": "Copy info, $ITEMNAME$",
"description": "Aria label for a button that opens a menu with options to copy information from an item.",
"placeholders": {
"itemname": {
"content": "$1",
"example": "Secret Item"
}
}
},
"copyInfoTitle": {
"message": "Copy info - $ITEMNAME$",
"description": "Title for a button that opens a menu with options to copy information from an item.",
Expand All @@ -3325,16 +3333,6 @@
}
}
},
"copyNoteLabel": {
"message": "Copy Note, $ITEMNAME$",
"description": "Aria label for a button copies a note to the clipboard.",
"placeholders": {
"itemname": {
"content": "$1",
"example": "Secret Note Item"
}
}
},
"copyNoteTitle": {
"message": "Copy Note - $ITEMNAME$",
"description": "Title for a button copies a note to the clipboard.",
Expand Down Expand Up @@ -3375,6 +3373,19 @@
}
}
},
"autofillTitle": {
"message": "Auto-fill - $ITEMNAME$",
"description": "Title for a button that auto-fills a login item.",
"placeholders": {
"itemname": {
"content": "$1",
"example": "Secret Item"
}
}
},
"noValuesToCopy": {
"message": "No values to copy"
},
"assignCollections": {
"message": "Assign collections"
},
Expand Down
55 changes: 33 additions & 22 deletions apps/browser/src/_locales/az/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -393,10 +393,10 @@
"message": "Sevimlilərdən sil"
},
"itemAddedToFavorites": {
"message": "Item added to favorites"
"message": "Element sevimlilərə əlavə edildi"
},
"itemRemovedFromFavorites": {
"message": "Item removed from favorites"
"message": "Element sevimlilərdən çıxarıldı"
},
"notes": {
"message": "Notlar"
Expand Down Expand Up @@ -1434,6 +1434,24 @@
"typeIdentity": {
"message": "Kimlik"
},
"newItemHeader": {
"message": "Yeni $TYPE$",
"placeholders": {
"type": {
"content": "$1",
"example": "Login"
}
}
},
"editItemHeader": {
"message": "$TYPE$ - düzəliş et",
"placeholders": {
"type": {
"content": "$1",
"example": "Login"
}
}
},
"passwordHistory": {
"message": "Parol tarixçəsi"
},
Expand Down Expand Up @@ -3305,16 +3323,6 @@
"clearFiltersOrTryAnother": {
"message": "Filtrləri təmizləyin və ya başqa bir axtarış terminini sınayın"
},
"copyInfoLabel": {
"message": "$ITEMNAME$ elementlərini kopyala",
"description": "Aria label for a button that opens a menu with options to copy information from an item.",
"placeholders": {
"itemname": {
"content": "$1",
"example": "Secret Item"
}
}
},
"copyInfoTitle": {
"message": "Məlumatları kopyala - $ITEMNAME$",
"description": "Title for a button that opens a menu with options to copy information from an item.",
Expand All @@ -3325,16 +3333,6 @@
}
}
},
"copyNoteLabel": {
"message": "$ITEMNAME$ notunu kopyala",
"description": "Aria label for a button copies a note to the clipboard.",
"placeholders": {
"itemname": {
"content": "$1",
"example": "Secret Note Item"
}
}
},
"copyNoteTitle": {
"message": "Notu kopyala - $ITEMNAME$",
"description": "Title for a button copies a note to the clipboard.",
Expand Down Expand Up @@ -3375,6 +3373,19 @@
}
}
},
"autofillTitle": {
"message": "Avto-doldur - $ITEMNAME$",
"description": "Title for a button that auto-fills a login item.",
"placeholders": {
"itemname": {
"content": "$1",
"example": "Secret Item"
}
}
},
"noValuesToCopy": {
"message": "Kopyalanacaq dəyər yoxdur"
},
"assignCollections": {
"message": "Kolleksiyaları təyin et"
},
Expand Down
Loading

0 comments on commit 691299a

Please sign in to comment.