gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,858 Commits 38 Branches 306 Tags
Commit Graph

3508 Commits

Author SHA1 Message Date
Elian Doran
44c0ecdbfa Fix middle vertical align on table cells 
For merged cells, middle vertical alignment would not work properly (it
was either aligned to the top or bottom).
 2023-02-26 22:45:58 +02:00
zadam
d343ff0d23 removed deprecated widgets from frontend API 2023-02-17 23:04:49 +01:00
zadam
400b14e021 removed remnants of dev branch 2023-02-17 16:44:04 +01:00
zadam
97cadc3acf cleaned up unused backend log widget 2023-02-17 16:27:37 +01:00
zadam
7d0117bd28 unneeded changes from dev 2023-02-17 16:24:47 +01:00
zadam
6f7b554cdc preparing 0.59 without ocr/pdf, userguide, note ancillaries 2023-02-17 14:49:45 +01:00
zadam
42e08284b0 Merge remote-tracking branch 'origin/master' into dev 
# Conflicts:
#	package-lock.json
#	src/public/app/widgets/mermaid.js
 2023-02-15 23:47:41 +01:00
zadam
127486fdf5 removed deprecated API methods 2023-02-15 23:45:25 +01:00
zadam
4ffe36e4d0 added options for OCR and extract text from PDF 2023-02-15 16:08:00 +01:00
zadam
85403321cf tweaks 2023-02-15 15:57:33 +01:00
zadam
22cea63863 unneeded await 2023-02-15 15:09:34 +01:00
zadam
c95c5bb471 fix lost content data after CKEditor crash, closes #3584 2023-02-15 15:08:59 +01:00
zadam
cbabaa6b0c move advanced menu slightly below to not overlay the text 2023-02-15 14:49:58 +01:00
zadam
520ffecd36 ancillary type widget 2023-02-15 14:32:12 +01:00
zadam
b1e2b5ba8e reimplement note source to open in a new tab 2023-02-14 16:06:49 +01:00
zadam
896a4fe981 show mermaid errors, fixes #3610 2023-02-13 23:46:04 +01:00
zadam
e411ad0eb1 Merge branch 'master' into dev 2023-02-13 15:58:02 +01:00
zadam
17085e5578 fix hidden subtree appearing after collapse, #2922 2023-02-13 15:09:57 +01:00
zadam
33d6bb69c0 refresh note list on pageSize update 2023-02-10 13:21:00 +01:00
zadam
8371703090 Merge branch 'master' into dev 2023-02-10 10:41:12 +01:00
zadam
fc7da015fe fix image display with slash in title, closes #3591 2023-02-10 10:23:02 +01:00
zadam
15607becc6 Merge branch 'master' into dev 
# Conflicts:
#	package-lock.json
#	src/public/app/entities/fnote.js
#	src/services/notes.js
 2023-02-02 23:35:41 +01:00
zadam
290f7e2101 fix sharing of templates, #3562 2023-02-01 22:58:40 +01:00
zadam
460b5fb3a4 fix sharing of templates, #3562 2023-02-01 22:55:31 +01:00
zadam
7b2c3afe4c always open the note in URL, closes #3571 2023-01-31 23:20:11 +01:00
zadam
2e181d0fb1 toggling the left pane will toggle the focus between tree and detail, #3563 2023-01-31 22:35:01 +01:00
zadam
68a03211ce fix padding on launcher when collapsed 2023-01-31 22:25:46 +01:00
zadam
37ba76fdd8 refactored note attachment into note ancillary 2023-01-28 13:13:46 +01:00
zadam
78954268ab small attribute optimizations 2023-01-27 16:59:59 +01:00
zadam
b0528b62d8 small attribute optimizations 2023-01-27 16:57:23 +01:00
zadam
0bfb2631df fix saving mermaid attachment 2023-01-24 23:09:00 +01:00
zadam
a7b103e07a add a button to temporarily hide TOC, closes #3555 2023-01-24 16:24:51 +01:00
zadam
a888f9aa04 recalculate maxEntityChangeId after rollbacked transaction 2023-01-24 09:35:00 +01:00
zadam
2e9dbda077 Merge remote-tracking branch 'origin/master' into dev 
# Conflicts:
#	package.json
 2023-01-24 09:20:15 +01:00
zadam
c474e65cae saving attachments when editing 2023-01-24 09:19:49 +01:00
zadam
f59e19d93b fixes to note attachment handling 2023-01-23 23:37:58 +01:00
zadam
339d8a7378 initial implementation of note attachments 2023-01-22 23:36:05 +01:00
zadam
f2a19c56b1 add excludeFromNoteMap to a day template instead of journal root, #3547 2023-01-21 11:13:40 +01:00
zadam
6a6ae359b6 Merge branch 'master' into dev 
# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/widgets/dialogs/note_revisions.js
#	src/services/handlers.js
#	src/services/hidden_subtree.js
#	src/services/search/services/parse.js
 2023-01-17 22:20:10 +01:00
zadam
2fa1d812f6 _hidden note does not inherit attributes from root, fixes #3537 2023-01-17 22:14:53 +01:00
zadam
b567775129 small fixes of steel blue theme 2023-01-17 21:06:30 +01:00
zadam
9fd0b85ff2 doc note for the back/forward launchers 2023-01-16 22:37:21 +01:00
zadam
a5e21ea5f3 simplified/fixed close tab button 2023-01-16 22:28:55 +01:00
zadam
f50a9c250a many small issues found by intellij analysis 2023-01-15 21:04:17 +01:00
zadam
743979266a fix history navigation buttons in server, #3527 2023-01-15 19:46:32 +01:00
zadam
4f98c960ec fix note revision for images 2023-01-15 19:23:28 +01:00
zadam
424b624ea9 small mermaid fixes 2023-01-15 13:48:01 +01:00
zadam
038c0e78a6 fix options check in froca 2023-01-14 23:01:02 +01:00
zadam
a110f24b05 Merge branch 'master' into dev 2023-01-13 21:11:23 +01:00
zadam
8eaef3e1d8 add runOnNoteContentChange into the autocomplete 2023-01-13 14:28:41 +01:00