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

224 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
7779fd1dfe synchronize the removal of the selection in cuttonote to make it more predictable 2020-08-10 22:42:57 +02:00
zadam
02cc52af66 small improvements and fixes 2020-08-06 23:55:17 +02:00
zadam
ddf0a89e1f bootstrap 4.5.1 2020-08-04 20:39:16 +02:00
zadam
4b101baf00 CKEditor 21 content styles 2020-08-03 23:36:33 +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
4fc8bace94 support horizontal line, closes #1164 2020-08-01 23:41:30 +02:00
zadam
95bbdb3b6b CKEditor 21 2020-07-29 23:34:49 +02:00
zadam
0ab9d02434 fancytree 2.36.0 2020-07-15 22:40:58 +02:00
zadam
448a3254a3 small tweaks 2020-07-08 23:51:47 +02:00
zadam
b2c0eaeaf8 Merge remote-tracking branch 'origin/stable' 2020-07-08 23:14:26 +02:00
zadam
1b0a2b41da added tab and shift-tab shortcuts for indent/outdent, closes #978 2020-07-08 21:57:09 +02:00
zadam
5b862c3d29 Merge remote-tracking branch 'origin/stable' 2020-07-02 23:21:17 +02:00
zadam
582429e762 updated content styles 2020-07-01 21:03:51 +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
263b65997c hide "type around" controls in printed PDF, closes #1129 2020-06-24 20:44:00 +02:00
zadam
2b757bfccd upgrade ckeditor to 20.0.0 2020-06-24 16:17:39 +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
da9b321aa0 allow mouse interactions in ckeditor widgets, fixes #1117 2020-06-19 22:24:57 +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
2d92b4931a fix ctrl+click opening the link twice/thrice, closes #1094 2020-06-10 00:10:27 +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
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
ec4586b164 fix reference link implementation, closes #1069 2020-06-02 23:54:33 +02:00
zadam
91e5f24798 fix db anonymization 2020-06-02 23:13:55 +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
d4c3f1b3f2 upgrade to ckeditor 19.1.0 2020-05-27 22:08:06 +02:00
zadam
d75b770fb9 update of bootstrap to 4.5.0 2020-05-12 20:17:51 +02:00
zadam
2e837642e2 create note directly from mention linking 2020-05-09 14:25:27 +02:00
zadam
c3438e0f3f implemented SQL console as a type of code note 2020-05-08 22:22:43 +02:00
zadam
90d091aedb make note tree initial load non-lazy 2020-04-30 23:58:34 +02:00
zadam
6d6695e3a9 ckeditor 19 2020-04-29 17:29:32 +02:00
zadam
242f139be4 allow specifying include note widget size 2020-04-11 11:49:58 +02:00
zadam
f3b84e5185 use ckeditor content styles also for read only notes, tooltips and book notes 2020-04-08 21:38:11 +02:00
zadam
6cc3e3cdf6 note paths is now on the left side and showing current path 2020-04-07 22:53:03 +02:00
zadam
7bd05415fa revert fancytree upgrade which caused some issues (tree duplication) 2020-04-05 12:56:25 +02:00
zadam
4485650cbc library upgrades 2020-03-31 20:52:41 +02:00
zadam
084882a50e fixes in ckeditor build 2020-03-29 15:58:18 +02:00
zadam
34de8fb874 improved reference link handling 2020-03-26 20:40:15 +01:00
zadam
b778985b5e minor fixes and upgrades 2020-03-26 16:21:17 +01:00
zadam
8a92786012 save paste images locally WIP 2020-03-25 11:28:44 +01:00
zadam
8584de27ab mentions also insert reference links 2020-03-22 18:27:13 +01:00
zadam
a36d6bf9be add link dialog now allows switching between reference link and normal hyperlink 2020-03-22 11:41:00 +01:00
zadam
6dfc2755e7 ckeditor 18 2020-03-19 16:29:48 +01:00
zadam
babc27f824 update dayjs 2020-03-16 08:21:53 +01:00
zadam
c4f7bb37db removed sidebar widget settings 2020-03-07 21:34:39 +01:00
zadam
81ec85083a link map widget always rendered centered map 2020-03-07 20:41:03 +01:00
zadam
f64b343d8d ref 2020-03-01 10:41:23 +01:00
zadam
47b803920b keep body hidden until rendered 2020-02-29 22:13:54 +01:00
zadam
8888d04878 fixes 2020-02-29 22:04:46 +01:00
zadam
e5155130e7 ckeditor with table/cell properties 2020-02-29 14:32:26 +01:00
zadam
8e77d729e5 ckeditor 17 2020-02-20 17:01:18 +01:00
zadam
32d60a7eb9 refactored tree context menu to reduce duplication 2020-02-16 22:56:40 +01:00
zadam
e06f3ef97e refactorings for add link and include note 2020-02-16 10:50:48 +01:00
zadam
9337564075 boxicons 2.0.5 2020-02-15 09:16:23 +01:00
zadam
81f4966a1a fixes, cleaned up noise in the developer console 2020-02-08 10:40:58 +01:00
zadam
44ddcdd852 various widget optimizations for faster note switching 2020-02-03 21:16:33 +01:00
zadam
7c6cd63a53 various widget refactorings 2020-02-02 20:02:08 +01:00
zadam
cb79f2c7eb updated ckeditor build to support cuttonote 2020-01-02 10:38:29 +01:00
zadam
547a5714ae fancytree 2.34.0 2020-01-01 23:13:49 +01:00
zadam
82420fe5f6 reactivate "cut to note", closes #795 2020-01-01 22:59:51 +01:00
zadam
0fe91d0184 include note feature 2019-12-30 19:32:45 +01:00
zadam
2f711a12f8 added "include note" widget to text notes, WIP 2019-12-29 23:46:40 +01:00
zadam
ab79f24729 added content style to tar html export as well 2019-12-25 11:34:45 +01:00
zadam
cec71f65b3 load ckeditor content style for printing to have more similar look to the in-editor, #782 2019-12-25 10:59:45 +01:00
zadam
7c8e7a3f4b frameless design with tabs on top, split for left panel 2019-12-23 11:52:45 +01:00
zadam
01cd9d8fb3 ckeditor 16 with code blocks plugin 2019-12-04 21:21:07 +01:00
zadam
e58dc829f5 bootstrap 4.4.0 2019-11-27 18:59:42 +01:00
zadam
bf9ad976b9 fixing non-root path issues, #404 2019-11-25 21:44:46 +01:00
zadam
744855d4f5 linking notes through CKEditor mentiones 2019-11-07 22:43:01 +01:00
zadam
894c888d87 including ckeditor mentions plugin for easy linking 2019-11-06 22:58:32 +01:00
zadam
d87c469fbb Merge branch 'stable' 2019-11-05 22:28:27 +01:00
zadam
a2c78e2c5c disabling link map animation, closes #684 2019-11-05 20:59:20 +01:00
zadam
56e50cc850 boxicons 2019-11-02 13:50:17 +01:00
zadam
fc87bcf10c using boxicons instead of jam icons WIP 2019-11-02 12:17:00 +01:00
zadam
a2a53deb94 fancytree 2.33.0 2019-10-29 19:07:05 +01:00
zadam
86a330c8c3 delete notes are now in cache as well which allows simplified update of the tree after deletion 2019-10-26 22:50:46 +02:00
zadam
7ccbf45569 update to ckeditor 15 2019-10-26 10:09:48 +02:00
zadam
3de124748d fix a bug where render note content could be set to null during renaming 2019-10-21 22:56:43 +02:00
zadam
2305ad7405 reloading notes after script changes 2019-10-20 12:29:34 +02:00
zadam
8886e95847 replaced bootstrap-notify.min.js with bootstrap toasts 2019-10-17 20:03:05 +02:00
zadam
42cf02e9a4 library updates 2019-09-30 19:35:00 +02:00
zadam
a81b00e130 fix link map zoom after reload and some tweaks to springy 2019-08-30 22:01:49 +02:00
zadam
84b1f1f24e text editor now support font size, color, background 2019-08-29 22:20:08 +02:00
zadam
9d958e1860 link map is kept centered on the active note box 2019-08-28 23:08:05 +02:00
zadam
48a654630f added checkboxes/todo lists and image resize, closes #264, #587 2019-08-27 19:50:57 +02:00
zadam
0558c30b56 updated to ckeditor 12.4.0 2019-08-26 20:34:50 +02:00
zadam
6d8f11d533 fix code editor sometimes not rendering 2019-08-25 19:11:42 +02:00
zadam
4e4beb26c6 codemirro 5.48.4 2019-08-25 18:46:32 +02:00
zadam
dddb02a286 sorting widgets in options WIP 2019-08-20 23:30:19 +02:00
zadam
b488adc330 sidebar POC WIP 2019-07-24 22:52:51 +02:00
zadam
b5d75f183a update to ckeditor 12.3.1 2019-07-11 22:30:40 +02:00
zadam
7b1fdfabf8 upgrade ckeditor to 12.3.0 2019-07-04 19:53:10 +02:00
zadam
c4b957427d implement print, closes #581 2019-06-29 22:57:47 +02:00
zadam
1b831f94a9 fix orphan note autocomplete, closes #569 2019-06-24 20:45:35 +02:00
zadam
ad46ba7d0f fix fancytree navigation bug before official release, use unminified build in the meantime 2019-06-16 09:44:23 +02:00
zadam
8ab081a3fd configuration of displayed link types + max number of links 2019-06-10 14:33:59 +02:00
zadam
4329675c60 dynamic display of link map 2019-06-09 19:18:14 +02:00
zadam
4cacd1dfa2 Merge branch 'stable' 
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
 2019-06-09 10:20:45 +02:00
