gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 11:39:01 +01:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
3,402 Commits 41 Branches 349 Tags
Commit Graph

3402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zadam
96e2b9bc18 fix tree keyboard shortcuts propagating outside of tree 2020-02-02 10:10:37 +01:00
jasontan056
adb8caa8a2
Fix corner case preventing notes from being created before ckeditor is initialized (#849) 
* Pass deleteId to deleteBranch in ensureNoteIsAbsentFromParent

* Add checks for whether window.cutToNote is defined.

* check ckEditor initialized.
 2020-02-02 09:28:19 +01:00
zadam
0054a32dc7 treecache now manages reloading when starting protected session 2020-02-01 22:29:32 +01:00
zadam
513ce1a183 Merge branch 'master' into m41 
# Conflicts:
#	src/public/javascripts/services/sidebar.js
#	src/public/javascripts/services/tab_context.js
#	src/public/javascripts/services/tree.js
 2020-02-01 20:01:30 +01:00
zadam
9f38ea6ee7 update tab title upon its change 2020-02-01 19:25:37 +01:00
zadam
0e13678f7c note complement is now loaded through tree cache 2020-02-01 18:29:18 +01:00
zadam
f0cbca2838 lazy loading of note complement 2020-02-01 11:33:31 +01:00
zadam
f6f7836b8e renamed notefull to notecomplement 2020-02-01 11:15:58 +01:00
zadam
7651c53363 release 0.40.2 v0.40.2 2020-02-01 10:17:51 +01:00
zadam
0f25c8a95f autobook should not be active on the mobile interface 2020-02-01 10:17:03 +01:00
zadam
1a49894adf fix tree loading on mobile interface, closes #839 2020-02-01 10:04:18 +01:00
zadam
bd8c078fb9 Merge remote-tracking branch 'origin/master' 2020-02-01 09:30:14 +01:00
zadam
6e060b87b8 fix date parsing in local timezone, closes #845 2020-02-01 09:29:56 +01:00
jasontan056
2375b170ba
Pass deleteId to deleteBranch in ensureNoteIsAbsentFromParent (#846) 2020-02-01 09:05:23 +01:00
zadam
eeedb91ef7 sync are sent upon DB commit 2020-01-31 22:32:24 +01:00
zadam
05b51c0f68 frontend sync through websocket 2020-01-31 20:52:31 +01:00
zadam
8bf794f13b wip 2020-01-30 22:38:31 +01:00
zadam
48b401164a wip 2020-01-29 22:32:22 +01:00
zadam
b65631be7e tree change listener and others 2020-01-29 21:38:58 +01:00
zadam
439b45b0b8 refactored entity reloading 2020-01-29 20:14:02 +01:00
zadam
976b2aa6f5 got rid of "origParentNoteId" since it's not needed anymore 2020-01-28 22:39:44 +01:00
zadam
88213c1bbd attributes are now updated only if their type and name does not change, in case of relation not even value must change. If they do, the old attribute is deleted and new is created instead 2020-01-28 22:37:06 +01:00
zadam
d2e3aedf7f moving notes across parents now deletes the old branch and creates new which makes detecting changes much easier 2020-01-28 22:15:33 +01:00
zadam
368d3b1b97 wip 2020-01-28 21:54:28 +01:00
zadam
9301679707 wip 2020-01-27 22:58:03 +01:00
zadam
865f7e1ee1 fix propagating note reloads 2020-01-27 20:07:33 +01:00
zadam
c243d2e85c sync changes wip 2020-01-26 11:41:40 +01:00
zadam
97a35d6fba wip 2020-01-26 10:42:24 +01:00
zadam
3f0974d3d2 smaller fixes 2020-01-25 18:29:32 +01:00
zadam
48a7c0235f fixed iconClass and cssClass 2020-01-25 14:48:53 +01:00
zadam
ac7d5f2e81 fixes, separation of notefull from noteshort 2020-01-25 14:37:12 +01:00
zadam
516e6c35da fixes 2020-01-25 13:46:55 +01:00
zadam
7cad386a56 frontend attribute cache refactoring WIP 2020-01-25 13:27:23 +01:00
zadam
60c908cd63 frontend attribute cache refactoring WIP 2020-01-25 11:52:45 +01:00
zadam
52a907651e reduce unnecessary tab activation events 2020-01-25 10:25:06 +01:00
zadam
3254b551d8 merged tree utils into tree service 2020-01-25 09:56:08 +01:00
zadam
7a62d1636b fixes 2020-01-24 22:30:17 +01:00
zadam
7d9b720ea8 fix note switching in current tab 2020-01-24 21:15:40 +01:00
zadam
ba500a3a80 fixes 2020-01-24 20:15:53 +01:00
zadam
606d5afcab refactoring of note detail API 2020-01-24 17:54:47 +01:00
zadam
4b66765cc1 refactoring 2020-01-24 15:44:24 +01:00
zadam
8651e47118 small fixes 2020-01-22 22:29:55 +01:00
zadam
34bc02965f book and search fixes 2020-01-22 22:05:28 +01:00
zadam
eacefeb08b converted remaining type widgets 2020-01-22 21:38:00 +01:00
zadam
11a61325f9 removed last global keyboard handlers 2020-01-22 20:48:56 +01:00
zadam
370c63986d converting more keyboard shortcuts 2020-01-22 19:41:19 +01:00
zadam
d103b16d9a updated generate-cert script, #835 2020-01-22 19:12:03 +01:00
zadam
c63bb7ce8a converted more keyboard actions 2020-01-21 22:54:16 +01:00
zadam
af5c623671 simplification of triggering events from links 2020-01-21 22:08:41 +01:00
zadam
55d1f9e9f0 import & export fixed 2020-01-21 21:43:23 +01:00