zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-09-29 20:15:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
3661 commits 38 branches 306 tags 138 MiB
Commit graph

493 commits

Author SHA1 Message Date
zadam 8d0df6ddb9 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	db/demo.zip
#	src/services/notes.js
#	src/services/request.js
 2020-08-10 23:45:17 +02:00
zadam 02cc52af66 small improvements and fixes 2020-08-06 23:55:17 +02:00
zadam 224fbdc8cd small improvements to text preview in file notes 2020-08-04 22:06:25 +02:00
zadam 7900622f38 refactored "sync" table to "entity_changes" - more changes 2020-08-02 23:43:39 +02:00
zadam 864271d5ef refactored "sync" table to "entity_changes" 2020-08-02 23:27:48 +02:00
zadam f4a4e746bf Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	libraries/ckeditor/ckeditor.js.map
#	package.json
#	src/routes/api/login.js
#	src/routes/api/sync.js
#	src/routes/index.js
#	src/services/app_info.js
#	src/services/sync.js
 2020-08-02 20:41:22 +02:00
zadam 17d7ff3ff1 small improvements to sync table handling 2020-07-31 00:08:01 +02:00
zadam c9cbc2db02 import fixes 2020-07-27 23:40:14 +02:00
zadam 3261fea67f added promotedAttributesExpanded option 2020-07-25 23:32:46 +02:00
zadam e1d4be814f toggle to expand/collapse attr list is saved and propagated across tabs 2020-07-23 22:31:06 +02:00
zadam 32ecb43b5c search refactoring 2020-07-21 00:01:07 +02:00
zadam f028b88cce Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package.json
#	src/routes/api/clipper.js
 2020-07-15 00:11:26 +02:00
zadam 3219441fdf fallback for missing parsed title, closes trilium-web-clipper/issues/16 2020-07-11 23:05:28 +02:00
zadam 055db32510 removed tar import 2020-07-09 21:46:33 +02:00
zadam 51dae378a3 more cleanup 2020-07-04 10:29:17 +02:00
zadam c4cc48dfc9 fixed initial demo import 2020-07-02 21:08:18 +02:00
zadam 51f094f87f image handling consistency fixes 2020-06-28 23:10:45 +02:00
zadam c778e87683 wip 2020-06-27 00:40:35 +02:00
zadam 1f05638609 attribute progress 2020-06-25 23:56:06 +02:00
zadam 9615e25a67 fix merge problems 2020-06-24 22:29:53 +02:00
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 c78ca4c9db fixed triggers to sort children of notes with "sorted" label, closes #1126 2020-06-23 22:03:01 +02:00
zadam 5f699cc28c converted most dynamic SQL queries into prepared statement to avoid excessive statement caching 2020-06-20 23:24:34 +02:00
zadam 969f31dde2 fixed backup and anonymization with better-sqlite3 2020-06-20 23:09:34 +02:00
zadam 027afab6b1 fix DB setup 2020-06-20 21:42:41 +02:00
zadam 6207203b35 wip 2020-06-20 13:18:03 +02:00
zadam 88348c560c syncification 2020-06-20 12:31:38 +02:00
zadam ffc96ad6b2 parser status indication 2020-06-20 09:39:44 +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 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 9791dab97d recent changes sorting fixes, closes #1099 2020-06-15 23:22:11 +02:00
zadam 00faf758e8 fixes and polish 2020-06-15 17:56:53 +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 f245d51746 basic saving of attributes in the widget 2020-06-05 17:25:14 +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 3c5db844ba fix tree focusing issues 2020-06-03 11:06:45 +02:00
zadam 91e5f24798 fix db anonymization 2020-06-02 23:13:55 +02:00
zadam 8c88ce6f65 fix moving/cloning notes broken in 0.42.4, closes #1066 2020-05-31 22:33:02 +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 5e353a5612 improved drag & drop 2020-05-30 10:30:21 +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 6b359b7796 return 401 when auth request is out of sync, closes #1056 2020-05-29 22:06:36 +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 b5627b138a integrate new search into the main global search 2020-05-24 09:30:08 +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 fa5d982a55 fix exporting root note, closes #1024 2020-05-17 21:07:54 +02:00
zadam 32eaafd024 note cache fixes after refactoring 2020-05-17 10:11:19 +02:00
zadam dcd371b5b1 note cache breakup into classes, WIP 2020-05-16 23:12:29 +02:00