gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 03:29:02 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
4,474 Commits 41 Branches 349 Tags
Commit Graph

4474 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zadam
9ba514d930 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package-lock.json
#	trilium.iml
 2021-04-18 12:39:19 +02:00
zadam
8e1b8ab26c show not set keyboard shortcuts as "not set", #1851 2021-04-15 21:45:37 +02:00
zadam
197537b159 idea config stuff 2021-04-13 21:54:34 +02:00
zadam
917b259e92 add new sync status "unknown" to differentiate from "can't connect", #1844 2021-04-13 21:54:07 +02:00
zadam
a53a65be1f clipper fix, closes #1840 2021-04-12 23:29:02 +02:00
zadam
44aa2834b3 release 0.47.0-beta v0.47.0-beta 2021-04-11 22:29:56 +02:00
zadam
58e4bd4974 Merge remote-tracking branch 'origin/stable' 2021-04-11 22:28:30 +02:00
zadam
44af431a93 ctrl + click / middle click now opens image in a text note in a new tab 2021-04-11 22:24:21 +02:00
zadam
479d742e85 partly reverted wrong change, #1820 2021-04-10 23:24:17 +02:00
zadam
3337487063 fixes 2021-04-10 23:23:43 +02:00
zadam
beb42f18fe linux server better-sqlite3 binary 2021-04-10 11:15:13 +02:00
zadam
00a27313fb linux desktop and mac better-sqlite3 binaries 2021-04-09 23:40:42 +02:00
zadam
564fea43a9 don't open new tab after duplicating subtree 2021-04-09 23:40:15 +02:00
zadam
3d3142e20c Merge remote-tracking branch 'origin/master' 2021-04-08 21:22:54 +02:00
zadam
9c679aef20 added #runOnInstance and #runAtHour 2021-04-08 21:22:47 +02:00
Davi Alexandre
d47a55d23a
Avoid resetting all background properties on note-icons (#1834) 
This ensures only the background-color property will be changed transparent,
avoiding to reset any other properties (background-image, for example) that
might have been set by some custom CSS rules applied in combination with
#iconClass
 2021-04-08 20:24:19 +02:00
zadam
052f584bf4 edit note button is now just an icon 2021-04-08 20:17:35 +02:00
MatAsmania
1dfebdf6db
Fix for Evernote workaround and support for en-todo (#1827) 2021-04-07 22:48:49 +02:00
zadam
5314446980 fix seeing only part of the PDF preview 2021-04-07 22:45:46 +02:00
zadam
6b41c26d2b disable entering new line in the attribute editor 2021-04-07 22:35:06 +02:00
zadam
463071ea4d make global button more consistent with sync button 2021-04-07 22:15:44 +02:00
zadam
79c5645964 various javaDoc improvements 2021-04-07 22:01:52 +02:00
zadam
2f58b6b3c8 fix bottom margin/padding styling in tooltip 2021-04-07 21:21:06 +02:00
zadam
e7909d25c6 fix linking to notes 2021-04-07 21:12:55 +02:00
zadam
f739dbfe87 ckeditor 5.60.0 2021-04-06 22:16:34 +02:00
zadam
c43b20ec2b script api search ignores hoisting by default 2021-04-06 21:56:46 +02:00
zadam
2d0cb5b66e update electron to 13 beta 2021-04-06 20:19:34 +02:00
zadam
caf38c94c7 fix search route 2021-04-06 20:18:34 +02:00
zadam
51db6761c8 fix opening links with single click outside of the ckeditor instance 2021-04-06 20:18:16 +02:00
zadam
4d110aa143 updated render note help 2021-04-05 22:37:12 +02:00
zadam
9c436cb61f Merge remote-tracking branch 'origin/stable' 2021-04-05 21:39:35 +02:00
zadam
caa11b8f7e fix inheriting inheritable attributes through template, closes #1828 2021-04-05 20:52:19 +02:00
zadam
926e9e12c0 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package-lock.json
#	package.json
 2021-04-05 11:44:42 +02:00
zadam
c4d35fb44e fix reference link widget in attr editor after CKEditor 27 upgrade 2021-04-05 11:28:34 +02:00
zadam
1b41b92e02 publish xml2js into backend script api 2021-04-05 11:18:56 +02:00
zadam
41cce4dcb9 improved task manager with allowed year range, #1823 2021-04-04 23:57:55 +02:00
zadam
858072cc10 fix lexer to parse correctly quoted empty strings, #1825 2021-04-04 23:13:18 +02:00
zadam
855c5e0e67 fix unit tests 2021-04-04 22:44:22 +02:00
WPum
903e6b7ccc
correct a typo in #1820 fix (#1824) 
Thanks!
 2021-04-04 22:11:42 +02:00
zadam
c71f3c35b8 Merge remote-tracking branch 'origin/stable' 2021-04-04 22:03:00 +02:00
zadam
f0cc3d0bcd use entity changes instead of actual tables to fill in sector to sync, fixes #1809 2021-04-04 22:02:40 +02:00
zadam
7672f22ce0 release 0.46.7 v0.46.7 2021-04-03 22:37:04 +02:00
zadam
ef37a52a06 when leaving protected session don't forget to reset note cache (titles), #1810 2021-04-03 22:02:25 +02:00
zadam
2318d615bb make note cache decryption more robust - one failure will not crash the whole process, #1810 2021-04-03 21:48:16 +02:00
zadam
2e82b7380b hide relationMapLink and template relations from link map, fixes #1820 2021-04-03 11:28:11 +02:00
zadam
bc14c3d665 backport not deforming standard top widget in small window size from master 2021-03-31 22:59:07 +02:00
zadam
b89ea9a684 check for note cache branch existence, #1808 2021-03-31 22:35:10 +02:00
zadam
6c9ac5b5ec jquery 3.6.0 2021-03-30 23:32:44 +02:00
zadam
9cd45299b1 grid items in note list are clickable as a whole 2021-03-30 23:26:14 +02:00
zadam
f1f4f45c9d display note icon in note list 2021-03-30 23:13:16 +02:00