Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 02:16:05 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'develop' of https://github.com/TriliumNext/Notes into develop

Browse Source
This commit is contained in:
Adorian Doran
2024-12-02 22:42:28 +02:00
parent 95035acf38 d35e933206
commit a22d207d43
10 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
db/demo.zip
View File

Binary file not shown.

2
src/public/app/widgets/dialogs/export.js
View File

@@ -49,7 +49,7 @@ const TPL = `
<div class="form-check">
<label class="form-check-label">
<input class="form-check-input" type="radio" name="export-subtree-format" value="html">
${t('export.format_html')}
${t('export.format_html_zip')}
</label>
</div>

2
src/public/translations/cn/translation.json
View File

@@ -93,7 +93,7 @@
"export_note_title": "导出笔记",
"close": "关闭",
"export_type_subtree": "此笔记及其所有子笔记",
"format_html": "HTML ZIP 归档 - 建议使用此选项，因为它保留了所有格式。",
"format_html_zip": "HTML ZIP 归档 - 建议使用此选项，因为它保留了所有格式。",
"format_markdown": "Markdown - 保留大部分格式。",
"format_opml": "OPML - 大纲交换格式，仅限文本。不包括格式、图像和文件。",
"opml_version_1": "OPML v1.0 - 仅限纯文本",

2
src/public/translations/de/translation.json
View File

@@ -88,7 +88,7 @@
"export_note_title": "Notiz exportieren",
"close": "Schließen",
"export_type_subtree": "diese Notiz und alle ihre Unternotizen",
"format_html": "HTML im ZIP-Archiv – dies wird empfohlen, da dadurch die gesamte Formatierung erhalten bleibt.",
"format_html_zip": "HTML im ZIP-Archiv – dies wird empfohlen, da dadurch die gesamte Formatierung erhalten bleibt.",
"format_markdown": "Markdown – dadurch bleiben die meisten Formatierungen erhalten.",
"format_opml": "OPML – Outliner-Austauschformat nur für Text. Formatierungen, Bilder und Dateien sind nicht enthalten.",
"opml_version_1": "OPML v1.0 – nur Klartext",

3
src/public/translations/en/translation.json
View File

@@ -93,7 +93,8 @@
"export_note_title": "Export note",
"close": "Close",
"export_type_subtree": "this note and all of its descendants",
"format_html": "HTML in ZIP archive - this is recommended since this preserves all the formatting.",
"format_html": "HTML - recomandat deoarece păstrează toată formatarea",
"format_html_zip": "HTML in ZIP archive - this is recommended since this preserves all the formatting.",
"format_markdown": "Markdown - this preserves most of the formatting.",
"format_opml": "OPML - outliner interchange format for text only. Formatting, images and files are not included.",
"opml_version_1": "OPML v1.0 - plain text only",

2
src/public/translations/es/translation.json
View File

@@ -93,7 +93,7 @@
"export_note_title": "Exportar nota",
"close": "Cerrar",
"export_type_subtree": "esta nota y todos sus descendientes",
"format_html": "HTML en un archivo ZIP: se recomienda ya que conserva todo el formato.",
"format_html_zip": "HTML en un archivo ZIP: se recomienda ya que conserva todo el formato.",
"format_markdown": "Markdown: esto conserva la mayor parte del formato.",
"format_opml": "OPML: formato de intercambio de esquemas solo para texto. El formato, las imágenes y los archivos no están incluidos.",
"opml_version_1": "OPML v1.0: solo texto sin formato",

2
src/public/translations/fr/translation.json
View File

@@ -89,7 +89,7 @@
"export_note_title": "Exporter la note",
"close": "Fermer",
"export_type_subtree": "cette note et tous ses descendants",
"format_html": "HTML dans l'archive ZIP - recommandé car cela préserve tout le formatage.",
"format_html_zip": "HTML dans l'archive ZIP - recommandé car cela préserve tout le formatage.",
"format_markdown": "Markdown - préserve la majeure partie du formatage.",
"format_opml": "OPML - format d'échange pour les outlineurs, uniquement pour le texte. Les mises en forme, images et fichiers ne sont pas inclus.",
"opml_version_1": "OPML v1.0 - texte brut uniquement",

2
src/public/translations/ro/translation.json
View File

@@ -509,7 +509,7 @@
"export_status": "Starea exportului",
"export_type_single": "doar această notiță fără descendenții ei",
"export_type_subtree": "această notiță și toți descendenții ei",
"format_html": "HTML în arhivă ZIP - recomandat deoarece păstrează toată formatarea",
"format_html_zip": "HTML în arhivă ZIP - recomandat deoarece păstrează toată formatarea",
"format_markdown": "Markdown - păstrează majoritatea formatării",
"format_opml": "OPML - format de interschimbare pentru editoare cu structură ierarhică (outline). Formatarea, imaginile și fișierele nu vor fi incluse.",
"opml_version_1": "OPML v1.0 - text simplu",

2
src/public/translations/tw/translation.json
View File

@@ -93,7 +93,7 @@
"export_note_title": "匯出筆記",
"close": "關閉",
"export_type_subtree": "此筆記及其所有子筆記",
"format_html": "HTML ZIP 歸檔 - 建議使用此選項，因為它保留了所有格式。",
"format_html_zip": "HTML ZIP 歸檔 - 建議使用此選項，因為它保留了所有格式。",
"format_markdown": "Markdown - 保留大部分格式。",
"format_opml": "OPML - 大綱交換格式，僅限文字。不包括格式、圖片和文件。",
"opml_version_1": "OPML v1.0 - 僅限純文字",

3
src/services/html_sanitizer.ts
View File

@@ -52,7 +52,8 @@ function sanitize(dirtyHtml: string) {
return sanitizeHtml(dirtyHtml, {
allowedTags,
allowedAttributes: {
'*': [ 'class', 'style', 'title', 'src', 'href', 'hash', 'disabled', 'align', 'alt', 'center', 'data-*' ]
"*": [ 'class', 'style', 'title', 'src', 'href', 'hash', 'disabled', 'align', 'alt', 'center', 'data-*' ],
"input": [ "type", "checked" ]
},
allowedSchemes: [
'http', 'https', 'ftp', 'ftps', 'mailto', 'data', 'evernote', 'file', 'facetime', 'irc', 'gemini', 'git',