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

6061 commits

This branch
This branch
All branches
Author SHA1 Message Date
zadam
0d06d5ccee dump-db should not contain node_modules in release artifacts 2022-12-04 23:49:16 +01:00
zadam
74fdaad032 mobile fix 2022-12-04 22:59:09 +01:00
zadam
d3bf0c1d8e bookmark migration 2022-12-04 20:05:18 +01:00
zadam
27ce273d29 bookmarks use cloning 2022-12-04 13:16:05 +01:00
zadam
cd60ad4267 improvements 2022-12-03 21:11:49 +01:00
zadam
56e01046c8 Merge branch 'master' into next58 2022-12-03 13:28:21 +01:00
zadam
518a413de7 fix internal link creation, closes #3376 2022-12-03 13:26:33 +01:00
zadam
29923af17d Merge remote-tracking branch 'origin/next58' into next58 2022-12-03 13:01:10 +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
42cd333694 clarification on the 5 minute sync auth leeway 2022-12-02 22:12:07 +01:00
zadam
aaa69f696b Merge remote-tracking branch 'origin/master' 2022-12-02 22:07:41 +01:00
zadam
8ce9dcf4aa fix webmanifest and robots.txt 2022-12-02 22:06:18 +01:00
zadam
130ded91ff
Merge pull request #3375 from DynamoFox/fix-dockerfile-to-generate-webpack-bundle 
Fix missing webpack bundle generation in Docker container build
 2022-12-02 21:09:50 +01:00
DynamoFox
851465da62 Fix missing webpack bundle generation in Docker container build 2022-12-02 18:15:03 +01:00
zadam
b85f335561 launcher improvements 2022-12-02 16:46:14 +01:00
zadam
7b36709e18 Merge remote-tracking branch 'origin/master' into next58 2022-12-02 15:28:04 +01:00
zadam
0d50cdb0f5 Merge remote-tracking branch 'origin/next58' into next58 2022-12-02 15:27:30 +01:00
zadam
eec2ff043e Merge branch 'master' into next58 2022-12-02 15:27:09 +01:00
zadam
0480f391d3 release 0.57.2 2022-12-01 22:56:29 +01:00
zadam
36c98e919a fix cursor jumping problem when having same note open in two tabs, closes #3365 2022-12-01 22:50:53 +01:00
zadam
0e68e8069b launcher improvements 2022-12-01 16:22:04 +01:00
zadam
7aa801fc1f notes with #keyboardShortcut don't need reload to take effect 2022-12-01 13:24:34 +01:00
zadam
fc080f785b moving components to its own directory 2022-12-01 13:07:23 +01:00
zadam
1a6c9be065 renamed shortcuts to launchers 2022-12-01 10:16:57 +01:00
zadam
b55c2d3dbc shortcut improvements 2022-12-01 10:03:04 +01:00
zadam
720fb0f73e refactorted shortcut handling into a service 2022-12-01 00:17:15 +01:00
zadam
0985314fb7 shortcut improvements 2022-11-30 16:57:51 +01:00
zadam
e759b4846a shortcut improvements 2022-11-29 16:16:57 +01:00
zadam
dacc2444c4
Merge pull request #3357 from agentydragon/stuff 
Add Ctrl+PgUp/Dn for tab switching, pointer to Electron docs
 2022-11-29 00:06:03 +01:00
zadam
8ea3608bf1 each stripped tag will be replace by a space, #3355 2022-11-29 00:00:45 +01:00
zadam
eecfce3cc9 shortcuts use templates 2022-11-28 23:39:23 +01:00
Rai
a402c79287 Add Ctrl+PgUp/Dn for tab switching, pointer to Electron docs 2022-11-27 19:33:05 -08:00
zadam
a459230aa9 shortcuts improvements 2022-11-27 23:43:25 +01:00
zadam
e4f57ab2fe fix path resolution bug when path is outside of hosted subtree 2022-11-27 15:50:01 +01:00
zadam
6a9ac6f90a shortcuts improvements 2022-11-26 14:57:39 +01:00
zadam
6883b71ce7 shortcut improvements 2022-11-25 15:29:57 +01:00
zadam
70552d58ac global menu styling improvements 2022-11-25 09:21:56 +01:00
zadam
c7bda4d0be global menu ref 2022-11-24 22:59:09 +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
ee667634ab Merge branch 'stable' 2022-11-23 22:48:52 +01:00
zadam
7a8c69a6f9 fix jumping cursor position after closing a dialog, fixes #3325 2022-11-23 22:48:32 +01:00
zadam
723db97094 fix jumping cursor position after closing a dialog, fixes #3325 2022-11-23 22:47:20 +01:00
zadam
65be882b49 optimize initial render 2022-11-22 23:53:08 +01:00
zadam
48765cc87d optimize initial render 2022-11-22 22:45:50 +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
a76bef1a28 docker should use webpacked frontend files, fixes #3322 2022-11-21 21:15:04 +01:00
zadam
a259bd8c3a release 0.57.1-beta 2022-11-20 23:43:38 +01:00