gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,871 Commits 38 Branches 306 Tags
Commit Graph

2008 Commits

Author SHA1 Message Date
zadam
c1127ec429 fix running of runOnNoteCreation hook, #3219 2022-10-22 21:34:38 +02:00
zadam
876e6caa23 better handling of incorrect operators 2022-10-22 15:58:15 +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
e22af42cd0 release 0.56.0-beta 2022-10-15 12:49:56 +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
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
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
1d26fd6bf0 added "note color" 2022-09-25 14:19:30 +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
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
Sylvain Pasche
fc69f3b8f3 let import continue when malformed URLs are encountered 
In case of malformed URLs in imported HTML, keep original URL instead
of having the import get stuck.
 2022-09-18 18:18:42 +02:00
zadam
ea35b0c800 Merge branch 'api-log-capture' 2022-09-17 23:06:42 +02:00
zadam
1a30087426 api log implementation 2022-09-17 23:06:17 +02:00
zadam
05231bd1c2 stop #workspaceTemplate from being inherited (should have the same special behavior as #template) 2022-09-16 23:03:02 +02:00
zadam
b816773d02 add #workspaceTemplate which works as workspace-scoped template, closes #3137 2022-09-16 22:44:52 +02:00
zadam
78238381a7 release 0.55.0-beta 2022-09-12 22:37:41 +02:00
zadam
9b8474a728 Merge branch 'stable' 
# Conflicts:
#	package-lock.json
 2022-09-12 21:44:49 +02:00
zadam
8588ed5eec remove port scanning for an available port #3036 2022-09-04 14:00:39 +02:00
zadam
f161488c13 focus existing window on port conflict, closes #3036 2022-09-04 14:00:34 +02:00
zadam
563808144e small fixes to tray and closing windows 2022-09-04 13:59:58 +02:00
zadam
3c1f826ead add support for the persistent #sortDirection and #sortFoldersFirst (one time UI action exists), closes #3046 2022-09-04 13:59:34 +02:00
zadam
86d3a695ac fix handling of parenthesis without explicit AND operator, closes #3096 2022-08-28 14:40:24 +02:00
zadam
7109a12afd Merge branch 'stable' 
# Conflicts:
#	bin/release-flatpack.sh
 2022-08-27 13:19:29 +02:00
zadam
6547b66228 release 0.54.3 2022-08-26 22:16:49 +02:00
sigaloid
10676a8d0c Add shareDescription 2022-08-17 15:18:34 -04:00
zadam
2694bcff67 launchbar WIP 2022-08-08 23:13:31 +02:00
zadam
df7c089344 Merge branch 'master' into next55 2022-08-08 20:45:35 +02:00
zadam
616e2c1c29 add support for the persistent #sortDirection and #sortFoldersFirst (one time UI action exists), closes #3046 2022-08-07 23:51:23 +02:00
zadam
2335e40262 release 0.54.2 2022-08-07 23:20:59 +02:00
zadam
3a07c5fcc0 release 0.54.2 2022-08-07 23:18:03 +02:00
zadam
3c26e00fe1 launchbar WIP 2022-08-07 15:34:59 +02:00
zadam
fc920becac launchbar WIP 2022-08-07 13:23:03 +02:00
zadam
8d608c3c1c launchbar WIP 2022-08-06 23:49:25 +02:00
zadam
08aa65bddb launchbar WIP 2022-08-06 15:00:56 +02:00
zadam
54900b35dc launchbar WIP 2022-08-06 13:47:27 +02:00
zadam
7696702a2a launchbar WIP 2022-08-05 19:15:28 +02:00
zadam
42cade17cb launchbar WIP 2022-08-05 16:44:26 +02:00
zadam
7565458332 launchbar WIP 2022-08-04 23:00:32 +02:00
zadam
b86dbc088d small fixes to tray and closing windows 2022-08-04 21:19:57 +02:00
zadam
82c596d1e3 Merge branch 'master' into next55 2022-08-03 22:23:58 +02:00
zadam
b3097b59c7 remove port scanning for an available port #3036 2022-08-03 00:19:29 +02:00
zadam
5ec359e929 focus existing window on port conflict, closes #3036 2022-08-02 22:53:06 +02:00
zadam
ffd73c0e57 release 0.54.1-beta 2022-08-02 21:56:34 +02:00
zadam
30b2d15f3d fix creating new calendar on each date note request 2022-08-02 18:25:05 +02:00