Merge remote-tracking branch 'origin/master'

# Conflicts:
#	package-lock.json
#	package.json
#	src/routes/api/sender.js

README.md

@@ -8,7 +8,7 @@ Trilium Notes is a hierarchical note taking application with focus on building l
 ## Features
 
 * Notes can be arranged into arbitrarily deep tree. Single note can be placed into multiple places in the tree (see [cloning](https://github.com/zadam/trilium/wiki/Cloning-notes))
-* Rich WYSIWYG note editing including e.g. tables and images with markdown [autoformat](https://github.com/zadam/trilium/wiki/Text-notes#autoformat)
+* Rich WYSIWYG note editing including e.g. tables, images and [math](https://github.com/zadam/trilium/wiki/Text-notes#math-support) with markdown [autoformat](https://github.com/zadam/trilium/wiki/Text-notes#autoformat)
 * Support for editing [notes with source code](https://github.com/zadam/trilium/wiki/Code-notes), including syntax highlighting
 * Fast and easy [navigation between notes](https://github.com/zadam/trilium/wiki/Note-navigation), full text search and [note hoisting](https://github.com/zadam/trilium/wiki/Note-hoisting)
 * Seamless [note versioning](https://github.com/zadam/trilium/wiki/Note-revisions)
@@ -54,4 +54,4 @@ npm run start-server
 * [CKEditor 5](https://github.com/ckeditor/ckeditor5) - best WYSIWYG editor on the market, very interactive and listening team
 * [FancyTree](https://github.com/mar10/fancytree) - very feature rich tree library without real competition. Trilium Notes would not be the same without it.
 * [CodeMirror](https://github.com/codemirror/CodeMirror) - code editor with support for huge amount of languages
-* [jsPlumb](https://github.com/jsplumb/jsplumb) - visual connectivity library without competition. Used in [relation maps](https://github.com/zadam/trilium/wiki/Relation-map) and [link maps](https://github.com/zadam/trilium/wiki/Link-map)
+* [jsPlumb](https://github.com/jsplumb/jsplumb) - visual connectivity library without competition. Used in [relation maps](https://github.com/zadam/trilium/wiki/Relation-map) and [link maps](https://github.com/zadam/trilium/wiki/Link-map)

package.json

@@ -2,7 +2,7 @@
   "name": "trilium",
   "productName": "Trilium Notes",
   "description": "Trilium Notes",
-  "version": "0.45.0-beta",
+  "version": "0.44.8",
   "license": "AGPL-3.0-only",
   "main": "electron.js",
   "bin": {
@@ -32,7 +32,7 @@
     "commonmark": "0.29.2",
     "cookie-parser": "1.4.5",
     "csurf": "1.11.0",
-    "dayjs": "1.9.3",
+    "dayjs": "1.9.1",
     "ejs": "3.1.5",
     "electron-debug": "3.1.0",
     "electron-dl": "3.0.2",
@@ -40,7 +40,7 @@
     "electron-window-state": "5.0.3",
     "express": "4.17.1",
     "express-session": "1.17.1",
-    "file-type": "16.0.0",
+    "file-type": "15.0.1",
     "fs-extra": "9.0.1",
     "helmet": "4.1.1",
     "html": "1.0.0",
@@ -61,14 +61,14 @@
     "request": "^2.88.2",
     "rimraf": "3.0.2",
     "sanitize-filename": "1.6.3",
-    "sanitize-html": "2.1.1",
+    "sanitize-html": "2.1.0",
     "sax": "1.2.4",
     "semver": "7.3.2",
     "serve-favicon": "2.5.0",
     "session-file-store": "1.5.0",
     "striptags": "3.1.1",
     "tmp": "^0.2.1",
-    "turndown": "7.0.0",
+    "turndown": "6.0.0",
     "turndown-plugin-gfm": "1.0.2",
     "unescape": "1.0.1",
     "ws": "7.3.1",
@@ -78,16 +78,16 @@
   "devDependencies": {
     "cross-env": "7.0.2",
     "electron": "9.3.2",
-    "electron-builder": "22.9.1",
+    "electron-builder": "22.8.1",
     "electron-packager": "15.1.0",
-    "electron-rebuild": "2.3.2",
+    "electron-rebuild": "2.2.0",
     "esm": "3.2.25",
-    "jasmine": "3.6.2",
+    "jasmine": "3.6.1",
     "jsdoc": "3.6.6",
     "lorem-ipsum": "2.0.3",
     "rcedit": "2.2.0",
-    "webpack": "5.1.3",
+    "webpack": "5.1.0",
-    "webpack-cli": "4.1.0"
+    "webpack-cli": "4.0.0"
   },
   "optionalDependencies": {
     "electron-installer-debian": "2.0.1"

src/routes/api/sender.js

@@ -35,10 +35,12 @@ function saveNote(req) {
         mime: 'text/html'
     });
 
-    if (req.body.labels) {
+    if (req.body.label && req.body.label.trim()){
-        for (const {name, value} of req.body.labels) {
+        let value;
-            note.setLabel(name, value);
+        if (req.body.labelValue && req.body.labelValue.trim()){
+            value = req.body.labelValue;
         }
+        note.setLabel(req.body.label, value);
     }
 
     return {