Merge remote-tracking branch 'upstream/master' into excalidraw

conflict in
- package-lock (accept incoming),
- routes (remove the option to have image without filename, since it is not really necessary for canvas_note)
- note_detail

src/public/app/widgets/note_detail.js

@@ -154,7 +154,8 @@ export default class NoteDetailWidget extends NoteContextAwareWidget {
         // https://github.com/zadam/trilium/issues/2522
         this.$widget.toggleClass("full-height",
             !this.noteContext.hasNoteList()
-            && ['editable-text', 'editable-code', 'canvas-note'].includes(this.type));
+            && ['editable-text', 'editable-code', 'canvas-note'].includes(this.type)
+            && this.mime !== 'text/x-sqlite;schema=trilium');
     }
 
     getTypeWidget() {