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
4,474 Commits 38 Branches 306 Tags
Commit Graph

1511 Commits

Author SHA1 Message Date
zadam
6207203b35 wip 2020-06-20 13:18:03 +02:00
zadam
88348c560c syncification 2020-06-20 12:31:38 +02:00
zadam
30062d687f Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
 2020-06-20 09:40:11 +02:00
zadam
2af2b45062 fix keyboard shortcut for print this note, #1118 2020-06-20 00:04:31 +02:00
zadam
f700e6e12b use standard search to find notes with same attrs 2020-06-18 22:28:18 +02:00
zadam
a87e59cecb WIP of attribute view on click 2020-06-18 12:52:16 +02:00
zadam
a04aa6fd36 version updates 2020-06-18 09:12:30 +02:00
zadam
a7d9870846 Merge remote-tracking branch 'origin/better-sqlite3' 
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
#	package-lock.json
#	package.json
#	src/public/app/services/utils.js
#	src/public/app/widgets/type_widgets/editable_text.js
#	src/services/utils.js
 2020-06-18 09:03:09 +02:00
zadam
f745e21e0d use better-sqlite3 2020-06-17 23:03:46 +02:00
zadam
5f2361ebd5 release 0.43.0-beta 2020-06-15 23:26:12 +02:00
zadam
85d986534d fix enforcing node's http requests for sync 2020-06-15 18:24:43 +02:00
zadam
00faf758e8 fixes and polish 2020-06-15 17:56:53 +02:00
zadam
6ba2e5cf73 add word count widget to the demo document (plus cleanup of external links) 2020-06-14 16:29:29 +02:00
zadam
fb975849b9 small API additions 2020-06-14 14:30:57 +02:00
zadam
e0b4b369dc transaction handling fixes 2020-06-14 00:35:53 +02:00
zadam
0df7851214 fix sync 2020-06-13 22:34:15 +02:00
zadam
5d47c2b23e opening transactions only on write operations which enforces exclusive lock only there to improve concurrency, custom handling of sync request timeouts, #1093, #1018 2020-06-13 10:23:36 +02:00
zadam
2d92b4931a fix ctrl+click opening the link twice/thrice, closes #1094 2020-06-10 00:10:27 +02:00
zadam
535dcb6d12 release 0.42.7 2020-06-08 10:43:12 +02:00
zadam
e70c862e72 fix import 2020-06-07 23:55:55 +02:00
zadam
e8cd821e57 futrther improvements to anonymization 2020-06-07 10:20:48 +02:00
zadam
be7ac74235 better fallback for resolving filenames of binary attachments 2020-06-05 10:40:35 +02:00
zadam
e817acba4e fix template attribute cycle in note cache 2020-06-04 23:58:31 +02:00
zadam
4ae965c5cb Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	src/public/app/widgets/collapsible_widgets/note_info.js
 2020-06-04 22:37:04 +02:00
zadam
1502b9ce66 prevent attribute inheritance cycle via template, closes #1077 2020-06-04 12:27:41 +02:00
zadam
ed9fbae65d attribute parser and tests WIP 2020-06-04 00:04:57 +02:00
zadam
915b1d1a45 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
#	package-lock.json
#	package.json
#	src/public/app/widgets/type_widgets/editable_text.js
 2020-06-03 16:25:45 +02:00
zadam
e68aed2057 Merge remote-tracking branch 'origin/master' 2020-06-03 16:24:52 +02:00
zadam
eedeaca37d wip 2020-06-03 16:24:41 +02:00
zadam
7307ca385f release 0.42.6 2020-06-03 14:30:07 +02:00
zadam
c1fd9825aa fix backup 2020-06-03 12:16:16 +02:00
zadam
3c5db844ba fix tree focusing issues 2020-06-03 11:06:45 +02:00
zadam
e7330c1104 more anonymization 2020-06-03 09:55:05 +02:00
zadam
91e5f24798 fix db anonymization 2020-06-02 23:13:55 +02:00
zadam
38723e0189 release 0.42.5 2020-05-31 23:33:30 +02:00
zadam
8c88ce6f65 fix moving/cloning notes broken in 0.42.4, closes #1066 2020-05-31 22:33:02 +02:00
zadam
4d22959e28 release 0.42.4 2020-05-31 10:33:12 +02:00
zadam
e25b633ec4 better error logging in backup 2020-05-31 10:24:59 +02:00
Adam Coyne
ac10701b55
Add import option to replace underscores with spaces in note names (#1064) 2020-05-30 23:15:00 +02:00
zadam
75bd395669 fix extra refresh because of duplicated sync event, closes #1063 2020-05-30 22:35:18 +02:00
Adam Coyne
c0cd321118
Fix import error (#1060) 
* Fix access to attributes on undefined noteMeta

* Remove .markdown extension from imported page titles
 2020-05-30 10:09:10 +02:00
zadam
d65624d8d2 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
 2020-05-29 22:29:28 +02:00
zadam
13f9d037dc safer backup to file using VACUUM INTO + possibility to explicitly ask for backup now 2020-05-29 21:55:08 +02:00
zadam
ae934720bc Merge branch 'm43' 2020-05-27 00:09:51 +02:00
zadam
753c181979 Merge remote-tracking branch 'origin/stable' 2020-05-27 00:09:40 +02:00
zadam
55b210d7c5 added not() expression 2020-05-27 00:09:19 +02:00
zadam
dc2d5a0a79 fix fulltext content search 2020-05-26 23:25:13 +02:00
zadam
c753f228ac more tests & fixes 2020-05-25 23:39:34 +02:00
zadam
a1a744bb00 order & limit implementation WIP 2020-05-25 00:25:47 +02:00
zadam
b5627b138a integrate new search into the main global search 2020-05-24 09:30:08 +02:00