zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-09-20 15:45:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
7123 commits 38 branches 306 tags 138 MiB
Commit graph

1044 commits

Author SHA1 Message Date
zadam f86fb0d0a2 added TRILIUM_SYNC_SERVER_HOST env. variable to prevent prod sync issues 2023-01-06 15:14:04 +01:00
zadam d7cae7d5bb improvements in API docs generation 2023-01-05 23:38:41 +01:00
zadam ac51d0d569 Merge branch 'master' into dev 
# Conflicts:
#	package-lock.json
#	package.json
 2023-01-05 16:17:33 +01:00
zadam 0995c56506 release 0.58.3-beta 2023-01-04 22:36:31 +01:00
zadam 3a5fa2954d Merge remote-tracking branch 'origin/master' 2023-01-03 22:36:56 +01:00
zadam 81013ed21a Merge branch 'stable' 
# Conflicts:
#	package-lock.json
#	package.json
 2023-01-03 22:35:45 +01:00
zadam 53360c147a npm script improvements 2023-01-03 22:34:31 +01:00
zadam d910191e83
Merge pull request #3480 from contributor/feature/pageUrlSanitizeUrl 
Fix pageUrl and clipping selection can create multiple notes for the same Url
 2023-01-03 22:28:37 +01:00
contributor f02ad63e97 npm i @braintree/sanitize-url 2023-01-03 21:18:23 +02:00
zadam c5ab6fa2fa jsdoc fixes to make export simpler 2023-01-03 14:31:46 +01:00
zadam da161c7ce0 rename shaca entities to have F-prefix, #3476 2023-01-03 13:40:21 +01:00
zadam ca4e1c19a7 make utils.normalize null-safe, #3469 2022-12-30 21:00:42 +01:00
zadam f4cf04232f release 0.58.2-beta 2022-12-29 00:12:54 +01:00
zadam d36cf47974 no-dir npm scripts 2022-12-28 23:17:59 +01:00
zadam 701911b766 release 0.58.1-beta 2022-12-26 23:57:31 +01:00
zadam 3b5f2b86d5 release 0.58.0-beta 2022-12-24 22:09:05 +01:00
zadam 059c339c09 fix warnings in ckeditor 2022-12-21 23:10:13 +01:00
zadam 4026c2be4f Merge branch 'next58' 
# Conflicts:
#	src/public/app/widgets/note_tree.js
#	src/services/tree.js
 2022-12-14 23:48:58 +01:00
zadam b9ae68d559 small fixes 2022-12-14 12:26:04 +01:00
zadam ffb3c044fa release 0.57.5 2022-12-13 23:08:52 +01:00
zadam d1b989ac12 Merge remote-tracking branch 'origin/stable' into next58 2022-12-12 21:43:56 +01:00
zadam 1bfd26ee8f release 0.57.4 2022-12-11 23:24:24 +01:00
zadam 73eb585398 fixed migrations 2022-12-08 13:45:56 +01:00
zadam cd60ad4267 improvements 2022-12-03 21:11:49 +01:00
zadam 99a5774148 Merge branch 'master' into next58 
# Conflicts:
#	package-lock.json
 2022-12-03 13:01:03 +01:00
zadam 46fdd15857 release 0.57.3 2022-12-02 22:44:40 +01:00
zadam 0480f391d3 release 0.57.2 2022-12-01 22:56:29 +01:00
zadam e4e20c8007 Revert "open window before loading becca" 
This reverts commit 2fbcd9aaf7.
 2022-11-23 23:49:49 +01:00
zadam 2fbcd9aaf7 open window before loading becca 2022-11-23 23:31:05 +01:00
zadam e2f6191229 upgrades 2022-11-22 20:48:04 +01:00
zadam 19126b7c6d Merge branch 'master' into next58 
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
#	package-lock.json
#	package.json
#	src/public/app/layouts/desktop_layout.js
 2022-11-22 20:46:08 +01:00
