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
4,614 Commits 38 Branches 306 Tags
Commit Graph

731 Commits

Author SHA1 Message Date
zadam
3a7da1d561 icon and theme experiments 2021-06-06 22:15:51 +02:00
zadam
3893f663d0 sql console also doesn't create a normal note by default 2021-06-06 13:38:01 +02:00
zadam
a0de3c97a5 note paths widget does not show hidden path 2021-06-06 11:13:17 +02:00
zadam
c886583396 added "save search to note" button 2021-06-06 11:01:10 +02:00
zadam
e48609aa68 introducing hidden notes, WIP 2021-06-05 23:35:47 +02:00
zadam
ac04be4433 mobile frontend fixes 2021-06-03 21:47:25 +02:00
zadam
4c64bd852e Merge remote-tracking branch 'origin/stable' into redesign 2021-06-01 23:33:07 +02:00
zadam
9a147365f5 link map lazy loading 2021-06-01 22:03:38 +02:00
zadam
e48bbe5b19 link map WIP 2021-05-31 23:38:47 +02:00
zadam
a76e3f6e2d correctly logging slow async requests 2021-05-30 21:21:20 +02:00
zadam
205f9953f9 Merge remote-tracking branch 'origin/stable' into redesign 
# Conflicts:
#	package-lock.json
#	package.json
 2021-05-26 21:27:06 +02:00
zadam
3c7232f427 don't error out when backend log does not exist yet, fixes #1977 2021-05-25 21:03:00 +02:00
zadam
845f5d15c4 buttons on the left 2021-05-18 22:14:35 +02:00
zadam
a093508fbe converting note properties to methods 2021-05-18 20:56:49 +02:00
zadam
2451596e8c converting note properties to methods 2021-05-17 22:35:36 +02:00
zadam
439ef4a8cb moved becca to top level source dir 2021-05-17 22:09:49 +02:00
zadam
8bd3e17a3b removed legacy entities and repository 2021-05-17 22:05:35 +02:00
zadam
04f249e800 backend scripts should not be async because of transaction management 2021-05-15 22:57:23 +02:00
zadam
9645a07f2f Merge remote-tracking branch 'origin/stable' into next 
# Conflicts:
#	package-lock.json
#	package.json
 2021-05-15 22:45:11 +02:00
zadam
623200b92b fix "force note sync" 2021-05-15 14:04:01 +02:00
zadam
8417d4a4ea various becca migration fixes 2021-05-11 22:00:16 +02:00
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
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
1af10d48a2 becca conversion WIP 2021-05-02 11:23:58 +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
93cae44ba0 subtree duplication with becca 2021-04-25 22:02:32 +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
dcd35b1ea2 fix broken inline PDF viewer, #1833 2021-04-24 20:27:42 +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
583df35231 log warning about unsucessful login 2021-04-19 21:41:29 +02:00
zadam
d3cccae2df implemented audio/video in note content renderer + streaming API #886 2021-04-18 12:40:12 +02:00
zadam
9ba514d930 Merge remote-tracking branch 'origin/stable' 
# Conflicts:
#	package-lock.json
#	trilium.iml
 2021-04-18 12:39:19 +02:00
zadam
79bb249f3b implemented audio/video in note content renderer + streaming API #886 2021-04-17 22:35:47 +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
a53a65be1f clipper fix, closes #1840 2021-04-12 23:29:02 +02:00
zadam
479d742e85 partly reverted wrong change, #1820 2021-04-10 23:24:17 +02:00