Merge branch 'master' into mqtt2

# Conflicts:
#	server/database.js
#	server/util-server.js
This commit is contained in:
Louis Lam 2022-04-17 19:46:33 +08:00
commit 5fa62a888c
58 changed files with 456 additions and 168 deletions

View file

@ -426,17 +426,17 @@ export default {
},
bodyPlaceholder() {
return this.$t("Example:", [`
return this.$t("Example:", [ `
{
"key": "value"
}`]);
}` ]);
},
headersPlaceholder() {
return this.$t("Example:", [`
return this.$t("Example:", [ `
{
"HeaderName": "HeaderValue"
}`]);
}` ]);
}
},
@ -521,7 +521,7 @@ export default {
upsideDown: false,
expiryNotification: false,
maxredirects: 10,
accepted_statuscodes: ["200-299"],
accepted_statuscodes: [ "200-299" ],
dns_resolve_type: "A",
dns_resolve_server: "1.1.1.1",
proxyId: null,