Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors

SECURITY.md

@@ -6,6 +6,10 @@ Please report security issues to https://github.com/louislam/uptime-kuma/securit
 
 Do not use the public issue tracker or discuss it in the public as it will cause more damage.
 
+## Do you accept other 3rd-party bug bounty platforms?
+
+At this moment, I DO NOT accept other bug bounty platforms, because I am not familiar with these platforms and someone have tried to send a phishing link to me by this already. To minimize my own risk, please report through GitHub Advisories only. I will ignore all 3rd-party bug bounty platforms emails.
+
 ## Supported Versions
 
 ### Uptime Kuma Versions

server/model/status_page.js

@@ -60,8 +60,11 @@ class StatusPage extends BeanModel {
         }
 
         // OG Meta Tags
-        head.append(`<meta property="og:title" content="${statusPage.title}" />`);
+        let ogTitle = $("<meta property=\"og:title\" content=\"\" />").attr("content", statusPage.title);
-        head.append(`<meta property="og:description" content="${description155}" />`);
+        head.append(ogTitle);
+
+        let ogDescription = $("<meta property=\"og:description\" content=\"\" />").attr("content", description155);
+        head.append(ogDescription);
 
         // Preload data
         // Add jsesc, fix https://github.com/louislam/uptime-kuma/issues/2186

server/util-server.js

@@ -323,7 +323,7 @@ exports.mysqlQuery = function (connectionString, query) {
                 reject(err);
             })
             .finally(() => {
-                connection.end();
+                connection.destroy();
             });
     });
 };

src/i18n.js

@@ -38,6 +38,7 @@ const languageList = {
     "th-TH": "ไทย",
     "el-GR": "Ελληνικά",
     "yue": "繁體中文 (廣東話 / 粵語)",
+    "ro": "Limba română",
 };
 
 let messages = {

src/lang/ro.json

@@ -0,0 +1,3 @@
+{
+    "languageName": "Limba română"
+}

src/pages/Setup.vue

@@ -14,7 +14,7 @@
                 </p>
 
                 <div class="form-floating">
-                    <select id="language" v-model="$i18n.locale" class="form-select">
+                    <select id="language" v-model="$root.language" class="form-select">
                         <option v-for="(lang, i) in $i18n.availableLocales" :key="`Lang${i}`" :value="lang">
                             {{ $i18n.messages[lang].languageName }}
                         </option>
@@ -59,9 +59,7 @@ export default {
         };
     },
     watch: {
-        "$i18n.locale"() {
+
-            localStorage.locale = this.$i18n.locale;
-        },
     },
     mounted() {
         this.$root.getSocket().emit("needSetup", (needSetup) => {