Skip to content

Commit 293ea5f

Browse files
committed
Merge remote-tracking branch 'upstream/v2' into v2
2 parents 942b4d6 + e268c02 commit 293ea5f

File tree

134 files changed

+1185
-1855
lines changed

Some content is hidden

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

134 files changed

+1185
-1855
lines changed

.changes/fix-android-warnings.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
"barcode-scanner": patch
3+
"biometric": patch
4+
"clipboard-manager": patch
5+
"nfc": patch
6+
"notification": patch
7+
"shell": patch
8+
---
9+
10+
Fixes Android warnings.

.changes/http-origin-unsafe.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"http": "patch"
3+
"http-js": "patch"
4+
---
5+
6+
Allow setting `Origin` header when `unsafe-headers` feature flag is active.

.changes/pre.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
".changes/feat-single-instance-semver.md",
2323
".changes/feat-websocket-tls-connector.md",
2424
".changes/file-autogen-fix.md",
25+
".changes/fix-android-warnings.md",
2526
".changes/fix-authenticator-windows-compile.md",
2627
".changes/fix-autolaunch-macos.md",
2728
".changes/fix-deep-link-linux.md",
@@ -69,6 +70,7 @@
6970
".changes/tauri-beta-15.md",
7071
".changes/tauri-beta-17.md",
7172
".changes/tauri-beta-20.md",
73+
".changes/tauri-beta-22.md",
7274
".changes/tauri-beta-4.md",
7375
".changes/tauri-beta-8.md",
7476
".changes/tauri-beta-9.md",

.eslintignore

Lines changed: 0 additions & 10 deletions
This file was deleted.

.eslintrc.json

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/test-rust.yml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -47,130 +47,105 @@ jobs:
4747
tauri-plugin-authenticator:
4848
- .github/workflows/test-rust.yml
4949
- Cargo.toml
50-
- Cargo.lock
5150
- plugins/authenticator/**
5251
tauri-plugin-autostart:
5352
- .github/workflows/test-rust.yml
5453
- Cargo.toml
55-
- Cargo.lock
5654
- plugins/autostart/**
5755
tauri-plugin-cli:
5856
- .github/workflows/test-rust.yml
5957
- Cargo.toml
60-
- Cargo.lock
6158
- plugins/cli/**
6259
tauri-plugin-clipboard-manager:
6360
- .github/workflows/test-rust.yml
6461
- Cargo.toml
65-
- Cargo.lock
6662
- plugins/clipboard-manager/**
6763
tauri-plugin-deep-link:
6864
- .github/workflows/test-rust.yml
6965
- Cargo.toml
70-
- Cargo.lock
7166
- plugins/deep-link/**
7267
tauri-plugin-dialog:
7368
- .github/workflows/test-rust.yml
7469
- Cargo.toml
75-
- Cargo.lock
7670
- plugins/dialog/**
7771
- plugins/fs/**
7872
tauri-plugin-fs:
7973
- .github/workflows/test-rust.yml
8074
- Cargo.toml
81-
- Cargo.lock
8275
- plugins/fs/**
8376
tauri-plugin-global-shortcut:
8477
- .github/workflows/test-rust.yml
8578
- Cargo.toml
86-
- Cargo.lock
8779
- plugins/global-shortcut/**
8880
tauri-plugin-http:
8981
- .github/workflows/test-rust.yml
9082
- Cargo.toml
91-
- Cargo.lock
9283
- plugins/http/**
9384
- plugins/fs/**
9485
tauri-plugin-localhost:
9586
- .github/workflows/test-rust.yml
9687
- Cargo.toml
97-
- Cargo.lock
9888
- plugins/localhost/**
9989
tauri-plugin-log:
10090
- .github/workflows/test-rust.yml
10191
- Cargo.toml
102-
- Cargo.lock
10392
- plugins/log/**
10493
tauri-plugin-notification:
10594
- .github/workflows/test-rust.yml
10695
- Cargo.toml
107-
- Cargo.lock
10896
- plugins/notification/**
10997
tauri-plugin-os:
11098
- .github/workflows/test-rust.yml
11199
- Cargo.toml
112-
- Cargo.lock
113100
- plugins/os/**
114101
tauri-plugin-persisted-scope:
115102
- .github/workflows/test-rust.yml
116103
- Cargo.toml
117-
- Cargo.lock
118104
- plugins/persisted-scope/**
119105
- plugins/fs/**
120106
tauri-plugin-positioner:
121107
- .github/workflows/test-rust.yml
122108
- Cargo.toml
123-
- Cargo.lock
124109
- plugins/positioner/**
125110
tauri-plugin-process:
126111
- .github/workflows/test-rust.yml
127112
- Cargo.toml
128-
- Cargo.lock
129113
- plugins/process/**
130114
tauri-plugin-shell:
131115
- .github/workflows/test-rust.yml
132116
- Cargo.toml
133-
- Cargo.lock
134117
- plugins/shell/**
135118
tauri-plugin-single-instance:
136119
- .github/workflows/test-rust.yml
137120
- Cargo.toml
138-
- Cargo.lock
139121
- plugins/single-instance/**
140122
tauri-plugin-sql:
141123
- .github/workflows/test-rust.yml
142124
- Cargo.toml
143-
- Cargo.lock
144125
- plugins/sql/**
145126
tauri-plugin-store:
146127
- .github/workflows/test-rust.yml
147128
- Cargo.toml
148-
- Cargo.lock
149129
- plugins/store/**
150130
tauri-plugin-stronghold:
151131
- .github/workflows/test-rust.yml
152132
- Cargo.toml
153-
- Cargo.lock
154133
- plugins/stronghold/**
155134
tauri-plugin-updater:
156135
- .github/workflows/test-rust.yml
157136
- Cargo.toml
158-
- Cargo.lock
159137
- plugins/updater/**
160138
tauri-plugin-upload:
161139
- .github/workflows/test-rust.yml
162140
- Cargo.toml
163-
- Cargo.lock
164141
- plugins/upload/**
165142
tauri-plugin-websocket:
166143
- .github/workflows/test-rust.yml
167144
- Cargo.toml
168-
- Cargo.lock
169145
- plugins/websocket/**
170146
tauri-plugin-window-state:
171147
- .github/workflows/test-rust.yml
172148
- Cargo.toml
173-
- Cargo.lock
174149
- plugins/window-state/**
175150
176151
test:

0 commit comments

Comments
 (0)