gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-04 13:39:01 +01:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity
4,738 Commits 43 Branches 349 Tags
Commit Graph

4738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zadam
39f0f26f28 split window WIP 2021-05-21 22:34:40 +02:00
zadam
1a13132a69 split window WIP 2021-05-20 23:13:34 +02:00
zadam
a3847842cb split window WIP 2021-05-19 23:00:03 +02:00
zadam
b7bd5396d1 split window WIP 2021-05-19 22:45:34 +02:00
zadam
8c1c9b00e2 buttons on the left improvements 2021-05-18 22:49:47 +02:00
zadam
845f5d15c4 buttons on the left 2021-05-18 22:14:35 +02:00
zadam
d18b95d87c Merge branch 'next' into redesign 2021-05-18 21:08:02 +02:00
zadam
731051154b Merge branch 'stable' into next 
# Conflicts:
#	package.json
 2021-05-18 21:07:29 +02:00
zadam
a093508fbe converting note properties to methods 2021-05-18 20:56:49 +02:00
zadam
5860b2eebb style cleanup 2021-05-18 20:46:19 +02:00
zadam
a4aaa49774 fix width in zen mode, closes #1965 2021-05-18 20:30:06 +02:00
zadam
a4c7069856
Delete FUNDING.yml 2021-05-18 19:56:00 +02:00
zadam
7cad65b370
Update FUNDING.yml 2021-05-18 19:55:45 +02:00
zadam
3ead734323
Create FUNDING.yml 2021-05-18 19:54:19 +02:00
zadam
2451596e8c converting note properties to methods 2021-05-17 22:35:36 +02:00
zadam
a5d702b143 moved becca to top level source dir 2021-05-17 22:10:00 +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
7a7c890946 redesign experiments 2021-05-17 21:46:18 +02:00
zadam
cb8e551ee0 release 0.47.3 v0.47.3 2021-05-15 23:05:20 +02:00
zadam
04f249e800 backend scripts should not be async because of transaction management 2021-05-15 22:57:23 +02:00
zadam
a65eda5e4a Merge remote-tracking branch 'origin/master' into next 2021-05-15 22:45:28 +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
f6dd1110e8 fix sync status 2021-05-15 22:00:53 +02:00
zadam
623200b92b fix "force note sync" 2021-05-15 14:04:01 +02:00
zadam
4ff40ba14f fix sync status in-progress 2021-05-15 13:44:12 +02:00
zadam
16563eaba4 limit data base filename in ZIP export to 30 characters 2021-05-15 13:22:54 +02:00
zadam
caa6e9ee72 use archiver.js to export instead of yazl, #1938 2021-05-14 22:57:44 +02:00
zadam
f4a58a2598 Merge remote-tracking branch 'origin/master' 2021-05-14 22:35:15 +02:00
zadam
cecce1df20 electron upgrade 2021-05-14 22:23:11 +02:00
zadam
2030c8e995 fallback value for isErased for 0173 migration, #1937 2021-05-14 21:52:14 +02:00
zadam
8a9bd4deb4 zooming with ctrl + mousewheel 2021-05-12 22:38:17 +02:00
zadam
8417d4a4ea various becca migration fixes 2021-05-11 22:00:16 +02:00
zadam
5d58520949 froca should not keep any deleted notes 2021-05-09 22:00:21 +02:00
zadam
d8d15b528e fix .runOnBackend() API call 2021-05-09 21:29:59 +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
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
Jules-Bertholet
a410ed1b74
Update KaTeX to v0.13.9 (#1925) 
* Update KaTeX to v0.13.9

* Allow KaTeX commands like \url and \includegraphics
https://katex.org/docs/options.html
 2021-05-08 20:58:56 +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
fddab59265 added note.executeScript() 2021-05-07 21:23:10 +02:00
Jules-Bertholet
1308dc20e8
Add support for mhchem markup in KaTeX (#1917) 2021-05-06 22:38:56 +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