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

5731 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zadam eb68ab6776 Merge branch 'stable' 2022-11-01 19:10:16 +01:00
zadam 44b85d252d fix paste after, closes #3276 2022-11-01 13:39:29 +01:00
zadam 38d6fddc61 redirect /share to /share/, closes #3264 2022-10-30 09:05:12 +01:00
zadam 521d95021b fix refocusing find widget, closes #3252 2022-10-28 20:05:53 +02:00
zadam 51aa9a0d6e Merge branch 'stable' 2022-10-27 23:04:55 +02:00
zadam 64d3ec940c release 0.56.2 2022-10-27 22:41:15 +02:00
zadam 6c37f2ce71 package-lock.json 2022-10-27 22:41:01 +02:00
zadam 75bd38885b use trilium version number in asset paths to avoid caching issues 2022-10-27 20:34:53 +02:00
zadam b499640db8 use trilium version number in asset paths to avoid caching issues WIP 2022-10-26 23:50:54 +02:00
zadam 999a9da299 upgrade mermaid to 9.1.7 
(cherry picked from commit 441a59305b)
 2022-10-26 20:16:16 +02:00
zadam 441a59305b upgrade mermaid to 9.1.7 2022-10-26 20:15:42 +02:00
zadam b74f5a0a33 Merge branch 'stable' 2022-10-26 20:12:22 +02:00
zadam 7d732eb73b fix deleting note from task manager, closes #3239 2022-10-26 19:14:49 +02:00
zadam 44b68326a0 close hanging autocomplete on dialog close, fixes #3241 2022-10-26 16:52:44 +02:00
zadam d5732d7731 api docs 2022-10-26 16:52:00 +02:00
zadam 4e3d48fe7d allow specifying rootNote for date API functions, #3237 2022-10-26 14:23:56 +02:00
zadam c7acfd4d4e fix clicking internal link in the ckeditor toolbar, closes #3236 2022-10-26 14:11:20 +02:00
zadam af6d738d56 updated boxicons to 2.1.4, update icon index + search also within term array, fixes #3233 2022-10-25 23:01:09 +02:00
zadam bbde7141b0 fix wrong display of included note in read only text, closes #3225 2022-10-23 14:34:37 +02:00
zadam f6ad1c6aa7 release 0.56.1 2022-10-22 23:07:24 +02:00
zadam c1127ec429 fix running of runOnNoteCreation hook, #3219 2022-10-22 21:34:38 +02:00
zadam 867f7f3f59 don't display "workspace templates", #3219 2022-10-22 16:03:21 +02:00
zadam 1c52303bb3 don't display "workspace templates", #3219 2022-10-22 16:01:15 +02:00
zadam 876e6caa23 better handling of incorrect operators 2022-10-22 15:58:15 +02:00
zadam 34f07b4376 better inbox desc 2022-10-22 15:22:42 +02:00
zadam ffc28c8485 better inbox desc 2022-10-22 15:22:03 +02:00
zadam 913e9ef6e0 Merge remote-tracking branch 'origin/master' 2022-10-22 15:01:17 +02:00
zadam 14fb9c76b0 fix backlinks in day note subtree, fixes #3158 2022-10-22 15:01:10 +02:00
zadam c5435009d7
Merge pull request #3213 from agentydragon/both-protos 
Check both http and https in DockerHealthcheck
 2022-10-22 14:00:45 +02:00
Rai 1d3132e447 Check both http and https in DockerHealthcheck 
I've been getting Docker reporting my Trilium container as unhealthy
because wget was trying to talk HTTP to it while it was expecting
HTTPS.
 2022-10-20 23:29:23 -07:00
zadam 63eb22c7ac fix print color to black, closes #3202 2022-10-20 22:32:06 +02:00
zadam c11cf41f30 don't create app icon for flatpak/debian linux builds, fixes #3201 2022-10-16 20:52:10 +02:00
zadam 01910d3231 flathub release script 2022-10-15 21:09:27 +02:00
zadam e22af42cd0 release 0.56.0-beta 2022-10-15 12:49:56 +02:00
zadam 70c9292413 codemirror 5.65.9 2022-10-15 12:22:09 +02:00
zadam b9c22fcbc8 Merge remote-tracking branch 'origin/master' 2022-10-15 12:03:13 +02:00
zadam 4012ec7498 Merge branch 'stable' 
# Conflicts:
#	src/public/app/widgets/attribute_widgets/attribute_detail.js
 2022-10-15 12:03:03 +02:00
zadam 7d6d466284
Merge pull request #3199 from DaiYuANg/master 
update pwa manifest support deploy in sub folder
 2022-10-15 12:00:41 +02:00
DaiYuANg 36842f4a58 update pwa manifest support deploy in sub folder 2022-10-15 13:01:48 +08:00
zadam dc62cf4805 ckeditor 35.2.1 2022-10-14 22:39:28 +02:00
zadam ed8acc7ee3 switch-server, switch-electron npm scripts to ease rebuilding better-sqlite3 2022-10-14 21:59:43 +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 a4e99662cb edit button should get refreshed based on type change 2022-10-13 23:52:53 +02:00
zadam c6d4eb486e fix toc with > 10 items on the same level, closes #3182 2022-10-09 22:20:11 +02:00
zadam c2308b7a5d fix comment 2022-10-09 21:34:01 +02:00
zadam 3e07c08043 basic auth etapi should require "etapi" username 2022-10-09 21:33:32 +02:00
zadam 5a3c50d9fb extra null relation checks in notemap 2022-10-08 22:24:58 +02:00
zadam 3e4a9f63fa support basic auth in ETAPI 2022-10-08 20:59:11 +02:00
zadam 6d4ef4ee3d improved error handling of wrong port configuration, #3177 2022-10-01 15:32:30 +02:00
zadam 20ff5627d8 ckeditor 35.1.0 2022-09-28 22:55:53 +02:00