zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-01-31 11:32:30 +08:00
Code Issues Projects Releases Packages Wiki Activity
5876 commits 38 branches 306 tags 138 MiB
Commit graph

872 commits

Author SHA1 Message Date
zadam
73eb585398 fixed migrations 2022-12-08 13:45:56 +01:00
zadam
cd60ad4267 improvements 2022-12-03 21:11:49 +01:00
zadam
99a5774148 Merge branch 'master' into next58 
# Conflicts:
#	package-lock.json
 2022-12-03 13:01:03 +01:00
zadam
46fdd15857 release 0.57.3 2022-12-02 22:44:40 +01:00
zadam
0480f391d3 release 0.57.2 2022-12-01 22:56:29 +01:00
zadam
e4e20c8007 Revert "open window before loading becca" 
This reverts commit 2fbcd9aaf7.
 2022-11-23 23:49:49 +01:00
zadam
2fbcd9aaf7 open window before loading becca 2022-11-23 23:31:05 +01:00
zadam
e2f6191229 upgrades 2022-11-22 20:48:04 +01:00
zadam
19126b7c6d Merge branch 'master' into next58 
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
#	package-lock.json
#	package.json
#	src/public/app/layouts/desktop_layout.js
 2022-11-22 20:46:08 +01:00
zadam
9a6df54832 release 0.57.1-beta 2022-11-20 23:43:17 +01:00
zadam
f7e56cbffe release 0.57.0-beta 2022-11-12 20:40:45 +01:00
zadam
b3c87156c2 library upgrades 2022-11-07 21:26:13 +01:00
zadam
64d3ec940c release 0.56.2 2022-10-27 22:41:15 +02:00
zadam
06e6fec4ca increment db and sync version due to new note type 2022-10-23 21:16:15 +02:00
zadam
12943cc808 Merge branch 'master' into next57 
# Conflicts:
#	package-lock.json
 2022-10-23 21:13:09 +02:00
zadam
f6ad1c6aa7 release 0.56.1 2022-10-22 23:07:24 +02:00
zadam
876e6caa23 better handling of incorrect operators 2022-10-22 15:58:15 +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
ed8acc7ee3 switch-server, switch-electron npm scripts to ease rebuilding better-sqlite3 2022-10-14 21:59:43 +02:00
zadam
a9c0daa51a FIXME comment on virtual branches 2022-09-24 23:03:38 +02:00
zadam
15ed381f85 release 0.55.1 2022-09-21 22:43:34 +02:00
zadam
78238381a7 release 0.55.0-beta 2022-09-12 22:37:41 +02:00
zadam
ca03c41205 flatpak release script should support beta channel 2022-09-12 22:35:22 +02:00
zadam
8588ed5eec remove port scanning for an available port #3036 2022-09-04 14:00:39 +02:00
zadam
b2a63afc28 limit max imported file size to 250 MiB, #3108 2022-09-03 15:11:03 +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
zadam
80dcb45415 disable compression for electron / desktop builds 2022-08-22 19:29:58 +02:00
zadam
df7c089344 Merge branch 'master' into next55 2022-08-08 20:45:35 +02:00
zadam
3a07c5fcc0 release 0.54.2 2022-08-07 23:18:03 +02:00
zadam
08aa65bddb launchbar WIP 2022-08-06 15:00:56 +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
ffd73c0e57 release 0.54.1-beta 2022-08-02 21:56:34 +02:00
zadam
a316ac5b35 fix docker build 2022-08-02 00:20:08 +02:00
zadam
aed0a8126c release 0.54.0-beta 2022-08-01 22:37:40 +02:00
zadam
46deceedc9 optional basic auth for shared notes, closes #2781 2022-07-31 21:45:32 +02:00
zadam
5444cc2009 floating button container WIP 2022-07-24 14:30:42 +02:00
zadam
bed0db9fa0 prevent zooming the whole app when ctrl + zoom on the canvas note, fixes #3002 2022-07-20 23:39:40 +02:00
Tom Free
4ca59dcc5c upgrade to excalidraw v0.12, fix breaking changes 2022-07-14 23:49:30 +02:00
zadam
ea3bce25d9 release 0.53.2 2022-07-09 13:40:41 +02:00
zadam
ef49d20470 release 0.53.1-beta 2022-07-01 22:50:19 +02:00
zadam
0d4275a260 fix saving new protected note revisions, closes #2951 2022-07-01 22:49:10 +02:00
zadam
1434effa22 upgraded mermaid to 9.1.2 2022-06-19 21:16:30 +02:00
zadam
67e69f1940 release 0.53.0-beta 2022-06-19 14:49:48 +02:00
zadam
11412a258b converted recent changes dialog to new pattern 2022-06-14 22:55:07 +02:00
zadam
bc35efd565 Merge branch 'stable' 2022-06-14 22:46:58 +02:00