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
5827 commits 38 branches 306 tags 138 MiB
Commit graph

5827 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 657c54efd4 fix print color to black, closes #3202 2022-10-20 22:31:08 +02:00
zadam 4f1f632a7d fix activating notes in the hidden subtree 2022-10-16 23:11:46 +02:00
zadam 7e83d3a54d Merge remote-tracking branch 'origin/master' into next57 2022-10-16 21:25:03 +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 8d30d5d689 Merge remote-tracking branch 'origin/master' into next57 2022-10-16 11:24:24 +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 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 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
zadam 1d26fd6bf0 added "note color" 2022-09-25 14:19:30 +02:00
zadam a9c0daa51a FIXME comment on virtual branches 2022-09-24 23:03:38 +02:00
zadam e3b2bbdca5 Merge remote-tracking branch 'origin/master' 2022-09-24 22:38:27 +02:00
zadam d905f7cc26 include icon into reference links 2022-09-24 22:38:20 +02:00
zadam fe3f24cdb0
Merge pull request #3161 from oc013/docker-compose-example 
Update docker-compose sample to use node user home dir and pull directly from docker hub
 2022-09-24 13:14:28 +02:00
oc013 971c709e87
Update docker-compose sample to use node user home dir 2022-09-23 21:12:50 -04:00
zadam 7f78937543 keyboardShortcut attr detail help 2022-09-23 22:51:17 +02:00
zadam 41dac2bd1b keyboardShortcut attr detail help 2022-09-23 22:50:49 +02:00
zadam 85bf2a5706 fix hidden backlinks, closes #3158 2022-09-22 23:29:20 +02:00
zadam ce7937a3a3 Merge remote-tracking branch 'origin/master' 2022-09-22 22:53:29 +02:00
zadam 7bb9d33245 0 offset of context menu, fixes #3157 2022-09-22 22:53:22 +02:00
zadam 1be89c094b
Merge pull request #3153 from charlesdagenais/master 
improve "open" button behaviour for files when in browser
 2022-09-22 22:48:33 +02:00
Charles Dagenais 73ad557784 improve "open" button behaviour for files when in browser 2022-09-21 21:56:59 -04:00
zadam 9f744153e3 fix TODO script example 2022-09-22 00:00:32 +02:00
zadam 0c196ae3a5 fix deleting / erasing note 2022-09-21 23:58:54 +02:00
zadam 15ed381f85 release 0.55.1 2022-09-21 22:43:34 +02:00
zadam 180051d252 added "scrolling-container" class, fixes #3147 2022-09-19 23:15:54 +02:00
zadam a19c58703f Merge remote-tracking branch 'origin/master' 2022-09-19 23:12:20 +02:00
zadam fc43d9222a fix erasing notes - becca should be reloaded afterwards, closes #3146 2022-09-19 23:12:12 +02:00
zadam af6bf08243
Merge pull request #3143 from charlesdagenais/master 
add file properties widget in mobile layout
 2022-09-19 22:44:23 +02:00
zadam fb6a0bc2a6
Merge pull request #3142 from spasche/zip-import-skip-bad-url 
let import continue when malformed URLs are encountered
 2022-09-19 22:42:31 +02:00
Charles Dagenais 1f61c1b3b6 add file properties info in mobile view 2022-09-18 12:40:00 -04:00