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
6,359 Commits 38 Branches 306 Tags
Commit Graph

684 Commits

Author SHA1 Message Date
zadam
f01657e1dd refactorings 2023-04-14 16:49:06 +02:00
zadam
3f8bf7cacc renamed openTabs to openNoteContexts 2023-04-11 22:00:04 +02:00
zadam
17128c5874 navigation state is more nicely and completely serialized into URL 2023-04-11 21:41:55 +02:00
zadam
54c0268593 attachment improvements 2023-04-11 17:45:51 +02:00
zadam
15a11daf38 Merge branch 'master' into next60 
# Conflicts:
#	package-lock.json
#	package.json
 2023-04-10 18:52:30 +02:00
zadam
dba0c9f373 Merge branch 'stable' 
# Conflicts:
#	src/services/build.js
 2023-04-09 23:30:41 +02:00
soulsands
745e120a0b fix: remove unused variable 2023-04-08 21:13:37 +08:00
soulsands
a0ac603260 fix:Remove duplicates in character class 2023-04-08 21:07:48 +08:00
soulsands
181ddce887 fix:　remove misleading await 2023-04-08 20:49:25 +08:00
zadam
c44be53673 awaiting on triggered events/commands in the frontend API, fixes #3799 2023-04-05 22:07:08 +02:00
zadam
5d6d9ab6d6 wip attachment support 2023-04-03 23:47:24 +02:00
zadam
2bc78ccafb wip attachment widget 2023-04-01 23:55:04 +02:00
zadam
72b1cc4d89 fixed loading of parent to froca when e.g. sharing (cloning into not yet loaded _share parent) 2023-03-29 23:16:45 +02:00
MeIchthys
874b6c71a3
Add bottom border to note-book-header 2023-03-24 11:29:16 -04:00
zadam
9be524ef89 attachment improvements 2023-03-24 10:57:32 +01:00
zadam
56e8506cb9
Merge pull request #3756 from meichthys/note-book-card-margin 
Use same margin all around note-book-card
 2023-03-23 23:20:50 +01:00
MeIchthys
c86be990d6
Use same margin all around note-book-card 2023-03-21 16:19:09 -04:00
zadam
b6efc954bd blob WIP 2023-03-16 12:17:55 +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
5a8e216dec WIP blob 2023-03-15 22:44:08 +01:00
zadam
929f8ef720 note ancillary/attachment backported from dev branch 2023-03-08 09:01:23 +01:00
zadam
f883fde74a small search refactorings 2023-02-28 23:23:17 +01:00
zadam
b70699ce1c make the active fancytree selector more specific than the normal color setting 2023-02-27 21:01:25 +01:00
zadam
d343ff0d23 removed deprecated widgets from frontend API 2023-02-17 23:04:49 +01:00
zadam
6f7b554cdc preparing 0.59 without ocr/pdf, userguide, note ancillaries 2023-02-17 14:49:45 +01:00
zadam
127486fdf5 removed deprecated API methods 2023-02-15 23:45:25 +01:00
zadam
b1e2b5ba8e reimplement note source to open in a new tab 2023-02-14 16:06:49 +01:00
zadam
460b5fb3a4 fix sharing of templates, #3562 2023-02-01 22:55:31 +01:00
zadam
37ba76fdd8 refactored note attachment into note ancillary 2023-01-28 13:13:46 +01:00
zadam
b0528b62d8 small attribute optimizations 2023-01-27 16:57:23 +01:00
zadam
339d8a7378 initial implementation of note attachments 2023-01-22 23:36:05 +01:00
zadam
6a6ae359b6 Merge branch 'master' into dev 
# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/widgets/dialogs/note_revisions.js
#	src/services/handlers.js
#	src/services/hidden_subtree.js
#	src/services/search/services/parse.js
 2023-01-17 22:20:10 +01:00
zadam
f50a9c250a many small issues found by intellij analysis 2023-01-15 21:04:17 +01:00
zadam
88bc7402a2 hidden notes should not appear in the global search unless hoisted into it, #3516 2023-01-13 10:09:41 +01:00
zadam
edbb60f2b5 Merge branch 'master' into dev 
# Conflicts:
#	src/routes/api/sender.js
#	src/services/import/enex.js
 2023-01-10 16:33:31 +01:00
zadam
41b8f6882c note content renderer should load reference link titles, fixes #3499 2023-01-08 20:31:55 +01:00
zadam
8a641e1b4f added "inherit" relation, #3493 2023-01-06 20:31:55 +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
6dce13bc34 export root note fix, #2346 2023-01-03 21:30:49 +01:00
zadam
c5ab6fa2fa jsdoc fixes to make export simpler 2023-01-03 14:31:46 +01:00
zadam
977a47bc27 rename froca entities to have F-prefix, #3476 2023-01-03 13:35:10 +01:00
zadam
f809da58ec fix occurrences of 'root' branch 2022-12-28 13:09:49 +01:00
zadam
620bed73bb put back the removed widgets, the BC break is not worth it 2022-12-27 15:05:12 +01:00
zadam
392b89e6dd exported links to "named" notes should be preserved upon import 2022-12-23 23:08:30 +01:00
zadam
5c4db266a4 code should not rely on fixed branch IDs since they can change after move 2022-12-23 20:40:58 +01:00
zadam
c6a05d8853 fix calendar widget when hoisted into hidden subtree 2022-12-23 15:46:33 +01:00
zadam
7147cc267e small fixes 2022-12-22 23:38:57 +01:00
zadam
5a3882f388 fixed comments 2022-12-22 14:59:20 +01:00