Merge branch 'master' into public-dashboard

# Conflicts:
#	server/server.js
#	src/main.js
This commit is contained in:
LouisLam
2021-09-14 14:16:24 +08:00
22 changed files with 560 additions and 914 deletions

View File

@@ -62,6 +62,11 @@ class Discord extends NotificationProvider {
],
}],
}
if (notification.discordPrefixMessage) {
discorddowndata.content = notification.discordPrefixMessage;
}
await axios.post(notification.discordWebhookUrl, discorddowndata)
return okMsg;
@@ -92,6 +97,11 @@ class Discord extends NotificationProvider {
],
}],
}
if (notification.discordPrefixMessage) {
discordupdata.content = notification.discordPrefixMessage;
}
await axios.post(notification.discordWebhookUrl, discordupdata)
return okMsg;
}

View File

@@ -153,6 +153,10 @@ let indexHTML = fs.readFileSync("./dist/index.html").toString();
app.use("/", express.static("dist"));
app.get("/.well-known/change-password", async (_, response) => {
response.redirect("https://github.com/louislam/uptime-kuma/wiki/Reset-Password-via-CLI");
});
// ***************************
// Public API
// ***************************