zadam
0c8ad1b46e disable media embed in ckeditor, fixes #564 2019-06-09 09:58:25 +02:00
zadam
e0306d4ad7 ckeditor upgraded to 12.2.0 2019-06-06 21:33:59 +02:00
zadam
87b16f3325 link map WIP 2019-06-03 22:55:59 +02:00
zadam
54e37dea20 codemirror updated to 5.47.0 2019-06-02 09:59:07 +02:00
zadam
e845b80e10 fancytree upgrade to 2.31.0 2019-05-31 18:50:41 +02:00
zadam
79956b5676 mobile web fixes 2019-05-22 20:53:59 +02:00
zadam
119d7367da tree fixes 2019-05-19 18:21:29 +02:00
zadam
f22cc37df7 middle click can now open links in new tab (and close tab) 2019-05-15 21:50:27 +02:00
zadam
bd97df5ee9 refactored chrome tabs into "tab row" 2019-05-11 19:44:58 +02:00
zadam
8a501521e8 some refactoring etc. 2019-05-11 19:27:33 +02:00
zadam
bfc61f8b36 tab bar is automatically hidden for only one tab 2019-05-07 22:14:35 +02:00
zadam
4ea27e604f context menu on tab and "close all except for this tab" 2019-05-07 21:34:01 +02:00
zadam
aef0e552a0 ctrl+tab and ctrl+shift+tab can be used to switch tabs 2019-05-07 21:04:07 +02:00
zadam
b1d0cef33b tabs WIP 2019-05-05 10:59:34 +02:00
zadam
0d11cadc18 tabs wip 2019-05-02 22:24:43 +02:00
zadam
3ccf553fda initial experiments with tabs 2019-04-30 22:31:12 +02:00
zadam
2573c3b8a6 sync frontend dayjs to 1.8.12 2019-04-22 14:15:30 +02:00
zadam
25fe78012f upgrade to ckeditor 12.1.0 which fixes some upload issues 2019-04-15 21:08:31 +02:00
zadam
a5fc8d5329 moved libraries and images out of src folder 2019-03-30 09:39:58 +01:00