zadam 9a6df54832 release 0.57.1-beta 2022-11-20 23:43:17 +01:00
zadam f7e56cbffe release 0.57.0-beta 2022-11-12 20:40:45 +01:00
zadam b3c87156c2 library upgrades 2022-11-07 21:26:13 +01:00
zadam 64d3ec940c release 0.56.2 2022-10-27 22:41:15 +02:00
zadam 06e6fec4ca increment db and sync version due to new note type 2022-10-23 21:16:15 +02:00
zadam 12943cc808 Merge branch 'master' into next57 
# Conflicts:
#	package-lock.json
 2022-10-23 21:13:09 +02:00
zadam f6ad1c6aa7 release 0.56.1 2022-10-22 23:07:24 +02:00
zadam 876e6caa23 better handling of incorrect operators 2022-10-22 15:58:15 +02:00
zadam 8d30d5d689 Merge remote-tracking branch 'origin/master' into next57 2022-10-16 11:24:24 +02:00
zadam e22af42cd0 release 0.56.0-beta 2022-10-15 12:49:56 +02:00
zadam c16f7a5e02 Merge branch 'master' into next55 
# Conflicts:
#	electron.js
#	package-lock.json
#	package.json
#	src/public/app/layouts/desktop_layout.js
#	src/public/app/widgets/note_tree.js
#	src/services/port.js
 2022-10-15 12:09:25 +02:00
zadam ed8acc7ee3 switch-server, switch-electron npm scripts to ease rebuilding better-sqlite3 2022-10-14 21:59:43 +02:00
zadam a9c0daa51a FIXME comment on virtual branches 2022-09-24 23:03:38 +02:00
zadam 15ed381f85 release 0.55.1 2022-09-21 22:43:34 +02:00
zadam 78238381a7 release 0.55.0-beta 2022-09-12 22:37:41 +02:00
zadam ca03c41205 flatpak release script should support beta channel 2022-09-12 22:35:22 +02:00
zadam 8588ed5eec remove port scanning for an available port #3036 2022-09-04 14:00:39 +02:00
zadam b2a63afc28 limit max imported file size to 250 MiB, #3108 2022-09-03 15:11:03 +02:00
zadam 7109a12afd Merge branch 'stable' 
# Conflicts:
#	bin/release-flatpack.sh
 2022-08-27 13:19:29 +02:00
zadam 6547b66228 release 0.54.3 2022-08-26 22:16:49 +02:00
zadam 80dcb45415 disable compression for electron / desktop builds 2022-08-22 19:29:58 +02:00
zadam df7c089344 Merge branch 'master' into next55 2022-08-08 20:45:35 +02:00
zadam 3a07c5fcc0 release 0.54.2 2022-08-07 23:18:03 +02:00
zadam 08aa65bddb launchbar WIP 2022-08-06 15:00:56 +02:00
zadam b86dbc088d small fixes to tray and closing windows 2022-08-04 21:19:57 +02:00
zadam 82c596d1e3 Merge branch 'master' into next55 2022-08-03 22:23:58 +02:00
zadam b3097b59c7 remove port scanning for an available port #3036 2022-08-03 00:19:29 +02:00
zadam ffd73c0e57 release 0.54.1-beta 2022-08-02 21:56:34 +02:00
zadam a316ac5b35 fix docker build 2022-08-02 00:20:08 +02:00
zadam aed0a8126c release 0.54.0-beta 2022-08-01 22:37:40 +02:00
zadam 46deceedc9 optional basic auth for shared notes, closes #2781 2022-07-31 21:45:32 +02:00
zadam 5444cc2009 floating button container WIP 2022-07-24 14:30:42 +02:00
zadam bed0db9fa0 prevent zooming the whole app when ctrl + zoom on the canvas note, fixes #3002 2022-07-20 23:39:40 +02:00
Tom Free 4ca59dcc5c upgrade to excalidraw v0.12, fix breaking changes 2022-07-14 23:49:30 +02:00
zadam ea3bce25d9 release 0.53.2 2022-07-09 13:40:41 +02:00
zadam ef49d20470 release 0.53.1-beta 2022-07-01 22:50:19 +02:00
zadam 0d4275a260 fix saving new protected note revisions, closes #2951 2022-07-01 22:49:10 +02:00
zadam 1434effa22 upgraded mermaid to 9.1.2 2022-06-19 21:16:30 +02:00
zadam 67e69f1940 release 0.53.0-beta 2022-06-19 14:49:48 +02:00
zadam 11412a258b converted recent changes dialog to new pattern 2022-06-14 22:55:07 +02:00
zadam bc35efd565 Merge branch 'stable' 2022-06-14 22:46:58 +02:00
zadam fac9fef652 release 0.52.3 2022-06-13 23:41:52 +02:00
zadam f8fd8e47a9 added rename note bulk action 2022-06-12 23:29:11 +02:00
zadam 2115b76047 bulk action dialog converted to widget 2022-06-11 23:29:52 +02:00
zadam 8e23c15763 Merge branch 'next53' 
# Conflicts:
#	src/services/builtin_attributes.js
 2022-06-10 23:02:51 +02:00
