Commit Graph

6499 Commits

Author SHA1 Message Date
zadam 6f16b4caec Merge branch 'beta' 2023-06-13 23:24:09 +02:00
zadam bea39f37ee stop click propagation in tree item actions 2023-06-13 00:12:55 +02:00
mechanarchy 6548149107 Update etapi.js
(cherry picked from commit b97ebe9f03)
2023-06-12 23:21:38 +02:00
zadam fbc805a221 Merge pull request #4019 from mechanarchy/patch-2
Fix attempted ETAPI token rename after cancel
2023-06-12 23:21:13 +02:00
zadam 6015a067ec sql console outputs results of CTEs, fixes #2800 2023-06-12 23:18:57 +02:00
mechanarchy 4a1ecd906b Update entrypoints.js
(cherry picked from commit 08ec866dd2)
2023-06-12 23:13:40 +02:00
zadam 41844cf817 Merge pull request #4017 from mechanarchy/patch-1
Fix SQL Console error messages
2023-06-12 23:12:35 +02:00
zadam 004cfe1965 allow creating backups via ETAPI, #4014 2023-06-12 23:09:29 +02:00
mechanarchy b97ebe9f03 Update etapi.js 2023-06-10 17:36:23 +10:00
mechanarchy 08ec866dd2 Update entrypoints.js 2023-06-10 07:44:23 +10:00
zadam 2bdd538d7d release 0.60.2-beta v0.60.2-beta 2023-06-08 22:46:52 +02:00
zadam 6e69cafe54 fix showing deleted notes in the recent changes dialog, closes #4013 2023-06-08 22:45:44 +02:00
zadam c177aaa901 refactoring of highlight list 2023-06-04 17:46:37 +02:00
zadam eff3e1df85 Merge pull request #3988 from SiriusXT/Highlighted-Text
Show highlighted text in the right pane
2023-06-04 12:37:19 +02:00
SiriusXT 5b421d51b5 Merge branch 'Highlighted-Text' of https://github.com/SiriusXT/trilium into Highlighted-Text 2023-06-04 16:02:32 +08:00
SiriusXT 8852e8e531 Show highlighted text in right panel 2023-06-04 16:02:30 +08:00
zadam 8bc84cfaf6 Merge pull request #4004 from dymani/default-shortcuts
Fix shortcuts not resetting to default
2023-06-03 23:09:31 +02:00
SnnBcd cde13dc580 Merge branch 'zadam:master' into Highlighted-Text 2023-06-04 00:24:08 +08:00
dymani 282d135f0f Fix shortcuts not resetting to default 2023-06-03 22:03:54 +08:00
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
zadam d3bf325f19 added some comments to openapi spec 2023-06-03 00:32:16 +02:00
zadam c4f69fd9cb don't allow patching relation's value in ETAPI #3998 2023-06-03 00:21:46 +02:00
zadam af67cf64b1 Merge pull request #3984 from dymani/move-pane
Add buttons to reorder split panes
2023-06-02 16:07:15 +02:00
zadam 095da691a4 Merge remote-tracking branch 'origin/master' 2023-06-02 16:05:10 +02:00
zadam 7e71029d1c use note size format also in file properties 2023-06-02 16:05:02 +02: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
dymani 58253567cd Simplify noteContextReorder event call 2023-06-01 00:48:37 +08: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