Merge remote-tracking branch 'origin/main'

qownnotes · Feb 8, 2024 · 9ed4006 · 9ed4006
2 parents 3012ee6 + c37a9c0
commit 9ed4006
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,17 @@
 # QOwnNotes Web Companion Changelog
 
+## 2024.2.1
+- an issue with the columns in the bookmarks list was fixed
+  (for [#56](https://github.com/qownnotes/web-companion/issues/56))
+- the minimum version for Firefox was raised to 109, because of manifest version 3
+  (for [#56](https://github.com/qownnotes/web-companion/issues/56))
+- `host_permissions` were removed from the manifest file for Chrome, because they are not needed
+  (for [#56](https://github.com/qownnotes/web-companion/issues/56))
+- added more translation
+
 ## 2024.2.0
 - the extension was completely **rewritten in Vue.js 3 with Vite using QUASAR with BEX**
- (for [#56](https://github.com/qownnotes/web-companion/issues/56))
+  (for [#56](https://github.com/qownnotes/web-companion/issues/56))
   - also both the Chrome and Firefox extensions are now using manifest version 3
 
 ## 22.12.1

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "qownnotes-web-companion",
-  "version": "2024.2.0",
+  "version": "2024.2.1",
   "description": "This is a companion extension for QOwnNotes to interact with the note taking desktop application.",
   "author": "Patrizio Bekerle <patrizio@bekerle.com>",
   "license": "GPL",

diff --git a/src-bex/_locales/ar_SA/messages.json b/src-bex/_locales/ar_SA/messages.json
@@ -46,13 +46,13 @@
     "message": "استيراد الإشارات المرجعية من المتصفح"
   },
   "ImportBrowserBookmarksCaption": {
-    "message": "Import your browser bookmarks into QOwnNotes"
+    "message": "استورد علاماتك المرجعية من المتصفح إلى QOwnNotes"
   },
   "WebClipper": {
     "message": "مقص الويب"
   },
   "WebClipperCaption": {
-    "message": "Get more information about the Web clipper"
+    "message": "اعرف المزيد عن مقص الويب"
   },
   "Import": {
     "message": "استيراد"

diff --git a/src-bex/_locales/nl_NL/messages.json b/src-bex/_locales/nl_NL/messages.json
@@ -46,13 +46,13 @@
     "message": "Importeer browserbladwijzers"
   },
   "ImportBrowserBookmarksCaption": {
-    "message": "Import your browser bookmarks into QOwnNotes"
+    "message": "Importeer uw browserbladwijzers in QOwnNotes"
   },
   "WebClipper": {
     "message": "Webclipper"
   },
   "WebClipperCaption": {
-    "message": "Get more information about the Web clipper"
+    "message": "Meer informatie over de webclipper"
   },
   "Import": {
     "message": "Importeren"

diff --git a/src-bex/manifest.chrome.json b/src-bex/manifest.chrome.json
@@ -23,9 +23,6 @@
     "bookmarks",
     "scripting"
   ],
-  "host_permissions": [
-    "*://*/*"
-  ],
 
   "options_page": "www/index.html#/options",
 

diff --git a/src/pages/PopupPage.vue b/src/pages/PopupPage.vue
@@ -116,26 +116,30 @@
           >
             <template v-slot:body="props">
               <q-tr :props="props" @click="openUrl(props.row.url)">
-                <q-td v-if="props.row.name" key="name" :props="props">
-                  <div>
-                    <div class="column-name" tabindex="2" :accesskey="props.rowIndex + 1" @keyup.enter="openUrl(props.row.url)">{{ truncateText( props.row.name, 40 ) }}</div>
-                    <q-tooltip>
-                      <div class="column-name" v-if="props.row.name">{{ props.row.name }}</div>
-                      <div>{{ props.row.url }}</div>
-                      <div class="column-description" v-if="props.row.description">{{ props.row.description }}</div>
-                    </q-tooltip>
-                  </div>
-                </q-td>
-                <q-td v-if="props.row.name" key="url" :props="props">
-                  <div>
-                    {{ truncateText( props.row.url, 40 ) }}
-                  </div>
-                </q-td>
-                <q-td v-if="props.row.name === ''" colspan="2" key="url" :props="props">
-                  <div>
-                    <a tabindex="2" :href="props.row.url" @click="$event.stopPropagation()" :accesskey="props.rowIndex + 1" target="_blank" :title="props.row.url">{{ truncateText( props.row.url, 80 ) }}</a>
-                  </div>
-                </q-td>
+                <template v-if="props.row.name">
+                  <q-td key="name" :props="props">
+                    <div>
+                      <div class="column-name" tabindex="2" :accesskey="props.rowIndex + 1" @keyup.enter="openUrl(props.row.url)">{{ truncateText( props.row.name, 40 ) }}</div>
+                      <q-tooltip>
+                        <div class="column-name" v-if="props.row.name">{{ props.row.name }}</div>
+                        <div>{{ props.row.url }}</div>
+                        <div class="column-description" v-if="props.row.description">{{ props.row.description }}</div>
+                      </q-tooltip>
+                    </div>
+                  </q-td>
+                  <q-td key="url" :props="props">
+                    <div>
+                      {{ truncateText( props.row.url, 40 ) }}
+                    </div>
+                  </q-td>
+                </template>
+                <template v-else>
+                  <q-td colspan="2" key="url" :props="props">
+                    <div>
+                      <a tabindex="2" :href="props.row.url" @click="$event.stopPropagation()" :accesskey="props.rowIndex + 1" target="_blank" :title="props.row.url">{{ truncateText( props.row.url, 80 ) }}</a>
+                    </div>
+                  </q-td>
+                </template>
                 <q-td key="tags" :props="props">
                   <div class="column-tags">
                     <q-badge v-for="tag in props.row.tags" :key="tag" :label="tag" />