Merge branch 'master' into 1.23.X-merge-to-2.X.X

# Conflicts:
#	server/model/monitor.js
#	server/util-server.js
This commit is contained in:
Louis Lam
2023-11-13 21:25:49 +08:00
23 changed files with 9 additions and 573 deletions

View File

@@ -42,7 +42,8 @@ const languageList = {
"yue": "繁體中文 (廣東話 / 粵語)",
"ro": "Limba română",
"ur": "Urdu",
"ge": "ქართული"
"ge": "ქართული",
"uz": "O'zbek tili",
};
let messages = {

View File

@@ -33,10 +33,10 @@ export default {
} else if (res.type === "entryPage") { // Dev only. For production, the logic is in the server side
const entryPage = res.entryPage;
if (entryPage === "statusPage") {
this.$router.push("/status");
if (entryPage?.startsWith("statusPage-")) {
this.$router.push("/status/" + entryPage.replace("statusPage-", ""));
} else {
// should the old setting style still exist here?
this.$router.push("/dashboard");
}
} else if (res.type === "setup-database") {