zadam 23e9bcfdc5 release 0.52.2 2022-06-09 23:39:48 +02:00
zadam 0f7fa7a7b7 Merge branch 'master' into next53 
# Conflicts:
#	package-lock.json
#	src/routes/api/search.js
 2022-06-08 22:51:18 +02:00
zadam 2d33f570f4 fix bulk/search action delete 2022-06-08 22:25:00 +02:00
zadam 4211d0feda Merge branch 'master' into next53 2022-06-05 22:25:14 +02:00
zadam ec4fac421b release 0.52.1-beta 2022-06-05 15:00:25 +02:00
zadam 4837dd050b fix bug when giving focus again to autocomplete input when coming back from note type chooser 2022-06-02 23:21:17 +02:00
zadam 98b579524c create note from template WIP 2022-05-31 22:45:57 +02:00
zadam 388dcadef3 release 0.52.0-beta 2022-05-27 22:06:07 +02:00
zadam 37cb5f5e9a added previous/next buttons to the find widget 2022-05-25 20:43:52 +02:00
zadam 82fcc97ed2 Merge branch 'custom-search-dialog' 2022-05-25 20:32:22 +02:00
zadam 53e9c8cdac upgrades 2022-05-24 21:34:32 +02:00
zadam 13ccd2ba67 remove the canvas dependency (transitive dep of jsdom) in postinstall 2022-05-22 13:45:49 +02:00
zadam 2085dc5ed4 minor canvas note cleanup 2022-05-19 23:00:07 +02:00
zadam fca0b82610 find widget fixes 2022-05-17 22:11:45 +02:00
zadam 8ec814c29f Merge branch 'master' into custom-search-dialog 
# Conflicts:
#	docs/frontend_api/FrontendScriptApi.html
#	package-lock.json
#	package.json
 2022-05-14 20:50:43 +02:00
zadam 8df3b0a5bd
Merge branch 'master' into excalidraw 2022-05-12 23:46:52 +02:00
zadam 91d23c540a refactored note_content_protected_fulltext.js and note_content_unprotected_fulltext.js into one class 2022-05-11 21:33:41 +02:00
zadam 87f436c6ea search dialog WIP from custom widget from antoniotejada 2022-05-09 23:13:34 +02:00
zadam 83afb89a16 lib upgrades 2022-05-03 23:53:46 +02:00
Tom 8d510a3fdd Merge remote-tracking branch 'upstream/master' into excalidraw 
conflict in
- package-lock (accept incoming),
- routes (remove the option to have image without filename, since it is not really necessary for canvas_note)
- note_detail
 2022-05-03 21:56:52 +02:00
