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

5777 Commits

Author SHA1 Message Date
zadam
6b4800d2d6 port error clarifications 2023-03-08 07:31:10 +01:00
zadam
f60e4a1355 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	package-lock.json
 2023-03-07 23:07:06 +01:00
zadam
03897c5c9d use more precise detection of a mobile browser, fixes #3680 2023-03-07 23:06:55 +01:00
zadam
ef90f1ff3f
Merge pull request #3676 from jrao1/allow-labels-when-adding-notes-via-clipper 
Allow arbitrary labels to be added via web clipper
 2023-03-07 22:53:11 +01:00
zadam
177a67f59b content null check in full text search, #3672 2023-03-06 23:23:56 +01:00
zadam
1e551581f8 content null check in full text search, #3672 2023-03-06 23:23:32 +01:00
zadam
62c2547557 #run should respect inheritance, fixes #3669 2023-03-06 23:00:29 +01:00
J Rao
2389ab30f8 sanitize label value 2023-03-06 21:28:09 +08:00
J Rao
fdffc27bb6 Allow arbitrary labels to be added via web clipper 2023-03-06 21:21:09 +08:00
zadam
540d19c67c fix import of ZIP with images with no meta file, closes #3649 2023-03-02 08:44:55 +01:00
zadam
f541bf186c release 0.59.1 2023-02-28 23:39:34 +01:00
zadam
9eb3075f65 Merge remote-tracking branch 'origin/master' into next59 
# Conflicts:
#	bin/tpl/anonymize-database.sql
 2023-02-28 23:25:51 +01:00
zadam
e2b8dfe96a fix autocomplete showing hidden paths, closes #3654 2023-02-28 23:23:48 +01:00
zadam
f883fde74a small search refactorings 2023-02-28 23:23:17 +01:00
zadam
ee2953a5e1 fix display of note revision content, #3637 2023-02-27 22:58:02 +01:00
zadam
ec8ed65feb submenu choice of template should override child: settings, fixes #3628 2023-02-27 21:07:32 +01:00
zadam
b70699ce1c make the active fancytree selector more specific than the normal color setting 2023-02-27 21:01:25 +01:00
Elian Doran
5820f874fc Fix infinite loop in autocompletion 
In some cases, the token used for highlighting autocompletion gets to be
empty, resulting in an infinte loop. One such case is searching for `''`
(without the backticks).
 2023-02-27 01:00:30 +02:00
Elian Doran
44c0ecdbfa Fix middle vertical align on table cells 
For merged cells, middle vertical alignment would not work properly (it
was either aligned to the top or bottom).
 2023-02-26 22:45:58 +02:00
zadam
69d7684b0d fix refreshing option cache on sync, closes #3623 2023-02-22 22:10:41 +01:00
zadam
fc67dd4d0a release 0.59.0-beta 2023-02-19 21:36:05 +01:00
zadam
232dad66d1 trim imported text 2023-02-19 21:34:37 +01:00
zadam
eaab82551f API migration to remove deprecated calls 2023-02-17 23:23:53 +01:00
zadam
d343ff0d23 removed deprecated widgets from frontend API 2023-02-17 23:04:49 +01:00
zadam
400b14e021 removed remnants of dev branch 2023-02-17 16:44:04 +01:00
zadam
97cadc3acf cleaned up unused backend log widget 2023-02-17 16:27:37 +01:00
zadam
7d0117bd28 unneeded changes from dev 2023-02-17 16:24:47 +01:00
zadam
6f7b554cdc preparing 0.59 without ocr/pdf, userguide, note ancillaries 2023-02-17 14:49:45 +01:00
zadam
42e08284b0 Merge remote-tracking branch 'origin/master' into dev 
# Conflicts:
#	package-lock.json
#	src/public/app/widgets/mermaid.js
 2023-02-15 23:47:41 +01:00
zadam
127486fdf5 removed deprecated API methods 2023-02-15 23:45:25 +01:00
zadam
4ffe36e4d0 added options for OCR and extract text from PDF 2023-02-15 16:08:00 +01:00
zadam
85403321cf tweaks 2023-02-15 15:57:33 +01:00
zadam
22cea63863 unneeded await 2023-02-15 15:09:34 +01:00
zadam
c95c5bb471 fix lost content data after CKEditor crash, closes #3584 2023-02-15 15:08:59 +01:00
zadam
cbabaa6b0c move advanced menu slightly below to not overlay the text 2023-02-15 14:49:58 +01:00
zadam
520ffecd36 ancillary type widget 2023-02-15 14:32:12 +01:00
zadam
b1e2b5ba8e reimplement note source to open in a new tab 2023-02-14 16:06:49 +01:00
zadam
896a4fe981 show mermaid errors, fixes #3610 2023-02-13 23:46:04 +01:00
zadam
e9a2cacb5b release 0.58.8 2023-02-13 21:50:54 +01:00
zadam
c190296bf9 refactoring 2023-02-13 16:22:34 +01:00
zadam
e411ad0eb1 Merge branch 'master' into dev 2023-02-13 15:58:02 +01:00
zadam
17085e5578 fix hidden subtree appearing after collapse, #2922 2023-02-13 15:09:57 +01:00
zadam
33d6bb69c0 refresh note list on pageSize update 2023-02-10 13:21:00 +01:00
zadam
8371703090 Merge branch 'master' into dev 2023-02-10 10:41:12 +01:00
zadam
fc7da015fe fix image display with slash in title, closes #3591 2023-02-10 10:23:02 +01:00
zadam
adf222b5e8 fix consistency check to re-parent note from search parent to root 2023-02-10 10:12:58 +01:00
zadam
ade22ea825 recover notes into root only if no other valid branch exists, #3590 2023-02-10 10:09:06 +01:00
zadam
2c8fb90ecb
Merge pull request #3590 from eliandoran/feature/fix_broken_reference_check 
Fix broken reference consistency check
 2023-02-10 09:58:24 +01:00
zadam
c67644a2e3 fix filing entity changes for deleted notes 2023-02-10 09:16:32 +01:00
zadam
346f6edd7e fix filing entity changes for deleted notes 2023-02-10 08:55:26 +01:00