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

805 Commits

Author SHA1 Message Date
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
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
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
zadam
c43b20ec2b script api search ignores hoisting by default 2021-04-06 21:56:46 +02:00
zadam
caf38c94c7 fix search route 2021-04-06 20:18:34 +02:00
WPum
903e6b7ccc
correct a typo in #1820 fix (#1824) 
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 #1809 2021-04-04 22:02:40 +02:00
zadam
ef37a52a06 when leaving protected session don't forget to reset note cache (titles), #1810 2021-04-03 22:02:25 +02:00
zadam
2e82b7380b hide relationMapLink and template relations from link map, fixes #1820 2021-04-03 11:28:11 +02:00
zadam
da741b522e note cache fixes, #1805 2021-03-30 21:39:42 +02:00
zadam
6541523e88 empty page on new tab nw offers list of available workspaces 2021-03-28 00:07:38 +01:00
zadam
928c8bfdf7 Merge remote-tracking branch 'origin/stable' 2021-03-23 22:47:42 +01:00
zadam
7e3d424e23 fix deleting all revisions, closes #1774 2021-03-22 23:07:43 +01:00
zadam
b38a63d336 delete notes dialog provides checkbox to switch between delete all clones and normal delete 2021-03-18 23:42:30 +01:00
zadam
d62558d97a delete notes dialog WIP 2021-03-18 23:23:35 +01:00
zadam
76aa7d1451 Merge remote-tracking branch 'origin/master' 2021-03-18 22:11:45 +01:00
zadam
4f401d71a2 Merge remote-tracking branch 'origin/stable' 2021-03-18 21:11:56 +01:00
Patrick Moriarty
eb437ff642
Add mobile dropdown for plugin buttons (#1762) 
* Add mobile toolbar buttons

* cleanup

* more cleanup

* Mobile plugin buttons: Add else block & change icon
 2021-03-18 21:09:08 +01:00
zadam
e8903e82a1 add option to disable note tree auto collapse, fixes #1751 2021-03-18 20:11:58 +01:00
zadam
5b72b577b8 delete notes preview dialog WIP 2021-03-14 22:54:39 +01:00
zadam
ec2f8ec796 added subtree note count into info widget 2021-03-14 20:47:33 +01:00
zadam
98f02c3c9a added "hoistedInbox" label 2021-03-12 21:29:50 +01:00