1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-01-24 16:10:48 +08:00
Commit graph

4394 commits

Author SHA1 Message Date
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 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, 2021-04-04 23:57:55 +02:00
zadam
858072cc10 fix lexer to parse correctly quoted empty strings, 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 fix ()
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 2021-04-04 22:02:40 +02:00
zadam
7672f22ce0 release 0.46.7 2021-04-03 22:37:04 +02:00
zadam
ef37a52a06 when leaving protected session don't forget to reset note cache (titles), 2021-04-03 22:02:25 +02:00
zadam
2318d615bb make note cache decryption more robust - one failure will not crash the whole process, 2021-04-03 21:48:16 +02:00
zadam
2e82b7380b hide relationMapLink and template relations from link map, fixes 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, 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
zadam
8644c38abc hide sync status on extra window until the sync status is known 2021-03-30 22:59:25 +02:00
zadam
e569ae1a0d one sync status tooltip did not have data-toggle="tooltip" 2021-03-30 22:53:23 +02:00
zadam
da741b522e note cache fixes, 2021-03-30 21:39:42 +02:00
zadam
e055d4e15e ckeditor 27 2021-03-29 23:29:14 +02:00
zadam
58200d6431 fix dragabilly webpack build 2021-03-29 22:01:01 +02:00
zadam
57db945558 set cssClass and other note related classes on the root widget instead, fixes 2021-03-28 22:24:24 +02:00
zadam
2e6cd5f809 Merge remote-tracking branch 'origin/master' 2021-03-28 00:07:45 +01:00
zadam
6541523e88 empty page on new tab nw offers list of available workspaces 2021-03-28 00:07:38 +01:00
Igor
f60b282e09
* Russian README added ()
* * Russian README added

* Links to another READMEs added

* * Fix inline images

Co-authored-by: mopsicus <lii@rstgames.com>
2021-03-27 20:32:01 +01:00
bavis-m
744ed27d91
If the database hasn't been initialized (new install?) don't attempt to update our last synced id, as there is no db to grab it from (prevents running the server as a fresh install completely) ()
Co-authored-by: Mark <mark@mhack.io>
2021-03-27 20:30:40 +01:00
zadam
a254199746 Merge remote-tracking branch 'origin/stable' 2021-03-26 21:47:24 +01:00
zadam
496767a52b release 0.46.6 2021-03-25 20:28:57 +01:00
zadam
9139c597e5 use only one label for icon class, fixes 2021-03-25 19:46:10 +01:00
zadam
942132c01d release 0.46.6 2021-03-23 23:57:48 +01:00
zadam
928c8bfdf7 Merge remote-tracking branch 'origin/stable' 2021-03-23 22:47:42 +01:00
zadam
1862acd1ff avoid getting refreshes on note title 2021-03-23 22:46:18 +01:00
zadam
ce7e18d0b0 fix syncing protected notes in case there wasn't any other change, closes 2021-03-23 22:18:23 +01:00
zadam
65280d5ba3 avoid ugly error in the logs, 2021-03-22 23:27:41 +01:00
zadam
7e3d424e23 fix deleting all revisions, closes 2021-03-22 23:07:43 +01:00
zadam
d5f38c0f88 sync status style fix 2021-03-21 23:45:15 +01:00
zadam
56f97f1081 dragging the tab vertically by 100px will now move it to a new window (chrome like behavior) 2021-03-21 23:35:13 +01:00
zadam
e648505ad3 avoid weird button shrinking when window size is too small, fixes 2021-03-21 23:12:34 +01:00
zadam
71c3fd5cbb don't use special layout for "extra window" 2021-03-21 23:05:31 +01:00
zadam
f9b0418333 sync status widget tweaks 2021-03-21 22:46:45 +01:00
zadam
392a00ac17 sync status widget 2021-03-21 22:43:41 +01:00
zadam
1a9919a866 sync status widget WIP 2021-03-21 00:01:28 +01:00
zadam
9dd95b62a9 added ScrollingContainer to guarantee scrolling to top when switching notes 2021-03-20 19:44:43 +01:00
zadam
135b4fe88e Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	src/public/app/layouts/mobile_layout.js
2021-03-20 12:49:37 +01:00
zadam
bff04c121a fix scrolling in mobile frontend, closes 2021-03-20 12:47:47 +01:00
zadam
b79d81a94d sync status widget WIP 2021-03-20 00:00:49 +01:00