zadam 26e1ff4e16 release 0.51.2 2022-05-01 23:18:35 +02:00
zadam 569c80f551 release 0.51.1-beta 2022-04-22 00:07:59 +02:00
zadam 643a5e5b16 moving deleteNote and deleteBranch into entities to make them accessible to scripts, #2792 2022-04-19 23:06:46 +02:00
Tom 05c8c6cfaa set express same as master 4.17.3 2022-04-19 00:24:41 +02:00
Tom 9771b441ad missing path2d support for freedawings, remove node-side rendering, allow async getContent() 
* ## Excalidraw and SVG
 * 2022-04-16 - @thfrei
 *
 * Known issues:
 *  - excalidraw-to-svg (node.js) does not render any hand drawn (freedraw) paths. There is an issue with
 *    Path2D object not present in node-canvas library used by jsdom. (See Trilium PR for samples and other issues
 *    in respective library. Link will be added later). Related links:
 *     - https://github.com/Automattic/node-canvas/pull/2013
 *     - https://github.com/google/canvas-5-polyfill
 *     - https://github.com/Automattic/node-canvas/issues/1116
 *     - https://www.npmjs.com/package/path2d-polyfill
 *  - excalidraw-to-svg (node.js) takes quite some time to load an image (1-2s)
 *  - excalidraw-utils (browser) does render freedraw, however NOT freedraw with background
 *
 * Due to this issues, we opt to use **only excalidraw in the frontend**. Upon saving, we will also get the SVG
 * output from the live excalidraw instance. We will save this **SVG side by side the native excalidraw format
 * in the trilium note**.
 *
 * Pro: we will combat bit-rot. Showing the SVG will be very fast, since it is already rendered.
 * Con: The note will get bigger (maybe +30%?), we will generate more bandwith.
 *      (However, using trilium desktop instance, does not care too much about bandwidth. Size increase is probably
 *       acceptable, as a trade off.)
 2022-04-19 00:21:20 +02:00
Tom aefc9f1593 add excalidraw excalidraw/utils, react and react-dom as npm-dependencies 2022-04-19 00:20:13 +02:00
Tom f354821f25 basic support for using api/images with canvas-note 
http://localhost:8080/api/images/<noteId>/some-rando-text
 2022-04-19 00:17:16 +02:00
zadam a45cf033aa fix hiding of linked images in shared notes, closes #2791 2022-04-15 23:09:07 +02:00
zadam 06b6097f29 Merge remote-tracking branch 'origin/stable' 2022-04-15 14:53:47 +02:00
zadam 75c8e700d4 dev data directory should be relative 2022-04-15 14:51:14 +02:00
zadam c1092c97b5 release 0.51.0-beta 2022-04-10 14:13:51 +02:00
zadam a04becc4ec dep upgrades 2022-04-10 14:13:45 +02:00
zadam b250f0a3bf Merge remote-tracking branch 'origin/stable' 2022-04-03 14:21:28 +02:00
zadam 569b8898ef release 0.50.3 2022-03-22 21:30:21 +01:00
zadam 091d6a1cf1 added #shareRaw label 2022-03-22 21:20:47 +01:00
zadam 17dd6141fb Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	Dockerfile
#	package-lock.json
#	package.json
#	src/services/cloning.js
 2022-03-22 21:04:30 +01:00
zadam 316a2aee1a invalidate flat text cache after login to protected session, fixes #2712 2022-03-20 22:23:48 +01:00
zadam d940590add raise line-height in share CSS to 1.5, fixes #2671 2022-02-18 22:00:58 +01:00
zadam 5481375347 DB dump tool feature complete 2022-02-12 22:20:15 +01:00
zadam 832cac106e release 0.50.2 2022-02-09 22:52:36 +01:00
zadam 1c4358086d release 0.50.1 2022-02-02 21:38:21 +01:00
zadam 398376108d added integrity check button into advanced options. 2022-02-01 21:22:43 +01:00
zadam 2075e89239 improved logging 2022-01-31 21:25:18 +01:00
zadam b10a76f150 release 0.50.0-beta 2022-01-19 20:14:40 +01:00
zadam 52b118df7f add #shareRoot label to define an "index" note, closes #2567 2022-01-17 23:13:56 +01:00
zadam 4933b901f6 Merge remote-tracking branch 'origin/stable' 2022-01-14 21:53:00 +01:00
zadam b679f4218d release 0.49.5 2022-01-14 21:40:37 +01:00
zadam 6fbd5a77e4 forgotten note_types 2022-01-14 19:53:59 +01:00
zadam ce046b2e20 small dark theme tweaks 2022-01-12 20:13:11 +01:00
zadam 28df5d4aa2 etapi improvements and more tests 2022-01-12 19:32:23 +01:00
zadam 7119d08022 updated API docs 2022-01-10 19:54:38 +01:00
zadam cbb5b31f72 Merge remote-tracking branch 'origin/master' into next50 2022-01-10 17:09:40 +01:00
zadam d04d356429 release 0.49.4 2022-01-09 22:32:13 +01:00
zadam 96f4230bc1 Merge branch 'master' into next50 
# Conflicts:
#	src/public/app/widgets/containers/root_container.js
#	src/services/app_info.js
 2022-01-09 20:18:30 +01:00
