Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-29 09:16:45 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'master' into dev

Browse Source 
# Conflicts:
#	src/routes/api/sender.js
#	src/services/import/enex.js
This commit is contained in:
zadam
2023-01-09 23:02:19 +01:00
parent 2242397280 571cb6d0eb
commit 87636f27ba
9 changed files with 47 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/app/widgets/note_tree.js
View File

@@ -460,7 +460,7 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
if (dataTransfer && dataTransfer.files && dataTransfer.files.length > 0) {
const files = [...dataTransfer.files]; // chrome has issue that dataTransfer.files empties after async operation
const importService = await import('../services/import');
const importService = await import('../services/import.js');
importService.uploadFiles(node.data.noteId, files, {
safeImport: true,