Commit graph

6471 commits

Author SHA1 Message Date
SiriusXT 3e3d7aa4d7 Show highlighted text in right panel 2023-06-03 17:12:06 +08:00
SiriusXT 446c41d020 Show highlighted text in right panel 2023-06-03 17:00:15 +08:00
SiriusXT 33fdad5159 Show highlighted text in right panel 2023-06-03 14:43:20 +08:00
SiriusXT 463d145cb7 Merge branch 'Highlighted-Text' of https://github.com/SiriusXT/trilium into Highlighted-Text 2023-06-03 11:55:59 +08:00
SiriusXT 1413756d00 Show highlighted text in right panel 2023-06-03 11:55:50 +08:00
SnnBcd 045ee18237
Merge branch 'zadam:master' into Highlighted-Text 2023-06-02 21:02:31 +08:00
zadam e47c3a27b0 remove the workaround test 2023-06-01 23:18:50 +02:00
zadam ced99f8ac8
Merge pull request #3995 from mm21/master
Add ETAPI test to repro inherited attribute issue for cloned note #3994
2023-06-01 23:15:10 +02:00
zadam 0c4492bcd0 invalidate attribute cache on branch create/update, fixes #3994 2023-06-01 23:14:17 +02:00
zadam d9359c7c55 downgrade excalidraw to 0.14.2, #3979 2023-06-01 22:51:34 +02:00
mm21 86a080e7ec Add ETAPI test to repro inherited attribute issue for cloned note #3994 2023-06-01 17:20:11 +00:00
SiriusXT 0a66809bf0 Not show when nothing is checked in the options 2023-06-01 20:38:55 +08:00
SiriusXT ecfdde2f2a Show highlighted text in the right pane 2023-06-01 20:17:00 +08:00
zadam 758dba9ba5 fix event 2023-06-01 00:13:08 +02:00
zadam ae42e0efc7 refactoring 2023-06-01 00:07:57 +02:00
zadam b5cfc28912 rename inheritableAttributeCache to __inheritableAttributeCache for consistency 2023-05-31 23:21:06 +02:00
zadam c802bf7d8b
Merge pull request #3990 from mm21/master
Add ETAPI tests to repro inherited attribute issue #3989 and workaround
2023-05-31 22:55:57 +02:00
mm21 9e5a02094c Add ETAPI tests to repro inherited attribute issue and workaround 2023-05-31 17:11:42 +00:00
SiriusXT 92d5aeae41 Show highlighted text in the right panel 2023-05-31 22:34:24 +08:00
SiriusXT d2d286a4ff Show highlighted text in the left pane 2023-05-31 21:47:43 +08:00
zadam a6ade790c6 script api docs 2023-05-31 14:35:08 +02:00
zadam a9dae7823f script api docs 2023-05-31 14:00:37 +02:00
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
zadam 5428cafa50
Merge pull request #3963 from SiriusXT/master
keep this window on top
2023-05-30 22:37:10 +02:00
SiriusXT 1a2beb941e keep this window on top 2023-05-27 14:23:50 +08: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 82efc92413 lib upgrades 2023-05-26 23:11:37 +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
baiyongjie 9d49264258 cleaup 2023-05-26 14:54:13 +08:00
baiyongjie 6098d62dcc fix getEditedNotesOnDate 2023-05-26 14:36:21 +08:00
zadam 580ceec6b3
Merge pull request #3959 from soulsands/fix-search
fix search
2023-05-25 23:36:35 +02: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 7fc2824325 ignore husky install error 2023-05-20 14:23:22 +02:00
zadam 0728f540ab locked versions 2023-05-18 23:57:18 +02:00