Merge branch 'dev' into 'main'

Merge branch "dev" into "main"

See merge request keanuapp/keanuapp-weblite!380

package.json

@@ -1,6 +1,6 @@
 {
   "name": "keanuapp-weblite",
-  "version": "0.1.90",
+  "version": "0.1.91",
   "private": true,
   "scripts": {
     "dev": "vite",

package.json.bak

@@ -1,6 +1,6 @@
 {
   "name": "keanuapp-weblite",
-  "version": "0.1.89",
+  "version": "0.1.90",
   "private": true,
   "scripts": {
     "dev": "vite",

src/assets/translations/en.json

@@ -189,7 +189,7 @@
   },
   "login": {
     "title": "Login",
-    "username": "Username (ex: marta)",
+    "username": "Username (ex: {'@user:server'})",
     "password": "Enter Password",
     "username_required": "Username is required",
     "password_required": "Password is required",

src/assets/translations/lo.json

@@ -113,7 +113,7 @@
         "title": "ເຂົ້າສູ່ລະບົບ",
         "login": "ເຂົ້າສູ່ລະບົບ",
         "accept_terms": "ຍອມຮັບ",
-        "username": "ຊື່ຜູ້ໃຊ້ (ex: marta)",
+        "username": "ຊື່ຜູ້ໃຊ້ (ex: {'@user:server'})",
         "password": "ປ້ອນລະຫັດຜ່ານ",
         "username_required": "ຕ້ອງມີຊື່ຜູ້ໃຊ້",
         "password_required": "ຕ້ອງມີລະຫັດຜ່ານ",

src/assets/translations/my.json

@@ -336,7 +336,7 @@
     },
     "login": {
         "title": "လော့ဂ်အင်ဝင်ရန်",
-        "username": "အသုံးပြုသူအမည် (ex: marta)",
+        "username": "အသုံးပြုသူအမည် (ex: {'@user:server'})",
         "password": "စကားဝှက် ရိုက်ထည့်ပါ",
         "username_required": "အသုံးပြုသူအမည် လိုအပ်သည်",
         "password_required": "စကားဝှက် လိုအပ်သည်",

src/assets/translations/pt_BR.json

@@ -195,7 +195,7 @@
     },
     "login": {
         "title": "Entrar",
-        "username": "Nome de usuário (ex: marta)",
+        "username": "Nome de usuário (ex: {'@user:server'})",
         "password": "Digite a senha",
         "username_required": "É obrigatório um nome de usuário",
         "password_required": "A senha é obrigatória",

src/assets/translations/pt_PT.json

@@ -318,7 +318,7 @@
     },
     "login": {
         "title": "Entrar",
-        "username": "Nome de utilizador (ex: marta)",
+        "username": "Nome de utilizador (ex: {'@user:server'})",
         "password": "Digite a palavra-passe",
         "username_required": "É obrigatório um nome de utilizador",
         "password_required": "A palavra-passe é obrigatória",

src/assets/translations/ro.json

@@ -149,7 +149,7 @@
         "password_required": "Parola este necesară",
         "username_required": "Numele de utilizator este necesar",
         "password": "Introduceți Parola",
-        "username": "Nume utilizator (ex: marta)",
+        "username": "Nume utilizator (ex: {'@user:server'})",
         "title": "Autentificare",
         "create_room": "Înregistrare și creare cameră",
         "or": "SAU",

src/components/Login.vue

@@ -43,9 +43,8 @@
         ></v-text-field>
 
         <div class="text-red" v-if="loadingLoginFlows">Loading login flows...</div>
-
         <v-text-field
-          v-show="showPasswordField"
+          :disabled="!user.user_id || !showPasswordField"
           prepend-inner-icon="$vuetify.icons.password"
           ref="password"
           v-model="user.password"

src/components/file_mode/ThumbnailView.vue

@@ -101,11 +101,7 @@ const updateSource = () => {
       eventAttachment.loadThumbnail().then((url) => {
         source.value = url.data;
       })
-    } else if (isImage.value) {
-      eventAttachment.loadSrc().then((url) => {
-        source.value = url.data;
-      })
-    } else if (isVideo.value) {
+    } else if (isImage.value || isVideo.value || isPDF.value) {
       eventAttachment.loadSrc().then((url) => {
         source.value = url.data;
       })

src/plugins/utils.js

@@ -858,7 +858,7 @@ class Util {
    */
   makeUniqueAvatar(image) {
     var list = png.splitChunk(image);
-    
+
     // append
     var iend = list.pop(); // remove IEND
     var newchunk = png.createChunk("tEXt","Comment\0Keanu avatar - " + this.randomPass());
@@ -882,7 +882,7 @@ class Util {
             onlyContentUri: false,
           };
           let data = response.data;
-          
+
           // If making a system unique avatar, we add a random PNG header in here
           if (makeUnique) {
             data = this.makeUniqueAvatar(data);
@@ -1069,7 +1069,7 @@ class Util {
     if (match) {
       // Extract components and convert to numbers. Note that months are 0-indexed.
       const year = parseInt(match[1], 10);
-      const month = parseInt(match[2], 10) - 1; 
+      const month = parseInt(match[2], 10) - 1;
       const day = parseInt(match[3], 10);
       const hour = parseInt(match[4], 10);
       const minute = parseInt(match[5], 10);
@@ -1139,10 +1139,7 @@ class Util {
         const link = document.createElement("a");
         link.href = url;
         link.target = "_blank";
-        if (!this.isFileTypePDF(event)) {
-          // PDFs are shown inline, not downloaded
-          link.download = event.getContent().body || this.$t("fallbacks.download_name");
-        }
+        link.download = event.getContent().body || this.$t("fallbacks.download_name");
         console.log("LINK", link);
         document.body.appendChild(link);
         link.click();

src/services/matomo.service.js

@@ -15,7 +15,7 @@ export default {
                           var _paq = window._paq = window._paq || [];
                           /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
 			  _paq.push(['trackPageView', ' ', window.location.hostname]);
-                          _paq.push(['enableLinkTracking']);
+                         // _paq.push(['enableLinkTracking']);
                           (function() {
                             var u="${server}";
                             _paq.push(['setTrackerUrl', u+'matomo.php']);