Commit Graph

6449 Commits (86861f6ec36b6015c20dd0b4529b627fc8f92667)
 

Author SHA1 Message Date
SiriusXT 86861f6ec3 Show highlighted text in the left pane 2023-05-31 18:32:33 +07:00
zadam d26a0fae17 if a note context has sub contexts, then it has to be saved even if empty, fixes #3985 2023-05-31 00:03:20 +07:00
zadam 375dba3264 fixed infinite recursion with search notes 2023-05-30 23:54:11 +07:00
zadam 74044754e2 Merge remote-tracking branch 'origin/master' 2023-05-30 22:59:23 +07:00
zadam 64aed9b462 display icon for non-supported note types in content renderer 2023-05-30 22:52:48 +07:00
zadam 5428cafa50
Merge pull request #3963 from SiriusXT/master
keep this window on top
2023-05-30 22:37:10 +07:00
SiriusXT 1a2beb941e keep this window on top 2023-05-27 14:23:50 +07:00
SiriusXT 01b2887b36 Keep this window on top. 2023-05-27 14:18:26 +07:00
SiriusXT 5286d4a97c Merge branch 'master' of https://github.com/SiriusXT/trilium 2023-05-27 14:14:31 +07:00
zadam bf6106f4dc release 0.60.1-beta 2023-05-26 23:11:53 +07:00
zadam 82efc92413 lib upgrades 2023-05-26 23:11:37 +07:00
zadam 34481df2e7 Merge remote-tracking branch 'origin/master' 2023-05-26 11:14:22 +07:00
zadam ad4631018a right click on external link should not open the link, fixes #3971 2023-05-26 11:13:49 +07:00
zadam ef89eede17
Merge pull request #3974 from soulsands/fix-edited-note
fix getEditedNotesOnDate
2023-05-26 11:05:57 +07:00
zadam 6878877acd Merge remote-tracking branch 'origin/master' 2023-05-26 10:55:50 +07:00
zadam 611a983461 images in note list preview should be shrinked to fit into view, fixes #3965 2023-05-26 10:54:08 +07:00
baiyongjie 9d49264258 cleaup 2023-05-26 14:54:13 +07:00
baiyongjie 6098d62dcc fix getEditedNotesOnDate 2023-05-26 14:36:21 +07:00
zadam 580ceec6b3
Merge pull request #3959 from soulsands/fix-search
fix search
2023-05-25 23:36:35 +07:00
SiriusXT 79dca12274 top 2023-05-23 20:50:03 +07:00
SiriusXT 66c25e7f29 Bring this window to the top 2023-05-23 15:55:35 +07:00
SiriusXT dc4983a013 Bring this window to the top 2023-05-23 15:49:03 +07:00
SiriusXT 039959a48b Put this window top. 2023-05-23 15:44:26 +07:00
SiriusXT 63be25f5bb put window on top 2023-05-23 11:14:23 +07:00
SiriusXT ce7489049f put window on top 2023-05-23 10:32:24 +07:00
baiyongjie b3d5938665 fix search 2023-05-23 09:30:55 +07:00
zadam 7fc2824325 ignore husky install error 2023-05-20 14:23:22 +07:00
zadam 0728f540ab locked versions 2023-05-18 23:57:18 +07:00
zadam 4913a5a5fa release 0.60.0-beta 2023-05-18 23:31:57 +07:00
zadam 14dd2b8827 cleanup 2023-05-18 23:05:28 +07:00
zadam 4e9e7eba48 Merge remote-tracking branch 'origin/master' 2023-05-18 13:46:53 +07:00
zadam f3bc604516 Merge branch 'stable'
# Conflicts:
#	src/public/app/widgets/toc.js
2023-05-18 13:46:41 +07:00
zadam bd278e291a
Merge pull request #3948 from soulsands/tooltip
Normalize tooltip style
2023-05-18 13:42:18 +07:00
zadam 074820dae5 cleanup of find in text implementation 2023-05-18 13:41:32 +07:00
zadam 1089e84f56
Merge pull request #3947 from SiriusXT/master
FindInText: Automatically search the selected text
2023-05-18 13:27:37 +07:00
baiyongjie ed3d81ce62 normalize tooltip style 2023-05-18 16:41:07 +07:00
SnnBcd xt 57aa0a0fe1 findInText: Automatically search the selected text 2023-05-18 07:29:21 +07:00
zadam 88a961180f cleanup note open custom 2023-05-17 23:57:32 +07:00
zadam bd8429a0ba
Merge pull request #3944 from SiriusXT/toc
toc scrolls smoothly
2023-05-17 23:13:41 +07:00
zadam da348075e8
Merge pull request #3923 from soulsands/fix-include
fix included note display
2023-05-17 23:06:50 +07:00
SnnBcd xt d24d3af87d Other elements in the scroll-container (including text search) scroll smoothly 2023-05-17 12:03:38 +07:00
SnnBcd xt 085c0e76ca toc scrolls smoothly 2023-05-17 10:18:58 +07:00
zadam d7d98b29a7
Merge pull request #3940 from SiriusXT/open-note-custom
Open note custom
2023-05-16 23:55:17 +07:00
zadam cb3b03537c
Merge pull request #3938 from meichthys/keyboardshortcut
Change KeybaordLauncher to KeyboardShortcut
2023-05-16 22:37:00 +07:00
SnnBcd xt 7c7bea5e3a Open notes with custom software. 2023-05-16 14:01:55 +07:00
SnnBcd xt 9fc474504b Open notes with custom software 2023-05-16 11:57:28 +07:00
SnnBcd xt 412fd105c9 open-note-custom-test 2023-05-16 06:22:15 +07:00
MeIchthys 470a0c7b21
Update launchbar_command_launcher.html to refer to shortcuts 2023-05-15 10:21:40 +07:00
MeIchthys 9968cba348
singluarify 'mirrors' 2023-05-15 10:15:14 +07:00
MeIchthys aee520a209
Change keyboardLauncher to keyboardShortcut 2023-05-15 10:12:43 +07:00