gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Commit Graph

  • fbc805a221
         Merge pull request #4019 from mechanarchy/patch-2 zadam 2023-06-12 23:21:13 +02:00
  • 6015a067ec sql console outputs results of CTEs, fixes #2800 zadam 2023-06-12 23:18:57 +02:00
  • 4a1ecd906b Update entrypoints.js mechanarchy 2023-06-10 07:44:23 +10:00
  • 41844cf817
         Merge pull request #4017 from mechanarchy/patch-1 zadam 2023-06-12 23:12:35 +02:00
  • 004cfe1965 allow creating backups via ETAPI, #4014 zadam 2023-06-12 23:09:29 +02:00
  • b97ebe9f03
         Update etapi.js mechanarchy 2023-06-10 17:36:23 +10:00
  • 08ec866dd2
         Update entrypoints.js mechanarchy 2023-06-10 07:44:23 +10:00
  • 2bdd538d7d release 0.60.2-beta v0.60.2-beta zadam 2023-06-08 22:46:52 +02:00
  • 6e69cafe54 fix showing deleted notes in the recent changes dialog, closes #4013 zadam 2023-06-08 22:45:44 +02:00
  • 38839532d5 file upload WIP zadam 2023-06-06 12:31:38 +02:00
  • 0234ff5fca share support for attachment file download zadam 2023-06-06 00:16:32 +02:00
  • 44bcfd47c0 share support for attachment images zadam 2023-06-05 23:05:05 +02:00
  • 69c7eb14aa fixes zadam 2023-06-05 21:14:33 +02:00
  • 00453fc151 attachment ETAPI tests WIP zadam 2023-06-05 17:00:58 +02:00
  • 5c393f959d got rid of .isDeleted on froca entities (the property is not available there) zadam 2023-06-05 16:26:05 +02:00
  • e6bf6424e8 rename loadresults methods/properties for clarity that they don't contain entities, only rows zadam 2023-06-05 16:12:02 +02:00
  • 57702a07a2 attachment ETAPI support WIP zadam 2023-06-05 09:44:36 +02:00
  • 3b3f6082a7 attachment ETAPI support WIP zadam 2023-06-05 09:23:42 +02:00
  • 49241ab318 merge zadam 2023-06-05 00:12:08 +02:00
  • 93addac8bb Merge branch 'master' into next61 zadam 2023-06-05 00:09:55 +02:00
  • fe908759d1 rename "note revision" to just "revision" zadam 2023-06-04 23:02:49 +02:00
  • 779751a234 rename "note revision" to just "revision" zadam 2023-06-04 23:01:40 +02:00
  • cb9feab7b2 got rid of the hot/cold blob, all blobs are "cold" now zadam 2023-06-04 22:50:07 +02:00
  • b79631a35d setContent refactoring zadam 2023-06-04 20:51:08 +02:00
  • c177aaa901 refactoring of highlight list zadam 2023-06-04 17:46:37 +02:00
  • eff3e1df85
         Merge pull request #3988 from SiriusXT/Highlighted-Text zadam 2023-06-04 12:37:19 +02:00
  • b46d5f4a71 add blobId to the ETAPI #4005 zadam 2023-06-04 11:59:19 +02:00
  • 5b421d51b5 Merge branch 'Highlighted-Text' of https://github.com/SiriusXT/trilium into Highlighted-Text SiriusXT 2023-06-04 16:02:32 +08:00
  • 8852e8e531 Show highlighted text in right panel SiriusXT 2023-06-04 16:02:30 +08:00
  • 8bc84cfaf6
         Merge pull request #4004 from dymani/default-shortcuts zadam 2023-06-03 23:09:31 +02:00
  • cde13dc580
         Merge branch 'zadam:master' into Highlighted-Text SnnBcd 2023-06-04 00:24:08 +08:00
  • 282d135f0f Fix shortcuts not resetting to default dymani 2023-06-03 22:03:54 +08:00
  • 3e3d7aa4d7 Show highlighted text in right panel SiriusXT 2023-06-03 17:12:06 +08:00
  • 446c41d020 Show highlighted text in right panel SiriusXT 2023-06-03 17:00:15 +08:00
  • 33fdad5159 Show highlighted text in right panel SiriusXT 2023-06-03 14:43:20 +08:00
  • 463d145cb7 Merge branch 'Highlighted-Text' of https://github.com/SiriusXT/trilium into Highlighted-Text SiriusXT 2023-06-03 11:55:59 +08:00
  • 1413756d00 Show highlighted text in right panel SiriusXT 2023-06-03 11:55:50 +08:00
  • d3bf325f19 added some comments to openapi spec zadam 2023-06-03 00:32:16 +02:00
  • c4f69fd9cb don't allow patching relation's value in ETAPI #3998 zadam 2023-06-03 00:21:46 +02:00
  • 50ec17433d Fix move pane button after reopen split dymani 2023-06-03 05:59:53 +08:00
  • 2c8eb82d42 Reopen recently closed tab/split in place dymani 2023-06-03 05:54:33 +08:00
  • af67cf64b1
         Merge pull request #3984 from dymani/move-pane zadam 2023-06-02 16:07:15 +02:00
  • 095da691a4 Merge remote-tracking branch 'origin/master' zadam 2023-06-02 16:05:10 +02:00
  • 7e71029d1c use note size format also in file properties zadam 2023-06-02 16:05:02 +02:00
  • 045ee18237
         Merge branch 'zadam:master' into Highlighted-Text SnnBcd 2023-06-02 21:02:31 +08:00
  • 671879f0c7 better size format Nriver 2023-06-02 16:48:54 +08:00
  • e47c3a27b0 remove the workaround test zadam 2023-06-01 23:18:50 +02:00
  • ced99f8ac8
         Merge pull request #3995 from mm21/master zadam 2023-06-01 23:15:10 +02:00
  • 0c4492bcd0 invalidate attribute cache on branch create/update, fixes #3994 zadam 2023-06-01 23:14:17 +02:00
  • d9359c7c55 downgrade excalidraw to 0.14.2, #3979 zadam 2023-06-01 22:51:34 +02:00
  • 86a080e7ec Add ETAPI test to repro inherited attribute issue for cloned note #3994 mm21 2023-06-01 17:20:11 +00:00
  • 0a66809bf0 Not show when nothing is checked in the options SiriusXT 2023-06-01 20:38:55 +08:00
  • ecfdde2f2a Show highlighted text in the right pane SiriusXT 2023-06-01 20:17:00 +08:00
  • 758dba9ba5 fix event zadam 2023-06-01 00:13:08 +02:00
  • ae42e0efc7 refactoring zadam 2023-06-01 00:07:57 +02:00
  • b5cfc28912 rename inheritableAttributeCache to __inheritableAttributeCache for consistency zadam 2023-05-31 23:21:06 +02:00
  • c802bf7d8b
         Merge pull request #3990 from mm21/master zadam 2023-05-31 22:55:57 +02:00
  • 9e5a02094c Add ETAPI tests to repro inherited attribute issue and workaround mm21 2023-05-31 17:11:42 +00:00
  • 58253567cd Simplify noteContextReorder event call dymani 2023-06-01 00:48:37 +08:00
  • 92d5aeae41 Show highlighted text in the right panel SiriusXT 2023-05-31 22:34:24 +08:00
  • d2d286a4ff Show highlighted text in the left pane SiriusXT 2023-05-31 21:47:43 +08:00
  • a6ade790c6 script api docs zadam 2023-05-31 14:35:08 +02:00
  • a9dae7823f script api docs zadam 2023-05-31 14:00:37 +02:00
  • 86861f6ec3 Show highlighted text in the left pane SiriusXT 2023-05-31 18:32:33 +08:00
  • d26a0fae17 if a note context has sub contexts, then it has to be saved even if empty, fixes #3985 zadam 2023-05-31 00:03:20 +02:00
  • 375dba3264 fixed infinite recursion with search notes zadam 2023-05-30 23:54:11 +02:00
  • 74044754e2 Merge remote-tracking branch 'origin/master' zadam 2023-05-30 22:59:23 +02:00
  • 64aed9b462 display icon for non-supported note types in content renderer zadam 2023-05-30 22:52:48 +02:00
  • 5428cafa50
         Merge pull request #3963 from SiriusXT/master zadam 2023-05-30 22:37:10 +02:00
  • 735852b3c1 Use noteContextReorder event instead dymani 2023-05-31 01:53:55 +08:00
  • f4b5d43899 inline file attachments when exporting single HTML file zadam 2023-05-29 23:42:08 +02:00
  • 235b779dec detect existing attachment in target note zadam 2023-05-29 22:37:19 +02:00
  • 2a39906993 Cleanup dymani 2023-05-30 04:22:51 +08:00
  • e1b67e20ec Add buttons to move split panes dymani 2023-05-30 02:24:56 +08:00
  • df17840dbc fixes attachments zadam 2023-05-29 13:02:25 +02:00
  • 9d52f80c2f linking attachments finished zadam 2023-05-29 10:21:34 +02:00
  • 0aa119af2c attachments WIP zadam 2023-05-29 00:19:54 +02:00
  • c2f70031d0 Merge branch 'master' into next61 zadam 2023-05-28 16:57:48 +02:00
  • 8697eeb92e
         Merge branch 'zadam:master' into master Teven Feng 2023-05-27 20:00:24 +08:00
  • 1a2beb941e keep this window on top SiriusXT 2023-05-27 14:23:50 +08:00
  • 01b2887b36 Keep this window on top. SiriusXT 2023-05-27 14:18:26 +08:00
  • 5286d4a97c Merge branch 'master' of https://github.com/SiriusXT/trilium SiriusXT 2023-05-27 14:14:31 +08:00
  • bf6106f4dc release 0.60.1-beta v0.60.1-beta zadam 2023-05-26 23:11:53 +02:00
  • 82efc92413 lib upgrades zadam 2023-05-26 23:11:37 +02:00
  • 34481df2e7 Merge remote-tracking branch 'origin/master' zadam 2023-05-26 11:14:22 +02:00
  • ad4631018a right click on external link should not open the link, fixes #3971 zadam 2023-05-26 11:13:49 +02:00
  • ef89eede17
         Merge pull request #3974 from soulsands/fix-edited-note zadam 2023-05-26 11:05:57 +02:00
  • 6878877acd Merge remote-tracking branch 'origin/master' zadam 2023-05-26 10:55:50 +02:00
  • 611a983461 images in note list preview should be shrinked to fit into view, fixes #3965 zadam 2023-05-26 10:54:08 +02:00
  • 8e913cb453 wip zadam 2023-05-26 10:36:05 +02:00
  • 9d49264258 cleaup baiyongjie 2023-05-26 14:54:13 +08:00
  • 6098d62dcc fix getEditedNotesOnDate baiyongjie 2023-05-26 14:36:21 +08:00
  • 580ceec6b3
         Merge pull request #3959 from soulsands/fix-search zadam 2023-05-25 23:36:35 +02:00
  • 1f0ae08591
         Merge branch 'zadam:master' into master Teven Feng 2023-05-24 20:57:10 +08:00
  • 9923f49b61
         Update settings.json SnnBcd 2023-05-23 21:06:54 +08:00
  • 79dca12274 top SiriusXT 2023-05-23 20:50:03 +08:00
  • 66c25e7f29 Bring this window to the top SiriusXT 2023-05-23 15:55:35 +08:00
  • dc4983a013 Bring this window to the top SiriusXT 2023-05-23 15:49:03 +08:00
  • 039959a48b Put this window top. SiriusXT 2023-05-23 15:44:26 +08:00
  • 63be25f5bb put window on top SiriusXT 2023-05-23 11:14:23 +08:00