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

5114 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zadam 1aff3db81f Merge remote-tracking branch 'origin/master' 2022-01-16 22:17:10 +01:00
zadam fc89e098b1 Merge remote-tracking branch 'origin/stable' 2022-01-16 22:16:49 +01:00
Mirwaisse Djanbaz 64172a7f6b
Get file extension before clipping file name (#2562) 
I think this fixes https://github.com/zadam/trilium/issues/2131
 2022-01-15 22:35:54 +01:00
zadam c8884f1917 don't export hidden subtree to ZIP, fixes #2555 2022-01-15 09:04:44 +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 77c6c4617b changed shared_info class names to avoid conflict with adblocker, closes #2546 2022-01-14 21:23:10 +01:00
zadam 8240a208dd fixed wrong cherry pick 2022-01-14 21:05:39 +01:00
zadam 1c34f73f61 print should include promoted attributes, #2550 
(cherry picked from commit a5444fd6ad)
 2022-01-14 21:03:21 +01:00
zadam a5444fd6ad print should include promoted attributes, #2550 2022-01-14 21:02:11 +01:00
zadam 6fbd5a77e4 forgotten note_types 2022-01-14 19:53:59 +01:00
zadam c102089731 migration workaround for corrupted index in entity_changes table, closes #2534 2022-01-14 19:44:23 +01:00
zadam 742ec44f55 Merge remote-tracking branch 'origin/stable' 2022-01-13 21:53:57 +01:00
zadam 7495777d97 make getAncestors safe in respect to saved search 2022-01-13 21:28:51 +01:00
zadam da4f26d7ce Merge remote-tracking branch 'origin/stable' 2022-01-13 20:32:37 +01:00
zadam fa2ffd7574 ignore "Sync not configured" message when toggling shared state 2022-01-13 20:22:50 +01:00
zadam d4325db207 revised demo document 2022-01-13 20:02:07 +01:00
zadam 48d93cb3da added custom resource handler to the demo document 2022-01-12 21:24:59 +01:00
zadam 2248d98cc7 using 201 for created entities in etapi 2022-01-12 21:14:12 +01:00
zadam ce046b2e20 small dark theme tweaks 2022-01-12 20:13:11 +01:00
zadam 4f4cbccf08 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package-lock.json
 2022-01-12 19:54:11 +01:00
zadam 412c745e53 prevent infinite recursion when checking shared status 2022-01-12 19:46:40 +01:00
zadam 28df5d4aa2 etapi improvements and more tests 2022-01-12 19:32:23 +01:00
zadam 42e85aefdc sync fixes 2022-01-10 21:24:07 +01:00
zadam 91e78998d1 unified Jump-To and quick search behavior with regards to hoisting and opening in a new tab 2022-01-10 20:44:59 +01:00
zadam 6f406f9aa2 search immediately when user chooses "full search" from Jump To dialog, #2483 2022-01-10 20:37:33 +01:00
zadam 86fa80f3eb updated API docs 2022-01-10 19:55:09 +01:00
zadam 7119d08022 updated API docs 2022-01-10 19:54:38 +01:00
zadam 916ff5f2ee Merge remote-tracking branch 'origin/next50' 2022-01-10 19:53:36 +01:00
zadam 913d2c06f3 start sync immediately after sharing/unsharing, fixes #2539 2022-01-10 17:15:21 +01:00
zadam cbb5b31f72 Merge remote-tracking branch 'origin/master' into next50 2022-01-10 17:09:40 +01:00
zadam 91dec23d5e ETAPI auth, spec improvements etc. 2022-01-10 17:09:20 +01:00
zadam d04d356429 release 0.49.4 2022-01-09 22:32:13 +01:00
zadam be59f248e8 fix sync skipping some changes and then forcing sector queuing 2022-01-09 22:22:13 +01:00
zadam 2d2641dbd7 sync fixes 2022-01-09 21:25:15 +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 1995b54770 fix migration to preserve IDs in entity_changes 2022-01-09 20:17:27 +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 f2732bcab7 fix display of children notes in an empty note, closes #2536 2022-01-09 09:12:21 +01:00
zadam 0e9d76890b use #shareAlias in parent link, closes #2535 2022-01-09 09:04:21 +01:00
zadam 9df521109b fix migration to handle duplicates in entity_changes, #2534 2022-01-08 22:43:34 +01:00
zadam 75b65c396e fix migration to handle duplicates in entity_changes, #2534 2022-01-08 22:31:52 +01:00
zadam d4d48f3834 use [protected] for protected notes in the export 2022-01-08 21:50:16 +01:00
zadam b90ba3d1a9 create note from API/import etc. should allow empty title, fixes #2530 2022-01-08 19:33:56 +01:00
zadam c448d34a38 ETAPI WIP 2022-01-08 19:30:46 +01:00
zadam c33bc7e12c ETAPI search endpoint 2022-01-08 13:18:12 +01:00
zadam c5366abf75 ETAPI put content 2022-01-08 12:01:54 +01:00
zadam 2532ea525d ETAPI openapi spec WIP 2022-01-07 23:06:04 +01:00
zadam d74371c9f5 added missing placeholder.js 2022-01-07 20:30:14 +01:00
zadam 9ee1c9f3da ETAPI delete/patch, refactoring 2022-01-07 19:33:59 +01:00