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

Merge remote-tracking branch 'origin/master' into next

Browse Source 
# Conflicts:
#	package-lock.json
#	src/public/app/services/note_content_renderer.js
#	src/public/stylesheets/style.css
#	src/routes/api/files.js
#	src/routes/routes.js
This commit is contained in:
zadam
2021-04-25 11:14:45 +02:00
parent 79bb249f3b 6f49f870ed
commit 7494491560
55 changed files with 378 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/app/services/tree.js
View File

@@ -127,7 +127,7 @@ async function sortAlphabetically(noteId) {
}
ws.subscribeToMessages(message => {
if (message.type === 'open-note') {
if (message.type === 'openNote') {
appContext.tabManager.activateOrOpenNote(message.noteId);
if (utils.isElectron()) {