zadam 7159b13c9d add memberId to entity_changes to avoid having to resend all changes second time 2022-01-09 20:16:39 +01:00
zadam 82ba0d5b1d release 0.49.3 2022-01-06 23:09:17 +01:00
zadam 2b10023055 electron update 2022-01-04 22:10:35 +01:00
zadam 5a85fe92aa release 0.49.2-beta 2022-01-02 22:43:30 +01:00
zadam ad8d35efe9 release 0.49.1-beta 2021-12-24 23:05:10 +01:00
zadam da050c6369 release 0.49.0-beta 2021-12-23 22:33:49 +01:00
zadam e7faebfac3 sharing WIP 2021-12-21 16:12:59 +01:00
zadam 3860028a9e sharing WIP 2021-12-20 17:30:47 +01:00
zadam 16d97b95af optimized custom script/widget loading 2021-12-19 22:08:52 +01:00
zadam e0378c5064 optimized #keyboardShortcuts retrieval 2021-12-19 10:50:38 +01:00
zadam 034aaa7209 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	src/public/app/dialogs/options/other.js
 2021-12-14 21:54:38 +01:00
zadam a81ea3771f release 0.48.8 2021-12-13 11:12:31 +01:00
zadam ab550a1e8d share functionality WIP 2021-12-07 23:03:49 +01:00
zadam b78ab1ee02 boxicons 2.1.1 2021-12-05 21:50:02 +01:00
zadam 89c04e6b6b fix "note paths" ribbon widget for root note 2021-12-04 13:33:31 +01:00
zadam e079359c15 copied links from tree should be reference links 2021-12-04 12:50:02 +01:00
zadam bbceb6251a backlinks WIP, #2349 2021-12-01 23:12:54 +01:00
zadam 1ee2abcc42 keep some types (e.g. mermaid diagrams) of notes full width 2021-11-24 21:27:55 +01:00
zadam f4242b4096 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	src/services/app_info.js
 2021-11-24 20:08:34 +01:00
