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

85 commits

Author SHA1 Message Date
zadam a574fce13f Merge remote-tracking branch 'origin/stable' into syncification 
# Conflicts:
#	package-lock.json
#	package.json
#	src/routes/custom.js
#	src/services/import/single.js
 2020-06-24 22:08:31 +02:00
zadam 89356918f1 fix unescaped HTML in the tree node title, closes #1127 2020-06-24 21:07:55 +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 ffc96ad6b2 parser status indication 2020-06-20 09:39:44 +02:00
zadam eabe4775bd fix click handler of links inside included note 2020-06-19 23:20:52 +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 fb975849b9 small API additions 2020-06-14 14:30:57 +02:00
zadam 16fef78344 add API method to force refresh of included notes, closes #1106 2020-06-14 10:50:08 +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 d09b021487 add time limit to frontend update 2020-06-11 00:13:56 +02:00
zadam 910bda860c fix delete note function just work one time, closes #1101 2020-06-10 23:43:59 +02:00
zadam 2d92b4931a fix ctrl+click opening the link twice/thrice, closes #1094 2020-06-10 00:10:27 +02:00
zadam 212b719ee9 better detection of changes in attributes and how they affect notes 2020-06-09 22:59:22 +02:00
zadam 2c609e8136 promoted attributes widget is now auto-updating, fixes #700 2020-06-08 00:29:52 +02:00
zadam 401a3f0ecb add info on read only notes, #1088 2020-06-06 18:46:45 +02:00
zadam e73dffad0b parse incomplete attrs 2020-06-06 12:56:24 +02:00
zadam ef1d062745 attribute parser preserves indexes from original string 2020-06-06 10:39:27 +02:00
zadam f245d51746 basic saving of attributes in the widget 2020-06-05 17:25:14 +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 58fa0832f6 fix focusing title after creating a note 2020-06-04 21:44:34 +02:00
zadam ed9fbae65d attribute parser and tests WIP 2020-06-04 00:04:57 +02:00
zadam 01a7af965c refactoring of es6 test skeleton 2020-06-03 17:28:57 +02:00
zadam 99120be46d skeleton of first tests 2020-06-03 17:11:03 +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 eedeaca37d wip 2020-06-03 16:24:41 +02:00
zadam 9de7d3fc53 fix unloading protected session after clicking on a button, closes #1078 2020-06-03 11:47: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 75bd395669 fix extra refresh because of duplicated sync event, closes #1063 2020-05-30 22:35:18 +02:00
zadam 5e353a5612 improved drag & drop 2020-05-30 10:30:21 +02:00
zadam 6a957eff17 added autocompletes for labels, relations 2020-05-28 23:59:08 +02:00
zadam 5aaa429203 WIP of new attribute widget 2020-05-28 00:17:13 +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 3db84daf94 fix hiding autocompletes after closing tab, closes #1034 2020-05-22 19:30:21 +02:00
zadam 04c573e212 set default executors 2020-05-20 08:54:37 +02:00
zadam 99aa481ace refactoring for testing parser 2020-05-20 00:03:33 +02:00
zadam ef37bc1a99 Merge remote-tracking branch 'origin/stable' into m43 
# Conflicts:
#	.idea/dataSources.xml
 2020-05-19 23:20:32 +02:00
zadam 58f4f5d1e6 fix deadlock after "cut to note", closes #1030 2020-05-19 22:58:08 +02:00
zadam fa5d982a55 fix exporting root note, closes #1024 2020-05-17 21:07:54 +02:00
zadam e3071e630a note cache refactoring WIP 2020-05-16 22:11:09 +02:00
zadam 108afe8896 fix incorrect processing of sync rows, closes #1019 2020-05-14 13:08:06 +02:00
zadam a287bb59ea note cache fixes for created notes 2020-05-13 23:06:13 +02:00
zadam 13117d2e68 Merge remote-tracking branch 'origin/stable' 2020-05-12 13:41:06 +02:00
zadam 4f50864ec8 better UX when deleting notes - focus in note tree is moved to the next/previous note 2020-05-12 13:40:42 +02:00
zadam ac4e6077bd Merge remote-tracking branch 'origin/stable' 2020-05-11 23:23:59 +02:00
zadam e541abbd60 disable hiding the body to not hide the noscript element 2020-05-11 22:44:10 +02:00
zadam 88e8eb7e9c fixed context menu positioning when scaling is active 2020-05-11 20:08:55 +02:00
zadam b365c186a1 fixed clicking on links in read only view 2020-05-11 19:38:14 +02:00
zadam 2e837642e2 create note directly from mention linking 2020-05-09 14:25:27 +02:00