gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,696 Commits 38 Branches 306 Tags
Commit Graph

114 Commits

Author SHA1 Message Date
zadam
f9bfc8ad86 load printThis from node_modules 2023-11-22 20:22:16 +01:00
zadam
035113db4d Merge branch 'beta' 
# Conflicts:
#	package-lock.json
 2023-09-14 00:19:19 +02:00
zadam
f37dc66074 add support for storing canvas libraries in note attachments plus storing exported SVG in attachment 2023-09-08 21:53:57 +02:00
zadam
0e16e48db6 scroll beyond last line in text/code editor, fixes #2728 2023-08-15 22:50:13 +02:00
zadam
995f1c9fc4 Merge branch 'stable' into next61 
# Conflicts:
#	src/etapi/etapi.openapi.yaml
#	src/etapi/notes.js
#	src/public/app/widgets/type_widgets/editable_text.js
#	src/services/app_info.js
 2023-06-20 23:30:45 +02:00
zadam
74400dad97 fix race condition between script execution and saving, closes #4028 2023-06-15 21:51:41 +02:00
zadam
38839532d5 file upload WIP 2023-06-06 12:31:38 +02:00
zadam
5c393f959d got rid of .isDeleted on froca entities (the property is not available there) 2023-06-05 16:26:05 +02:00
zadam
e6bf6424e8 rename loadresults methods/properties for clarity that they don't contain entities, only rows 2023-06-05 16:12:02 +02:00
zadam
579ed7e194 attachment content rendering 2023-05-21 18:14:17 +02:00
zadam
626af84f42 refactoring + uploading attachments WIP 2023-05-08 00:02:08 +02:00
zadam
fa3cbb4645 grammar 2023-05-05 23:41:11 +02:00
zadam
8edf06d28d small refactorings 2023-05-04 22:16:18 +02:00
zadam
5d6d9ab6d6 wip attachment support 2023-04-03 23:47:24 +02:00
zadam
eee05a4d01 blob WIP 2023-03-16 12:11:00 +01:00
zadam
dc97400dbf ancillary => attachment 2023-03-16 11:03:28 +01:00
zadam
e16bedfab4 WIP blobs 2023-03-16 11:02:07 +01:00
zadam
929f8ef720 note ancillary/attachment backported from dev branch 2023-03-08 09:01:23 +01:00
zadam
400b14e021 removed remnants of dev branch 2023-02-17 16:44:04 +01:00
zadam
6f7b554cdc preparing 0.59 without ocr/pdf, userguide, note ancillaries 2023-02-17 14:49:45 +01:00
zadam
520ffecd36 ancillary type widget 2023-02-15 14:32:12 +01:00
zadam
b1e2b5ba8e reimplement note source to open in a new tab 2023-02-14 16:06:49 +01:00
zadam
c474e65cae saving attachments when editing 2023-01-24 09:19:49 +01:00
zadam
8a641e1b4f added "inherit" relation, #3493 2023-01-06 20:31:55 +01:00
zadam
ac51d0d569 Merge branch 'master' into dev 
# Conflicts:
#	package-lock.json
#	package.json
 2023-01-05 16:17:33 +01:00
zadam
e8a9389e6d remove console.log 2023-01-03 21:44:47 +01:00
zadam
bff7434921 rename becca entities to have B-prefix, #3476 2023-01-03 13:52:37 +01:00
zadam
1b24276a4a always use template strings instead of string concatenation 2022-12-21 15:19:05 +01:00
zadam
5fc9f5f3f9 improvements 2022-12-06 23:48:44 +01:00
zadam
b9632a7814 rename note types to camelCase 2022-12-06 23:01:42 +01:00
zadam
d619a7a2d7 rename "widget" type to "content-widget" 2022-12-06 16:23:49 +01:00
zadam
012fb1f50b rename "widget" type to "content-widget" 2022-12-06 16:23:30 +01:00
zadam
aec2c2d5cd appearance options as a special note 2022-12-05 23:57:29 +01:00
zadam
99a5774148 Merge branch 'master' into next58 
# Conflicts:
#	package-lock.json
 2022-12-03 13:01:03 +01:00
zadam
36c98e919a fix cursor jumping problem when having same note open in two tabs, closes #3365 2022-12-01 22:50:53 +01:00
zadam
fc080f785b moving components to its own directory 2022-12-01 13:07:23 +01:00
zadam
1a6c9be065 renamed shortcuts to launchers 2022-12-01 10:16:57 +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
1d8b02055e Merge branch 'stable' 2022-11-06 14:24:37 +01:00
zadam
a7f4bf8289 fix updating note detail after change from another client, closes #3292 2022-11-06 14:19:40 +01:00
zadam
b499640db8 use trilium version number in asset paths to avoid caching issues WIP 2022-10-26 23:50:54 +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
4116fe0a20 fix propagation of noteTypeMimeChanged event to global scope to fix e.g. edit button switching depending on note type 2022-10-14 20:36:40 +02:00
zadam
08aa65bddb launchbar WIP 2022-08-06 15:00:56 +02:00
zadam
1f6222a653 fix notemap resize + upgrade of force-graph 2022-08-02 17:17:27 +02:00
zadam
4cec856e21 simplified updating note content 2022-06-13 22:38:59 +02:00
zadam
4211d0feda Merge branch 'master' into next53 2022-06-05 22:25:14 +02:00
zadam
5fbaed61c1 fix "cut to note", closes #2895, #1182 2022-06-03 22:05:18 +02:00
zadam
c0c38a4b49 Merge branch 'master' into next53 2022-06-02 22:32:29 +02:00
zadam
15a9ff4450 when closing / clearing last tab, close all splits 2022-06-02 22:28:25 +02:00