zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-11-17 13:14:44 +08:00
Code Issues Projects Releases Packages Wiki Activity
3521 commits 38 branches 306 tags 138 MiB
Commit graph

3521 commits

This branch
This branch
All branches
Author SHA1 Message Date
zadam
687a466a35 Merge remote-tracking branch 'origin/stable' 2020-03-15 09:57:57 +01:00
zadam
20c24e26cc added entity constructors for "content" tables 2020-03-14 21:09:07 +01:00
zadam
3bafc396fc fix consistency checks 2020-03-14 13:13:27 +01:00
zadam
08606f7d88 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	src/services/sync_table.js
 2020-03-14 12:58:47 +01:00
zadam
3fa3e912a4 not sending ping to clients after every sync addition, only after commit which significantly speeds up imports 2020-03-14 12:39:55 +01:00
zadam
44219e7ccc do not load the note content during ENEX import again since it's already available 2020-03-13 22:23:44 +01:00
zadam
48abd765c6 fix sync issues 2020-03-11 22:43:20 +01:00
zadam
2d38706ba8 wip 2020-03-10 23:33:39 +01:00
zadam
8d45662bee clear history in the code mirror after setting a value, closes #766 2020-03-10 22:51:44 +01:00
zadam
dc4024b6de Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	src/public/javascripts/services/note_detail_code.js
 2020-03-10 22:51:02 +01:00
zadam
5b67854cbe clear history in the code mirror after setting a value, closes #766 2020-03-10 22:48:21 +01:00
zadam
72745aca29 fix unnecessary scroll to parent when opening new tab 2020-03-10 22:25:57 +01:00
zadam
e6e41adad0 fix backend to frontend sync with waitForSyncId() 2020-03-10 21:33:03 +01:00
zadam
bcbf1b79c3 fixed waitForSync 2020-03-09 22:32:26 +01:00
zadam
1d78432df4 Merge remote-tracking branch 'origin/stable' 2020-03-09 22:16:43 +01:00
zadam
c6d912dcb7 sync only changes with isSynced = true 2020-03-09 21:34:03 +01:00
zadam
eb287917c1 set sync.isSynced correctly 2020-03-09 21:28:41 +01:00
zadam
da53c1eaa8 updated schema.sql 2020-03-09 21:23:11 +01:00
zadam
c67613a557 Merge remote-tracking branch 'origin/stable' 2020-03-09 21:00:38 +01:00
zadam
0ca107ff48 fix event listener for resize 2020-03-09 21:00:31 +01:00
zadam
73bf2dcb02 added isSynced to sync table to allow forward compatibility with 0.41 2020-03-09 20:56:43 +01:00
zadam
719f10981e fix sync 2020-03-08 22:00:12 +01:00
zadam
1774f48d07 fix sync 2020-03-08 21:59:19 +01:00
zadam
deb67d6275 release 0.40.5 2020-03-08 21:05:52 +01:00
zadam
bafd829ff6 updated electron 9.0 binary dependencies 2020-03-08 20:17:28 +01:00
zadam
e7aa84435b render PDF preview in electron for pdf notes 2020-03-08 18:06:24 +01:00
zadam
493d088d80 better back/forward navigation 2020-03-08 17:17:18 +01:00
zadam
5f4d963580 better back/forward navigation WIP 2020-03-08 11:41:42 +01:00
zadam
5114f3f782 fixes after merge 2020-03-08 09:38:49 +01:00
zadam
53f5df4e88 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	src/public/javascripts/desktop.js
#	src/public/stylesheets/style.css
#	src/views/details/image.ejs
#	src/views/details/relation_map.ejs
 2020-03-08 09:26:34 +01:00
zadam
e4039ea5e1 fixed printing relation map 2020-03-08 09:24:03 +01:00
zadam
95fef8d2e5 fixes after merge 2020-03-07 22:29:49 +01:00
zadam
7105b61aab Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	src/public/javascripts/desktop.js
#	src/views/desktop.ejs
#	src/views/mobile.ejs
 2020-03-07 22:21:55 +01:00
zadam
78a50be663 don't print control buttons 2020-03-07 22:18:12 +01:00
zadam
3d3ad3b99b include themes.css for printing to have default CSS variables available 2020-03-07 22:14:07 +01:00
zadam
0d9cdcac85 load appropriate styles for printing book notes, closes #899 2020-03-07 22:01:34 +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
62da383623 only one update 2020-03-07 15:01:48 +01:00
zadam
8513e0201c collapsed state is now synchronized across tab-cached instances 2020-03-07 14:31:25 +01:00
zadam
abd60581be right pane is now scrollable 2020-03-07 14:18:58 +01:00
zadam
aff02184f8 removed last tab should activate second to last 2020-03-07 13:57:31 +01:00
zadam
8909d175d0 event fixes 2020-03-07 13:40:46 +01:00
zadam
091eb8f791 event fixes WIP 2020-03-06 23:34:39 +01:00
zadam
e10d23289e event fixes WIP 2020-03-06 22:17:07 +01:00
zadam
26599f057c collapsible widget remember their collapsed state 2020-03-01 20:49:11 +01:00
zadam
4e0e2e8926 fixes in side pane toggling 2020-03-01 20:11:40 +01:00
zadam
9c631e4398 Merge remote-tracking branch 'origin/master' into m41 
# Conflicts:
#	.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml
#	src/public/stylesheets/desktop.css
 2020-03-01 19:20:08 +01:00
zadam
687539cc95 fix zen mode 2020-03-01 19:16:30 +01:00
zadam
03e0c98066 migrated desktop CSS to the desktop layout 2020-03-01 19:06:26 +01:00