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

6510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zadam
85a75fc186 getOwnedAttributes() should not make a copy, consistent with similar methods 2023-06-27 23:03:17 +02:00
zadam
42c8059ae1
Merge pull request #4057 from dymani/master 
Fix closing parenthesis
 2023-06-27 21:38:36 +02:00
dymani
0f4eb8ff4c fix closing parenthesis 2023-06-28 02:31:17 +08:00
zadam
8eb091445b
Merge pull request #4032 from mechanarchy/patch-1 
Ignore SQL comments in query console
 2023-06-26 23:05:42 +02:00
mechanarchy
1fc23c948e
Fix SQL comment handling 2023-06-23 09:06:14 +10:00
zadam
8fb42e4517
Merge pull request #4049 from SiriusXT/master 
Fix bugs in toc and improve related codes
 2023-06-22 22:34:47 +02:00
zadam
edae1a5d1c
Merge pull request #4050 from kianmeng/fix-typos 
Fix typos
 2023-06-22 22:33:09 +02:00
Kian-Meng Ang
712304bbc6 Fix typos 
Found via `codespell -S ./libraries,./package-lock.json -L tabel,tabels,uptodate,isnt,edn,falsy`
 2023-06-23 00:27:04 +08:00
SiriusXT
afb893c157 Fix bugs in toc and improve related codes 2023-06-22 15:38:36 +08:00
zadam
bbe3f436d3 avoid scrolling to active node without a reason, fixes #4031 2023-06-18 21:50:22 +02:00
mechanarchy
af053b61fc
Ignore SQL comments in query console 2023-06-17 17:06:17 +10:00
zadam
6f16b4caec Merge branch 'beta' 2023-06-13 23:24:09 +02:00
zadam
bea39f37ee stop click propagation in tree item actions 2023-06-13 00:12:55 +02:00
mechanarchy
6548149107 Update etapi.js 
(cherry picked from commit b97ebe9f03e84d01402f26b97fd0418a14a8d946)
 2023-06-12 23:21:38 +02:00
zadam
fbc805a221
Merge pull request #4019 from mechanarchy/patch-2 
Fix attempted ETAPI token rename after cancel
 2023-06-12 23:21:13 +02:00
zadam
6015a067ec sql console outputs results of CTEs, fixes #2800 2023-06-12 23:18:57 +02:00
mechanarchy
4a1ecd906b Update entrypoints.js 
(cherry picked from commit 08ec866dd269eca54b37db32284ede1402d560c3)
 2023-06-12 23:13:40 +02:00
zadam
41844cf817
Merge pull request #4017 from mechanarchy/patch-1 
Fix SQL Console error messages
 2023-06-12 23:12:35 +02:00
zadam
004cfe1965 allow creating backups via ETAPI, #4014 2023-06-12 23:09:29 +02:00
mechanarchy
b97ebe9f03
Update etapi.js 2023-06-10 17:36:23 +10:00
mechanarchy
08ec866dd2
Update entrypoints.js 2023-06-10 07:44:23 +10:00
zadam
2bdd538d7d release 0.60.2-beta v0.60.2-beta 2023-06-08 22:46:52 +02:00
zadam
6e69cafe54 fix showing deleted notes in the recent changes dialog, closes #4013 2023-06-08 22:45:44 +02:00
zadam
c177aaa901 refactoring of highlight list 2023-06-04 17:46:37 +02:00
zadam
eff3e1df85
Merge pull request #3988 from SiriusXT/Highlighted-Text 
Show highlighted text in the right pane
 2023-06-04 12:37:19 +02:00
SiriusXT
5b421d51b5 Merge branch 'Highlighted-Text' of https://github.com/SiriusXT/trilium into Highlighted-Text 2023-06-04 16:02:32 +08:00
SiriusXT
8852e8e531 Show highlighted text in right panel 2023-06-04 16:02:30 +08:00
zadam
8bc84cfaf6
Merge pull request #4004 from dymani/default-shortcuts 
Fix shortcuts not resetting to default
 2023-06-03 23:09:31 +02:00
SnnBcd
cde13dc580
Merge branch 'zadam:master' into Highlighted-Text 2023-06-04 00:24:08 +08:00
dymani
282d135f0f Fix shortcuts not resetting to default 2023-06-03 22:03:54 +08:00
SiriusXT
3e3d7aa4d7 Show highlighted text in right panel 2023-06-03 17:12:06 +08:00
SiriusXT
446c41d020 Show highlighted text in right panel 2023-06-03 17:00:15 +08:00
SiriusXT
33fdad5159 Show highlighted text in right panel 2023-06-03 14:43:20 +08:00
SiriusXT
463d145cb7 Merge branch 'Highlighted-Text' of https://github.com/SiriusXT/trilium into Highlighted-Text 2023-06-03 11:55:59 +08:00
SiriusXT
1413756d00 Show highlighted text in right panel 2023-06-03 11:55:50 +08:00
zadam
d3bf325f19 added some comments to openapi spec 2023-06-03 00:32:16 +02:00
zadam
c4f69fd9cb don't allow patching relation's value in ETAPI #3998 2023-06-03 00:21:46 +02:00
zadam
af67cf64b1
Merge pull request #3984 from dymani/move-pane 
Add buttons to reorder split panes
 2023-06-02 16:07:15 +02:00
zadam
095da691a4 Merge remote-tracking branch 'origin/master' 2023-06-02 16:05:10 +02:00
zadam
7e71029d1c use note size format also in file properties 2023-06-02 16:05:02 +02:00
SnnBcd
045ee18237
Merge branch 'zadam:master' into Highlighted-Text 2023-06-02 21:02:31 +08:00
zadam
e47c3a27b0 remove the workaround test 2023-06-01 23:18:50 +02:00
zadam
ced99f8ac8
Merge pull request #3995 from mm21/master 
Add ETAPI test to repro inherited attribute issue for cloned note #3994
 2023-06-01 23:15:10 +02:00
zadam
0c4492bcd0 invalidate attribute cache on branch create/update, fixes #3994 2023-06-01 23:14:17 +02:00
zadam
d9359c7c55 downgrade excalidraw to 0.14.2, #3979 2023-06-01 22:51:34 +02:00
mm21
86a080e7ec Add ETAPI test to repro inherited attribute issue for cloned note #3994 2023-06-01 17:20:11 +00:00
SiriusXT
0a66809bf0 Not show when nothing is checked in the options 2023-06-01 20:38:55 +08:00
SiriusXT
ecfdde2f2a Show highlighted text in the right pane 2023-06-01 20:17:00 +08:00
zadam
758dba9ba5 fix event 2023-06-01 00:13:08 +02:00
zadam
ae42e0efc7 refactoring 2023-06-01 00:07:57 +02:00