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
5,112 Commits 41 Branches 349 Tags
fc89e098b19e40cfd86b807065df1ca056ff0b29
Commit Graph

195 Commits

Author SHA1 Message Date
zadam
d74371c9f5 added missing placeholder.js 2022-01-07 20:30:14 +01:00
zadam
dad82ea4e8 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package.json
#	src/services/build.js
 2021-12-31 20:16:31 +01:00
DHMike57
ae951bfe23 Add option for vim keymap in codemirror (#2475) 2021-12-26 13:24:18 +01:00
zadam
3860028a9e sharing WIP 2021-12-20 17:30:47 +01:00
zadam
2d339dec6b share functionality WIP 2021-12-05 23:10:35 +01:00
zadam
b78ab1ee02 boxicons 2.1.1 2021-12-05 21:50:02 +01:00
zadam
b7efc92099 frontend library updates 2021-11-15 22:28:56 +01:00
zadam
a08690b123 CKEditor 30 content styles 2021-10-08 18:17:17 +02:00
zadam
e2c4f32b5e added ckeditor with Find & Replace, for now without keyboard shortcut (ckeditor/ckeditor5#10645) 2021-10-04 21:53:57 +02:00
zadam
291b434d70 added mermaid samples to demo document 2021-09-30 13:17:37 +02:00
Abitofevrything
b37bcd294c Implement mermaid diagrams (#2187) 
* Start implementing mermaid diagrams

* Implement theming for mermaid diagrams

* Add edit tab to mermaid diagrams

* Remove comment

* Render mermaid diagrams in included notes

* Prevent mermaid notes from being removed to consistency checks
 2021-09-29 21:54:56 +02:00
zadam
fea46bb150 ckeditor v30.0.0 2021-09-29 17:47:15 +02:00
zadam
a0caa21458 global link map WIP 2021-09-17 22:34:23 +02:00
zadam
0448883782 option to erase notes immediately 2021-09-16 14:38:09 +02:00
zadam
3f2ee4aefd ckeditor fix to use correct modified mention plugin 2021-09-12 00:08:25 +02:00
zadam
b90ae8eb79 ckeditor fix 2021-09-11 22:01:04 +02:00
zadam
266807179c ckeditor upgrade to 29.2.0 2021-09-11 21:44:52 +02:00
zadam
3c8e267aad added calendar to the sidebar 2021-07-05 14:46:20 +02:00
zadam
da0670188b Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	src/services/ws.js
 2021-07-05 10:14:37 +02:00
zadam
65938c5272 enable autoformat plugin in ckeditor build, closes #1339 2021-07-05 10:13:52 +02:00
zadam
f50bb2278c Merge remote-tracking branch 'origin/stable' into stable 2021-06-02 21:41:06 +02:00
zadam
f5573fcad4 starting work on link map reimplementation using force-graph library 2021-05-29 22:52:32 +02:00
zadam
f176191efb Merge remote-tracking branch 'origin/stable' into redesign 
# Conflicts:
#	package-lock.json
#	package.json
 2021-05-26 21:44:08 +02:00
zadam
dc5304faa0 updated ckeditor content styles 2021-05-26 21:41:58 +02:00
zadam
205f9953f9 Merge remote-tracking branch 'origin/stable' into redesign 
# Conflicts:
#	package-lock.json
#	package.json
 2021-05-26 21:27:06 +02:00
zadam
b9639bffce imported internal links crash ckeditor, #1979 2021-05-25 21:45:59 +02:00
zadam
e924662a29 tree visual changes, fonts etc. 2021-05-23 20:26:54 +02:00
Jules-Bertholet
a410ed1b74 Update KaTeX to v0.13.9 (#1925) 
* Update KaTeX to v0.13.9

* Allow KaTeX commands like \url and \includegraphics
https://katex.org/docs/options.html
 2021-05-08 20:58:56 +02:00
Jules-Bertholet
1308dc20e8 Add support for mhchem markup in KaTeX (#1917) 2021-05-06 22:38:56 +02:00
zadam
025af8df02 ckeditor 27.1 2021-04-21 23:03:09 +02:00
zadam
f739dbfe87 ckeditor 5.60.0 2021-04-06 22:16:34 +02:00
zadam
6c9ac5b5ec jquery 3.6.0 2021-03-30 23:32:44 +02:00
zadam
e055d4e15e ckeditor 27 2021-03-29 23:29:14 +02:00
zadam
7e2186721f added "re-render note" menu item & shortcut, closes #1766 2021-03-19 22:34:56 +01:00
zadam
0bc91da0bb added possibility to zoom into images using mousewheel 2021-03-15 22:24:56 +01:00
zadam
723a0e479e ckeditor 26.0 2021-03-10 20:02:23 +01:00
zadam
bf231d31a2 fancytree 2.38.0 2021-02-09 21:33:55 +01:00
zadam
2dc742f5b8 don't recompress animated images, #1585 2021-01-28 20:17:57 +01:00
zadam
7bf6ec3ff2 bootstrap 4.6.0 2021-01-19 22:28:43 +01:00
zadam
053162fef2 bootstrap 4.5.3 2020-12-17 15:20:20 +01:00
zadam
bf653a9a5c ckeditor 24 content styles 2020-12-15 15:18:45 +01:00
zadam
0bb548d0d1 ckeditor 24 2020-12-13 20:27:57 +01:00
zadam
bc520edd19 fix usage of async .getHeaders() 2020-12-03 21:50:41 +01:00
zadam
167b6974fe Merge remote-tracking branch 'origin/stable' 2020-11-23 21:20:06 +01:00
zadam
984ecaf99c show again the table handle and type around 2020-11-23 20:56:14 +01:00
zadam
473229f03a Merge remote-tracking branch 'origin/stable' 2020-11-21 20:44:37 +01:00
zadam
e5fa1e0ed5 hide table's selection handle, fixes #1448 2020-11-20 21:01:44 +01:00
zadam
af1fd5bd06 improvements to collapsible section container 2020-11-19 23:02:25 +01:00
zadam
1403acd808 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	src/public/app/services/note_content_renderer.js
 2020-11-08 21:06:48 +01:00
zadam
4bd87b1796 update ckeditor5-math which fixes focus and placeholder issues 2020-11-07 21:28:12 +01:00