zadam
b7f0fd2db3
Merge branch 'master' into next61
...
# Conflicts:
# package-lock.json
# src/public/app/services/note_content_renderer.js
# src/public/app/widgets/note_tree.js
# src/routes/routes.js
# src/services/consistency_checks.js
# src/services/notes.js
# src/services/task_context.js
2023-07-10 18:20:36 +02:00
harishkumarchellappa
7d6c847d47
added date and time attribute capability
2023-07-10 17:24:34 +05:30
Andrew Pluzhnikov
927da84d3b
Implement saving of global search string.
...
This implements point 1 of issue 868.
After performing a search, when returning to the global search tab the
previous search term is now retained and preselected, making it easier
to repeat the same search or modify it.
2023-07-06 20:26:55 -07:00
zadam
b7b0bd80ed
padding of right pane
2023-06-30 23:01:57 +02:00
zadam
f06207207b
fix styling for videos
2023-06-30 16:36:03 +02:00
zadam
068684101f
remove the option to show CKEditor banner
2023-06-30 15:58:42 +02:00
zadam
a0d958bf12
refactor uploading files
2023-06-30 15:25:45 +02:00
zadam
0802b81807
improved error logging in frontend
2023-06-30 12:14:58 +02:00
zadam
192e399cb5
typos
2023-06-30 11:18:34 +02:00
zadam
eb34f9c64f
small refactorings and fixes
2023-06-29 23:32:19 +02:00
zadam
788841d256
fix mentions
2023-06-29 12:19:01 +02:00
zadam
b7c37fdf58
cleanup
2023-06-29 11:44:28 +02:00
zadam
a46c5a2243
use isLabelTruthy() for most binary labels
2023-06-29 00:14:12 +02:00
zadam
05d2f4fe96
Merge branch 'stable'
2023-06-27 23:15:20 +02: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
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
176784834f
simple formatter for source view of text HTML notes
2023-06-20 23:59:36 +02:00
zadam
995f1c9fc4
Merge branch 'stable' into next61
...
# Conflicts:
# src/etapi/etapi.openapi.yaml
# src/etapi/notes.js
# src/public/app/widgets/type_widgets/editable_text.js
# src/services/app_info.js
2023-06-20 23:30:45 +02:00
zadam
1f3b6feaff
Merge branch 'master' into next61
...
# Conflicts:
# src/public/app/widgets/note_tree.js
2023-06-20 23:28:41 +02:00
zadam
8095c77b91
cache icon count to make filtering more responsive on slower connections, #4044
2023-06-20 21:31:25 +02:00
zadam
6cfd18b29b
read filter values in icon selector only after async events, #4044
2023-06-20 21:19:56 +02:00
zadam
691fccb769
fix keyboard navigation in the note tree, fixes #4036
2023-06-18 23:45:48 +02:00
zadam
bbe3f436d3
avoid scrolling to active node without a reason, fixes #4031
2023-06-18 21:50:22 +02:00
zadam
74400dad97
fix race condition between script execution and saving, closes #4028
2023-06-15 21:51:41 +02:00
zadam
1b68adf3e4
compatibility with online excalidraw tool
2023-06-15 21:34:42 +02:00
zadam
a2cd6f92d7
compatibility with online excalidraw tool
2023-06-15 21:34:02 +02:00
zadam
3ff5fe61b2
unified file and image upload WIP
2023-06-15 01:26:38 +02:00
zadam
75c6afd1c3
fix loading of string content saved as binary
2023-06-14 22:21:22 +02:00
zadam
8d2958738f
add option to hide the "Powered by CKEditor" banner
2023-06-14 00:51:05 +02:00
zadam
f80a20d18c
don't use non-existing btn-xs
2023-06-14 00:31:15 +02:00
zadam
34c642a49a
rename attachment
2023-06-14 00:28:59 +02:00
zadam
ac56056f65
Merge branch 'master' into next61
...
# Conflicts:
# package-lock.json
# src/routes/api/recent_changes.js
2023-06-13 23:25:35 +02: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
mechanarchy
b97ebe9f03
Update etapi.js
2023-06-10 17:36:23 +10:00
zadam
38839532d5
file upload WIP
2023-06-06 12:31:38 +02:00
zadam
69c7eb14aa
fixes
2023-06-05 21:14:33 +02:00
zadam
5c393f959d
got rid of .isDeleted on froca entities (the property is not available there)
2023-06-05 16:26:05 +02:00
zadam
e6bf6424e8
rename loadresults methods/properties for clarity that they don't contain entities, only rows
2023-06-05 16:12:02 +02:00
zadam
93addac8bb
Merge branch 'master' into next61
...
# Conflicts:
# src/becca/entities/bnote.js
# src/public/app/components/note_context.js
# src/public/app/layouts/desktop_layout.js
# src/public/app/services/note_content_renderer.js
# src/public/app/services/utils.js
# src/public/app/widgets/ribbon_widgets/file_properties.js
# src/public/app/widgets/ribbon_widgets/note_info_widget.js
# src/services/notes.js
2023-06-05 00:09:55 +02:00
zadam
fe908759d1
rename "note revision" to just "revision"
2023-06-04 23:02:49 +02:00
zadam
779751a234
rename "note revision" to just "revision"
2023-06-04 23:01:40 +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
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
