gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-04 05:28:59 +01:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity
6,278 Commits 50 Branches 349 Tags
Commit Graph

6278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zadam
a24c56a9d5 fixes 2023-03-20 23:11:32 +01:00
zadam
95e38a037b scrollbar tweak color 2023-03-20 20:50:18 +01:00
zadam
256b800d0e scrollbar tweak color 2023-03-20 20:48:52 +01:00
zadam
b3c4c850db Merge branch 'master' into next60 2023-03-20 20:21:30 +01:00
zadam
4284116280
Merge pull request #3736 from dymani/master 
Fix typo in backend API createOrUpdateLauncher()
 2023-03-19 22:26:16 +01:00
zadam
d31b5ac99f add #newNotesOnTop, closes #3734 2023-03-19 22:23:58 +01:00
dymani
b3f47bb2b6 Fix typo in backend API createOrUpdateLauncher() 2023-03-18 10:18:34 +08:00
zadam
e698aa5822 uploading image to attachment 2023-03-16 20:13:34 +01:00
zadam
1fdb23746a uploading image to attachment 2023-03-16 18:34:39 +01:00
zadam
9cd5bdeb53 fix note revision 2023-03-16 17:49:35 +01:00
zadam
e6183b9a1d improved saving 2023-03-16 17:43:37 +01:00
zadam
d83005fe4d improved saving attachment 2023-03-16 16:37:31 +01:00
zadam
2b84f1be00 unify .setContent() .getContent() handling across notes, revisions, attachments 2023-03-16 15:19:26 +01:00
zadam
bb45c67e60 Merge branch 'stable' into next60 2023-03-16 13:39:28 +01:00
zadam
147160ed45 fix dead references in consistency_checks.js 2023-03-16 13:30:33 +01:00
zadam
515fb4e5db blob WIP 2023-03-16 13:29:11 +01:00
zadam
b6efc954bd blob WIP 2023-03-16 12:17:55 +01:00
zadam
eee05a4d01 blob WIP 2023-03-16 12:11:00 +01:00
zadam
dc97400dbf ancillary => attachment 2023-03-16 11:03:28 +01:00
zadam
e16bedfab4 WIP blobs 2023-03-16 11:02:07 +01:00
zadam
5a8e216dec WIP blob 2023-03-15 22:44:08 +01:00
zadam
1faf8225c7 Merge branch 'master' into next60 2023-03-15 20:19:47 +01:00
zadam
bfbb531863
Merge pull request #3719 from meichthys/patch-sqlconsole 
Fixes #3718
 2023-03-15 16:41:07 +01:00
MeIchthys
48ba73e06d
Fixes #3718 2023-03-15 09:56:26 -04:00
zadam
c922322ed3
Merge pull request #3152 from spasche/scrollbar-color 
use same variable as Firefox for scrollbar thumb
 2023-03-14 22:16:39 +01:00
zadam
53aaffd0f5
Merge pull request #3652 from eliandoran/fix/infinite_loop_autocompletion 
Infinite loop when searching for '' in Jump to note
 2023-03-14 22:13:40 +01:00
zadam
63a70f2ffa release 0.59.2 v0.59.2 2023-03-14 21:15:08 +01:00
zadam
d8e9086bde
Merge pull request #3710 from meichthys/patch-3 
Capitalize Ribbon Widget titles for consistency
 2023-03-14 21:12:38 +01:00
zadam
af4470ead1
Merge pull request #3709 from PJB3005/23-03-14-mermaid-code-mode 
Avoid EditableCode inheriting mode from previous notes.
 2023-03-14 21:12:01 +01:00
zadam
7cda81ec68 fix default keyboard shortcuts for mac forward, back, closes #3708 2023-03-14 21:07:14 +01:00
MeIchthys
b1153f8d01
Capitalize Inherited Attributes for consistency 2023-03-14 16:01:08 -04:00
MeIchthys
54e21bf249
Capitalize Owned Attributes title 2023-03-14 15:58:40 -04:00
Pieter-Jan Briers
eebf329983 Avoid EditableCode inheriting mode from previous notes. 
Previously, if CodeMirror doesn't support a mode explicitly the mode wouldn't be updated on refresh. This means editors like Mermaid would get their mode "inherited" from the previous mode you had open.

Now the mode is set to text/plain if CodeMirror doesn't support the note's MIME type.

P.S. some of the mermaid diagrams in the demo data have their MIME type incorrectly set to text/plain rather than text/mermaid, so it doesn't reproduce on all diagrams in the demo data.
 2023-03-14 20:56:12 +01:00
zadam
7b1d6c3937
Merge pull request #3685 from holoword/holoword/issue3677 
“Docker non-root healthcheck”
 2023-03-14 20:44:35 +01:00
holo
e6803e9a9b “Docker non-root healthcheck” 2023-03-15 00:01:25 +00:00
zadam
0b24011468 docker_healthcheck.js should not create log files, #3677 2023-03-14 20:32:35 +01:00
zadam
2699c995ee
Merge pull request #3701 from meichthys/patch-2 
Add `onenote` Scheme to html sanitizer
 2023-03-14 20:23:21 +01:00
MeIchthys
697f6ee2a9
Add onenote Scheme to html sanitizer 2023-03-13 10:36:25 -04:00
zadam
35429f6a93
Merge pull request #3693 from meichthys/patch-1 
📝Emojify Readme
 2023-03-12 23:10:43 +01:00
zadam
29eae4eeb6 fixed jsdoc 2023-03-12 23:05:54 +01:00
zadam
8de67b6945 small fixes / refactoring 2023-03-12 21:37:13 +01:00
zadam
4f63284d41
Merge pull request #3699 from new-sashok724/unix-sockets 
Support listening on the unix socket
 2023-03-12 21:31:37 +01:00
zadam
0c806024fb added some extra allowed URI schemes, fixes #3692 2023-03-12 21:20:34 +01:00
Сашка724ая
9a08aa2ab5
Fix healthcheck and some messages 2023-03-11 20:57:16 +11:00
Сашка724ая
02f218389b
support listening on unix sockets 2023-03-11 20:21:32 +11:00
MeIchthys
4cd54e5a9a
Emojify Readme 2023-03-09 11:51:13 -05:00
zadam
5225a99995 wip 2023-03-09 09:38:02 +01:00
zadam
929f8ef720 note ancillary/attachment backported from dev branch 2023-03-08 09:01:23 +01:00
zadam
6b4800d2d6 port error clarifications 2023-03-08 07:31:10 +01:00
zadam
f60e4a1355 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	package-lock.json
 2023-03-07 23:07:06 +01:00