From 942132c01d1f2686c2e1694a852bb8b81568811d Mon Sep 17 00:00:00 2001 From: zadam Date: Tue, 23 Mar 2021 23:57:48 +0100 Subject: [PATCH 1/3] release 0.46.6 --- package.json | 2 +- src/services/build.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ff62d8d5a..bc0c7bffe 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "trilium", "productName": "Trilium Notes", "description": "Trilium Notes", - "version": "0.46.5", + "version": "0.46.6", "license": "AGPL-3.0-only", "main": "electron.js", "bin": { diff --git a/src/services/build.js b/src/services/build.js index 3734b6b3b..b1972844f 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2021-03-14T22:56:27+01:00", buildRevision: "6c8d20288df302f3a415bd1bdcace98bf29d4bf6" }; +module.exports = { buildDate:"2021-03-23T23:57:48+01:00", buildRevision: "1862acd1ff9261536ebc7118d35bbbd8449ba94d" }; From 9139c597e549add45aafdb70f461d6bc39f975d9 Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 25 Mar 2021 19:46:10 +0100 Subject: [PATCH 2/3] use only one label for icon class, fixes #1791 --- src/public/app/entities/note_short.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/public/app/entities/note_short.js b/src/public/app/entities/note_short.js index 1cc4fd376..884b1d98a 100644 --- a/src/public/app/entities/note_short.js +++ b/src/public/app/entities/note_short.js @@ -359,7 +359,7 @@ class NoteShort { const workspaceIconClass = this.getWorkspaceIconClass(); if (iconClassLabels.length > 0) { - return iconClassLabels.map(l => l.value).join(' '); + return iconClassLabels[0].value; } else if (workspaceIconClass) { return workspaceIconClass; From 496767a52bc0866395c37bba80ec557f38e87c9e Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 25 Mar 2021 20:28:57 +0100 Subject: [PATCH 3/3] release 0.46.6 --- src/services/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/build.js b/src/services/build.js index b1972844f..b7a3eb896 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2021-03-23T23:57:48+01:00", buildRevision: "1862acd1ff9261536ebc7118d35bbbd8449ba94d" }; +module.exports = { buildDate:"2021-03-25T20:28:57+01:00", buildRevision: "9139c597e549add45aafdb70f461d6bc39f975d9" };