zadam 8c11d022fb release 0.48.7 2021-11-23 21:53:32 +01:00
Myzel394 b23ead8097
Fix: Highlighting searched term should ignore accents (#2364) 
* fixed accent highlighting not working

* fixed

* fixes

* improvements
 2021-11-21 16:27:50 +01:00
zadam ae29c6bac4 global note map should respect hoisting, #2365 2021-11-21 10:40:48 +01:00
zadam 15ac81627c DB cleanup migration 2021-11-18 21:52:56 +01:00
zadam 298af217e9 fix bug overwriting entity changes 2021-11-17 21:47:41 +01:00
zadam 89322c4b03 upgrade to electron v16 and node v16 2021-11-16 22:43:08 +01:00
zadam 20a187fab9 fix exporting root note, closes #2346 2021-11-15 21:23:19 +01:00
zadam 8996f35cc0 Merge remote-tracking branch 'origin/next49' 2021-11-14 13:18:13 +01:00
zadam acb50f44a1 release 0.48.6 2021-11-13 22:49:58 +01:00
zadam 600c16551a fixed jsdoc script API generation, closes #2313 2021-11-10 21:30:54 +01:00
zadam 6f60cf1a86 release 0.48.5 2021-11-01 09:19:28 +01:00
zadam e42357f1f8 release 0.48.4 2021-10-28 22:28:52 +02:00
zadam 35fc4ba9a4 fix wrapping of code blocks in note revisions, #2216 2021-10-28 20:38:35 +02:00
zadam 6e0a65b59c release 0.48.3 2021-10-22 21:31:44 +02:00
zadam a434aa113d fix repeated invocation of actions in note actions dropdown, closes #2255 2021-10-21 20:53:35 +02:00
zadam 3d98644bf6 release 0.48.2 2021-10-20 22:12:20 +02:00
zadam 980309ae2a sharing WIP 2021-10-19 22:48:38 +02:00
zadam 4111a2f0e8 docker image build/push is now handled by github actions 2021-10-14 20:49:48 +02:00
zadam f505f9d65a hide tooltip after clicking on a button, fixes #2228 2021-10-13 23:05:47 +02:00
zadam 21d2ca3c54 release 0.48.1-beta 2021-10-12 22:42:48 +02:00
zadam 64a3a8b561 tweaks 2021-10-12 22:36:22 +02:00
zadam 1cdd644b8f fix reloading frontend after erasing notes in firefox, fixes #2221 2021-10-12 19:47:44 +02:00
zadam ec732c0a98 filter out duplicated note paths, fixes #2218 2021-10-11 21:08:25 +02:00
zadam d02d846024 empty notes in note overview will display the list of children 2021-10-10 14:09:22 +02:00
zadam 11e9f8403e release 0.48.0-beta 2021-10-08 22:32:59 +02:00
zadam abbba6501d script execution results are also pojo-ized 2021-10-08 15:14:23 +02:00
zadam 8d42ffca6d basic bookmark support 2021-10-05 22:08:02 +02:00
zadam 0654dc855f Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package-lock.json
#	package.json
 2021-10-05 19:45:32 +02:00
zadam b2b1c9ebb7 release 0.47.8 2021-10-04 22:18:33 +02:00
zadam 1f75b9c92f electron 13.5.1 to fix the TLS expiration issue 2021-10-04 22:16:51 +02:00
zadam e2c4f32b5e added ckeditor with Find & Replace, for now without keyboard shortcut (ckeditor/ckeditor5#10645) 2021-10-04 21:53:57 +02:00
zadam e4a483aefe fix duplicate subtree 2021-10-02 23:26:18 +02:00
zadam 8c2a5d19f2 remove extra logging 2021-09-30 22:26:56 +02:00
zadam 8a8bdaf80e updated API docs 2021-09-30 12:26:13 +02:00
zadam 0264e847ef fixes 2021-09-28 10:58:34 +02:00
zadam c5917bfc78 fix "steel blue" demo theme 2021-09-28 10:02:25 +02:00
zadam 2fcb0c05c0 added grey icon for the dark mode 2021-09-25 21:58:15 +02:00
zadam b041d081db added migration to add excludeFromTreeMap for journal subtrees 2021-09-23 22:08:23 +02:00
zadam dd37f09309 global link map WIP 2021-09-18 14:29:41 +02:00
zadam 43e829ca99 global link map setup 2021-09-17 10:09:42 +02:00
zadam 0448883782 option to erase notes immediately 2021-09-16 14:38:09 +02:00
zadam 4023c28f5e consistency_checks fix 2021-09-11 14:34:37 +02:00
zadam 2b8c6e3dd0 bug fixes 2021-09-07 22:37:03 +02:00
zadam 6e300c7cf5 make sure the sorted branches are still sorted after drag & drop, #2142 2021-09-02 23:21:02 +02:00
zadam 1bc50ed976 strip # or ~ when getting attribute 2021-09-02 22:14:22 +02:00
zadam cfcc34fa8e package upgrades (including #2134) 2021-08-31 21:54:42 +02:00
zadam d27fcaf317 improvements in frontend sync (WIP) 2021-08-24 22:37:00 +02:00
zadam 0ee093f038 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	Dockerfile
#	bin/build-server.sh
#	package-lock.json
#	src/public/app/layouts/mobile_layout.js
 2021-08-23 22:27:19 +02:00
zadam c59b3a0c5c release 0.47.7 2021-08-22 12:36:49 +02:00
zadam 8cb07525cf Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package-lock.json
 2021-08-21 21:32:11 +02:00
zadam c3ed673453 release 0.47.6 2021-08-21 20:56:58 +02:00