zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-01-16 03:58:53 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/stable'

Browse source 
# Conflicts:
#	src/public/app/widgets/attribute_list.js
This commit is contained in:
zadam 2020-12-04 22:09:27 +01:00
commit 526bd81b50
4 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -2,7 +2,7 @@
"name": "trilium", "name": "trilium",
"productName": "Trilium Notes", "productName": "Trilium Notes",
"description": "Trilium Notes", "description": "Trilium Notes",
"version": "0.45.5", "version": "0.45.6",
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"main": "electron.js", "main": "electron.js",
"bin": { "bin": {

0
src/public/app/widgets/attribute_list.js Normal file
View file

2
src/services/build.js
View file

@ -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" };

2
src/services/import/zip.js
View file

@ -158,7 +158,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
} }
if (taskContext.data.safeImport && attributeService.isAttributeDangerous(attr.type, attr.name)) { if (taskContext.data.safeImport && attributeService.isAttributeDangerous(attr.type, attr.name)) {
attr.name = 'disabled-' + attr.name; attr.name = 'disabled:' + attr.name;
} }
attributes.push(attr); attributes.push(attr);