Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 02:16:05 +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

2
src/services/script.js
View File

@@ -5,7 +5,7 @@ const becca = require("../becca/becca");
function executeNote(note, apiParams) {
if (!note.isJavaScript() || note.getScriptEnv() !== 'backend' || !note.isContentAvailable()) {
log.info(`Cannot execute note ${note.noteId} "${note.title}", note must be of type "Code: JS frontend"`);
log.info(`Cannot execute note ${note.noteId} "${note.title}", note must be of type "Code: JS backend"`);
return;
}