gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-04 05:28:59 +01:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity
5,558 Commits 50 Branches 349 Tags
Commit Graph

220 Commits

Author SHA1 Message Date
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