Skip to content

Commit 51759d1

Browse files
committed
Merge remote-tracking branch 'origin/v2' into feat/geolocation-permissions
2 parents 2112d91 + 7a37355 commit 51759d1

File tree

112 files changed

+4999
-7870
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+4999
-7870
lines changed

.changes/deep-link-on-new-url.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"deep-link": patch
3+
---
4+
5+
Added `DeepLink::on_open_url` function to match the JavaScript API implementation,
6+
which wraps the `deep-link://new-url` event and also send the current deep link if there's any.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"barcode-scanner-js": patch
3+
---
4+
5+
Fixed an issue which caused checkPermission and requestPermission to be mixed up.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"clipboard-manager": patch
3+
"clipboard-manager-js": patch
4+
---
5+
6+
Fix warnings and clear implementation on Android below SDK 28.

.changes/fix-fs-app-scopes.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"fs": patch
3+
---
4+
5+
Fix `scope-app`, `scope-app-recursive` and `scope-index` not properly enabling the application paths.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"window-state": patch
3+
---
4+
5+
Fix can't restore a minimized window's size and position properly
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"window-state": patch
3+
---
4+
5+
Fix deadlock when trying to restore window states on initial load

.changes/pre.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,21 @@
77
".changes/consolidate-permission-state.md",
88
".changes/deep-link-event.md",
99
".changes/deep-link-get-current-desktop.md",
10+
".changes/deep-link-on-new-url.md",
1011
".changes/deep-link-register-all.md",
1112
".changes/dialog-asset-scope.md",
1213
".changes/dialog-file-response-non-exhaustive.md",
1314
".changes/dialog-return-path.md",
15+
".changes/fix-barcodae-scanner-imports.md",
16+
".changes/fix-clipboard-warnings-sdk.md",
1417
".changes/fix-deep-link-config.md",
18+
".changes/fix-fs-app-scopes.md",
1519
".changes/fix-fs-write-file-android.md",
1620
".changes/fix-http-plugin-abort.md",
1721
".changes/fix-ios-file-dialog-default-mode.md",
1822
".changes/fix-linux-updater-permission-error.md",
1923
".changes/fix-restore-minimized-window-position.md",
24+
".changes/fix-restore-minimized-window-state.md",
2025
".changes/fs-dialog-file-path-methods.md",
2126
".changes/fs-dialog-file-path-traits.md",
2227
".changes/fs-dialog-non-exhaustive-error.md",
@@ -44,8 +49,10 @@
4449
".changes/swift-build-older-versions.md",
4550
".changes/tauri-rc-8.md",
4651
".changes/update-fs-api-docs.md",
52+
".changes/update-tauri-rc-12.md",
4753
".changes/update-tauri-rc-3.md",
4854
".changes/updater-js-headers-download-crate.md",
49-
".changes/updater-js-headers-download.md"
55+
".changes/updater-js-headers-download.md",
56+
".changes/window-state-physical-size.md"
5057
]
5158
}

.changes/update-tauri-rc-12.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"notification": patch
3+
---
4+
5+
Update to tauri 2.0.0-rc.12.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"window-state": patch:breaking
3+
---
4+
5+
Window's size is now stored in physical size instead of logical size

.prettierignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,8 @@ plugins/*/examples/*/src-tauri/gen/
1919
api-iife.js
2020
init-iife.js
2121
CHANGELOG.md
22-
*schema.json
22+
*schema.json
23+
24+
# mobile build
25+
**/ios/.build
26+
**/.tauri

0 commit comments

Comments
 (0)