Commit Graph

5444 Commits

Author SHA1 Message Date
SiriusXT 86861f6ec3 Show highlighted text in the left pane 2023-05-31 18:32:33 +08: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 +02:00
zadam 375dba3264 fixed infinite recursion with search notes 2023-05-30 23:54:11 +02:00
zadam 74044754e2 Merge remote-tracking branch 'origin/master' 2023-05-30 22:59:23 +02:00
zadam 64aed9b462 display icon for non-supported note types in content renderer 2023-05-30 22:52:48 +02:00
dymani 735852b3c1 Use noteContextReorder event instead 2023-05-31 01:53:55 +08:00
zadam f4b5d43899 inline file attachments when exporting single HTML file 2023-05-29 23:42:08 +02:00
zadam 235b779dec detect existing attachment in target note 2023-05-29 22:37:19 +02:00
dymani 2a39906993 Cleanup 2023-05-30 04:22:51 +08:00
dymani e1b67e20ec Add buttons to move split panes 2023-05-30 03:44:05 +08:00
zadam df17840dbc fixes attachments 2023-05-29 13:02:25 +02:00
zadam 9d52f80c2f linking attachments finished 2023-05-29 10:21:34 +02:00
zadam 0aa119af2c attachments WIP 2023-05-29 00:19:54 +02:00
zadam c2f70031d0 Merge branch 'master' into next61
# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/entities/fnote.js
#	src/public/app/services/link.js
2023-05-28 16:57:48 +02:00
SiriusXT 01b2887b36 Keep this window on top. 2023-05-27 14:18:26 +08:00
SiriusXT 5286d4a97c Merge branch 'master' of https://github.com/SiriusXT/trilium 2023-05-27 14:14:31 +08:00
zadam bf6106f4dc release 0.60.1-beta 2023-05-26 23:11:53 +02:00
zadam 34481df2e7 Merge remote-tracking branch 'origin/master' 2023-05-26 11:14:22 +02:00
zadam ad4631018a right click on external link should not open the link, fixes #3971 2023-05-26 11:13:49 +02:00
zadam ef89eede17 Merge pull request #3974 from soulsands/fix-edited-note
fix getEditedNotesOnDate
2023-05-26 11:05:57 +02:00
zadam 6878877acd Merge remote-tracking branch 'origin/master' 2023-05-26 10:55:50 +02:00
zadam 611a983461 images in note list preview should be shrinked to fit into view, fixes #3965 2023-05-26 10:54:08 +02:00
zadam 8e913cb453 wip 2023-05-26 10:36:05 +02:00
baiyongjie 9d49264258 cleaup 2023-05-26 14:54:13 +08:00
baiyongjie 6098d62dcc fix getEditedNotesOnDate 2023-05-26 14:36:21 +08:00
SiriusXT 79dca12274 top 2023-05-23 20:50:03 +08:00
SiriusXT 66c25e7f29 Bring this window to the top 2023-05-23 15:55:35 +08:00
SiriusXT dc4983a013 Bring this window to the top 2023-05-23 15:49:03 +08:00
SiriusXT 039959a48b Put this window top. 2023-05-23 15:44:26 +08:00
SiriusXT 63be25f5bb put window on top 2023-05-23 11:14:23 +08:00
SiriusXT ce7489049f put window on top 2023-05-23 10:32:24 +08:00
baiyongjie b3d5938665 fix search 2023-05-23 09:30:55 +08:00
zadam 579ed7e194 attachment content rendering 2023-05-21 18:14:17 +02:00
zadam e20fac19ba attachment WIP 2023-05-20 23:46:45 +02:00
zadam 9e9fb2979f Merge branch 'master' into next61
# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/components/note_context.js
#	src/public/app/services/open.js
#	src/public/app/widgets/buttons/note_actions.js
#	src/public/app/widgets/find_in_code.js
#	src/public/app/widgets/type_widgets/canvas.js
#	src/services/options.js
2023-05-20 20:55:57 +02:00
zadam 4913a5a5fa release 0.60.0-beta 2023-05-18 23:31:57 +02:00
zadam 4e9e7eba48 Merge remote-tracking branch 'origin/master' 2023-05-18 13:46:53 +02:00
zadam f3bc604516 Merge branch 'stable'
# Conflicts:
#	src/public/app/widgets/toc.js
2023-05-18 13:46:41 +02:00
zadam bd278e291a Merge pull request #3948 from soulsands/tooltip
Normalize tooltip style
2023-05-18 13:42:18 +02:00
zadam 074820dae5 cleanup of find in text implementation 2023-05-18 13:41:32 +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 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
SnnBcd xt 7c7bea5e3a Open notes with custom software. 2023-05-16 14:01:55 +00:00