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

4467 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zadam 8d8d654fe8 becca entities enriched with functionality from repository entities 2021-04-25 20:00:42 +02:00
zadam 7494491560 Merge remote-tracking branch 'origin/master' into next 
# Conflicts:
#	package-lock.json
#	src/public/app/services/note_content_renderer.js
#	src/public/stylesheets/style.css
#	src/routes/api/files.js
#	src/routes/routes.js
 2021-04-25 11:14:45 +02:00
FliegendeWurst 6f49f870ed
Exit on SIGTERM (#1891) 
Stopping the systemd service running the server now works properly.
 2021-04-25 11:05:09 +02:00
zadam b9133cb683 fix keyboard shortcut for "open externally" 2021-04-24 22:18:25 +02:00
zadam ccac46527c opened file change detection now useable on all note types 2021-04-24 21:56:44 +02:00
zadam dcd35b1ea2 fix broken inline PDF viewer, #1833 2021-04-24 20:27:42 +02:00
zadam a74741343e upload of modified open file WIP 2021-04-24 11:39:59 +02:00
zadam 4ff7e0813d upload of modified open file WIP 2021-04-24 11:39:44 +02:00
zadam 6d2d72fa7f add ERR_ADDRESS_UNREACHABLE as expected sync exception, #1888 2021-04-24 10:17:21 +02:00
zadam 30ec706d37 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package.json
#	src/services/build.js
 2021-04-22 21:25:15 +02:00
zadam 25ce2e4253 release 0.46.9 2021-04-22 20:50:22 +02:00
zadam b5674223e5 fixed some incorrect order by behavior, #1881 2021-04-22 20:28:26 +02:00
zadam 02988ed2b3 added random ordering 2021-04-22 19:53:11 +02:00
zadam c27f573eed fix line continuation in the release script 2021-04-22 19:39:57 +02:00
zadam c5b0c60797 Merge remote-tracking branch 'origin/master' 2021-04-21 23:03:16 +02:00
zadam 025af8df02 ckeditor 27.1 2021-04-21 23:03:09 +02:00
chee d9e8cff00f
Only add widgets that are executable (#1875) 
closes #1874
 2021-04-21 22:25:52 +02:00
zadam 1a4f35470c Merge remote-tracking branch 'origin/stable' 2021-04-21 22:04:33 +02:00
zadam 1d99c4e80b fix moving notes with keyboard on Firefox, closes #1865 2021-04-21 22:03:41 +02:00
zadam dc7c64a94d Merge remote-tracking branch 'origin/stable' into stable 2021-04-21 20:38:15 +02:00
zadam dc6a530d8c clear note selection anytime a new note is activated 2021-04-21 20:38:07 +02:00
chee 38b0d05c20
Add .includes to the type check (#1871) 
beforehand it would always be `true`
fixes #1869
 2021-04-21 20:16:15 +02:00
zadam 6e010dfbd7 fix note preview, closes #1869 2021-04-21 20:14:37 +02:00
zadam 172bdb6118 release 0.47.1-beta 2021-04-19 22:43:03 +02:00
zadam 6136243d61 release 0.47.1-beta 2021-04-19 22:40:50 +02:00
zadam a88a32acae support OPML from MindManager, fixes #1862 2021-04-19 22:33:58 +02:00
zadam 583df35231 log warning about unsucessful login 2021-04-19 21:41:29 +02:00
zadam 634baae796 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	src/services/build.js
 2021-04-19 20:56:56 +02:00
zadam a674a12706 disable tar polluting build log 2021-04-19 20:56:05 +02:00
zadam c29f1af48f use n to force node version 
(cherry picked from commit 51d1d8efb8)
 2021-04-19 20:51:06 +02:00
zadam 51d1d8efb8 use n to force node version 2021-04-19 20:26:58 +02:00
zadam a8d72c46e4 release 0.46.8 2021-04-18 21:47:45 +02:00
zadam ec36fbd83e release 0.46.8 2021-04-18 21:46:35 +02:00
zadam aedb05cbab release 0.46.8 2021-04-18 21:39:01 +02:00
zadam bb16840a72 release 0.46.8 2021-04-18 21:30:43 +02:00
zadam 7b5d44a329 use official gh client instead of github-release to execute releases 2021-04-18 21:29:10 +02:00
zadam d3cccae2df implemented audio/video in note content renderer + streaming API #886 2021-04-18 12:40:12 +02:00
zadam 9ba514d930 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package-lock.json
#	trilium.iml
 2021-04-18 12:39:19 +02:00
zadam 79bb249f3b implemented audio/video in note content renderer + streaming API #886 2021-04-17 22:35:47 +02:00
zadam 1fdf889ccf refactoring 2021-04-17 20:52:46 +02:00
zadam 42510fda5c renamed also cache files/modules 2021-04-16 23:01:56 +02:00
zadam f7e86c5be0 renamed noteCache into becca 2021-04-16 23:00:08 +02:00
zadam af5b1021c7 renamed treeCache into froca 2021-04-16 22:57:37 +02:00
zadam 8e1b8ab26c show not set keyboard shortcuts as "not set", #1851 2021-04-15 21:45:37 +02:00
zadam 4311834d75 reload note cache if transaction rollback is detected 2021-04-14 22:57:45 +02:00
zadam 197537b159 idea config stuff 2021-04-13 21:54:34 +02:00
zadam 917b259e92 add new sync status "unknown" to differentiate from "can't connect", #1844 2021-04-13 21:54:07 +02:00
zadam a53a65be1f clipper fix, closes #1840 2021-04-12 23:29:02 +02:00
zadam 44aa2834b3 release 0.47.0-beta 2021-04-11 22:29:56 +02:00
zadam 58e4bd4974 Merge remote-tracking branch 'origin/stable' 2021-04-11 22:28:30 +02:00