gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,033 Commits 38 Branches 306 Tags
Commit Graph

1741 Commits

Author SHA1 Message Date
zadam
1d008cad13 fixes 2021-05-09 20:46:32 +02:00
zadam
ef0941479c fix undelete 2021-05-09 11:12:53 +02:00
zadam
9afea492db delete note fixes 2021-05-08 23:31:20 +02:00
zadam
84246fd197 adding missing .getPojo() to becca entities 2021-05-08 22:13:08 +02:00
zadam
9441cb177f undelete becca conversion 2021-05-08 22:01:14 +02:00
zadam
bcfe097dd6 refactoring of becca entity saving 2021-05-08 21:10:58 +02:00
zadam
2edc7dbf58 merge fixes 2021-05-08 11:20:20 +02:00
zadam
051b9dff21 Merge remote-tracking branch 'origin/stable' into next 
# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/entities/note_short.js
#	src/public/app/services/protected_session.js
#	src/routes/api/login.js
 2021-05-08 10:58:38 +02:00
zadam
de6108f95d protected session is now global application state to avoid weird issues with multiple tabs/windows/reloads 2021-05-07 22:23:49 +02:00
zadam
e257634ccf becca conversion WIP 2021-05-02 22:47:57 +02:00
zadam
3091119893 becca conversion WIP 2021-05-02 21:34:57 +02:00
zadam
c035627f0a use .markAsDeleted() instead of setting .isDeleted manually 2021-05-02 20:32:50 +02:00
zadam
273d4e0052 becca conversion WIP 2021-05-02 19:59:16 +02:00
zadam
77eac8f764 becca conversion WIP 2021-05-02 12:02:32 +02:00
zadam
1af10d48a2 becca conversion WIP 2021-05-02 11:23:58 +02:00
zadam
d13c8771ca becca conversion WIP 2021-05-01 21:52:22 +02:00
zadam
6626f100ad becca conversion WIP 2021-05-01 11:38:20 +02:00
zadam
ccadff5015 becca conversion WIP 2021-04-30 23:10:25 +02:00
zadam
e41be520a8 becca conversion WIP 2021-04-30 22:13:13 +02:00
zadam
43eb248450 Merge branch 'master' into next 2021-04-29 22:09:48 +02:00
zadam
b1131844d6 fix filling entity changes from Options' Advanced tab, closes #1898 2021-04-27 22:59:08 +02:00
zadam
03f3e46f8b release 0.47.2 2021-04-26 22:32:54 +02:00
zadam
6f1b0b92fe fix searchForNote backend API method 2021-04-26 22:27:12 +02:00
zadam
219098ab53 more becca changes 2021-04-26 22:24:55 +02:00
zadam
e466c393eb converted NoteRevision entity to the becca 2021-04-26 22:18:14 +02:00
zadam
d8f1c39282 converted NoteRevision entity to the becca 2021-04-26 22:00:55 +02:00
zadam
cb3a5bba61 Merge branch 'master' into next 
# Conflicts:
#	package-lock.json
 2021-04-26 21:45:37 +02:00
zadam
5e40c03fc9 use Map instead of object where keys can be (reserved) words, fixes #1895 2021-04-26 21:12:46 +02:00
zadam
3b1fb8024f handle undefined in the search ordering 2021-04-26 21:04:22 +02:00
zadam
93cae44ba0 subtree duplication with becca 2021-04-25 22:02:32 +02:00
zadam
a5ee590544 after note creation with becca 2021-04-25 21:24:32 +02:00
zadam
6c5b1420d2 basic note creation with becca 2021-04-25 21:19:18 +02:00
zadam
8d8d654fe8 becca entities enriched with functionality from repository entities 2021-04-25 20:00:42 +02:00
zadam
7494491560 Merge remote-tracking branch 'origin/master' into next 
# Conflicts:
#	package-lock.json
#	src/public/app/services/note_content_renderer.js
#	src/public/stylesheets/style.css
#	src/routes/api/files.js
#	src/routes/routes.js
 2021-04-25 11:14:45 +02:00
zadam
ccac46527c opened file change detection now useable on all note types 2021-04-24 21:56:44 +02:00
zadam
a74741343e upload of modified open file WIP 2021-04-24 11:39:59 +02:00
zadam
4ff7e0813d upload of modified open file WIP 2021-04-24 11:39:44 +02:00
zadam
6d2d72fa7f add ERR_ADDRESS_UNREACHABLE as expected sync exception, #1888 2021-04-24 10:17:21 +02:00
zadam
b5674223e5 fixed some incorrect order by behavior, #1881 2021-04-22 20:28:26 +02:00
zadam
02988ed2b3 added random ordering 2021-04-22 19:53:11 +02:00
zadam
172bdb6118 release 0.47.1-beta 2021-04-19 22:43:03 +02:00
zadam
6136243d61 release 0.47.1-beta 2021-04-19 22:40:50 +02:00
zadam
a88a32acae support OPML from MindManager, fixes #1862 2021-04-19 22:33:58 +02:00
zadam
1fdf889ccf refactoring 2021-04-17 20:52:46 +02:00
zadam
42510fda5c renamed also cache files/modules 2021-04-16 23:01:56 +02:00
zadam
f7e86c5be0 renamed noteCache into becca 2021-04-16 23:00:08 +02:00
zadam
af5b1021c7 renamed treeCache into froca 2021-04-16 22:57:37 +02:00
zadam
4311834d75 reload note cache if transaction rollback is detected 2021-04-14 22:57:45 +02:00
zadam
44aa2834b3 release 0.47.0-beta 2021-04-11 22:29:56 +02:00
zadam
3337487063 fixes 2021-04-10 23:23:43 +02:00