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

5129 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zadam 1b54596c5e tweaks to handling of branch removal 2022-01-31 22:09:39 +01:00
zadam 2feb778d8d Merge remote-tracking branch 'origin/stable' 2022-01-31 21:25:37 +01:00
zadam 2075e89239 improved logging 2022-01-31 21:25:18 +01:00
zadam be44431fde fix setting becca's dateModified after marking as deleted 2022-01-30 13:18:22 +01:00
zadam 99cc4078c6 fix setting becca's utcDateModified after marking as deleted 2022-01-30 13:17:40 +01:00
zadam b8b6b38a20 added links to sharing/ETAPI to README 2022-01-22 12:54:14 +01:00
zadam efd8556129 release 0.50.0-beta 2022-01-19 20:24:54 +01:00
zadam b10a76f150 release 0.50.0-beta 2022-01-19 20:14:40 +01:00
U-Bren 780b520506
Add powershell equivalents to existing batch scripts (#2561) 
* Add powershell equivalents to existing windows scripts

Each .bat will try to invoke its .ps1 version if powershell is available, or else will fallback on the behavior
previous to this commit.
Should help fix bugs with accents and non-ASCII characters (issue #2327).

* Add powershell equivalents to existing windows scripts

Each .bat will try to invoke its .ps1 version if powershell is available, or else will fallback on the behavior
previous to this commit.
Should help fix bugs with accents and non-ASCII characters (issue #2327).

Co-authored-by: zadam <zadam.apps@gmail.com>
 2022-01-17 23:51:25 +01:00
zadam 3055ed86ec Merge remote-tracking branch 'origin/stable' 2022-01-17 23:48:44 +01:00
zadam 4fc3305080 Merge branch 'generateanonymize-script' 
# Conflicts:
#	package-lock.json
#	src/services/builtin_attributes.js
 2022-01-17 23:48:30 +01:00
zadam d1b39ee8fa generate anonymization script into a file 2022-01-17 23:47:26 +01:00
zadam 52b118df7f add #shareRoot label to define an "index" note, closes #2567 2022-01-17 23:13:56 +01:00
zadam a97a7cdcdd fix note title refreshing with old state when user quickly skips to content and starts editing, closes #2566 2022-01-17 20:54:57 +01:00
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 66a6c76552 generate anonymization script WIP 2022-01-15 22:09:51 +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