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
7,350 Commits 50 Branches 349 Tags
Commit Graph

7350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zadam
1089e84f56
Merge pull request #3947 from SiriusXT/master 
FindInText: Automatically search the selected text
 2023-05-18 13:27:37 +02:00
baiyongjie
ed3d81ce62 normalize tooltip style 2023-05-18 16:41:07 +08:00
SnnBcd xt
57aa0a0fe1 findInText: Automatically search the selected text 2023-05-18 07:29:21 +00:00
zadam
88a961180f cleanup note open custom 2023-05-17 23:57:32 +02:00
zadam
1f8798d7ac upgrades 2023-05-17 23:47:30 +02:00
zadam
bd8429a0ba
Merge pull request #3944 from SiriusXT/toc 
toc scrolls smoothly
 2023-05-17 23:13:41 +02:00
zadam
af95d387b9 Merge remote-tracking branch 'origin/master' into next60 
# Conflicts:
#	src/public/app/services/open.js
#	src/public/app/widgets/buttons/note_actions.js
 2023-05-17 23:10:02 +02:00
zadam
da348075e8
Merge pull request #3923 from soulsands/fix-include 
fix included note display
 2023-05-17 23:06:50 +02:00
SnnBcd xt
d24d3af87d Other elements in the scroll-container (including text search) scroll smoothly 2023-05-17 12:03:38 +00:00
SnnBcd xt
085c0e76ca toc scrolls smoothly 2023-05-17 10:18:58 +00:00
zadam
d7d98b29a7
Merge pull request #3940 from SiriusXT/open-note-custom 
Open note custom
 2023-05-16 23:55:17 +02:00
zadam
cb3b03537c
Merge pull request #3938 from meichthys/keyboardshortcut 
Change KeybaordLauncher to KeyboardShortcut
 2023-05-16 22:37:00 +02:00
SnnBcd xt
7c7bea5e3a Open notes with custom software. 2023-05-16 14:01:55 +00:00
SnnBcd xt
9fc474504b Open notes with custom software 2023-05-16 11:57:28 +00:00
SnnBcd xt
412fd105c9 open-note-custom-test 2023-05-16 06:22:15 +00:00
MeIchthys
470a0c7b21
Update launchbar_command_launcher.html to refer to shortcuts 2023-05-15 10:21:40 -04:00
MeIchthys
9968cba348
singluarify 'mirrors' 2023-05-15 10:15:14 -04:00
MeIchthys
aee520a209
Change keyboardLauncher to keyboardShortcut 2023-05-15 10:12:43 -04:00
MeIchthys
cf4201b084
update keyboardlauncher to keyboardShortcut 2023-05-15 10:11:07 -04:00
zadam
76196ed42c Merge remote-tracking branch 'origin/master' into next60 2023-05-14 17:32:59 +02:00
zadam
6089a369e3 added missing font files #3933 2023-05-13 16:29:18 +02:00
zadam
092db03729 update montserrat for better cyrillic support, fixes #3933 2023-05-13 16:28:32 +02:00
zadam
239c14a5df fix search in "view source", closes #3929 2023-05-13 16:00:41 +02:00
zadam
8a6002c6be fix search in "view source", closes #3929 2023-05-13 15:58:32 +02:00
zadam
38781d33ac Merge remote-tracking branch 'origin/master' into next60 
# Conflicts:
#	src/public/app/widgets/type_widgets/editable_text.js
 2023-05-13 15:43:35 +02:00
zadam
0518cdbe8e
Merge pull request #3928 from meichthys/auto-flex-note-title 
Auto flex note title in tree
 2023-05-13 15:42:12 +02:00
MeIchthys
4849dacd52
auto flex note title in tree 2023-05-12 10:14:34 -04:00
baiyongjie
7cf47520d4 fix included note display 2023-05-11 10:54:20 +08:00
baiyongjie
8eb0a4e1cb fix cursor position when Jumping from note to included note 
(cherry picked from commit 6a9aa5eedaf27d8b077d200cca659eef541b2143)
 2023-05-11 00:22:06 +02:00
zadam
ad2a7a2da3
Merge pull request #3920 from soulsands/fix-include 
fix cursor position when Jumping from note to included note
 2023-05-11 00:21:21 +02:00
baiyongjie
6a9aa5eeda fix cursor position when Jumping from note to included note 2023-05-10 18:08:25 +08:00
zadam
04524ae8e4
Merge pull request #3918 from meichthys/ribbon_more_obvious 
Make active ribbon item more obvious
 2023-05-09 23:46:45 +02:00
zadam
04caba9f5b fix parsing the authentication header with password containing a colon, closes #3916 2023-05-09 23:44:43 +02:00
zadam
cc1f831a6a don't allow setting image quality to empty value, #3894 2023-05-09 23:32:06 +02:00
zadam
331d280075 TOC scrolls smoothly (on readonly), #3911 2023-05-09 23:14:56 +02:00
MeIchthys
46ed61d38a
Make active ribbon item more obvious 2023-05-09 16:29:04 -04:00
zadam
ff5d3a5f0c import WIP 2023-05-09 00:05:27 +02:00
zadam
626af84f42 refactoring + uploading attachments WIP 2023-05-08 00:02:08 +02:00
zadam
b05ce12e7b adding links to owning note and list to attachments 2023-05-07 23:32:30 +02:00
zadam
274505188b fix "go to note" from note autocomplete 2023-05-07 21:29:09 +02:00
zadam
f85209a72f getting rid of attributes like data-note-path in favor of the whole nav state in URLs 2023-05-07 21:18:21 +02:00
zadam
291f0e79d9 make a special backup before migrating to 0.60 2023-05-07 15:46:17 +02:00
zadam
64db5e2542 cleanup of app.js, wwww 2023-05-07 15:23:46 +02:00
zadam
c4a2ff5fa1 fix hamburger icon in canvas, #3780 2023-05-07 12:09:38 +02:00
zadam
9f5f0aeddd fix hamburger icon in canvas 2023-05-07 11:54:04 +02:00
zadam
4d5612e845 fix updating non-text notes 2023-05-07 11:20:51 +02:00
zadam
371f174756 run hiddenSubtreeService.checkHiddenSubtree() also periodically, useful for server deployments, #3907 2023-05-07 10:54:06 +02:00
zadam
5676ff9b2e
Merge pull request #3909 from mm21/etapi-generated-client 
Enable generated etapi client
 2023-05-07 10:50:05 +02:00
zadam
aa8c0fdad8
Merge pull request #3908 from mm21/etapi-attribute-position 
Allow etapi to update attribute fields isInheritable, position
 2023-05-07 10:48:25 +02:00
zadam
8284c673f9 can't allow opening externally on attachment list 2023-05-07 10:43:51 +02:00