diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 10d37fdda5..15dd91acb5 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -77,7 +77,7 @@ jobs: GPG_SIGNING_KEY: ${{ secrets.GPG_SIGN_KEY }} - name: Publish release - uses: softprops/action-gh-release@v2.3.3 + uses: softprops/action-gh-release@v2.3.4 if: ${{ github.event_name != 'pull_request' }} with: make_latest: false @@ -118,7 +118,7 @@ jobs: arch: ${{ matrix.arch }} - name: Publish release - uses: softprops/action-gh-release@v2.3.3 + uses: softprops/action-gh-release@v2.3.4 if: ${{ github.event_name != 'pull_request' }} with: make_latest: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6a0a387527..f73cdb54cc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -127,7 +127,7 @@ jobs: path: upload - name: Publish stable release - uses: softprops/action-gh-release@v2.3.3 + uses: softprops/action-gh-release@v2.3.4 with: draft: false body_path: docs/Release Notes/Release Notes/${{ github.ref_name }}.md diff --git a/README.md b/README.md index 1074cd9f52..b84fd1003a 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/triliumnext/trilium/total) [![RelativeCI](https://badges.relative-ci.com/badges/Di5q7dz9daNDZ9UXi0Bp?branch=develop)](https://app.relative-ci.com/projects/Di5q7dz9daNDZ9UXi0Bp) [![Translation status](https://hosted.weblate.org/widget/trilium/svg-badge.svg)](https://hosted.weblate.org/engage/trilium/) -[English](./README.md) | [Chinese (Simplified)](./docs/README-ZH_CN.md) | [Chinese (Traditional)](./docs/README-ZH_TW.md) | [Russian](./docs/README.ru.md) | [Japanese](./docs/README.ja.md) | [Italian](./docs/README.it.md) | [Spanish](./docs/README.es.md) +[English](./README.md) | [Chinese (Simplified)](./docs/README-ZH_CN.md) | [Chinese (Traditional)](./docs/README-ZH_TW.md) | [Russian](./docs/README-ru.md) | [Japanese](./docs/README-ja.md) | [Italian](./docs/README-it.md) | [Spanish](./docs/README-es.md) Trilium Notes is a free and open-source, cross-platform hierarchical note taking application with focus on building large personal knowledge bases. @@ -166,16 +166,34 @@ Please view the [documentation guide](https://github.com/TriliumNext/Trilium/blo ## 👏 Shoutouts -* [CKEditor 5](https://github.com/ckeditor/ckeditor5) - best WYSIWYG editor on the market, very interactive and listening team -* [FancyTree](https://github.com/mar10/fancytree) - very feature rich tree library without real competition. Trilium Notes would not be the same without it. -* [CodeMirror](https://github.com/codemirror/CodeMirror) - code editor with support for huge amount of languages -* [jsPlumb](https://github.com/jsplumb/jsplumb) - visual connectivity library without competition. Used in [relation maps](https://triliumnext.github.io/Docs/Wiki/relation-map.html) and [link maps](https://triliumnext.github.io/Docs/Wiki/note-map.html#link-map) +* [zadam](https://github.com/zadam) for the original concept and implementation of the application. +* [Larsa](https://github.com/LarsaSara) for designing the application icon. +* [nriver](https://github.com/nriver) for his work on internationalization. +* [Thomas Frei](https://github.com/thfrei) for his original work on the Canvas. +* [antoniotejada](https://github.com/nriver) for the original syntax highlight widget. +* [Dosu](https://dosu.dev/) for providing us with the automated responses to GitHub issues and discussions. +* [Tabler Icons](https://tabler.io/icons) for the system tray icons. + +Trilium would not be possible without the technologies behind it: + +* [CKEditor 5](https://github.com/ckeditor/ckeditor5) - the visual editor behind text notes. We are grateful for being offered a set of the premium features. +* [CodeMirror](https://github.com/codemirror/CodeMirror) - code editor with support for huge amount of languages. +* [Excalidraw](https://github.com/excalidraw/excalidraw) - the infinite whiteboard used in Canvas notes. +* [Mind Elixir](https://github.com/SSShooter/mind-elixir-core) - providing the mind map functionality. +* [Leaflet](https://github.com/Leaflet/Leaflet) - for rendering geographical maps. +* [Tabulator](https://github.com/olifolkerd/tabulator) - for the interactive table used in collections. +* [FancyTree](https://github.com/mar10/fancytree) - feature-rich tree library without real competition. +* [jsPlumb](https://github.com/jsplumb/jsplumb) - visual connectivity library. Used in [relation maps](https://triliumnext.github.io/Docs/Wiki/relation-map.html) and [link maps](https://triliumnext.github.io/Docs/Wiki/note-map.html#link-map) ## 🤝 Support -Support for the TriliumNext organization will be possible in the near future. For now, you can: -- Support continued development on TriliumNext by supporting our developers: [eliandoran](https://github.com/sponsors/eliandoran) (See the [repository insights]([developers]([url](https://github.com/TriliumNext/trilium/graphs/contributors))) for a full list) -- Show a token of gratitude to the original Trilium developer ([zadam](https://github.com/sponsors/zadam)) via [PayPal](https://paypal.me/za4am) or Bitcoin (bitcoin:bc1qv3svjn40v89mnkre5vyvs2xw6y8phaltl385d2). +Trilium is built and maintained with [hundreds of hours of work](https://github.com/TriliumNext/Trilium/graphs/commit-activity). Your support keeps it open-source, improves features, and covers costs such as hosting. + +Consider supporting the main developer ([eliandoran](https://github.com/eliandoran)) of the application via: + +- [GitHub Sponsors](https://github.com/sponsors/eliandoran) +- [PayPal](https://paypal.me/eliandoran) +- [Buy Me a Coffee](https://buymeacoffee.com/eliandoran) ## 🔑 License diff --git a/_regroup/package.json b/_regroup/package.json index f822dd8055..b8cc7ce85f 100644 --- a/_regroup/package.json +++ b/_regroup/package.json @@ -41,7 +41,7 @@ "@types/node": "22.18.8", "@types/yargs": "17.0.33", "@vitest/coverage-v8": "3.2.4", - "eslint": "9.36.0", + "eslint": "9.37.0", "eslint-plugin-simple-import-sort": "12.1.1", "esm": "3.2.25", "jsdoc": "4.0.4", diff --git a/apps/client/package.json b/apps/client/package.json index 395953e873..0abafc87a5 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -1,6 +1,6 @@ { "name": "@triliumnext/client", - "version": "0.99.0", + "version": "0.99.1", "description": "JQuery-based client for TriliumNext, used for both web and desktop (via Electron)", "private": true, "license": "AGPL-3.0-only", @@ -15,7 +15,7 @@ "circular-deps": "dpdm -T src/**/*.ts --tree=false --warning=false --skip-dynamic-imports=circular" }, "dependencies": { - "@eslint/js": "9.36.0", + "@eslint/js": "9.37.0", "@excalidraw/excalidraw": "0.18.0", "@fullcalendar/core": "6.1.19", "@fullcalendar/daygrid": "6.1.19", @@ -46,14 +46,14 @@ "jquery": "3.7.1", "jquery.fancytree": "2.38.5", "jsplumb": "2.15.6", - "katex": "0.16.22", + "katex": "0.16.23", "knockout": "3.5.1", "leaflet": "1.9.4", "leaflet-gpx": "2.2.0", "mark.js": "8.11.1", "marked": "16.3.0", "mermaid": "11.12.0", - "mind-elixir": "5.3.1", + "mind-elixir": "5.1.1", "normalize.css": "8.0.1", "panzoom": "9.4.3", "preact": "10.27.2", diff --git a/apps/client/src/translations/ja/translation.json b/apps/client/src/translations/ja/translation.json index 1cb33b0806..a5cc74b501 100644 --- a/apps/client/src/translations/ja/translation.json +++ b/apps/client/src/translations/ja/translation.json @@ -550,7 +550,7 @@ "beta-feature": "Beta", "ai-chat": "AI チャット", "task-list": "タスクリスト", - "new-feature": "新しい", + "new-feature": "New", "collections": "コレクション" }, "edited_notes": { @@ -767,7 +767,7 @@ "placeholder": "ノート名で検索", "label": "祖先", "depth_label": "深さ", - "depth_doesnt_matter": "関係ない", + "depth_doesnt_matter": "関係なし", "depth_eq": "ちょうど {{count}} つ下の階層", "direct_children": "直接の子", "depth_gt": "{{count}} より下の階層", @@ -830,7 +830,7 @@ "max_width_label": "最大コンテンツ幅", "max_width_unit": "ピクセル", "apply_changes_description": "コンテンツ幅の変更を適用するには、クリックしてください", - "reload_description": "外観オプションからの変更" + "reload_description": "外観設定から変更" }, "theme": { "title": "アプリのテーマ", @@ -899,14 +899,14 @@ "bg_color": "背景色付きテキスト", "visibility_title": "ハイライトリスト表示", "visibility_description": "#hideHighlightWidget ラベルを追加することで、ノートごとにハイライトウィジェットを非表示にできます。", - "shortcut_info": "オプション -> ショートカット（'右ペイン切り替え'）で、右ペイン（ハイライトを含む）を素早く切り替えるキーボードショートカットを設定できます。" + "shortcut_info": "設定 -> ショートカット（右ペイン切り替え）で、右ペイン（ハイライトを含む）を素早く切り替えるキーボードショートカットを設定できます。" }, "table_of_contents": { "title": "目次", "description": "ノートに定義された数以上の見出しがある場合、テキストノートに目次が表示されます。この数はカスタマイズできます:", "unit": "見出し", - "disable_info": "このオプションに非常に大きな数値を設定することで、目次を効果的に無効にすることもできる。", - "shortcut_info": "オプション -> ショートカット（'右ペイン切り替え'）で、右ペイン（目次を含む）を素早く切り替えるキーボードショートカットを設定できます。" + "disable_info": "このオプションに非常に大きな数値を設定することで、目次を効果的に無効にすることもできます。", + "shortcut_info": "設定 -> ショートカット（右ペイン切り替え）で、右ペイン（目次を含む）を素早く切り替えるキーボードショートカットを設定できます。" }, "toc": { "table_of_contents": "目次", @@ -1073,7 +1073,7 @@ "read_only": "エディターは読み取り専用モードです。テキストとコードノートのみ機能します。", "auto_read_only_disabled": "テキスト/コードノートは、サイズが大きすぎる場合、自動的に読み取りモードに設定されます。このラベルをノートに追加することで、ノートごとにこの動作を無効にすることができます", "app_css": "Trilium アプリケーションに読み込まれ、Trilium の外観を変更するために使用できる CSS ノートをマークします。", - "app_theme": "Trilium のフルテーマである CSS ノートをマークし、Trilium オプションで利用できるようにします。", + "app_theme": "Trilium のフルテーマである CSS ノートをマークし、Trilium の設定で利用できるようにします。", "app_theme_base": "「next」、「next-light」、または「next-dark」に設定すると、従来のテーマではなく、対応する TriliumNext テーマ (auto、light、または dark) がカスタム テーマのベースとして使用されます。", "css_class": "このラベルの値は、ツリー内の特定のノートを表すノードにCSSクラスとして追加されます。これは高度なテーマ設定に役立ちます。テンプレートノートで使用できます。", "icon_class": "このラベルの値は、ツリー上のアイコンにCSSクラスとして追加され、ツリー内のノートを視覚的に区別するのに役立ちます。例えば、bx bx-home のように、アイコンは boxicons から取得されます。テンプレートノートで使用できます。", @@ -1275,7 +1275,7 @@ "editor_type": { "label": "書式設定ツールバー", "floating": { - "description": "編集ツールがカーソル付近に表示されます;", + "description": "編集ツールがカーソル付近に表示されます。", "title": "フローティング" }, "fixed": { diff --git a/apps/client/src/translations/ko/translation.json b/apps/client/src/translations/ko/translation.json index 6f4a28b9b6..6bbef5adbc 100644 --- a/apps/client/src/translations/ko/translation.json +++ b/apps/client/src/translations/ko/translation.json @@ -29,9 +29,25 @@ "note": "노트", "search_note": "이름으로 노트 검색하기", "help_on_links": "링크 관련 도움말", - "link_title_mirrors": "링크 제목은 노트의 현재 제목을 반영합니다" + "link_title_mirrors": "링크 제목은 노트의 현재 제목을 반영합니다", + "link_title_arbitrary": "링크 제목은 임의로 변경될 수 있습니다", + "link_title": "링크 제목", + "button_add_link": "링크 추가" }, "branch_prefix": { - "save": "저장" + "save": "저장", + "edit_branch_prefix": "브랜치 접두사 편집", + "help_on_tree_prefix": "트리 접두사에 대한 도움말", + "prefix": "접두사: ", + "branch_prefix_saved": "브랜치 접두사가 저장되었습니다." + }, + "bulk_actions": { + "bulk_actions": "대량 작업", + "affected_notes": "영향을 받은 노트들", + "include_descendants": "선택한 노트의 자손 포함", + "available_actions": "가능한 액션들", + "chosen_actions": "선택한 액션들", + "execute_bulk_actions": "대량 액션들 실행", + "bulk_actions_executed": "대량 액션들이 성공적으로 실행되었습니다." } } diff --git a/apps/client/src/translations/md/translation.json b/apps/client/src/translations/md/translation.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/apps/client/src/translations/md/translation.json @@ -0,0 +1 @@ +{} diff --git a/apps/client/src/widgets/FloatingButtonsDefinitions.tsx b/apps/client/src/widgets/FloatingButtonsDefinitions.tsx index a423d0ccd1..8f4288eff7 100644 --- a/apps/client/src/widgets/FloatingButtonsDefinitions.tsx +++ b/apps/client/src/widgets/FloatingButtonsDefinitions.tsx @@ -218,8 +218,8 @@ function SaveToNoteButton({ note }: FloatingButtonContext) { /> } -function RelationMapButtons({ note, triggerEvent }: FloatingButtonContext) { - const isEnabled = (note.type === "relationMap"); +function RelationMapButtons({ note, isDefaultViewMode, triggerEvent }: FloatingButtonContext) { + const isEnabled = (note.type === "relationMap" && isDefaultViewMode); return isEnabled && ( <>