Skip to content

Commit

Permalink
Merge branch 'dev' into prevent-window-overflow
Browse files Browse the repository at this point in the history
  • Loading branch information
Legend-Master committed Jan 6, 2025
2 parents bdb8d2e + 22d5852 commit e87436e
Show file tree
Hide file tree
Showing 102 changed files with 1,672 additions and 1,563 deletions.
6 changes: 0 additions & 6 deletions .changes/api-transfrom-icon-about-menu-item.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/api-transfrom-icon-icon-menu-item.md

This file was deleted.

8 changes: 0 additions & 8 deletions .changes/bundler-nsis-portuguese.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/bundler-skip-ci.md

This file was deleted.

6 changes: 6 additions & 0 deletions .changes/cli-generate-64x64-icon.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'tauri-cli': 'patch:enhance'
'@tauri-apps/cli': 'patch:enhance'
---

Enhance `tauri icon` command by including 64x64 png size in default icon sizes.
5 changes: 0 additions & 5 deletions .changes/core-background-color-permissions.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/core-builder-on-tray-icon-event.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/core-scope-is-forbidden.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changes/data-store-identifier.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changes/deb-updater-support.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changes/extension-path.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/fix-add-capability-panic.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/fix-apijs-mockipc-cb-type.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/fix-cli-plugin-path.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changes/info-linux-de-and-session.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/json5-capability-files.md

This file was deleted.

11 changes: 0 additions & 11 deletions .changes/overlay.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/path-plugin-is-absolute.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/set-show-menu-on-left-click-windows-api.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/show-menu-on-left-click-windows-api.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/show-menu-on-left-click-windows.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/specta-feature-fix.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/tray-icon-menu-on-left-click-windows-api.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/tray-icon-menu-on-left-click-windows.md

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/covector-version-or-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:

- name: Create Pull Request With Versions Bumped
if: steps.covector.outputs.commandRan == 'version'
uses: tauri-apps/create-pull-request@v3
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # 7.0.6
with:
token: ${{ secrets.GITHUB_TOKEN }}
branch: release/version-updates
Expand All @@ -124,7 +124,7 @@ jobs:
if: |
steps.covector.outputs.successfulPublish == 'true' &&
steps.covector.outputs.packagesPublished != ''
uses: peter-evans/repository-dispatch@v1
uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # 3.0.0
with:
token: ${{ secrets.ORG_TAURI_BOT_PAT }}
repository: tauri-apps/tauri-docs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-cli-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
if: matrix.platform == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev
sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev librsvg2-dev
- uses: Swatinem/rust-cache@v2

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-cli-rs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
if: matrix.platform.os == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.1 libayatana-appindicator3-dev
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.1 libayatana-appindicator3-dev librsvg2-dev
- uses: Swatinem/rust-cache@v2

Expand Down
Loading

0 comments on commit e87436e

Please sign in to comment.