zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-09-21 16:16:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
6286 commits 38 branches 306 tags 138 MiB
Commit graph

6286 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zadam 2d7b5e4aa2 Merge branch 'stable' 
# Conflicts:
#	src/services/build.js
 2023-03-29 22:37:44 +02:00
zadam b542a28673 Merge branch 'stable' 2023-03-27 23:35:40 +02:00
zadam ed52919f9e release 0.59.3 2023-03-27 23:06:14 +02:00
zadam 45a74a046c release 0.59.3 2023-03-27 23:03:27 +02:00
zadam 3192531d4c don't trigger menu items on right click, #3764 2023-03-27 22:49:41 +02:00
zadam 79a6baca6f adjust logo sizing/positioning 2023-03-26 23:23:13 +02:00
zadam f9645e8971 Merge branch 'stable' 2023-03-26 23:11:47 +02:00
zadam 7611c83148
Merge pull request #3773 from mm21/master 
Add svg icons
 2023-03-26 23:11:04 +02:00
zadam 9881e6de3e fix hangup on highlighting empty tokens, closes #3772 2023-03-26 23:09:15 +02:00
Matt 53b4f0e0d5 Add svg icons 2023-03-26 19:29:52 +00:00
zadam 9a645c24ca
Merge pull request #3771 from eltociear/add-readme_ja 
Add Japanese README
 2023-03-26 21:10:21 +02:00
zadam 682d821b67
Merge pull request #3766 from meichthys/patch-7 
Move .tree-actions left to accomodate wider windows scrollbar and adjust boarder
 2023-03-26 20:58:59 +02:00
zadam 71afffaac1
Merge pull request #3765 from meichthys/patch-5 
Add bottom border to note-book-header
 2023-03-26 20:58:12 +02:00
zadam a099876088 fix escaping in sql console results 2023-03-26 20:50:37 +02:00
Ikko Eltociear Ashimine cf904a874e Add links 2023-03-26 20:34:46 +09:00
Ikko Eltociear Ashimine 5a32a7ce18 minor fix 2023-03-26 20:33:59 +09:00
Ikko Eltociear Ashimine 6d6221636c Add Japanese README 2023-03-26 20:25:17 +09:00
MeIchthys 8a4caaf6fb
Add border to tree-actions section and adjust padding 2023-03-24 15:17:17 -04:00
MeIchthys fa6d1879dd
Move .tree-actions left to accomodate wider windows scrollbar 2023-03-24 14:46:09 -04:00
MeIchthys 874b6c71a3
Add bottom border to note-book-header 2023-03-24 11:29:16 -04:00
zadam cd72ea524e promoted and inherited attributes should be shown grouped based on the owning note, #3761 2023-03-23 23:47:28 +01:00
zadam 56e8506cb9
Merge pull request #3756 from meichthys/note-book-card-margin 
Use same margin all around note-book-card
 2023-03-23 23:20:50 +01:00
MeIchthys c86be990d6
Use same margin all around note-book-card 2023-03-21 16:19:09 -04:00
zadam 6b1f9d3243 add #newNotesOnTop, closes #3734 
(cherry picked from commit d31b5ac99f)
 2023-03-19 22:27:12 +01:00
dymani 117f1101e4 Fix typo in backend API createOrUpdateLauncher() 
(cherry picked from commit b3f47bb2b6)
 2023-03-19 22:27:12 +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 64d8c7a657 add a check for the hidden note existence, #3728 2023-03-17 22:14:50 +01:00
zadam 4c3fcc3ea6 fix sanitization of autocomplete against XSS 2023-03-17 22:04:49 +01:00
zadam 5ad47d3866 fix cache invalidation upon note title change 2023-03-17 20:44:26 +01:00
zadam 147160ed45 fix dead references in consistency_checks.js 2023-03-16 13:30:33 +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 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