Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-12 08:15:52 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'master' into next50

Browse Source 
# Conflicts:
#	src/public/app/widgets/containers/root_container.js
#	src/services/app_info.js
This commit is contained in:
zadam
2022-01-09 20:18:30 +01:00
parent 7159b13c9d 1995b54770
commit 96f4230bc1
37 changed files with 549 additions and 1494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/routes/api/note_map.js
View File

@@ -98,7 +98,7 @@ function getLinkMap(req) {
return [
note.noteId,
note.isContentAvailable() ? note.title : '[protected]',
note.getTitleOrProtected(),
note.type
];
});
@@ -158,7 +158,7 @@ function getTreeMap(req) {
.concat(...mapRootNote.getParentNotes())
.map(note => [
note.noteId,
note.isContentAvailable() ? note.title : '[protected]',
note.getTitleOrProtected(),
note.type
]);

2
src/routes/api/tree.js
View File

@@ -54,7 +54,7 @@ function getNotesAndBranchesAndAttributes(noteIds) {
notes.push({
noteId: note.noteId,
title: note.isDecrypted ? note.title : '[protected]',
title: note.getTitleOrProtected(),
isProtected: note.isProtected,
type: note.type,
mime: note.mime