From e318acc977933e20adeb133ff78ecf26b3d00e8a Mon Sep 17 00:00:00 2001 From: zadam Date: Fri, 27 Nov 2020 22:33:33 +0100 Subject: [PATCH 1/3] fix incorrectly set isInheritable on inherited attrs --- src/public/app/widgets/attribute_list.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/public/app/widgets/attribute_list.js b/src/public/app/widgets/attribute_list.js index 0999ff4f2..7b50478e2 100644 --- a/src/public/app/widgets/attribute_list.js +++ b/src/public/app/widgets/attribute_list.js @@ -214,7 +214,8 @@ export default class AttributeListWidget extends TabAwareWidget { noteId: attribute.noteId, type: attribute.type, name: attribute.name, - value: attribute.value + value: attribute.value, + isInheritable: attribute.isInheritable }, isOwned: false, x: e.pageX, From b7b1324dd0b2af6abc8cd5b98f620ca227582d4d Mon Sep 17 00:00:00 2001 From: zadam Date: Fri, 4 Dec 2020 22:05:29 +0100 Subject: [PATCH 2/3] fixed disabled prefix in case of unsafe import to conform to new attribute name pattern constraints --- src/services/import/zip.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/import/zip.js b/src/services/import/zip.js index ddbe47610..7dc61ef66 100644 --- a/src/services/import/zip.js +++ b/src/services/import/zip.js @@ -158,7 +158,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) { } if (taskContext.data.safeImport && attributeService.isAttributeDangerous(attr.type, attr.name)) { - attr.name = 'disabled-' + attr.name; + attr.name = 'disabled:' + attr.name; } attributes.push(attr); From 58555b36600df121e706d0e3b065a3aede2447bf Mon Sep 17 00:00:00 2001 From: zadam Date: Fri, 4 Dec 2020 22:08:24 +0100 Subject: [PATCH 3/3] release 0.45.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 f8c47f6d6..0a1278a17 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "trilium", "productName": "Trilium Notes", "description": "Trilium Notes", - "version": "0.45.5", + "version": "0.45.6", "license": "AGPL-3.0-only", "main": "electron.js", "bin": { diff --git a/src/services/build.js b/src/services/build.js index 872330545..dcbd5d8f5 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2020-11-20T22:50:10+01:00", buildRevision: "e5fa1e0ed555c1c2cb4a14c426d7091d62b5beea" }; +module.exports = { buildDate:"2020-12-04T22:08:24+01:00", buildRevision: "b7b1324dd0b2af6abc8cd5b98f620ca227582d4d" };