Compare commits

...

2874 Commits

Author SHA1 Message Date
Elian Doran 6e64cab2d4 Merge pull request #327 from TriliumNext/JYC333-patch-1
Create nightly release action
2024-10-11 21:56:04 +03:00
Elian Doran 9c8cf0bc09 Merge pull request #452 from TriliumNext/fix-image-copy
Use the electron Clipboard module when using "Copy image to clipboard"
2024-10-11 19:48:18 +03:00
Elian Doran bafc556b00 server: Fix build errors 2024-10-11 19:45:54 +03:00
Elian Doran 0ec3232c81 Merge pull request #451 from jaimeferj/bugfix/parseDatesOnSort
Fixes issue #441: Dates were not parsed on sorting
2024-10-10 23:31:47 +03:00
Elian Doran 469c1ceb07 Merge pull request #458 from TriliumNext/zip-import-image-fix
Resolve MIME type not being used when creating new note correctly, upon zip import
2024-10-10 23:26:48 +03:00
Elian Doran 5e80f120c9 server: Refactor variable usage 2024-10-10 20:21:06 +03:00
Elian Doran 8faa26b663 Merge pull request #391 from SiriusXT/revisions_number_limit
Revisions number limit
2024-10-10 20:13:24 +03:00
Elian Doran 201e2fcfdb Merge pull request #472 from dousha/bugfix-math-preview
Override the z-index of Bootstrap tooltips
2024-10-10 20:04:25 +03:00
Elian Doran 5678487a16 Merge pull request #473 from TriliumNext/feature/i18n-part5
Feature/i18n part5
2024-10-10 19:13:31 +03:00
Nriver 6646e8c311 update Chinese translation and synchronize with English 2024-10-10 15:42:10 +08:00
dousha 96fc4d3280 Override the z-index of Bootstrap tooltips, making it conform to CKEditor's z-index ordering.
This change overrides the z-index of Bootstrap tooltips (calculates to 1080 in the current version) to the value assigned to CKEditor Panel Balloons (calculates to 1000 in the current version) minus 1. It also removes the original override to the CKEditor Panel Balloons which forces the autocomplete box to appear above tooltips, which is no longer needed and would interfere with math preview boxes.

This change fixes the regression to the [original issue][1] and the [math preview issue][2]. One notable effect is that tooltips will not cover menus when overlapped with one, including menus opened from the top-right corner. Further discussion and more extensive testing are encouraged.

[1]: https://github.com/zadam/trilium/issues/1272
[2]: https://github.com/TriliumNext/Notes/issues/297
2024-10-10 13:19:08 +08:00
Elian Doran cb3ea3fb75 Merge pull request #449 from hasecilu/i18n/Spanish_pt_3_4
i18n: Continue Spanish translation, parts 3 and 4
2024-10-09 21:58:38 +03:00
Elian Doran 787a2d1957 Merge pull request #450 from hasecilu/docs/fix_links
docs: Use relative link to other README files
2024-10-09 21:56:38 +03:00
Elian Doran 89e1275dda i18n: Tweak a single message 2024-10-09 20:06:20 +03:00
Elian Doran ddc927d617 server: Bump sync version (closes #467) 2024-10-09 20:06:13 +03:00
perf3ct c37a51c6d0 use type assertions to make TS happy? 2024-10-03 22:48:47 -07:00
perf3ct 91095e8d4e detectFileTypeAndMime also returns the type, fixes #456 2024-10-03 22:24:43 -07:00
MeIchthys d4fa7e3fd2 Add link to docs repo under contributing section 2024-10-03 23:23:43 -04:00
perf3ct 9204f0735c use fewer const 2024-09-30 19:43:44 +00:00
perf3ct cfc32a14e0 Use the electron Clipboard module when using "Copy image to clipboard" 2024-09-28 17:41:59 -07:00
Jaime Fernández 270aa52591 Fixes issue #441: Dates were not parsed on sorting 2024-09-28 02:33:36 +02:00
hasecilu 99a5913391 docs: Use relative link to other README files
`master` branch was hardcoded despite working on `develop` branch
2024-09-27 14:38:45 -06:00
hasecilu c3d6165aff i18n: Continue Spanish translation, parts 3 and 4
Some fixes were done thanks by using PO file with Poedit. It enhances a
lot the workflow for translators

---

Step 1: Create PO files from English and localized JSON files as source
$ json2po -t en es po-es

Step 2: Make the translation

Step 3: Recover translation from PO files to JSON file. Remember to set
the indentation to 2 spaces
$ po2json -t en po-es es

Step 4: Update localized JSON file with missing tags from English JSON
$ jq -s '.[0] * .[1]' en/translation.json \
    es/translation.json > merged.json
$ mv merged.json es/translation.json

Step 5: Remove PO files
$ rm -r po-es
2024-09-25 17:54:46 -06:00
Elian Doran 9220616bb5 Merge pull request #448 from Nriver/feature/i18n-part4
Feature/i18n part4
2024-09-25 18:54:12 +03:00
Nriver eb9b4aee21 add translation for 6 widgets 2024-09-24 09:57:16 +08:00
Nriver d9a7671830 update Chinese translation and synchronize with English 2024-09-24 09:28:46 +08:00
SiriusXT 353c410f0e Merge branch 'develop' into revisions_number_limit 2024-09-17 19:58:16 +08:00
Elian Doran 7ca4cddc58 Merge pull request #431 from TriliumNext/perfectra1n-patch-2
Print Docker container log, regardless of success or failure of healthcheck
2024-09-15 23:29:06 +03:00
Elian Doran 12543f762b Merge pull request #432 from TriliumNext/hide_float_button
Floating buttons can be displayed again after being closed
2024-09-15 23:21:44 +03:00
SiriusXT ec7fabcb58 Floating buttons can be displayed again after being closed 2024-09-15 22:22:38 +08:00
Jin 5d08f2bc5a fix revision list ESC behaviour 2024-09-15 12:41:45 +02:00
SiriusXT a557b82c83 Fixed the bug that notes in different formats cannot be restoredRevisioned 2024-09-15 12:48:01 +08:00
SiriusXT 62a884cb5a fix potential bugs that may exist in getRevisions 2024-09-15 10:51:55 +08:00
perfectra1n 88875a3375 Print Docker container log, if success or failure healthcheck 2024-09-14 12:50:25 -07:00
SiriusXT cd547ebdaf Fix svg not previewing in revisions 2024-09-14 21:09:52 +08:00
Elian Doran e511d6aecf client: Fix strange margins when ribbon has hidden components 2024-09-14 14:47:48 +03:00
Elian Doran 9b6148dec3 client: Translate attribute editor placeholder 2024-09-14 14:44:32 +03:00
Elian Doran 29a1aad45a Merge pull request #430 from TriliumNext/fix
Fix global menu advanced command can't click
2024-09-14 14:40:03 +03:00
SiriusXT a9fce727d4 Fix svg not previewing in revisions 2024-09-14 19:37:25 +08:00
Elian Doran 9e85d2cdbd server: Fix missing translations in keyboard actions 2024-09-14 14:34:24 +03:00
Jin c4f430276a fix global menu advanced command can't click 2024-09-14 11:02:23 +02:00
SiriusXT fdf57b6cfa revisions_number_limit 2024-09-14 16:00:18 +08:00
SiriusXT 0a9e76abb7 Merge branch 'develop' into revisions_number_limit 2024-09-14 14:58:47 +08:00
SiriusXT 3e085e5cae Show revision information 2024-09-14 14:32:43 +08:00
Elian Doran 73cd54e75c client: Fix shortcuts section crashing when no translations 2024-09-13 22:58:39 +03:00
Elian Doran 28b8e59b4d electron: Translate title bar button 2024-09-13 22:56:30 +03:00
Elian Doran 51b6725b91 server,electron: Downgrade incompatible libraries for now 2024-09-13 22:54:06 +03:00
Elian Doran 93ca30fda0 build: Fix type not in dev dependencies 2024-09-13 22:46:15 +03:00
Elian Doran 8c222368de i18n: Translate some more messages in Romanian 2024-09-13 22:26:56 +03:00
Elian Doran a3aa6b0628 client: Translate note tree 2024-09-13 22:22:16 +03:00
Elian Doran d0061794dd client: Translate note icon 2024-09-13 22:17:22 +03:00
Elian Doran 17c8708b54 client: Translate quick search 2024-09-13 22:08:52 +03:00
Elian Doran da0ddbb80d i18n: Translate the rest of Romanian messages 2024-09-13 21:59:19 +03:00
Elian Doran 138b4b1a95 i18n: Remove unused key 2024-09-13 21:57:23 +03:00
Elian Doran 1299072ea9 server: Update dependencies 2024-09-13 21:51:46 +03:00
Elian Doran bb5893f989 electron: Update squirrel startup 2024-09-13 21:49:36 +03:00
Elian Doran 7b764fd7d8 client: Update mermaid, mind elixir 2024-09-13 21:48:38 +03:00
Elian Doran ac2fc49a48 build: Update tooling dependencies 2024-09-13 21:44:57 +03:00
Elian Doran c0abf6e2c5 Use fixed versions for all dependencies 2024-09-13 21:43:58 +03:00
Elian Doran 85ff0bac55 electron: Set up StartupWMClass to avoid missing icon 2024-09-13 21:21:29 +03:00
Elian Doran 3671b83a9c server: Disable debug logs for i18n 2024-09-13 21:16:20 +03:00
Elian Doran 6970bf4fc1 Merge pull request #428 from TriliumNext/icon_improvement
Fix strange underline for zoom button
2024-09-13 17:50:44 +03:00
SiriusXT e5cce1b1bc Fix strange underline for zoom button 2024-09-13 22:24:19 +08:00
Elian Doran faa8eca810 i18n: Translate a few Romanian messages 2024-09-13 14:57:05 +03:00
SiriusXT 84bf0cbae5 Merge branch 'develop' into revisions_number_limit 2024-09-13 19:46:07 +08:00
SiriusXT a77264208e Merge branch 'develop' into icon_improvement 2024-09-13 19:15:33 +08:00
SiriusXT ee06db8c8f Fix strange underline for zoom button 2024-09-13 19:10:44 +08:00
Elian Doran e330b43750 Merge pull request #426 from TriliumNext/feature/i18n-part3
Feature/i18n part3
2024-09-13 10:28:26 +03:00
Nriver f5b21498bf add translation for mermaid.js 2024-09-13 11:24:42 +08:00
Nriver 83388ecf1c add translation for 2 widgets 2024-09-13 11:10:59 +08:00
Nriver 87de631af4 sync Chinese translation with English 2024-09-13 10:53:50 +08:00
Nriver e4271d3945 update missing translation 2024-09-13 10:29:44 +08:00
Elian Doran 65b8a2f97c Merge pull request #425 from TriliumNext/dropped-backslash
Picking up the backslash that I dropped
2024-09-13 00:04:08 +03:00
perfectra1n 0656154c35 Picking up the backslash that I dropped
I wiped it off and cheered it up, so it should be ready to go now.
2024-09-12 13:45:13 -07:00
Elian Doran b3f682144b server: Update better-sqlite3 11.1.2 → 11.3.0 2024-09-12 23:08:22 +03:00
Elian Doran d3c3e157c7 server: Update express 4.19.2 -> 4.21.0 2024-09-12 22:49:21 +03:00
Elian Doran 2534402157 client,server: Update i18next 23.14.0 -> 23.15.1 2024-09-12 22:47:46 +03:00
Elian Doran ec80ba5caf build: Update jasmine from 5.1.0 to 5.3.0 2024-09-12 22:43:21 +03:00
Elian Doran 26621b6336 build: Fix test-jasmine on Windows 2024-09-12 22:42:22 +03:00
Elian Doran d961e3cdf1 build: tsx 4.19.0 -> 4.19.1 2024-09-12 22:39:38 +03:00
Elian Doran 7ef399912b Merge branch 'develop' of https://github.com/TriliumNext/Notes into develop 2024-09-12 22:23:51 +03:00
Elian Doran 9fc789676f electron: Fix window drag not working 2024-09-12 22:23:49 +03:00
Elian Doran f01dc3d102 Merge pull request #424 from TriliumNext/stop-sha-images
Stop tagging images with `sha*`
2024-09-12 22:23:36 +03:00
perfectra1n 501bf624cc Stop tagging images with sha* 2024-09-12 12:20:54 -07:00
Elian Doran f8605688ab Merge pull request #423 from TriliumNext/perfectra1n-patch-1
Add explicit permissions for GITHUB_TOKEN for package access
2024-09-12 20:54:15 +03:00
Elian Doran 590a9bef2d client: Fix calendar double open on existing note 2024-09-12 20:53:31 +03:00
perfectra1n 419756d19e Add explicit permissions for GITHUB_TOKEN for package access 2024-09-12 10:42:47 -07:00
Elian Doran 93ce81b355 Merge pull request #416 from SiriusXT/highlightslits
Toc and Highlightslist improvement
2024-09-12 20:24:30 +03:00
Elian Doran 8bfa4461b0 Merge pull request #381 from TriliumNext/bootstrap
Upgrade bootstrap from v4 to v5
2024-09-12 20:09:19 +03:00
Elian Doran 648feb82f8 client: Fix close button on dark theme 2024-09-12 20:06:40 +03:00
Elian Doran 74645e12fc Merge remote-tracking branch 'origin/develop' into bootstrap 2024-09-12 20:06:31 +03:00
Elian Doran 71de1a0b55 Merge pull request #421 from TriliumNext/perfectra1n-patch-1
Force `github.repository_owner` to lowercase
2024-09-12 19:59:23 +03:00
perfectra1n 694f3cb174 Force github.repository_owner to lowercase
Ahhhh, the joys of Docker....
2024-09-12 09:54:00 -07:00
Elian Doran a2bc5073d0 client: Fix note hint not working in calendar 2024-09-12 19:37:15 +03:00
Elian Doran 3134ef7c03 Merge pull request #402 from perfectra1n/develop
Use matrix strategy for CI/CD
2024-09-12 19:24:56 +03:00
Elian Doran 8e665e27e7 client: Fix calendar opening notes twice (closes #417) 2024-09-12 19:22:58 +03:00
Elian Doran e6fbf62cf9 Merge pull request #414 from SiriusXT/i18n_falls_back_en
i18n Fallback to English for null characters
2024-09-12 19:03:50 +03:00
Jin ce8b5e33da fix regressions 2024-09-12 13:55:07 +02:00
SiriusXT b63b603d64 complete toc/highlightslist improvements 2024-09-12 19:34:23 +08:00
SiriusXT 31aa6feb0c Make toc/hightlightslist reopen after it's closed 2024-09-12 19:22:41 +08:00
SiriusXT 98c9e25124 Merge branch 'develop' into highlightslits 2024-09-12 09:37:01 +08:00
SiriusXT bb97e1a661 Let toc and highlights_list display formulas 2024-09-12 09:36:08 +08:00
Elian Doran a4341a5cac Merge pull request #392 from SiriusXT/Icon_improvements
Icon improvements
2024-09-11 23:56:10 +03:00
Elian Doran fe844d4f8c client: Fix math not loading (closes #297) 2024-09-11 23:50:17 +03:00
SiriusXT 447cf60afb i18n Fallback to English for null characters 2024-09-11 15:17:21 +08:00
Elian Doran 7a11f9aaff Merge pull request #389 from SiriusXT/open_in_file_manager_of_data
Open in file manager of Trilium's data directory
2024-09-10 21:04:56 +03:00
Jin 527591f651 fix package-lock conflict 2024-09-10 00:48:52 +02:00
Jin fca6f99870 fix checkbox problem 2024-09-10 00:45:00 +02:00
Jin 8c97f0bec7 fix some styles, add some cn translations 2024-09-10 00:45:00 +02:00
Jin 58ee801e57 other fixes 2024-09-10 00:45:00 +02:00
Jin c1ce578018 fix all dialogs 2024-09-10 00:45:00 +02:00
Jin 464d8417f5 fix all dropdowns and tooltips, fix some translations 2024-09-10 00:45:00 +02:00
Jin 44bd008829 fix note revisions layout 2024-09-10 00:45:00 +02:00
Jin f3b7261748 fix all launcher bar components 2024-09-10 00:45:00 +02:00
Jin 5d579fee68 Upgrade bootstrap from v4 to v5, fix global menu 2024-09-10 00:44:54 +02:00
Elian Doran d7ab99013c client: Fix zoom interfering with mind map (closes #387) 2024-09-09 23:59:25 +03:00
Elian Doran a3a5339048 client: Fix relative path for loading languages 2024-09-09 20:42:47 +03:00
Elian Doran d95a23de28 Merge pull request #392 from SiriusXT/Icon_improvements
Icon improvements
2024-09-09 20:30:35 +03:00
SiriusXT 744d953822 icon improvement 2024-09-09 20:15:35 +08:00
SiriusXT f8e5717b80 Merge branch 'develop' into revisions_number_limit 2024-09-09 14:52:31 +08:00
SiriusXT 3ad2d1a309 Merge branch 'develop' into open_in_file_manager_of_data 2024-09-09 14:50:01 +08:00
SiriusXT 7186222393 Merge branch 'develop' into Icon_improvements 2024-09-09 14:30:22 +08:00
SiriusXT d66c07717c Merge branch 'develop' into Icon_improvements 2024-09-09 14:08:27 +08:00
Elian Doran 132dd7514a client: Update axios 1.7.2 to 1.7.7 2024-09-09 00:22:49 +03:00
Elian Doran aca9d0f1ef server: Update ini 4.1.3 -> 5.0.0 2024-09-09 00:20:11 +03:00
Elian Doran eabceae6f1 server: Update Marked 13.0.2 → 14.1.2 2024-09-09 00:18:15 +03:00
Elian Doran 3a5b05e5c6 client: Bump eslint to 9.10.0 2024-09-09 00:14:29 +03:00
Elian Doran 11e5f6a1c1 client: Update dayjs 1.11.12 -> 1.11.13 2024-09-09 00:10:52 +03:00
Elian Doran bec9acdc3f client: Update jsdom 24.1.0 -> 25.0.0 2024-09-09 00:07:53 +03:00
Elian Doran 37079b7388 client: Update Mermaid to 11.1.1 2024-09-09 00:03:02 +03:00
Elian Doran 22b7bf826b electron: Bump electron-dl 2024-09-08 23:59:55 +03:00
Elian Doran 7cc71a4fdb electron: Bump electron-debug 2024-09-08 23:51:01 +03:00
Elian Doran fb28b9d36d client: Improve max content widget fit on other languages 2024-09-08 22:20:38 +03:00
Elian Doran 720087f082 client: Translate open help page 2024-09-08 22:18:54 +03:00
Elian Doran 3bdb87d3aa client: Translate template switch 2024-09-08 22:14:51 +03:00
Elian Doran e4066ba164 client: Translate shared switch 2024-09-08 22:11:52 +03:00
Elian Doran a0fdaabb1f client: Translate protected switch 2024-09-08 22:04:22 +03:00
Elian Doran 38ac4318b9 client: Translate rest of note types 2024-09-08 21:54:30 +03:00
Elian Doran e382a32ebd client: Translate note types 2024-09-08 21:48:24 +03:00
Elian Doran 8074245758 client: Translate shared info 2024-09-08 21:19:13 +03:00
Elian Doran f26a04216a server: Translate share page 2024-09-08 20:36:25 +03:00
Elian Doran e565d29490 server: Translate share 404 2024-09-08 20:25:38 +03:00
Elian Doran 947c50353d server: Translate here link in setup 2024-09-08 20:16:57 +03:00
Elian Doran 83851a61d5 i18n: Translate setup screen into Romanian 2024-09-08 20:02:29 +03:00
Elian Doran 893a1e3723 i18n: Translate setup screen 2024-09-08 20:00:55 +03:00
Elian Doran 6bf18b6837 i18n: Configure i18n-ally for .ejs templates 2024-09-08 19:27:19 +03:00
Elian Doran 94857d8802 server: Translate JavaScript required 2024-09-08 18:55:11 +03:00
Elian Doran 58d1e77ac1 server: Translate set password page 2024-09-08 18:28:29 +03:00
Elian Doran 1fbc65b007 electron: Fix crash on first start due to i18n 2024-09-08 18:23:06 +03:00
Elian Doran c25c8c753d server: Translate login page 2024-09-08 18:12:16 +03:00
Elian Doran 317b7b4c59 server: Implement basic restore of language 2024-09-08 18:01:08 +03:00
Elian Doran 68042994e0 electron: Fix loading of i18n 2024-09-08 17:40:05 +03:00
Elian Doran d00c028a0c client: Fix note actions not fitting on all languages 2024-09-08 16:38:12 +03:00
Elian Doran a9e6c887f2 i18n: Configure extensions & nodemon 2024-09-08 16:04:14 +03:00
Elian Doran 69f9457bda i18n: Translate keyboard actions into Romanian 2024-09-08 16:04:00 +03:00
Elian Doran 0fed54f1c3 server: Translate keyboard actions 2024-09-08 15:33:06 +03:00
Elian Doran b45fde2e5f server: Set up early initialization of i18n 2024-09-08 15:31:47 +03:00
Elian Doran c1010a79f9 server: Initialize backend translations 2024-09-08 14:37:40 +03:00
Elian Doran c33154d128 i18n: Translate tree context menu 2024-09-08 12:32:22 +03:00
Elian Doran c0d613c46d i18n: Translate note map buttons 2024-09-08 11:59:24 +03:00
Elian Doran 4f7bbee769 i18n: Fix erase attachments button translation 2024-09-08 11:53:36 +03:00
Elian Doran 7a567583f2 i18n: Improve keybindings phrasing 2024-09-08 11:49:23 +03:00
Elian Doran 0ac1f071cd i18n: Tweak two Romanian translations 2024-09-08 11:48:01 +03:00
perf3ct 114e7809fe Fix CI/CD to use Matrix strategy
fix the digests missing

tweak dockerhub digests 1

Revert "tweak dockerhub digests 1"

This reverts commit 3542125d6035d2330fe1075682b046133568137d.

Revert "fix the digests missing"

This reverts commit 01954e5687549586233d73339b74e03e2182a339.

give this a shot then

add short sha

fix sha tag names
2024-09-07 22:34:57 -07:00
Elian Doran 4106cc61b5 release 0.90.6-beta
/ Check Docker build (push) Failing after 35s
/ Build Docker images (push) Has been skipped
Release / Make Electron (arm64, map[extension:deb image:ubuntu-latest name:linux]) (push) Failing after 33s
Release / Make Electron (x64, map[extension:deb image:ubuntu-latest name:linux]) (push) Failing after 35s
Release / Build Linux Server x86_64 (push) Failing after 30s
Release / Make Electron (arm64, map[extension:dmg image:macos-latest name:macos]) (push) Has been cancelled
Release / Make Electron (arm64, map[extension:exe image:windows-latest name:windows]) (push) Has been cancelled
Release / Make Electron (x64, map[extension:dmg image:macos-latest name:macos]) (push) Has been cancelled
Release / Make Electron (x64, map[extension:exe image:windows-latest name:windows]) (push) Has been cancelled
2024-09-07 21:36:34 +03:00
Elian Doran 7c0d6930fa build: Revert alpine build 2024-09-07 21:35:51 +03:00
Elian Doran 1c8cc36402 release 0.90.5-beta
/ Build Docker images (push) Has been skipped
/ Check Docker build (push) Failing after 37s
Release / Make Electron (arm64, map[extension:deb image:ubuntu-latest name:linux]) (push) Failing after 31s
Release / Make Electron (x64, map[extension:deb image:ubuntu-latest name:linux]) (push) Failing after 34s
Release / Build Linux Server x86_64 (push) Failing after 39s
Release / Make Electron (arm64, map[extension:dmg image:macos-latest name:macos]) (push) Has been cancelled
Release / Make Electron (arm64, map[extension:exe image:windows-latest name:windows]) (push) Has been cancelled
Release / Make Electron (x64, map[extension:dmg image:macos-latest name:macos]) (push) Has been cancelled
Release / Make Electron (x64, map[extension:exe image:windows-latest name:windows]) (push) Has been cancelled
2024-09-07 10:02:55 +03:00
Elian Doran 4f6392ce14 ci: Rename server release artifact 2024-09-07 10:02:28 +03:00
Elian Doran c6abbf0cf7 ci: Remove test name for release 2024-09-07 09:49:54 +03:00
Elian Doran 89beda16fd Clean up workflow 2024-09-07 09:42:16 +03:00
Elian Doran 6dee56d72e Prepare for release 2024-09-07 09:34:59 +03:00
Elian Doran e4d6ab3a6e ci: Refactor release workflow & add version in name 2024-09-07 00:54:21 +03:00
Elian Doran c964f9eeff ci: Upload server build as well 2024-09-07 00:20:38 +03:00
Elian Doran 7248d5bab8 ci: Release ZIP artifacts as well 2024-09-06 23:59:09 +03:00
Elian Doran 42c714891a ci: Set up a test release process 2024-09-06 23:50:11 +03:00
SiriusXT 89e073bf28 bx-map-alt->bxl-graphql 2024-09-05 15:24:37 +08:00
SiriusXT 490ae1c9fd icon improvements 2024-09-05 15:09:31 +08:00
SiriusXT 2a27383682 revision snapshots number limit 2024-09-04 14:27:33 +00:00
SiriusXT 00f8a43b0f test 2024-09-04 12:10:13 +00:00
SiriusXT 759ac4a4c8 test 2024-09-04 11:52:05 +00:00
SiriusXT e66b865cd6 open directory 2024-09-04 11:08:04 +00:00
SiriusXT 78bfc3341b Add versioningLimit label support 2024-09-04 09:04:40 +00:00
SiriusXT 898afb7ed7 Add revision number limit 2024-09-04 08:41:17 +00:00
Elian Doran 2b01392b41 Merge pull request #390 from hasecilu/i18n/Spanish_again
i18n: Complete Spanish translation again
2024-09-04 07:47:51 +03:00
hasecilu 8eb12b2280 i18n: Complete Spanish translation again 2024-09-03 17:27:33 -06:00
Elian Doran 67528789ed client: Fix open note custom when no terminal 2024-09-03 22:13:17 +03:00
Elian Doran 2e86ae6556 db: Remove image URL from mindmap 2024-09-03 22:10:18 +03:00
Elian Doran 1e6e9fa417 db: Fix preview for mindmap 2024-09-03 21:43:24 +03:00
Elian Doran a27feee1be client: Clean up restart warnings in spellcheck 2024-09-03 21:24:03 +03:00
Elian Doran 6a3e4671b6 client: Disable ligatures in help dropdown code 2024-09-03 21:14:47 +03:00
Elian Doran 6a8825d972 i18n: Add a few minor tweaks to Romanian translation 2024-09-03 21:14:40 +03:00
Elian Doran 3a87f8bc31 client: Fix F1 shortcut in mind map (fixes #387) 2024-09-03 20:57:39 +03:00
Elian Doran 15a041a195 server: Remove redundant whitespace in CPU log 2024-09-03 19:09:50 +03:00
Elian Doran 891621be69 Merge pull request #388 from SiriusXT/electron_start_dialog
The new instance makes the dialog box error not display
2024-09-03 19:07:15 +03:00
SiriusXT bc4444d132 open in file manager of Trilium's data directory 2024-09-03 10:37:28 +00:00
SiriusXT 56259616cb open in file manager of Trilium's data directory 2024-09-03 10:06:01 +00:00
SiriusXT 4113574a43 makes the dialog box error not display 2024-09-03 08:49:19 +00:00
SiriusXT cef8086419 The new instance makes the dialog box error not display 2024-09-03 08:23:05 +00:00
Elian Doran 9d59203121 build: Update Electron Forge to latest 2024-09-03 01:14:36 +03:00
Elian Doran f426e3d764 build: Update TypeScript 2024-09-03 01:11:02 +03:00
Elian Doran f378411bb8 client,server: Update i18next 2024-09-03 01:08:30 +03:00
Elian Doran b882bcb1df i18n: Reach 100% for Romanian 2024-09-03 00:41:31 +03:00
Elian Doran 8abb8f9e0e client,server: Downgrade edit branch prefix to note-tree scope (fixes #385) 2024-09-02 23:37:34 +03:00
Elian Doran 191c9e9c82 i18n: Fix a typo in translation 2024-09-02 23:31:56 +03:00
Elian Doran 94c5fba66f server: Fix import of mind map notes 2024-09-02 23:31:49 +03:00
Elian Doran 86c74c7fdb db: Update demo to add mindmap 2024-09-02 23:00:31 +03:00
Elian Doran 9cf45468ae client: Prevent dismissing the calendar popup by clicking on an empty space inside it 2024-09-02 22:24:53 +03:00
Elian Doran c2ce7d617a client: Fix calendar dropdown not closing (fixes #384)
The regression was introduced in 612e4406b5.
This might cause some other issues in closing the highlights, but none
were identified during a cursory testing.
2024-09-02 22:15:46 +03:00
Elian Doran 50c0252055 client: Fix mindmap preview in revision 2024-09-02 22:03:02 +03:00
Elian Doran f82ff5aa76 i18n: Add some more Romanian translations (87.3%) 2024-09-02 22:02:50 +03:00
Elian Doran 0b5945f219 i18n: Add more Romanian translations 2024-09-02 21:23:29 +03:00
Elian Doran 0bdb6d7e96 i18n: Remove redundant translations 2024-09-02 20:40:57 +03:00
Elian Doran e78ab589b0 i18n: Add a few more translations 2024-09-02 20:31:23 +03:00
Elian Doran 339bd84cf9 i18n: Translate note_info_widget in Romanian 2024-09-02 20:23:06 +03:00
Elian Doran 529760213b Merge branch 'develop' of ssh://github.com/TriliumNext/Notes into develop 2024-09-02 20:19:45 +03:00
Elian Doran 1c17bf82a0 Merge pull request #380 from hasecilu/i18n/README_Spanish
Translate README to Spanish
2024-09-02 20:18:03 +03:00
hasecilu 200e1c016c i18n: Translate README to Spanish
Also complete some missing strings
2024-09-02 07:46:57 -06:00
Elian Doran f29e047ba2 i18n: Translate note actions and erasure into Romanian 2024-09-02 14:53:40 +03:00
Elian Doran 466d4966fd i18n: Tweak a few more messages 2024-09-02 13:56:57 +03:00
Elian Doran 8a83267ead i18n: Translate more Romanian words 2024-09-02 13:55:26 +03:00
Elian Doran 5e8be78760 i18n: Change reference to pasting in Romanian 2024-09-01 23:56:47 +03:00
Elian Doran 2a6870d73b client: Fix console error when exporting SVG after multiple note types 2024-09-01 23:24:36 +03:00
Elian Doran ace237989c client: Reduce code duplication 2024-09-01 23:20:41 +03:00
Elian Doran 61e0678af4 client: Implement SVG export button for mindmap 2024-09-01 23:10:58 +03:00
Elian Doran 27a287f8ea client: Change translation for Export SVG button 2024-09-01 23:05:25 +03:00
Elian Doran 87b8c623c5 client: Rename MermaidExportButton to SvgExportButton 2024-09-01 23:05:06 +03:00
Elian Doran 64b4aba6ba client: Enable copy image reference button for mindmaps 2024-09-01 22:56:45 +03:00
Elian Doran 5c2446be67 share: Render mind map 2024-09-01 22:41:48 +03:00
Elian Doran 1437df7de1 client,server: Set up SVG rendering for mindmap 2024-09-01 22:36:50 +03:00
Elian Doran ad88042e5b i18n: Add even more Romanian translations 2024-09-01 21:02:19 +03:00
Elian Doran f3669dfc42 i18n: Add a few more Romanian translations 2024-09-01 20:52:09 +03:00
Elian Doran efdc3ebfac i18n: Improve highlight wording 2024-09-01 20:47:05 +03:00
Elian Doran 2751d655e6 i18n: Review a few translations 2024-09-01 20:32:01 +03:00
Elian Doran 73ba913f59 client: Fix mindmap in multiple tabs not working 2024-09-01 18:51:51 +03:00
Elian Doran 49a373426e Merge pull request #379 from hasecilu/i18n/Spanish
Update Spanish translation
2024-09-01 18:28:09 +03:00
hasecilu 392fb2abad i18n: Translate new strings 2024-09-01 09:01:42 -06:00
hasecilu d543e8147f i18n: Fix "consistency" Spanish translations 2024-09-01 09:01:42 -06:00
Elian Doran 27dbcdd281 ci: Fix problematic ignore for workflow 2024-09-01 17:28:32 +03:00
Elian Doran 0dbad48d47 electron: Fix missing mind-elixir 2024-09-01 17:24:44 +03:00
Elian Doran 07170a5a39 client: Improve code selection in note type 2024-09-01 16:56:25 +03:00
Elian Doran 13860a3f16 client: Remove redundant separators in note type selection 2024-09-01 16:51:33 +03:00
Elian Doran 95b7a30d06 client: Add mind map to note type combo 2024-09-01 16:47:27 +03:00
Elian Doran b32f3ffd84 client: Fix center issue at startup 2024-09-01 16:44:55 +03:00
Elian Doran 6c54f3c804 client: Improve mind map saving & centering 2024-09-01 16:31:05 +03:00
Elian Doran 1b08487ee9 client: Fix first show in mindmap 2024-09-01 16:14:19 +03:00
Elian Doran ff3d01f2c7 client: Implement basic refresh for mind map 2024-09-01 15:51:01 +03:00
Elian Doran 10df00d62f client: Save content of mind map 2024-09-01 15:41:59 +03:00
Elian Doran 73c19c6cbf client: Enable viewing source of mind map 2024-09-01 15:38:13 +03:00
Elian Doran c2959fe52d client: Fix switching notes, default text 2024-09-01 15:25:28 +03:00
Elian Doran 594f816702 client: Add basic mindmap integration 2024-09-01 15:04:47 +03:00
Elian Doran e39dd1525d client: Create blank type widget for mind map 2024-09-01 14:16:45 +03:00
Elian Doran 945bc7ded3 i18n: Add a few more Romanian translations (39.4%) 2024-09-01 10:24:24 +03:00
Elian Doran 5df6f32fda i18n: Add Romanian to the list of languages 2024-09-01 02:06:51 +03:00
Elian Doran d31bc8a0bd i18n: Translate Romanian (18.8%) 2024-09-01 02:05:33 +03:00
Elian Doran 73e25fc721 i18n: Small tweaks to translation 2024-09-01 02:04:52 +03:00
Elian Doran 5df371b20a i18n: Fix one more translation issue 2024-09-01 00:34:14 +03:00
Elian Doran e6e478e857 i18n: Fix incorrect & missing keys 2024-09-01 00:32:48 +03:00
Elian Doran bfea3d53b3 client: Use translations for first day of week 2024-09-01 00:22:29 +03:00
Elian Doran 9fa31db207 client: Fix another case of tooltip overlap 2024-09-01 00:16:09 +03:00
Elian Doran 84efc13b52 client: Make sure tooltips cannot overlap (fixes #375) 2024-09-01 00:04:29 +03:00
Elian Doran 607af4b8fc client: Dismiss tooltip if clicking a link inside it 2024-08-31 23:58:26 +03:00
Elian Doran 08060abe76 electron: Ignore TRILIUM_HOST env (fixes #368) 2024-08-31 23:41:08 +03:00
Elian Doran 27f513e2a3 server: Improve error handling for invalid host 2024-08-31 23:38:30 +03:00
Elian Doran 40651e9852 server,electron: Improve error logging 2024-08-31 23:28:45 +03:00
Elian Doran c6d043b42c electron: Fix crash on Linux 2024-08-31 23:08:19 +03:00
Elian Doran 3a3dae3d02 client: Refresh calendar immediately 2024-08-31 17:08:55 +03:00
Elian Doran 5c326c553c client: Add support for first day of week (closes #247) 2024-08-31 17:05:02 +03:00
Elian Doran 981ff34ac4 client: Update calendar header for first day of week 2024-08-31 16:50:23 +03:00
Elian Doran f5330cb915 client,server: Add first day of week option 2024-08-31 16:24:09 +03:00
Elian Doran dab97071c0 client: Improve calendar design slightly (closes #374) 2024-08-31 15:27:59 +03:00
Elian Doran 84056415ca client: Implement simple year switcher for calendar 2024-08-31 14:49:01 +03:00
Elian Doran 9cc2e7745e client: Implement simple month switcher 2024-08-31 14:42:21 +03:00
Elian Doran cb57ceb541 client: Add basic year navigation to calendar 2024-08-31 14:32:25 +03:00
Elian Doran 0fd92a379b build: Build alpine only for amd64 2024-08-30 23:04:10 +03:00
Elian Doran 1a17b8907a build: Fix docker alpine not building 2024-08-30 22:35:02 +03:00
Elian Doran b7ed153b14 Merge pull request #373 from SiriusXT/New_window_from_taskbar
Open New window from taskbar
2024-08-30 22:24:38 +03:00
Elian Doran b1163624ba Merge pull request #377 from SiriusXT/find_widget
Fix a bug of find widget
2024-08-30 22:22:44 +03:00
Elian Doran 59a92c33b6 Merge pull request #366 from TriliumNext/update-cicd-again
Alpine = AMD64, Debian = ARM
2024-08-30 22:15:54 +03:00
MeIchthys 55403c6e76 Add note to upgrade to latest trilium version before migrating 2024-08-30 13:15:45 -04:00
SiriusXT 35171fe2b4 Fix a bug of find widget 2024-08-30 11:42:55 +00:00
Elian Doran 95158c30b7 Merge pull request #372 from TriliumNext/add-png-images
Add PNG icons from SVG icons.
2024-08-29 09:45:41 +03:00
perf3ct da20a377c1 have alpine more closely match deb dockerfile 2024-08-28 18:24:00 +00:00
perf3ct fcbb178096 change Dockerfile.alpine name 2024-08-28 17:07:25 +00:00
SiriusXT 553a2f9929 New window from taskbar 2024-08-28 06:30:25 +00:00
SiriusXT e5213640d7 Open new window from taskbar 2024-08-28 06:28:02 +00:00
perf3ct c95da1c813 move to better folder 2024-08-27 19:04:03 +00:00
perf3ct 2ee290034a remove entries in gitignore for larger pngs 2024-08-27 19:03:54 +00:00
perf3ct 69a81afd09 add png images from svg 2024-08-27 17:10:53 +00:00
Elian Doran a18ac7c504 client: Fix default focus of "Include note" dialog (closes #365) 2024-08-27 00:30:54 +03:00
Elian Doran 07bd3de4fb Merge pull request #359 from hasecilu/i18n/Spanish_pt2
i18n: Continue Spanish translation, part 2
2024-08-26 21:26:08 +03:00
Elian Doran ef955a300a Merge pull request #342 from TriliumNext/feature/i18n-part2
i18n support (part 2)
2024-08-26 21:24:56 +03:00
MeIchthys 19cb783e66 Update README.md
Fix minor spelling error
2024-08-26 08:47:53 -04:00
MeIchthys d2dd61f297 Update README.md
Add note about migrating from zadam/Trilium
2024-08-26 08:46:36 -04:00
perf3ct a769aef059 have alpine be only for amd64 2024-08-24 00:22:30 +00:00
perf3ct 6eb6bfa25d have debian be only for arm 2024-08-24 00:22:25 +00:00
perf3ct 6b916c1494 add other CI/CD step 2024-08-24 00:10:46 +00:00
perf3ct 08a4b2d19a add new alpine files 2024-08-19 22:24:13 +00:00
Nriver 2890885157 Merge remote-tracking branch 'upstream-next/develop' into feature/i18n-part2 2024-08-19 17:09:03 +08:00
hasecilu 2d65797dfc i18n: Continue Spanish translation, part 2
Indentation changed to 4 spaces
2024-08-18 12:02:39 -06:00
Elian Doran bb2fa70cd6 client: Fix title outline (closes #358) 2024-08-17 10:59:12 +03:00
Elian Doran 937e87d760 client: Improve hint & toast regarding attachments 2024-08-17 10:51:43 +03:00
Elian Doran 808797a48b client: Fix double question mark in attachments context menu (see #306) 2024-08-17 10:42:59 +03:00
Elian Doran c61f76f020 server: Show absolute path to data dir 2024-08-17 02:08:25 +03:00
Elian Doran 16073ea4aa client: Disable some context options in settings (closes #346) 2024-08-17 02:01:12 +03:00
Elian Doran 3163b8687b client: Disable more items in options 2024-08-17 01:57:52 +03:00
Elian Doran 1c1d71e2d0 client: Disable show attachments in options 2024-08-17 01:52:52 +03:00
Elian Doran e70531fcc1 client: Remove broken Firefox scrollbar styling 2024-08-17 01:19:07 +03:00
Elian Doran 12756a165f client: Improve Firefox scrollbar background 2024-08-17 01:13:43 +03:00
Elian Doran fa4b890bce client: Disable template button in options 2024-08-17 00:56:49 +03:00
Elian Doran c1ab1296f8 client: Disable share button in options 2024-08-17 00:56:49 +03:00
Elian Doran 1284cf9868 client: Fix invisible scrollbar on Firefox 2024-08-17 00:56:49 +03:00
Elian Doran b0480e1667 client: Add a toggle to set template label (closes #348) 2024-08-16 23:41:59 +03:00
Elian Doran ca6b4c3497 client: Hide spellcheck settings on web (closes #345) 2024-08-16 22:14:19 +03:00
Elian Doran 1172908e41 client: Hide tray settings on web 2024-08-16 22:05:53 +03:00
Elian Doran 4a8c3d719f client: Hide native title bar setting on web 2024-08-16 22:02:38 +03:00
Elian Doran bd732386e4 Merge pull request #334 from TriliumNext/lib
Remove hard-coded libraries part 2
2024-08-16 19:20:43 +03:00
Nriver 8e87bcf37b add translation for bookmark_switch.js and editability_select.js 2024-08-16 11:39:26 +08:00
Nriver 0198f135ac Fix duplicated key and missing '{' in translation.json 2024-08-16 11:27:22 +08:00
Nriver ff3effdb31 Merge remote-tracking branch 'upstream-next/develop' into feature/i18n-part2 2024-08-16 11:23:35 +08:00
Jin 22d344e764 keep zadam codemirror.js 2024-08-15 20:48:14 +02:00
Jin c85a8ecc7d remove libraries and fix js code color problem 2024-08-15 20:48:14 +02:00
Jin 2fec1b79af remove codemirror and autocomplete libraries 2024-08-15 20:48:14 +02:00
Jin 69586e6876 fix js note can't run 2024-08-15 18:50:17 +02:00
Elian Doran d2bd369144 Merge pull request #351 from TriliumNext/chore/update-language-name
update language name
2024-08-15 12:48:31 +03:00
Nriver 47e8977371 update language name 2024-08-15 16:23:37 +08:00
Elian Doran 71f8d09043 i18n: Add Spanish to the list 2024-08-15 10:44:05 +03:00
Elian Doran 216afdd494 Merge pull request #349 from hasecilu/i18n/Spanish
i18n: Add Spanish translation
2024-08-15 10:23:55 +03:00
Elian Doran 2de2c7fc9d client: Fix custom scroll bar on Chrome/Electron (closes #350) 2024-08-15 09:59:37 +03:00
Nriver e7eec0f328 add translation for widget: attachment_detail.js 2024-08-15 11:42:30 +08:00
Nriver 4c3694bfa3 add translation for widget: api_log.js 2024-08-15 11:33:44 +08:00
Nriver 34d2f20e16 fix translation key 2024-08-15 11:31:11 +08:00
Nriver a78859fc2a add translation for the last 2 option files 2024-08-15 11:26:51 +08:00
Nriver cc98ae0ea4 Merge remote-tracking branch 'upstream-next/develop' into feature/i18n-part2 2024-08-15 11:04:14 +08:00
hasecilu 6b8cb54e71 i18n: Add Spanish translation 2024-08-14 19:48:13 -06:00
Elian Doran 5609612473 client: Add a synthetic fix for CKeditor list spacing (closes #341) 2024-08-15 01:11:48 +03:00
Elian Doran 317505484e integration-test: Set up system for resetting in-memory DB 2024-08-15 00:06:37 +03:00
Elian Doran d1f4d99c19 integration-test: Set up development server 2024-08-14 23:03:36 +03:00
Elian Doran 2e56db6475 integration-test: Add notes for deletion 2024-08-14 23:03:17 +03:00
Elian Doran 1656cfae63 client: Remove i18n debug logs 2024-08-14 22:19:01 +03:00
Elian Doran 295cd6ac83 client: Fix double translation causing logs 2024-08-14 22:17:20 +03:00
Elian Doran bd20cec286 client: Remove errors in log when changing a setting 2024-08-14 22:10:54 +03:00
Elian Doran 115c2576cf client: Fix duplicate items in language selection 2024-08-14 21:51:42 +03:00
Elian Doran c204b31cda client: Fix fancytree being broken on mobile 2024-08-14 19:15:07 +03:00
Elian Doran 07fb8c072d server: Fix CSRF on mobile reload (closes #318) 2024-08-14 18:59:02 +03:00
Nriver 9210f915ca fix text wrap for shortcuts.js 2024-08-14 17:14:07 +08:00
Nriver 78e908c761 add translation for shortcuts.js 2024-08-14 17:12:33 +08:00
Nriver 68733cf0c2 add translation for 3 option files 2024-08-14 11:31:00 +08:00
Nriver b231905981 add translation for backup.js 2024-08-14 11:07:00 +08:00
Elian Doran a9b094bf27 Merge pull request #330 from TriliumNext/feature/i18n_language_switcher
Implement a language switcher
2024-08-12 19:48:16 +03:00
Elian Doran 3c37f13f54 Merge remote-tracking branch 'origin/develop' into feature/i18n_language_switcher 2024-08-12 16:03:17 +03:00
Elian Doran 196c4f7976 Merge pull request #328 from JYC333/lib
Remove hard-coded libraries part 1
2024-08-12 10:23:13 +03:00
Elian Doran f378cf9ff9 Merge pull request #264 from TriliumNext/feature/i18n
i18n support again (part 1)
2024-08-12 10:21:44 +03:00
Elian Doran ef20645447 docker: Fix reading USER_UID/GID (closes #331) 2024-08-12 10:01:22 +03:00
Elian Doran c4a4acdc39 Merge pull request #333 from TriliumNext/chore/update-gitignore
Ignore JetBrains IDE shelf files
2024-08-12 09:13:13 +03:00
Nriver 54a63e7689 Ignore JetBrains IDE shelf files 2024-08-12 11:39:50 +08:00
Nriver dcdbb092c3 update links in Chinese translation 2024-08-12 09:54:37 +08:00
Elian Doran e87ef882d5 client: Fix restoring language on mobile 2024-08-11 15:38:47 +03:00
Elian Doran 221fc66ca1 client: Fix flakiness when changing language on desktop 2024-08-11 14:22:37 +03:00
Elian Doran ec3066caee integration-test: Fix test for i18n 2024-08-11 14:13:05 +03:00
Elian Doran 45e2b565ef integration-test: Start writing test for language change 2024-08-11 13:56:11 +03:00
Elian Doran ffdc90012e integration-test: Add support for running dev server 2024-08-11 13:56:02 +03:00
Elian Doran 307c6ebb73 client: Remove flags from language selection to avoid potential political issues 2024-08-11 13:07:17 +03:00
Jin 9fc0b7cc38 fix eslint error 2024-08-11 10:13:20 +02:00
Jin b5e8fcaf57 fix eslint module 2024-08-11 10:13:01 +02:00
Jin 0967ee1b46 remove fancytree and bootstrap 2024-08-11 10:13:01 +02:00
Jin c16c528270 fix electron import 2024-08-11 10:13:01 +02:00
Jin d3803fc6f3 remove hard-coded libraries part 1 2024-08-11 10:12:55 +02:00
Elian Doran 18515111ff client: Address self-review changes 2024-08-11 08:29:02 +03:00
Elian Doran ea34a1688c i18n: Revert indentation change 2024-08-11 08:27:21 +03:00
Elian Doran aa5a7294df client: Add country flags to language selection 2024-08-11 08:24:15 +03:00
Elian Doran e086ba5eb4 i18n: Translate locale section 2024-08-11 08:18:06 +03:00
Elian Doran 22dc4ef997 client: Apply locale selection 2024-08-11 08:12:01 +03:00
Elian Doran bc648e981e client: Add language switcher in settings 2024-08-11 07:46:27 +03:00
Elian Doran 51afb63e25 server: Add endpoint to get list of locales 2024-08-11 07:36:09 +03:00
Elian Doran 6871216649 server: Set up a locale option 2024-08-11 07:36:00 +03:00
Elian Doran 94340ab1a1 build: Fix app name in Electron Forge hook 2024-08-11 06:57:34 +03:00
Elian Doran 3a837cf663 Merge remote-tracking branch 'origin/develop' into feature/i18n 2024-08-11 06:26:32 +03:00
Elian Doran edebe8f7c6 build: Remove unnecessary electron-installer-debian 2024-08-11 06:11:10 +03:00
Elian Doran 3028b20a7f build: Change name of application for Electron Forge 2024-08-11 06:09:28 +03:00
Elian Doran 2752f30f21 ci: Fix name conflict in artifacts 2024-08-11 05:27:24 +03:00
Jin a50e5cc733 fix typo 2024-08-10 22:52:41 +02:00
JYC333 b790dabc8c Create nighyly release action 2024-08-10 22:38:32 +02:00
Elian Doran 395cf59e59 Merge pull request #325 from JYC333/action
FIx Github actions
2024-08-10 23:00:15 +03:00
Jin 6113990b50 fix name conflict 2024-08-10 21:12:58 +02:00
Jin 71495f3878 seperate artifacts and add arch to matrix 2024-08-10 21:02:15 +02:00
Jin b83c6023c4 port dump-db and other tools to TS 2024-08-10 18:23:49 +02:00
Jin 2cc34efbde update backend_script_api.ts @link 2024-08-10 14:07:51 +02:00
Elian Doran 4090386cc3 ci: Try to fix "Cannot find module 'appdmg'" 2024-08-10 14:14:32 +03:00
Elian Doran ee9ce5fadc ci: Disable npm cache to see if that's the cause for macos failing to build 2024-08-10 13:50:43 +03:00
Elian Doran f7639d2537 Merge pull request #322 from JYC333/develop
Fix CI builds
2024-08-10 13:44:49 +03:00
Jin 16851d10b4 fix main.yml conflict 2024-08-10 12:42:59 +02:00
Jin 468e996ba1 remove wrong fix 2024-08-10 12:02:45 +02:00
Jin 86603573f0 fix ci build 2024-08-10 12:00:57 +02:00
Jin 690bd4ce5f fix ci errors 2024-08-10 11:39:05 +02:00
Elian Doran daeea2258d build: Turn off fail fast for matrix 2024-08-10 12:30:56 +03:00
Elian Doran 8cc583e714 build: Fix extra resources for macos 2024-08-10 12:23:26 +03:00
Elian Doran a29392e75a ci: Experiment with build matrix 2024-08-10 12:14:35 +03:00
Elian Doran 061b0c981d Merge pull request #294 from JYC333/sql
Remove hard-coded better-sqlite3 binaries
2024-08-10 10:56:38 +03:00
Elian Doran 72b669b5db release 0.90.4
/ Check Docker build (push) Failing after 40s
/ Build Docker images (push) Has been skipped
Main / Build macOS x86_64 (push) Failing after 24s
Main / Build macOS aarch64 (push) Failing after 32s
Main / Build Linux x86_64 (push) Failing after 34s
Main / Build Linux Server x86_64 (push) Failing after 40s
Main / Build Windows x86_64 (push) Failing after 2m16s
Main / Build Windows x86_64 (Setup) (push) Has been cancelled
2024-08-10 01:05:59 +03:00
Elian Doran 2a5c444eff client: Fix link to Wiki in F1 popup 2024-08-10 00:39:45 +03:00
Elian Doran 0deb5df11d docs: Use nicer links to Wiki (dynamic) 2024-08-10 00:26:39 +03:00
Elian Doran 280f9a98c4 docs: Use nicer links to Wiki 2024-08-09 23:44:41 +03:00
JYC333 b05e51f2f1 Merge branch 'TriliumNext:develop' into sql 2024-08-09 22:40:54 +02:00
Jin 9efa748e66 fix CI 2024-08-09 22:36:43 +02:00
Jin 8932028a75 minor fix 2024-08-09 22:30:21 +02:00
Jin 62e483a21a using esrun for webpack and fix package arch problem 2024-08-09 22:23:54 +02:00
Elian Doran e2bdfbbedb server: Remove now comment 2024-08-09 22:35:26 +03:00
Elian Doran f297105c25 server: Fix duplicating notes with relationships (closes #308) 2024-08-09 22:31:30 +03:00
Elian Doran ddc82853fc integration-test: Set up password that was missing for some reason 2024-08-09 22:13:01 +03:00
Elian Doran 64f99ba637 integration-test: Allow for in-memory database 2024-08-09 21:51:10 +03:00
Elian Doran 1542eb14b3 integration-test: Set up DB for #308 2024-08-09 21:43:20 +03:00
Elian Doran 5aa0040a83 integration-test: Disable WAL for cleaner commits 2024-08-09 21:32:12 +03:00
Elian Doran c2e7ccddb4 integration-test: Start implementing dedicated DB 2024-08-09 21:28:35 +03:00
Nriver c9d0d339eb add translation for all text note options 2024-08-09 14:48:54 +08:00
Nriver d6aa4d26dd add translation for all other options 2024-08-09 14:37:03 +08:00
Elian Doran d0042b5891 Merge pull request #317 from TriliumNext/remove-ci-cd-matrices
Remove the strategy matrix for concurrent builds.
2024-08-09 09:22:02 +03:00
Nriver f6f5cc2ecb add translation for all image options 2024-08-09 13:54:28 +08:00
Nriver 38f19e21f0 add translation for all code note options 2024-08-09 13:46:26 +08:00
Nriver b78ac44e73 Merge remote-tracking branch 'upstream-next/develop' into feature/i18n 2024-08-09 13:36:48 +08:00
perf3ct 19ad1a1b82 linux/arm64/v8 is normalized as linux/arm64 2024-08-08 17:27:36 -07:00
perf3ct 00b40df6e1 remove the strategy matrix to fix ci/cd builds 2024-08-08 17:24:50 -07:00
Elian Doran 9d5966819b Merge pull request #316 from TriliumNext/update-start-docker
Update start-docker.sh to be more distro-agnostic
2024-08-09 01:22:51 +03:00
perf3ct 13ad877b2f also change the tags of build-docker.sh to triliumnext 2024-08-08 15:17:38 -07:00
perf3ct 138b85dd3c change from gosu to just su 2024-08-08 15:17:02 -07:00
Elian Doran 50a6a1f3dc Merge pull request #314 from TriliumNext/fix-arm-builds
Fix ARM container builds
2024-08-09 01:06:32 +03:00
Elian Doran 42058034a5 client: Fix redirecting to wrong URL for downloading new version (closes #313) 2024-08-09 00:54:26 +03:00
perf3ct 3014b11422 swap su-exec to gosu 2024-08-08 14:52:09 -07:00
Elian Doran a98f01d924 integration-test: Create authentication setup 2024-08-09 00:41:55 +03:00
perfectra1n d09195097d Merge branch 'develop' into fix-arm-builds 2024-08-08 14:40:41 -07:00
perf3ct 676bff43d9 fix arm builds 2024-08-08 14:38:39 -07:00
Elian Doran 6a459427fb Merge pull request #309 from slashtechno/update-docker-compose
Update `docker-compose.yml`
2024-08-09 00:01:22 +03:00
Elian Doran 513b0c6597 ci: Remove problematic platforms for now 2024-08-08 23:26:58 +03:00
Elian Doran 36f51baf2b client: Fix CKEditor modal background after update (fixes #304) 2024-08-08 19:59:30 +03:00
Elian Doran 3cc3c751b4 electron: Fix missing icons (closes #311) 2024-08-08 19:23:37 +03:00
slashtechno 5fbda79dbe Remove erroneous backtick 2024-08-08 10:21:13 -04:00
slashtechno b7ce4d04ba revert spacing to what it was before 2024-08-08 09:06:40 -04:00
Nriver ec4b35ea75 add translation for all appearance options 2024-08-08 11:43:09 +08:00
Nriver e8dc75df51 improve font size UI under smaller screen 2024-08-08 11:04:37 +08:00
Nriver febd1d5ab3 add translation for font option 2024-08-08 11:02:04 +08:00
Nriver fcf4b57838 add translation for backend_log.js and
5 advanced options
2024-08-08 10:40:15 +08:00
Nriver 9885abc626 add translation for 2 type widgets 2024-08-08 09:44:13 +08:00
Nriver 01f99d7f12 Merge remote-tracking branch 'upstream-next/develop' into feature/i18n 2024-08-08 09:04:14 +08:00
Elian Doran 17e306a3c9 Merge pull request #310 from capi/add-dockerhub-link-to-readme
docs: Add Dockerhub link to readme
2024-08-08 00:19:12 +03:00
Martin Carpella 32eaded3af docs: Add Dockerhub link to readme 2024-08-07 23:15:19 +02:00
Elian Doran 865c0fb981 docker: Reintroduce cross-platform builds 2024-08-08 00:06:19 +03:00
Elian Doran 645fd43339 Revert "docker: Reintroduce cross-platform builds"
This reverts commit 85db664756.
2024-08-08 00:03:51 +03:00
Elian Doran 85db664756 docker: Reintroduce cross-platform builds 2024-08-07 23:46:12 +03:00
Elian Doran f4e7dcd5e8 docker: Fix healthcheck & convert to TypeScript (closes #296) 2024-08-07 23:25:22 +03:00
slashtechno 4bc24246ab Update Docker image tag in build script 2024-08-07 15:51:29 -04:00
Elian Doran 9cf14cc3a8 ci: Use healthcheck action 2024-08-07 22:42:55 +03:00
Elian Doran e64234b462 ci: Add test for Docker healtcheck 2024-08-07 22:31:09 +03:00
Elian Doran 5295d956a2 ci: Add Docker test step 2024-08-07 22:25:01 +03:00
Elian Doran a8814f0e9b ci: Extract docker build into separate workflow 2024-08-07 22:10:16 +03:00
slashtechno 883e71612c Use triliumnext/notes as image in docker-compose.yml
Also added comments to `docker-compose.yml` and removed unused volumes
2024-08-07 13:39:56 -04:00
Elian Doran 2efbe97286 integration-test: Add basic test for KaTeX 2024-08-07 20:27:04 +03:00
Elian Doran cc9bb31b9c integration-test: Disable webkit runner for now 2024-08-07 20:21:04 +03:00
Elian Doran b2e27144b7 integration-test: Initialize Playwright 2024-08-07 20:21:04 +03:00
Nriver 8dbafa3cd9 revert change of i18n.js 2024-08-07 17:00:17 +08:00
Nriver 14bdd3819f Merge remote-tracking branch 'upstream-next/develop' into feature/i18n 2024-08-07 16:56:36 +08:00
meichthys 72173533a6 Update references from Trilium -> TriliumNext 2024-08-07 01:08:45 -04:00
meichthys 0b7bf533fa Update third-party communities description 2024-08-07 01:07:32 -04:00
meichthys b3791f7a6a Add open-source and cross-platform to project tagline 2024-08-07 01:06:15 -04:00
meichthys 3042ce13e7 Update installation instructions & communication links 2024-08-07 01:05:11 -04:00
meichthys ac9a9a7758 Rename Builds section to "Installation" 2024-08-07 00:43:58 -04:00
meichthys 94c53e6342 Remove MacOS unsupported message 2024-08-07 00:43:27 -04:00
meichthys eb91cfd650 Clarify Flatpack is not yet available 2024-08-07 00:33:37 -04:00
Nriver 3d955abd31 resolve code conflict in book.js 2024-08-07 11:48:24 +08:00
Nriver 8f6087068e add translation for type widgets: relation_map.js 2024-08-07 11:35:55 +08:00
Nriver 2754bd7a93 add translation for 8 type widgets 2024-08-07 11:18:02 +08:00
Nriver 40f74656f3 add translation for all 9 search option files 2024-08-07 10:16:27 +08:00
Elian Doran cba15f9df5 ci: Deploy main on tags as well
Main / Build macOS x86_64 (push) Failing after 33s
Main / Build macOS aarch64 (push) Failing after 33s
Main / Build Linux x86_64 (push) Failing after 32s
Main / Build Linux Server x86_64 (push) Failing after 33s
Main / Build Windows x86_64 (push) Failing after 2m17s
Main / Build Docker images (push) Failing after 2m37s
Main / Build Windows x86_64 (Setup) (push) Has been cancelled
2024-08-06 23:09:31 +03:00
Elian Doran b72626aab6 release 0.90.3 2024-08-06 20:40:58 +03:00
Elian Doran 712ef92f7c build: Mark releases as draft 2024-08-06 20:40:54 +03:00
Elian Doran c3b742df3b docs: Fix dynamic references to wiki 2024-08-06 20:38:35 +03:00
Elian Doran 85eaf0cb52 docs: Fix the remainder of hard-coded links to wiki 2024-08-06 20:18:19 +03:00
Elian Doran c1fcb10bc0 docs: Change reference to search.md 2024-08-06 20:12:13 +03:00
Elian Doran 743fee2783 electron: Fix alt+left, alt+right navigation
Broken due to a change in Electron API:
https://github.com/electron/electron/pull/41577/files
2024-08-06 18:44:19 +03:00
Nriver 9453ec4e29 add translation for the last ribbon widget 2024-08-06 10:41:08 +08:00
Nriver 74c4634da2 add translation for ribbon widgets: search_definition.js 2024-08-06 10:39:15 +08:00
Nriver a8bb064557 add translation for ribbon widgets: script_executor.js 2024-08-06 10:16:56 +08:00
Nriver b7809a709c add translation for ribbon widgets: promoted_attributes.js 2024-08-06 10:12:53 +08:00
Nriver 2916182cdf add translation for 2 ribbon widgets 2024-08-06 10:01:21 +08:00
Jin 42e3f126e4 add arm64 for linux 2024-08-05 20:46:32 +02:00
Jin e10df0708c remove old build scripts 2024-08-05 20:30:16 +02:00
Jin 46164de94a fix github action 2024-08-05 20:29:17 +02:00
Jin 39c0250833 fix server package 2024-08-05 20:20:35 +02:00
Jin e5e92c8ece add electron-forge for all platforms 2024-08-05 18:47:57 +02:00
Jin 5f6aba8a10 remove comments 2024-08-05 17:14:24 +02:00
Jin e5c1d38722 - Remove hard-coded better-sqlite3 binaries
- Fix ExperimentalWarning
2024-08-05 17:14:24 +02:00
Nriver 835891999e add translation for ribbon widgets: note_paths.js 2024-08-05 10:59:26 +08:00
Nriver 729715ebfb add translation for ribbon widgets: note_map.js 2024-08-05 10:55:37 +08:00
Nriver bdc6a1fe29 add translation for ribbon widgets: note_info_widget.js 2024-08-05 10:48:37 +08:00
Nriver 931e319fbf add translation for ribbon widgets: inherited_attribute_list.js 2024-08-05 10:43:11 +08:00
Nriver 6743eb8d1b add translation for ribbon widgets: image_properties.js 2024-08-05 10:40:08 +08:00
Nriver e2aaa97a01 fix text wrap for file_properties.js 2024-08-05 10:34:00 +08:00
Nriver c2a8f4f4a3 add translation for ribbon widgets: file_properties.js 2024-08-05 10:32:48 +08:00
Nriver 4270ab416e add translation for ribbon widgets: edited_notes.js 2024-08-05 10:26:40 +08:00
Nriver d47a5c4ffe add translation for ribbon widgets: book_properties.js 2024-08-05 10:23:38 +08:00
Nriver 97e127a4af fix double curly braces 2024-08-05 10:18:42 +08:00
Nriver cfd33c802c add translation for ribbon widgets: basic_properties.js 2024-08-05 10:09:25 +08:00
Nriver 971f52f92a add translation for mobile_detail_menu.js 2024-08-05 09:57:36 +08:00
Nriver 71c09b1d67 add translation for all floating buttons 2024-08-05 09:49:52 +08:00
Elian Doran f3641e5fa6 server: Fix fulltext search ignoring buffers 2024-08-04 23:26:35 +03:00
Elian Doran 8f5859f344 Merge pull request #285 from perfectra1n/develop
Add CI/CD step for DockerHub containers
2024-08-04 19:47:02 +03:00
perfectra1n a8337c51dd Merge branch 'develop' into develop 2024-08-04 09:42:37 -07:00
Elian Doran 2f9a75b74c Merge pull request #291 from TriliumNext/feature/new_icon
New icon
2024-08-04 19:36:25 +03:00
Elian Doran 2d7ffaf2a8 ci: Revert change 2024-08-04 19:35:59 +03:00
Elian Doran 8ca6dbe34b Scale mac icon to 0.8 2024-08-04 17:11:46 +03:00
Elian Doran 5ee62d4d65 Create Big Sur-style icons 2024-08-04 16:42:35 +03:00
Elian Doran 3544dc6650 Fix weird plural in author name 2024-08-04 16:09:44 +03:00
Elian Doran 03cb773560 Add sharper icons using Inkscape for rendering 2024-08-04 15:36:51 +03:00
Elian Doran 3659cad587 bin: Don't remove intermediate icons, simply ignore them 2024-08-04 15:18:39 +03:00
Elian Doran 54b9bcb6de Build small icons for macOS as well 2024-08-04 14:30:55 +03:00
Elian Doran 712b180f94 Set up 1024x1024 icon for macOS 2024-08-04 14:26:30 +03:00
Elian Doran 3ce2c98317 bin: Add asserts for create-icons dependencies 2024-08-04 14:26:10 +03:00
Elian Doran 880b0420cc client: Update icon in CKEditor 2024-08-04 14:15:35 +03:00
Elian Doran c0a26889e4 Document #run=mobileStartup (fixes #290) 2024-08-04 10:46:28 +03:00
Elian Doran efc5ac0e9b ci: Add workflow_dispatch to main 2024-08-03 23:37:28 +03:00
Elian Doran 86463086fa Update non-rendering emoji
See https://emojipedia.org/right-thought-bubble
2024-08-03 23:21:15 +03:00
Elian Doran 48ac02a1a7 Update logo in demo document 2024-08-03 22:33:33 +03:00
Elian Doran a94c2c45b7 build: Build Squirrel splash image as well 2024-08-03 22:25:10 +03:00
Elian Doran f81bf509cd build: Create script to build icons for the application 2024-08-03 22:20:05 +03:00
Elian Doran 7906c8b64f Remove unused icons 2024-08-03 21:55:38 +03:00
Elian Doran 80289b8059 client: Fix icon jumping on hover 2024-08-03 21:43:49 +03:00
Elian Doran 96aecf8544 client: Match original size icon slightly 2024-08-03 21:40:07 +03:00
Elian Doran deb2f389df client: Use correct color 2024-08-03 21:37:46 +03:00
Elian Doran ab25778e7e client: Embed SVG directly 2024-08-03 21:35:16 +03:00
Nriver d93a94322e fix broken button feature by over-translating 2024-08-02 09:40:49 +08:00
Nriver 156d3c421c fix miss deleted import 2024-08-02 09:21:15 +08:00
Nriver 7fc3fdab94 add translation for note launcher button 2024-08-02 09:09:49 +08:00
Nriver 625e9efcf3 add translation for buttons: update_available.js 2024-08-02 09:06:37 +08:00
Nriver e2d43b4538 add translation for buttons: revisions_button.js 2024-08-02 09:01:39 +08:00
Elian Doran 3b0ea51f5f docs: Add a few details about CKEditor 2024-08-02 00:20:17 +03:00
Nriver 9320a548f4 add translation for buttons: protected_session_status.js 2024-08-01 14:32:53 +08:00
Nriver 4081f44a0e add translation for buttons: onclick_button.js 2024-08-01 14:30:11 +08:00
Nriver d21ca03e9c add translation for buttons: note actions 2024-08-01 14:26:37 +08:00
Nriver 355c4164c9 add translation for buttons: move pane button 2024-08-01 14:20:33 +08:00
Nriver 989a0d6cd9 add translation for buttons: left pane toggle 2024-08-01 14:18:21 +08:00
Nriver 8a0fec0a63 add translation for buttons: global menu 2024-08-01 13:54:59 +08:00
perf3ct eb91834539 trigger CI 2024-07-31 12:06:01 -07:00
perf3ct c104475cd6 have DockerHub login use username secret instead 2024-07-31 12:03:53 -07:00
perf3ct 2a09c620fd update step names 2024-07-31 12:00:47 -07:00
perfectra1n fe03db7dba Merge pull request #1 from perfectra1n/cicd-add-dockerhub-images
add steps to push container to DockerHub as well
2024-07-31 11:59:05 -07:00
perf3ct 5b74a931aa fix push action ids 2024-07-31 11:58:49 -07:00
perf3ct ee4544cefe add steps to push container to DockerHub as well 2024-07-31 11:56:17 -07:00
Nriver d84f4387c5 add translation for buttons: edit button 2024-07-31 10:59:22 +08:00
Nriver 75e8a6cdc0 add translation for buttons: create pane button 2024-07-31 10:57:45 +08:00
Nriver 38a9ad6a46 add translation for buttons: close pane button 2024-07-31 10:51:35 +08:00
Nriver b99510ad4f add translation for buttons: calendar 2024-07-31 10:46:31 +08:00
Nriver 02ecdf565e add translation for buttons: attachments actions 2024-07-31 10:32:43 +08:00
Nriver f116e52228 add translation for bulk action titles 2024-07-30 10:15:07 +08:00
Nriver 3ff361495e add translation for bulk action of relation 2024-07-30 10:06:54 +08:00
Nriver 50434201cf add translation for bulk action of notes 2024-07-30 09:40:02 +08:00
Elian Doran 99ca701a5c electron: Fix initial sync (closes #284)
Apparently the issue was caused by options_init which for Electron was
attempting to read the theme asynchronously. That's why it didn't cause
issues on the server build.
2024-07-29 20:41:28 +03:00
Nriver f7b5dbd12f fix text wrap in about dialog 2024-07-29 10:40:30 +08:00
Nriver 71e69d34ed fix text wrap in rename label 2024-07-29 10:40:12 +08:00
Nriver 738684c4c7 add translation for bulk action of labels 2024-07-29 10:37:53 +08:00
Nriver bcf892ca37 add translation for bulk action and script execute 2024-07-29 10:23:32 +08:00
Nriver 92b0c7f0b7 add translation for attribute editor 2024-07-29 10:14:27 +08:00
Elian Doran bc5a1de9b7 server: Fix import when no meta (closes #281) 2024-07-28 23:39:25 +03:00
Elian Doran 89314fac03 server: Report ZIP import errors properly 2024-07-28 23:38:34 +03:00
Elian Doran 347f18058f build: Set up iconUrl for squirrel build 2024-07-28 21:51:48 +03:00
Elian Doran 2f0d41922b release 0.90.2-beta 2024-07-28 10:12:19 +03:00
Elian Doran 1d142b9e57 build: Fix accidental change in release script 2024-07-28 10:12:08 +03:00
Elian Doran e654f053b1 Merge pull request #277 from TriliumNext/feature/update_ckeditor_v41.4.2
ckeditor: 41.0.0 -> 41.4.2
2024-07-28 09:07:37 +03:00
Elian Doran d5693e21df ci: Fix main not triggering 2024-07-28 00:22:52 +03:00
Elian Doran 32dc064ffa docs: Add some more documentation 2024-07-27 23:49:56 +03:00
Elian Doran d9d8fff249 docs: Update example env 2024-07-27 23:39:15 +03:00
Elian Doran 312c85ae30 docs: Update documentation 2024-07-27 23:28:14 +03:00
Elian Doran f5e02102e7 docs: Improve the preview script 2024-07-27 23:27:18 +03:00
Elian Doran f32fb168dc docs: Fix the prepare script if run from a different dir 2024-07-27 23:27:11 +03:00
Elian Doran 1871846b64 ckeditor: Bring back emojis 2024-07-27 23:10:33 +03:00
Elian Doran f5ebd66661 ckeditor: 41.0.0 -> 41.4.2 2024-07-27 21:53:59 +03:00
Elian Doran e4d464d6c9 electron: Fix deprecated assert syntax 2024-07-27 16:51:36 +03:00
Elian Doran 557f6096b4 i18n: Fix warning about missing dev language 2024-07-27 16:50:34 +03:00
Elian Doran 84c535ae0d electron: Fix "Cannot access 'sqlInit' before initialization" at startup 2024-07-27 16:45:02 +03:00
Elian Doran e5cdccc066 build: Make copy-dist silent 2024-07-27 16:42:47 +03:00
Elian Doran ac4f902bb9 electron: Display TypeScript stack traces 2024-07-27 16:40:59 +03:00
Elian Doran 3bc83e19fa build: Turn off safe mode by default in order to be able to test scripts 2024-07-27 15:28:12 +03:00
Elian Doran 3466786a96 Merge branch 'develop' of ssh://github.com/TriliumNext/Notes into develop 2024-07-27 15:25:34 +03:00
Elian Doran b58b7a6575 Merge pull request #268 from TriliumNext/feature/server_esm_part4
Server ESM port: Fix Electron build
2024-07-27 15:21:03 +03:00
Elian Doran 48cf41b5a5 Merge pull request #243 from TriliumNext/feature/server_esm_part3
Server ESM port: Getting things to run
2024-07-27 15:20:52 +03:00
Elian Doran 7b2d70ba56 Merge remote-tracking branch 'origin/develop' into feature/server_esm_part3 2024-07-27 15:20:39 +03:00
Elian Doran 1a5649e8ac Merge pull request #259 from TriliumNext/feature/server_esm
Server ESM port: Basic imports
2024-07-27 15:19:44 +03:00
Elian Doran 0f7446c198 client: Display errors for all basic widgets instead of just right panel widget 2024-07-27 12:26:35 +03:00
Elian Doran 0ba9fc7f5b client: Display errors for right panel widgets instead of crashing 2024-07-27 12:24:49 +03:00
Elian Doran 584ba246e3 client: Use translations for critical error 2024-07-27 12:10:59 +03:00
Elian Doran 22761d8a00 client: Display critical error toast instead of blank screen 2024-07-27 12:05:24 +03:00
Elian Doran 7bb70bb659 client: Allow newlines in toast message 2024-07-27 12:03:40 +03:00
Nriver f3e09c3a4b add translation for attribute detail 2024-07-26 17:00:28 +08:00
Nriver fa2d0578c0 fix export note title 2024-07-26 14:02:54 +08:00
Nriver da96344690 add translation for the rest 7 dialogs 2024-07-25 17:14:08 +08:00
Elian Doran b508b5bbfd Update SECURITY.md 2024-07-25 00:31:42 +03:00
Elian Doran dc48eeb7c1 dev: Set up default JSON formatter on VS Code 2024-07-25 00:30:51 +03:00
Elian Doran 3ba8f93412 Merge remote-tracking branch 'origin/develop' into feature/server_esm_part4 2024-07-24 21:39:39 +03:00
Elian Doran 25db092b41 electron: Fix crash due to missing i18next 2024-07-24 21:04:20 +03:00
Elian Doran ae80a748af electron: Fix not starting due to squirrel 2024-07-24 20:57:32 +03:00
Elian Doran 6006d01f8b electron: Fix JSON imports 2024-07-24 20:52:46 +03:00
Elian Doran 7fb3abb4ea electron: Fix directory imports 2024-07-24 20:41:44 +03:00
Elian Doran bb19cc216b server: Fix shadowed fields in becca entities 2024-07-24 20:40:03 +03:00
Elian Doran 709101c540 server: Fix some build errors 2024-07-24 20:35:19 +03:00
Elian Doran eca9459d4c server: Use the TypeScript configuration that corresponds for Electron 2024-07-24 20:33:49 +03:00
Elian Doran 24af2e55dc server: Fix the remainder of import issues 2024-07-24 20:33:35 +03:00
Elian Doran 42f0073ab6 server: Fix various imports 2024-07-24 20:31:26 +03:00
Elian Doran 20ee62dfb1 server: Fix search-related imports 2024-07-24 20:30:12 +03:00
Elian Doran 2787feb593 server: Fix missing .js import for blob_interface 2024-07-24 20:27:50 +03:00
Elian Doran 8a5dca5dca server: Fix missing .js import for becca 2024-07-24 20:26:57 +03:00
Elian Doran d5ec62f797 server: Fix missing .js import for shaca 2024-07-24 20:25:38 +03:00
Elian Doran 3595ace249 server: Fix missing .js import for request_interface 2024-07-24 20:24:47 +03:00
Elian Doran ed0970b33b server: Fix missing .js import for entity_changes_interface 2024-07-24 20:24:13 +03:00
Elian Doran ed0d86c787 server: Fix missing .js import for note-interface 2024-07-24 20:23:34 +03:00
Elian Doran 212d61c1d2 server: Fix missing .js import for route-interface 2024-07-24 20:23:05 +03:00
Elian Doran 3067380338 server: Fix missing .js import for etapi-interface 2024-07-24 20:21:52 +03:00
Elian Doran 76fcea7189 server: Fix missing .js import for rows file 2024-07-24 20:20:20 +03:00
MeIchthys 379c07a7fa Update issue template to use new version scheme and TriliumNext Documentation links 2024-07-24 09:49:50 -04:00
Nriver a8d6e5b1ea add translation for 6 more dialogs 2024-07-24 17:34:26 +08:00
Nriver 5691554442 add translation for enter 2024-07-24 17:32:01 +08:00
Nriver a01065908d Merge remote-tracking branch 'upstream-next/develop' into feature/i18n 2024-07-24 09:17:51 +08:00
Elian Doran f382d3c728 Merge remote-tracking branch 'origin/feature/update_bettersqlite3' into feature/server_esm_part3 2024-07-24 00:02:15 +03:00
Elian Doran fd1f43d192 Merge remote-tracking branch 'origin/feature/update_electron' into feature/server_esm_part3 2024-07-24 00:01:44 +03:00
Elian Doran 989462c1b8 electron: Fix Common.js import 2024-07-24 00:00:41 +03:00
Elian Doran bd6ef06732 Merge remote-tracking branch 'origin/develop' into feature/server_esm_part3 2024-07-23 23:43:00 +03:00
Elian Doran b9a2be6808 Merge pull request #248 from TriliumNext/feature/i18n_first_steps
i18n: First steps
2024-07-23 23:27:45 +03:00
Elian Doran ece343ac09 dev: Improve custom translation framework slightly 2024-07-23 23:27:00 +03:00
Elian Doran 2fb05ab37d Merge remote-tracking branch 'origin/develop' into feature/i18n_first_steps
; Conflicts:
;	package-lock.json
;	package.json
2024-07-23 23:22:34 +03:00
Elian Doran de342c3285 dev: Set up key style & source language 2024-07-23 23:19:11 +03:00
Elian Doran 906dad62a8 dev: Set up i18n-ally 2024-07-23 22:52:34 +03:00
Elian Doran 0606fe01f6 Merge pull request #242 from TriliumNext/feature/server_esm_part2
Server ESM port: Convert some of the asynchronous imports
2024-07-23 19:17:20 +03:00
Elian Doran 1b5b3e697e Merge branch 'feature/server_esm_part2' into feature/server_esm_part3 2024-07-23 19:15:59 +03:00
Elian Doran 3aa38b998a server: Address requested changes 2024-07-23 19:14:33 +03:00
Elian Doran 45bf75b864 Merge branch 'feature/server_esm' into feature/server_esm_part2 2024-07-23 19:08:46 +03:00
Elian Doran 7f2caa00cb test: Remove commented-out code 2024-07-23 19:07:39 +03:00
Nriver 935e882f3e translate 5 more dialogs and refine some translation 2024-07-23 17:38:22 +08:00
Elian Doran e9e329c6dd build: Fix Windows installer build 2024-07-23 00:26:02 +03:00
Elian Doran faa9ebe1bc build: Remove unnecessary rm 2024-07-23 00:24:27 +03:00
Elian Doran 26efa9299e build: Fix export = 2024-07-23 00:17:20 +03:00
Elian Doran 3dbf8fb1c1 build: Fix running webpack on ESM 2024-07-23 00:12:08 +03:00
Elian Doran 6f6ce38538 build: Increase strictness of copy-trilium 2024-07-22 21:44:48 +03:00
Elian Doran e74eff75db Revert "build: Export correct build info"
This reverts commit ef4f0f80b9.
2024-07-22 21:43:55 +03:00
Elian Doran 7fb4a66127 build: Remove redundant rm 2024-07-22 21:39:36 +03:00
Elian Doran ef4f0f80b9 build: Export correct build info 2024-07-22 21:35:24 +03:00
Elian Doran dd14ba9e0e build: Increase error strictness 2024-07-22 21:33:07 +03:00
Elian Doran c39d131426 ci: Add ESM change to main temporarily 2024-07-22 21:23:06 +03:00
Elian Doran b0d6564a63 server: Fix share not working after ESM port 2024-07-22 21:17:43 +03:00
Elian Doran c20c8d1176 server: Fix init database not working due to share db 2024-07-22 21:17:27 +03:00
Elian Doran 10239d1a0b Merge branch 'feature/server_esm_part2' into feature/server_esm_part3 2024-07-22 20:20:34 +03:00
Elian Doran f0a561565e Merge branch 'feature/server_esm' into feature/server_esm_part2 2024-07-22 20:15:49 +03:00
Elian Doran e53b7dd297 Merge remote-tracking branch 'origin/develop' into feature/server_esm 2024-07-22 19:59:44 +03:00
Elian Doran 997da1c3bc client: Change URL for checking updates (not testable yet) 2024-07-22 19:40:00 +03:00
Elian Doran c1b5eb086b ci: Don't build main if only docs were changed 2024-07-22 19:39:15 +03:00
Nriver cb9b4c07e5 translate some dialogs 2024-07-22 17:31:54 +08:00
Elian Doran 043313c71a Merge branch 'feature/update_electron' into feature/update_bettersqlite3 2024-07-21 23:29:48 +03:00
Elian Doran 62804ec67a Merge remote-tracking branch 'origin/develop' into feature/update_electron 2024-07-21 23:28:03 +03:00
Elian Doran 4edb0374fc server: Fix "Content hash check for [...] sector [...] FAILED"
The issue was caused by a guard condition which prevented the writing of
entity changes which came from the remote and were marked as deleted,
resulting in an incorrect checksum when attempting to sync.
2024-07-21 21:14:27 +03:00
Elian Doran 2e9a624bfd release 0.90.1-beta 2024-07-21 13:25:01 +03:00
Elian Doran 715a952148 build: Remove auth if token not provided 2024-07-21 13:24:44 +03:00
Elian Doran d09578735e build: Implement cross-platform build info script 2024-07-21 11:45:31 +03:00
Elian Doran 374a51b77c ci: Update build info for Windows setup as well 2024-07-21 11:26:14 +03:00
Elian Doran 5a8442f3d8 build: Fix artifacts not generated due to name change 2024-07-21 10:57:43 +03:00
Elian Doran f07a6600c9 ci: Patch package.json main 2024-07-21 09:12:46 +03:00
Elian Doran b2f688a3e5 ci: Fix typo 2024-07-21 08:53:21 +03:00
Elian Doran 4a7c447528 Merge pull request #255 from TriliumNext/feature/windows_installer
Windows installer
2024-07-21 08:52:06 +03:00
Elian Doran 028565d89b ci: Fix dev workflow no longer triggering 2024-07-21 08:48:54 +03:00
Elian Doran b55e93c7c1 ci: Join workflows 2024-07-21 08:37:18 +03:00
Elian Doran ad7a29a700 ci: Try to fix missing assets in installer 2024-07-21 00:31:36 +03:00
Elian Doran f49008bf21 ci: Improve workflow 2024-07-21 00:02:43 +03:00
Elian Doran 3ac643b3ac build: Reorder scripts & rename artifact 2024-07-20 23:56:28 +03:00
Elian Doran 2e2400edb3 build: Improve product information in package.json 2024-07-20 23:39:53 +03:00
Elian Doran 6c36c47135 ci: Adapt to changes to package.json 2024-07-20 23:34:52 +03:00
Elian Doran a5f7a3a029 build: Improve package.json for building with electron-forge 2024-07-20 23:33:40 +03:00
Elian Doran 52af97c88f build: Remove electron-builder 2024-07-20 23:24:04 +03:00
Elian Doran dcb5d539b3 Fix removing dependency on electron 2024-07-20 23:23:44 +03:00
Elian Doran 19e776b1f6 Merge remote-tracking branch 'origin/develop' into feature/windows_installer
; Conflicts:
;	electron.js
;	package-lock.json
;	package.json
2024-07-20 23:07:32 +03:00
Elian Doran f9a4f9b538 Merge pull request #253 from TriliumNext/feature/update_ci
CI improvements
2024-07-20 22:28:26 +03:00
Elian Doran 5277c3e6b6 ci: Revert artifact upload for darwin 2024-07-20 22:23:31 +03:00
Elian Doran e380fa5224 ci: Fix permission issue with build script 2024-07-20 22:10:09 +03:00
Elian Doran 5eabdf8496 ci: Cancel unnecessary actions 2024-07-20 22:03:51 +03:00
Elian Doran 128af66797 ci: Don't pack Windows artifact 2024-07-20 22:02:29 +03:00
Elian Doran 80e647ffec ci: Update build info 2024-07-20 21:58:14 +03:00
Elian Doran 7dc8c662ca ci: Revert .tar.xz to avoid losing permissions 2024-07-20 21:50:32 +03:00
Elian Doran cc55e1b657 ci: Remove .tar.xz to avoid double archiving 2024-07-20 21:48:04 +03:00
Elian Doran 27c2d1efbd ci: Fix double .zip artifact name 2024-07-20 21:46:37 +03:00
Elian Doran 4dc615fe68 ci: Fix double zipping 2024-07-20 21:39:11 +03:00
Elian Doran 9647738162 Merge pull request #252 from TriliumNext/feature/update_reduce_binary_size
Reduce dist size
2024-07-20 21:33:21 +03:00
Elian Doran 5b8148206d Merge pull request #251 from TriliumNext/feature/update_server_dependencies
Update server dependencies
2024-07-20 21:33:05 +03:00
Elian Doran 758c08ec85 build: Remove map files & ts files 2024-07-20 20:55:38 +03:00
Elian Doran cb0d1d80a1 build: Remove some more unnecessary files 2024-07-20 20:53:33 +03:00
Elian Doran 9dcf51b117 build: Remove some unnecessary files 2024-07-20 20:39:18 +03:00
Elian Doran 389097bcc2 build: Silence clean-up phase 2024-07-20 20:31:36 +03:00
Elian Doran 366e791e2d build: Use--omit=dev 2024-07-20 20:19:38 +03:00
Elian Doran d570b3c428 build: Move rimraf to devDependencies 2024-07-20 20:18:47 +03:00
Elian Doran 3b3f676964 server: Update ini, debounce 2024-07-20 19:06:56 +03:00
Elian Doran 77ddf529ac server: Update https-proxy-agent, sax 2024-07-20 19:06:55 +03:00
Elian Doran ba74f39d86 server: Update semver, async-mutex 2024-07-20 19:06:55 +03:00
Elian Doran 76890de33b server: Update dayjs 2024-07-20 19:06:55 +03:00
Elian Doran e9860e9523 server: Update axios, ejs 2024-07-20 19:06:55 +03:00
Elian Doran 44d095777c server: Update ws 2024-07-20 19:06:55 +03:00
Elian Doran af726eff6c server: Update jsdom 2024-07-20 19:06:55 +03:00
Elian Doran abd860754f server: Update express, express-rate-limit 2024-07-20 19:06:55 +03:00
Elian Doran 1a5b3ab0e3 server: Update yauzl 2024-07-20 19:06:55 +03:00
Elian Doran 8a507d3cc0 server: Update sanitize-url, archiver, marked, sanitize-html, turndown 2024-07-20 19:06:55 +03:00
Elian Doran 645c16e450 Merge pull request #228 from TriliumNext/feature/update_to_node20
Update Node.js version
2024-07-20 19:06:21 +03:00
Elian Doran 338012ec7e build: Bring update script for better-sqlite3 2024-07-20 16:48:41 +03:00
Elian Doran e778680e94 Merge branch 'feature/update_to_node20' into feature/update_electron 2024-07-20 16:39:38 +03:00
Elian Doran 9b9180e5c8 Merge remote-tracking branch 'origin/develop' into feature/update_to_node20 2024-07-20 16:30:46 +03:00
Elian Doran 460bd6b979 ci: Always build main for update branches 2024-07-20 16:30:17 +03:00
Elian Doran 45a751ac6c Merge remote-tracking branch 'origin/feature/update_to_node20' into feature/update_electron 2024-07-20 15:27:19 +03:00
Elian Doran c080dab9fa Revert "ci: Build main temporarily"
This reverts commit 776d2e7402.
2024-07-20 15:24:36 +03:00
Elian Doran 75ccf9c3a7 Merge pull request #232 from TriliumNext/feature/update_tooling_dependencies
Update tooling dependencies
2024-07-20 15:22:15 +03:00
Elian Doran 66415abe8a server: Remove dependency to "open", closes #221
This is a very old dependency from 2018:
https://github.com/zadam/trilium/commit/aa2bbc65758ae1b270a19d8f2020e0d63198d183

It is no longer used.
2024-07-20 15:21:24 +03:00
Elian Doran 431e04d039 build: Update rimraf, webpack, nodemon, jsdoc 2024-07-20 15:21:24 +03:00
Elian Doran 946a02fd67 build: Determine better-sqlite3 version automatically 2024-07-20 15:13:42 +03:00
Elian Doran 6a7f95f75b Revert "ci: Build main temporarily"
This reverts commit 79871dce638f47a86f673daa36cec84daa37c6ae.
2024-07-20 15:13:42 +03:00
Elian Doran 2a57765dd9 build: Update bettersqlite3 binary for Linux server 2024-07-20 15:13:42 +03:00
Elian Doran 42c0a557b4 build: Update bettersqlite3 binary for Linux desktop 2024-07-20 15:13:42 +03:00
Elian Doran aa6cf1f11c build: Update bettersqlite3 binary for macOS 2024-07-20 15:13:42 +03:00
Elian Doran d73b10d10d build: Update bettersqlite3 binary for Windows 2024-07-20 15:13:42 +03:00
Elian Doran 6aea3b1472 Revert "build: Investigate not embedding better_sqlite3 natives"
This reverts commit 0e10fbb0875e515b6c10d4d010fe81464b41f6b4.
2024-07-20 15:13:40 +03:00
Elian Doran edc18e5be8 Revert "build: Fix ".node is not a valid Win32 application""
This reverts commit 8ac84e12c8dd2a838bf602e032b08d507b9d763b.
2024-07-20 15:13:19 +03:00
Elian Doran 86659552ee build: Fix ".node is not a valid Win32 application"
See https://github.com/electron/packager/issues/740.
2024-07-20 15:13:19 +03:00
Elian Doran 03ab41bfba build: Investigate not embedding better_sqlite3 natives 2024-07-20 15:13:17 +03:00
Elian Doran 956beb1cc0 server: Update better-sqlite3 from 8.5.0 to 11.1.2 2024-07-20 15:12:34 +03:00
Elian Doran 9db4e1d7d3 build: Fix Node version incompatibility 2024-07-20 15:10:50 +03:00
Elian Doran 776d2e7402 ci: Build main temporarily 2024-07-20 15:10:50 +03:00
Elian Doran 41286d41ee electron: Downgrade electron-debug
Avoids an import error because electron-debug became ESM-only in version
4. We will update to it once we upgrade to ESM.
2024-07-20 15:10:50 +03:00
Elian Doran 4bae19b1c3 electron: Switch 25.9.8 -> 31.2.1 2024-07-20 15:10:49 +03:00
Elian Doran b587ec474c build: Use rimraf instead of rm -rf 2024-07-20 14:16:49 +03:00
Elian Doran 837b7ce3d1 Merge remote-tracking branch 'origin/develop' into feature/update_to_node20 2024-07-20 13:23:25 +03:00
Elian Doran 05776d178e docs: Move binaries to bin/ 2024-07-20 13:14:48 +03:00
Elian Doran 46c193dd9f docs: Get rid of /share 2024-07-20 13:10:19 +03:00
Elian Doran 5bcae52d08 docs: Always use HTML extensions 2024-07-20 13:08:22 +03:00
Elian Doran 4f5fa9f42b docs: Deploy .html files for GitHub Pages 2024-07-20 12:51:41 +03:00
Elian Doran d381ef5100 docs: Deploy first documentation 2024-07-20 12:41:39 +03:00
Elian Doran 0a1a8c5a27 docs: Deploy to docs folder 2024-07-20 12:41:30 +03:00
Elian Doran 5db499cf56 docs: Create home page with redirect 2024-07-20 12:40:03 +03:00
Elian Doran bfab6b4d5c docs: Add preview script 2024-07-20 12:29:12 +03:00
Elian Doran 621cc4a065 docs: Get rid of domain in output folder 2024-07-20 12:26:52 +03:00
Elian Doran 30c1810211 docs: Set up basic download script 2024-07-20 12:23:56 +03:00
Elian Doran e284ea945c i18n: Improve formatting 2024-07-20 11:42:54 +03:00
Elian Doran 288e677495 i18n: Change back to English 2024-07-20 10:37:28 +03:00
Elian Doran 5ea35dd851 i18n: Implement HTTP backend loader 2024-07-20 10:19:11 +03:00
Elian Doran d4bf162e92 i18n: Add i18next-http-backend to library loader 2024-07-20 10:07:10 +03:00
Elian Doran d14cf7c246 i18n: Move translations to backend serve 2024-07-20 10:02:25 +03:00
Elian Doran 784891409f i18n: Add Romanian as demo 2024-07-20 09:51:09 +03:00
Elian Doran 0dbe6702ff i18n: Translate about page 2024-07-20 09:42:55 +03:00
Elian Doran 10ec7d6b2b i18n: Set up client dependency to i18next 2024-07-20 09:32:56 +03:00
Elian Doran 33d6d51d59 i18n: Set up i18next 2024-07-20 09:24:16 +03:00
Elian Doran a71a53de97 Merge pull request #246 from CrO2Cl2/develop
update Italian README
2024-07-20 00:03:11 +03:00
CrO2Cl2 6a0949e5b4 found out the Italian README was actually already in here, and Translated all of the new stuff 2024-07-19 18:27:18 +00:00
Elian Doran 33a26b0b70 Merge pull request #212 from TriliumNext/bugfix/sync_failure
Sync failed: Cannot read properties of undefined (reading 'utcDateChanged')
2024-07-19 19:33:42 +03:00
Elian Doran ab23459299 server: Fix script execution error (closes #244) 2024-07-19 19:30:27 +03:00
CrO2Cl2 f18939942b copy Italian README by MatMasIt from Zadams Repo 2024-07-19 16:27:29 +00:00
Elian Doran 40363f6e8e Merge pull request #225 from TriliumNext/feature/update_typescript
Update TypeScript dependencies
2024-07-19 19:12:13 +03:00
Elian Doran 583a4420fd Merge pull request #245 from Nriver/develop
update Chinese README
2024-07-19 18:33:24 +03:00
Nriver 508b53d47b update Chinese README 2024-07-19 15:00:53 +08:00
Elian Doran dd416ed042 server-esm: Revert types config 2024-07-19 00:54:43 +03:00
Elian Doran a10cc7bf8b server-esm: Fix missing becca 2024-07-19 00:49:56 +03:00
Elian Doran 1cd6670c55 server-esm: Fix circular dependency between sql and sql_init 2024-07-19 00:47:09 +03:00
Elian Doran 87fbd4bce8 server-esm: Fix cyclical dependency 2024-07-19 00:34:37 +03:00
Elian Doran b6c5880484 server-esm: Fix use of __dirname 2024-07-19 00:18:35 +03:00
Elian Doran 27c296fa6c server-esm: Fix marked import issue 2024-07-19 00:02:39 +03:00
Elian Doran fb7c0fdb4c server-esm: Use tsx instead of ts-node 2024-07-18 23:59:48 +03:00
Elian Doran 93a0782009 server-esm: Fix a few more straightforward imports 2024-07-18 23:48:14 +03:00
Elian Doran 508b5e3c69 server-esm: Handle more straightforward requires 2024-07-18 23:45:17 +03:00
Elian Doran f137d38300 server-esm: Handle async client 2024-07-18 23:42:54 +03:00
Elian Doran da0829245f server-esm: Handle proxy agent 2024-07-18 23:40:32 +03:00
Elian Doran 0a7828b9ae server-esm: Handle two more async imports 2024-07-18 23:39:04 +03:00
Elian Doran 86808c07bd server-esm: Handle migrations asynchronously 2024-07-18 23:36:49 +03:00
Elian Doran 3852753a89 server-esm: Avoid passing async to express 2024-07-18 23:36:26 +03:00
Elian Doran fe385bf2e4 server-esm: Solve a few straightforward cases 2024-07-18 23:35:13 +03:00
Elian Doran 013f25a49b server-esm: Make crash async 2024-07-18 23:26:21 +03:00
Elian Doran 8a30663d1e server-esm: Start with some fundamental imports 2024-07-18 23:24:36 +03:00
Elian Doran 6de1291efa server-esm: Configure for dynamic imports 2024-07-18 23:23:23 +03:00
Elian Doran 4f018c8ceb server-esm: Fix one more service import 2024-07-18 23:15:01 +03:00
Elian Doran bf29b30004 server-esm: Fix some more service imports 2024-07-18 23:06:08 +03:00
Elian Doran c5561530ec server-esm: Fix import to session-file-store 2024-07-18 22:59:39 +03:00
Elian Doran f4d19e2bc1 server-esm: Solve some more imports 2024-07-18 22:58:12 +03:00
Elian Doran 4ed88d28e9 server-esm: Fix type errors related to cloning 2024-07-18 22:41:58 +03:00
Elian Doran 8ac8f6c2df server-esm: Fix a few more import issues 2024-07-18 22:33:36 +03:00
Elian Doran ad93fe4b75 server-esm: Remove dynamic imports due to past circular issues 2024-07-18 22:30:16 +03:00
Elian Doran efdae79c10 server-esm: Remove two more straightforward imports 2024-07-18 22:25:03 +03:00
Elian Doran a8fd3be133 server-esm: Remove dynamic import to utils 2024-07-18 22:21:33 +03:00
Elian Doran 0c87fab550 server-esm: Fix wonderful token type mismatch 2024-07-18 22:18:10 +03:00
Elian Doran 20c729e62b server-esm: Solve a few straightforward imports 2024-07-18 22:11:38 +03:00
Elian Doran 5d3e54ee9c server-esm: Fix Electron helpers 2024-07-18 22:07:57 +03:00
Elian Doran 1dc894e279 server-esm: Fix the remaining compilation errors 2024-07-18 21:56:20 +03:00
Elian Doran 46f76d7284 server-esm: Fix some imports in app.ts 2024-07-18 21:55:26 +03:00
Elian Doran 6c8e9f69b0 server-esm: Fix import of package.json 2024-07-18 21:53:50 +03:00
Elian Doran ecb8a7f394 server-esm: Change single export to export default 2024-07-18 21:50:12 +03:00
Elian Doran 0ceae0a65e server-esm: Change some more export object to export default object 2024-07-18 21:47:30 +03:00
Elian Doran 55eecb0f61 server-esm: Change export object to export default object 2024-07-18 21:42:44 +03:00
Elian Doran 2750df04a3 server-esm: Change simple library import statements 2024-07-18 21:37:45 +03:00
Elian Doran 35d11cc0d2 server-esm: Change simple local import statements 2024-07-18 21:35:17 +03:00
Elian Doran 8fb67c9766 server-esm: Normalize quotes in require imports 2024-07-18 21:28:51 +03:00
Elian Doran 971c1472a5 server: Set to bundler / ES2015 2024-07-18 21:22:10 +03:00
Elian Doran 893a563afb vscode: Add task to watch build errors 2024-07-18 20:45:46 +03:00
Elian Doran 8b79975500 server: Fix SVG backwards compatibility (fixes #238) 2024-07-18 19:29:34 +03:00
Elian Doran 824bc4705f Merge pull request #234 from root-hal9000/develop
Fixed links to wiki and documentation to redirect to TriliumNext Docs
2024-07-18 12:58:20 +03:00
root-hal9000 75d583e064 Russian language README fixes
- fixes links and other small issues that differed from the English version, same as other languages
- Fixed forgotten change of title in Japanese version
2024-07-17 18:16:58 -05:00
root-hal9000 7562c28686 updated links in japanese readme 2024-07-17 18:06:44 -05:00
root-hal9000 4ef6406a76 Italian README links fixed
- Italian: same basic clean up and change of links as the other languages
**** Please note: Italian README file is not present in master branch
- For chinese: changed title to TriliumNext and fixed general link to docs
2024-07-17 18:00:08 -05:00
root-hal9000 be978e893f Updates of chinese language readme
-  updated for content to match current English version
- Changed wiki links from original zadam repo to TriliumNext docs
- changed release/builds link to TriliumNext repo
- removed gitpod reference
- added the same heading icons as in english version
- left a link referring to a third party wiki in chinese. Were they the ones who translated this? : https://github.com/baddate/trilium/wiki/
- did not mess with adding any of the new content such as "Why TriliumNext" - need an actual translator for a few of these
2024-07-17 17:49:21 -05:00
root-hal9000 95b8bf620f update links in English language readme 2024-07-17 17:24:00 -05:00
Elian Doran e74b7f6964 build: Update NODE_VERSION in build-server 2024-07-17 01:08:33 +03:00
Elian Doran 612907c830 Revert "ci: Force build release for branch"
This reverts commit bc60d77cd7.
2024-07-17 01:01:41 +03:00
Elian Doran 6a2ed4f621 server: Upgrade better-sqlite3 to 8.5.0 2024-07-17 00:40:52 +03:00
Elian Doran bc60d77cd7 ci: Force build release for branch 2024-07-17 00:02:19 +03:00
Elian Doran fe4bf31de8 Update .gitpod to Node 20 2024-07-17 00:01:33 +03:00
Elian Doran 0c0bcdcf4e ci: Update to Node 20 2024-07-16 23:59:46 +03:00
Elian Doran a7006df892 docker: Update to Node 20.15.1 2024-07-16 23:52:55 +03:00
Elian Doran 690048e910 Merge pull request #215 from TriliumNext/feature/investigate_tests
(Bug report) Search not working correctly
2024-07-16 23:19:22 +03:00
Elian Doran 2dbe3c62c2 Merge pull request #227 from TriliumNext/feature/client_updates
Update client dependencies, Canvas: "Copy image reference to clipboard" no longer working
2024-07-16 23:02:18 +03:00
Elian Doran 1eefa65418 client: Update KaTeX to 10.9.1 2024-07-16 22:51:44 +03:00
Elian Doran 7ad977de63 client: Update Mermaid to 10.9.1 2024-07-16 22:49:23 +03:00
Elian Doran d48cdb1c8d client: Update Excalidraw to 0.17.6 2024-07-16 22:43:15 +03:00
Elian Doran ea1da1e155 server: Fix rendering of SVG attachments (closes #226) 2024-07-16 22:29:00 +03:00
Elian Doran 623b2730ed server: Update @types/* to latest 2024-07-16 21:43:14 +03:00
Elian Doran c0b3c8496e server: Fix build errors after updating to latest TypeScript 2024-07-16 21:43:04 +03:00
Elian Doran 9fdb7b29de server: Update TypeScript to latest 2024-07-16 21:30:07 +03:00
Elian Doran e89faf6786 Merge remote-tracking branch 'origin/develop' into feature/investigate_tests 2024-07-16 18:33:55 +03:00
Elian Doran 66108c1067 client: Fix regression (front end no longer loading) 2024-07-16 18:33:39 +03:00
Elian Doran eb39da19b3 server: Fix build comparator preferring numeric comparators 2024-07-15 23:20:20 +03:00
Elian Doran 105aa3e5f8 tests: Fix test-jasmine on Windows 2024-07-15 22:42:12 +03:00
Elian Doran 9dc22264f4 test: Add additional context for failed test 2024-07-15 22:36:09 +03:00
Elian Doran 80d2a69f47 test: Ignore tests that are failing upstream due to "no such table: notes" 2024-07-15 22:31:04 +03:00
Elian Doran e393914b94 tests: Align with original repo
Apparently upstream does not run all the tests, the beforeAll() is not
even executed. On our side it was, causing a lot of errors related to
timeouts.
2024-07-15 22:24:14 +03:00
Elian Doran eff6ca3365 Merge pull request #173 from TriliumNext/feat/ts-unit-and-integration-tests
feat: TS unit and integration tests
2024-07-15 21:21:11 +03:00
Elian Doran 6a7eb9b34f Merge remote-tracking branch 'origin/develop' into feat/ts-unit-and-integration-tests
; Conflicts:
;	package.json
;	tsconfig.json
2024-07-15 21:17:20 +03:00
Elian Doran 1e54a9660b Revert indentation change 2024-07-15 21:15:22 +03:00
Elian Doran 653fba3b71 client: Fix URL to repository 2024-07-15 20:21:43 +03:00
Elian Doran ea47668916 server: Clarify name 2024-07-15 19:31:59 +03:00
Elian Doran 81a2b206ca electron: Improve run & switch scripts 2024-07-15 19:25:55 +03:00
Elian Doran ddce014495 server: Fix sync failing if local EC is missing 2024-07-15 19:25:31 +03:00
Elian Doran f323193c9d release 0.90.0-beta 2024-07-14 22:32:45 +03:00
Elian Doran b811f3d399 release 0.90.0-beta
Dev / Build Docker image (push) Failing after 35s
2024-07-14 22:32:17 +03:00
Elian Doran bbbbc3b860 bin/build*: Adjust error tolerance 2024-07-14 21:48:15 +03:00
Elian Doran c9f27547a2 bin/build*: Check if dpkg-deb tool is correct 2024-07-14 21:45:48 +03:00
Elian Doran 6bf063b92f bin/build*: Check that required binaries are present 2024-07-14 21:35:08 +03:00
Elian Doran 590442b0d5 client,server: Trilium Notes -> TriliumNext Notes (closes #195) 2024-07-14 21:20:42 +03:00
Elian Doran 4862b324a5 bin/release: Get rid of sponge 2024-07-14 21:13:06 +03:00
Elian Doran f678c4337b bin/release: Fail if jq is missing 2024-07-14 21:12:51 +03:00
Elian Doran 686b9c840e release 0.9.0 2024-07-14 21:04:43 +03:00
Elian Doran 2e8b2d4b81 server: Fix empty note titles (closes #205) 2024-07-14 20:50:42 +03:00
Elian Doran 3d423d25f8 Merge pull request #208 from TriliumNext/bugfix/fix_importing_non_text_files
Unable to import a PDF file
2024-07-14 17:14:04 +03:00
Elian Doran 79123b0c63 server: Fix import of non-text files 2024-07-14 15:21:45 +03:00
Elian Doran 595402adea dev: Fix npm start-electron script 2024-07-14 13:03:06 +03:00
Elian Doran f40257b591 Merge pull request #206 from TriliumNext/bugfix/image_upload_regression
server: Fix regression in uploading images
2024-07-14 11:07:34 +03:00
Elian Doran b6ca2281f7 Merge pull request #199 from TriliumNext/feature/port_0.63.7
Port 0.63.7
2024-07-14 10:17:18 +03:00
Elian Doran 186650b1cf ci: Add workflow to build macOS ARM64 2024-07-14 10:12:12 +03:00
Elian Doran 1dad4bc80f Merge remote-tracking branch 'origin/develop' into feature/port_0.63.7 2024-07-14 09:58:37 +03:00
Elian Doran d66a70f099 Merge pull request #201 from TriliumNext/feature/fix_build_scripts
Fix build scripts & add CI for running them
2024-07-14 09:58:00 +03:00
Elian Doran 0792714e45 server: Fix regression in uploading images
The attachment is first saved with no content while the image is being
asynchronously resized. On our side we had a guard condition fail if the
content was empty, whereas the original implementation was simply using
an empty string instead.
2024-07-14 09:52:01 +03:00
Elian Doran 6ecbf1c528 Merge pull request #198 from TriliumNext/bugfix/note_import_type
Fix import note type
2024-07-14 00:51:04 +03:00
Elian Doran 5460359753 Merge pull request #196 from TriliumNext/feature/fix_docker_build
Fix Docker build
2024-07-14 00:43:33 +03:00
Elian Doran 75ebe24abb ci: Remove temporary branch config 2024-07-14 00:43:04 +03:00
Elian Doran 3f5e5fd840 ci: Set up Wine 2024-07-14 00:30:49 +03:00
Elian Doran 998db5ce95 ci: Add build Windows 2024-07-14 00:14:30 +03:00
Elian Doran 7aed6d4ad4 ci: Add build Linux Server 2024-07-13 23:16:35 +03:00
Elian Doran 99ea741275 ci: Add build Linux 2024-07-13 22:52:28 +03:00
Elian Doran e6ff99198f ci: Fix docker build after macOS integration 2024-07-13 22:10:57 +03:00
Elian Doran 7c43a49046 ci: Add workflow for building macOS x86_64 2024-07-13 21:39:22 +03:00
Elian Doran 5b30bae5b2 bin: Adapt copy-trilium to TypeScript changes 2024-07-13 21:11:03 +03:00
Elian Doran 947aaa6156 webpack: Switch to TypeScript-based config 2024-07-13 21:10:40 +03:00
Elian Doran 534fe87fb1 Merge pull request #200 from TriliumNext/feature/basic_ci
Basic CI pipeline
2024-07-13 20:21:23 +03:00
Elian Doran 1652a7a2ec ci: Remove test branch 2024-07-13 20:04:00 +03:00
Elian Doran 7184c648ab ci: Test Docker publishing 2024-07-13 19:39:56 +03:00
Elian Doran be239d2230 ci: Set up node environment & cache 2024-07-13 19:11:25 +03:00
Elian Doran 439bf410ac ci: Use newer versions of actions 2024-07-13 19:05:39 +03:00
Elian Doran 5aadcb69f8 Merge branch 'feature/fix_docker_build' into feature/basic_ci 2024-07-13 19:02:57 +03:00
Elian Doran 543c29e539 server: Change build directory 2024-07-13 19:02:51 +03:00
Elian Doran 8bcff49198 ci: Install npm dependencies 2024-07-13 18:57:13 +03:00
Elian Doran c0cc1e3b52 ci: Run tsc & create server-package.json 2024-07-13 18:56:18 +03:00
Elian Doran 19550eec6a ci: Set up Docker build in dev workflow 2024-07-13 18:51:46 +03:00
Elian Doran 45f2691053 ci: Disable original CI workflows 2024-07-13 18:47:53 +03:00
Elian Doran ba2931b854 Update package.json 2024-07-13 18:41:36 +03:00
Elian Doran d5c1bd1085 Merge remote-tracking branch 'upstream/master' into feature/port_0.63.7
; Conflicts:
;	package-lock.json
;	src/routes/api/files.ts
;	src/services/build.js
;	src/services/notes.ts
2024-07-13 18:36:04 +03:00
Elian Doran 606490a611 server: Remove log and fix whitespace 2024-07-13 16:56:13 +03:00
Elian Doran d99cc11d8b server: Fix import of notes with type=file 2024-07-13 16:52:31 +03:00
Elian Doran 1b0690ddfc server: Fix note type import
A regression caused by the port to TypeScript caused all note types to
be treated as a "text" instead of other types such as canvas. The MIME
type, however, was unaffected.
2024-07-13 16:43:33 +03:00
Elian Doran ef92d17272 Revert change to tsconfig.json 2024-07-13 14:02:19 +03:00
Elian Doran 7fd63e8064 docker: Remove unneeded build directory 2024-07-13 11:45:20 +03:00
Elian Doran d18bfb9d69 docker: Fix build by generating artifacts 2024-07-13 11:40:52 +03:00
Elian Doran 60d134a89b Revert "docker: Fix webpack"
This reverts commit 0a7fcf399f.
2024-07-13 11:32:02 +03:00
Elian Doran 9b88228be9 docker: Cache system dependencies installation 2024-07-13 11:14:32 +03:00
Elian Doran 0a7fcf399f docker: Fix webpack 2024-07-13 11:06:45 +03:00
Elian Doran 408369fcac docker: Add build directory to gitignore 2024-07-13 10:54:37 +03:00
Elian Doran c435b97e10 docker: Fix "Missing script: "rebuild"" 2024-07-13 10:54:29 +03:00
Elian Doran e7c3dab56f Merge pull request #194 from TriliumNext/feature/disable_format_on_save
Disable format on save temporarily
2024-07-13 09:48:04 +03:00
Elian Doran 374b1f9bb2 Disable format on save for VS Code 2024-07-13 00:27:53 +03:00
MeIchthys 5f23a4e3c7 Fix TrilumRocks Link 2024-07-03 01:15:31 -04:00
meichthys 4e93209fbd - Update chat link to link to Matrix space instead of single room
- Emphasize Awesome Trilium repo
- Remove Ukraine images
- Add note about links still referring to original repo
- Emojify all headings
- Add "Why TriliumNext" section
2024-07-03 01:14:39 -04:00
meichthys 1cff016923 Revert "Update README.md (#171)"
This reverts commit a80a857e46.
2024-07-03 00:29:41 -04:00
MeIchthys a80a857e46 Update README.md (#171)
* Emojify readme and remove original repo specific items (links, images, maintenance mode notice, etc)

* Update readme links to point to TriliumNext repo

* Add link to TriliumRocks
2024-07-02 08:08:44 -04:00
perfectra1n 47c5f60a85 Merge pull request #179 from TriliumNext/perfectra1n-patch-1
Add "unofficial" section, and add some fancier wording
2024-06-17 17:57:24 -07:00
perfectra1n ec2e6f2507 Update README.md 2024-06-15 22:30:35 -07:00
perfectra1n 8eb1e803b5 Add "unofficial" section, and add some fancier wording around "discuss with us" 2024-06-15 22:28:30 -07:00
Alex 17fac31cd1 convert es6 tests to ts 2024-06-09 12:16:09 +02:00
Alex 615f15756b Merge branch 'develop' into feat/ts-unit-and-integration-tests 2024-06-09 11:36:52 +02:00
Alex d7f8cb4e38 remove rebuild 2024-06-09 11:35:48 +02:00
Elian Doran 44ad22ceea Merge pull request #167 from TriliumNext/feat/chatroom-links
Include links to chatrooms in readme
2024-06-03 18:55:16 +03:00
alexpietsch 40dfc46250 add links to readme 2024-05-31 19:37:09 +02:00
Alex 9775a8b7c5 feat: Add prettier config (#165)
* add prettier config

* format some files

* Revert "format some files"

This reverts commit 2c5681ba88c422a92737a9c109021aef8deff2f4.
2024-05-31 12:04:42 -04:00
zadam 82a437f2a8 remove unnecessary debounce which caused missed changes 2024-05-30 06:55:45 +02:00
zadam a64a0e52ec Merge branch 'refs/heads/stable'
# Conflicts:
#	package-lock.json
2024-05-30 06:46:36 +02:00
zadam 88c4171031 lock file 2024-05-30 06:46:22 +02:00
zadam b6c7e2e48f error handling 2024-05-30 06:25:03 +02:00
zadam 305d28b5b3 remove warning about the relation map - trilium is sunsetting anyway, there's no point now in deprecating this feature, fixes #4779 2024-05-30 06:24:50 +02:00
zadam a88bf68eb6 verify that the uploaded modified file is temporary
(cherry picked from commit a2711cfb7b)
2024-05-30 06:10:30 +02:00
zadam 8ebebecd93 Merge pull request #4772 from gigamonster256/macos-arm64
Support compiling native MacOS arm64 (Apple Silicon) builds
2024-05-30 06:06:08 +02:00
Alex b88f81b718 feat: add temp formatter settings 2024-05-21 20:31:22 +02:00
Caleb Norton f0d30dbe49 Add macos arm64 to release script 2024-05-18 03:48:33 -05:00
Caleb Norton d142d3261d support compiling native arm64 macos builds 2024-05-18 03:34:24 -05:00
zadam 25b49e1ca2 release 0.63.6
Publish Docker image / Push Docker image to multiple registries (push) Failing after 41s
2024-05-18 06:17:21 +02:00
zadam c7f19e04fa Merge remote-tracking branch 'origin/master' 2024-05-18 05:50:53 +02:00
zadam a2711cfb7b verify that the uploaded modified file is temporary 2024-05-18 05:50:46 +02:00
Alex fcb30f6319 feat: migrate jasmine tests to ts 2024-05-08 23:59:11 +02:00
Alex aa4960f1a5 Merge branch 'develop' into feat/ts-unit-and-integration-tests 2024-05-08 21:17:29 +02:00
Elian Doran ade6d08ded Merge pull request #67 from TriliumNext/fix/EtapiError-prototype
fix: set prototype
2024-05-08 21:37:36 +03:00
Elian Doran 045f318612 Merge pull request #60 from TriliumNext/fix/start-electron
fix: start-electron script
2024-05-08 21:36:36 +03:00
Elian Doran 2d67abbc12 Merge branch 'zadam:master' into develop 2024-05-07 20:44:45 +03:00
Alex 5f539427a9 fix: set prototype 2024-05-05 12:40:00 +02:00
zadam f984b361ee Merge pull request #4717 from MatMasIt/italian-translation
Italian translation of README
2024-05-05 05:13:26 +02:00
Alex e7f11d6687 enable jasmine test runs 2024-05-03 21:18:20 +02:00
Alex 3e82d30a32 fix: skipLibCheck 2024-05-01 11:32:08 +02:00
alexpietsch d2604e91d4 feat: add ts script for cross plattform use 2024-05-01 00:05:24 +02:00
Alex e2b4eaf9cc fix: copy only necessary modules 2024-04-29 23:37:08 +02:00
Alex 0a69ed91b6 fix: add postinstall step 2024-04-29 14:58:16 +02:00
Alex 8c0ce174b5 fix: script permissions 2024-04-29 14:54:39 +02:00
alexpietsch c8adf2a685 fix: restore start-electron script functionality 2024-04-29 00:36:27 +02:00
Elian Doran a68b75f069 Merge pull request #48 from TriliumNext/feature/typescript_backend_11
Convert backend to TypeScript (89% -> 92%, final)
2024-04-20 09:37:19 +03:00
Elian Doran 2771bd4ece Merge pull request #47 from TriliumNext/feature/typescript_backend_10
Convert backend to TypeScript (84% -> 89%)
2024-04-20 09:36:08 +03:00
Elian Doran 19cf9df52c Merge pull request #45 from TriliumNext/feature/typescript_backend_9
Convert backend to TypeScript (81% -> 84%)
2024-04-20 09:35:18 +03:00
Elian Doran 15168fb213 server-ts: Use unknown for validators 2024-04-18 21:26:29 +03:00
Elian Doran 0d700d6951 server-ts: Address review 2024-04-17 23:00:02 +03:00
Elian Doran 67cb02ed92 server-ts: Address some more review comments 2024-04-17 22:54:05 +03:00
Elian Doran 1d1ccc8d63 server-ts: Fix regression 2024-04-17 22:49:41 +03:00
Elian Doran 262e4db0f2 server-ts: Remove unnecessary type comments 2024-04-17 22:35:38 +03:00
Elian Doran c814187a25 server-ts: Address review 2024-04-17 22:24:27 +03:00
Elian Doran 138be84e45 server-ts: Address requested changes 2024-04-16 21:10:39 +03:00
Elian Doran 625d935f08 Merge pull request #44 from TriliumNext/feature/typescript_backend_8
Convert backend to TypeScript (80% -> 81%)
2024-04-16 21:01:20 +03:00
Elian Doran 98d12901a5 Merge pull request #43 from TriliumNext/feature/typescript_backend_7
Convert backend to TypeScript (71% -> 80%)
2024-04-15 21:51:00 +03:00
Elian Doran 1372cc1cb9 server-ts: Fix regression 2024-04-15 21:20:59 +03:00
Elian Doran a072016fc5 Merge pull request #42 from TriliumNext/feature/typescript_backend_6
Convert backend to TypeScript (67% -> 71%)
2024-04-15 21:12:55 +03:00
Elian Doran 97230ca82a server-ts: Remove some esdoc types 2024-04-15 21:12:34 +03:00
Elian Doran 4c69384b5d Merge pull request #41 from TriliumNext/feature/typescript_backend_5
Convert backend to TypeScript (64% -> 67%)
2024-04-15 21:09:37 +03:00
Elian Doran 6ac3c172b1 Merge pull request #28 from TriliumNext/feature/typescript_backend_4
Convert backend to TypeScript (50% -> 64%)
2024-04-15 21:00:38 +03:00
Elian Doran a66e4435ba server-ts: Address requested changes 2024-04-13 17:30:48 +03:00
Elian Doran ae29699e65 server-ts: Port www 2024-04-11 23:14:37 +03:00
Elian Doran 9022bc338a server-ts: Port app 2024-04-11 23:03:19 +03:00
Elian Doran dededcd303 server-ts: Port routes/routes 2024-04-11 23:00:24 +03:00
Elian Doran 4638351ec8 server-ts: Update progress script 2024-04-11 22:21:38 +03:00
Elian Doran 1ac65fff47 server-ts: Address requested changes 2024-04-11 19:49:01 +03:00
Elian Doran 17eda952e4 Merge branch 'feature/typescript_backend_5' into feature/typescript_backend_10 2024-04-10 19:29:00 +03:00
Elian Doran 8629993fe4 Merge branch 'feature/typescript_backend_5' into feature/typescript_backend_9 2024-04-10 19:28:36 +03:00
Elian Doran 8297e1a835 Merge branch 'feature/typescript_backend_5' into feature/typescript_backend_8 2024-04-10 19:28:10 +03:00
Elian Doran b517b18394 Merge branch 'feature/typescript_backend_5' into feature/typescript_backend_7 2024-04-10 19:27:31 +03:00
Elian Doran 32e34eec90 Merge branch 'feature/typescript_backend_5' into feature/typescript_backend_6 2024-04-10 19:26:30 +03:00
Elian Doran fb32ab9707 server-ts: Address requested changes 2024-04-10 19:26:08 +03:00
Elian Doran 8acfb5b558 Merge pull request #25 from TriliumNext/feature/typescript_backend_3
Convert backend to TypeScript (35% -> 50%)
2024-04-10 19:16:29 +03:00
Elian Doran a7ae16bb39 Merge pull request #18 from TriliumNext/feature/typescript_backend_2
Convert backend to TypeScript (19% -> 35%)
2024-04-10 19:16:06 +03:00
Elian Doran c08393f04b server-ts: Port share/routes 2024-04-10 19:04:38 +03:00
Elian Doran 88aba1c844 server-ts: Port share/shaca/content_renderer 2024-04-09 22:58:24 +03:00
Elian Doran 7c76d28f75 server-ts: Port share/shaca/shaca_loader 2024-04-09 22:49:05 +03:00
Elian Doran b3c2602620 server-ts: Port share/shaca/shaca 2024-04-09 22:42:48 +03:00
Elian Doran 0865e90cae server-ts: Port share/shaca/sbranch 2024-04-09 22:33:59 +03:00
Elian Doran e1d74cd2f5 server-ts: Port share/shaca/sattribute 2024-04-09 22:29:40 +03:00
Elian Doran c4c2259e69 server-ts: Port share/shaca/sattachment 2024-04-09 22:21:07 +03:00
Elian Doran 3e4b0d5f91 server-ts: Port share/shaca/snote 2024-04-09 22:13:01 +03:00
Elian Doran b07df6061f server-ts: Port share/share_root 2024-04-09 21:51:23 +03:00
Elian Doran 80a1b8b44d server-ts: Port share/sql 2024-04-09 21:50:47 +03:00
Elian Doran 45e3632c6e server-ts: Port share/shaca/abstract_shaca_entity 2024-04-09 21:48:15 +03:00
Elian Doran 39e152b0b9 Merge branch 'feature/typescript_backend_6' into feature/typescript_backend_10 2024-04-09 21:46:24 +03:00
Elian Doran 2a99ecc384 Merge branch 'feature/typescript_backend_6' into feature/typescript_backend_9 2024-04-09 21:45:40 +03:00
Elian Doran 22477f90ae Merge branch 'feature/typescript_backend_6' into feature/typescript_backend_8 2024-04-09 21:45:04 +03:00
Elian Doran d8c2ba0ed8 Merge branch 'feature/typescript_backend_6' into feature/typescript_backend_7 2024-04-09 21:44:26 +03:00
Elian Doran 74441273a8 server-ts: Fix getAttribute permitting null 2024-04-09 21:43:42 +03:00
Elian Doran ed79c1c62a server-ts: Convert etapi/special_notes 2024-04-07 18:21:18 +03:00
Elian Doran 9b9b452055 server-ts: Convert etapi/spec 2024-04-07 18:18:26 +03:00
Elian Doran 5fdf094e9d server-ts: Convert etapi/notes 2024-04-07 16:56:45 +03:00
Elian Doran e4024408bd server-ts: Convert etapi/bbranches 2024-04-07 15:21:42 +03:00
Elian Doran 602b4988ae server-ts: Convert etapi/backup 2024-04-07 15:18:35 +03:00
Elian Doran 071f9400d7 server-ts: Convert etapi/auth 2024-04-07 15:17:45 +03:00
Elian Doran 1e2a30adcc server-ts: Convert etapi/attributes 2024-04-07 15:15:50 +03:00
Elian Doran a6de065bf4 server-ts: Convert etapi/attachments 2024-04-07 15:13:34 +03:00
Elian Doran 3bd7231ba9 server-ts: Convert etapi/validators 2024-04-07 14:59:40 +03:00
Elian Doran 4bb46aeb9c server-ts: Convert etapi/mappers 2024-04-07 14:56:22 +03:00
Elian Doran 26859e83e4 server-ts: Convert etapi/app_info 2024-04-07 14:54:42 +03:00
Elian Doran 569bdf19be server-ts: Convert etapi/etapi_utils 2024-04-07 14:54:01 +03:00
Elian Doran b8eb301f34 server-ts: Add types for multer 2024-04-07 14:38:51 +03:00
Elian Doran 10c21d3403 server-ts: Convert routes/index 2024-04-07 14:36:47 +03:00
Elian Doran a18b054dbb server-ts: Convert routes/setup 2024-04-07 14:33:41 +03:00
Elian Doran 2e906af77d server-ts: Convert routes/session_parser 2024-04-07 14:32:08 +03:00
Elian Doran 34cd2eba91 server-ts: Remove use of (req as any) 2024-04-07 14:29:08 +03:00
Elian Doran 7fe6d1ab4d server-ts: Convert routes/login 2024-04-07 14:22:01 +03:00
Elian Doran c2eefad287 server-ts: Convert routes/error_handlers 2024-04-07 14:13:57 +03:00
Elian Doran 202fda3c30 server-ts: Convert routes/electron 2024-04-07 14:09:37 +03:00
Elian Doran 4940207b15 server-ts: Convert routes/custom 2024-04-07 14:05:50 +03:00
Elian Doran 79c9d7e305 server-ts: Convert routes/assets 2024-04-07 14:02:52 +03:00
Elian Doran 6e042c20e9 server-ts: Convert routes/api/tree 2024-04-06 23:34:47 +03:00
Elian Doran 7a98718e64 server-ts: Convert routes/api/sync 2024-04-06 23:28:51 +03:00
Elian Doran 6bbb1f8404 server-ts: Convert routes/api/stats 2024-04-06 23:15:00 +03:00
Elian Doran cecfc4cd34 server-ts: Convert routes/api/sql 2024-04-06 23:12:22 +03:00
Elian Doran c1875a8c8f server-ts: Convert routes/api/special_notes 2024-04-06 23:11:02 +03:00
Elian Doran 249e81c9eb server-ts: Convert routes/api/similar_notes 2024-04-06 23:09:32 +03:00
Elian Doran 5804dc52bc server-ts: Convert routes/api/setup 2024-04-06 23:08:41 +03:00
Elian Doran 90cf913083 server-ts: Convert routes/api/sender 2024-04-06 23:01:08 +03:00
Elian Doran fa82158e30 server-ts: Convert routes/api/search 2024-04-06 22:48:20 +03:00
Elian Doran de42df40bb server-ts: Convert routes/api/script 2024-04-06 22:38:17 +03:00
Elian Doran 6265aa99d3 server-ts: Convert routes/api/revisions 2024-04-06 22:32:03 +03:00
Elian Doran 4ab6f159e5 server-ts: Fix "Missing or incorrect type for target branch ID"
When attempting to add a new note from the relation map
2024-04-06 22:17:47 +03:00
Elian Doran b50ceaf299 server-ts: Convert routes/api/relation-map 2024-04-06 22:13:47 +03:00
Elian Doran 96c8c9080d server-ts: Convert routes/api/recent_notes 2024-04-06 22:07:58 +03:00
Elian Doran 66d7548046 server-ts: Convert routes/api/recent_changes 2024-04-06 22:07:03 +03:00
Elian Doran 4b1c351195 server-ts: Convert routes/api/password 2024-04-06 22:00:03 +03:00
Elian Doran eb7a7e4988 server-ts: Convert routes/api/other 2024-04-06 21:58:32 +03:00
Elian Doran 3d75366f02 server-ts: Convert routes/api/options 2024-04-06 21:57:26 +03:00
Elian Doran c63c7d518c server-ts: Convert routes/api/notes 2024-04-06 21:55:27 +03:00
Elian Doran 37697c7db7 server-ts: Convert routes/api/note_map 2024-04-06 21:45:58 +03:00
Elian Doran b1744c3867 server-ts: Convert routes/api/login 2024-04-06 21:34:34 +03:00
Elian Doran b0d6035a67 server-ts: Convert routes/api/keys 2024-04-06 21:31:09 +03:00
Elian Doran 3902719008 server-ts: Convert routes/api/import 2024-04-06 21:30:27 +03:00
Elian Doran 291b791b67 server-ts: Convert routes/api/image 2024-04-06 21:21:22 +03:00
Elian Doran b552f40ae8 server-ts: Convert routes/api/fonts 2024-04-05 22:24:21 +03:00
Elian Doran 0ab137de03 server-ts: Convert routes/api/files 2024-04-05 22:22:18 +03:00
Elian Doran 952c3cc12f server-ts: Convert routes/api/export 2024-04-05 20:58:31 +03:00
Elian Doran e451237361 server-ts: Convert routes/api/etapi_tokens 2024-04-05 20:56:23 +03:00
Elian Doran 27637b0483 server-ts: Convert routes/api/consistency_checks 2024-04-05 20:55:21 +03:00
Elian Doran 122ff3bb1d server-ts: Convert routes/api/cloning 2024-04-05 20:47:07 +03:00
Elian Doran f98f84d419 server-ts: Convert routes/api/bnote 2024-04-05 20:45:57 +03:00
Elian Doran 40ef533c5f server-ts: Convert routes/api/bulk_action 2024-04-05 20:36:10 +03:00
Elian Doran fd77c5e8c4 server-ts: Convert routes/api/branches 2024-04-05 20:33:04 +03:00
Elian Doran 706b9d0f46 server-ts: Convert routes/api/backend_log 2024-04-05 20:28:19 +03:00
Elian Doran 82f5553980 server-ts: Convert routes/api/autocomplete 2024-04-05 20:26:45 +03:00
Elian Doran c0349b3f84 server-ts: Convert routes/api/attributes 2024-04-05 20:22:10 +03:00
Elian Doran 9330241045 server-ts: Convert routes/api/attachments 2024-04-05 20:16:46 +03:00
Elian Doran b13ad5d01e server-ts: Convert routes/api/app_info 2024-04-05 20:12:54 +03:00
Elian Doran ea36b37f66 server-ts: Convert services/scheduler 2024-04-04 23:08:32 +03:00
Elian Doran 92ca32bd70 server-ts: Convert services/handlers 2024-04-04 23:04:54 +03:00
Elian Doran 59c533cb6c server-ts: Convert services/script 2024-04-04 22:47:58 +03:00
Elian Doran 884b6618fb server-ts: Convert services/script_context 2024-04-04 22:29:12 +03:00
Elian Doran 15dee4b952 server-ts: Convert services/backend_script_api 2024-04-04 22:04:30 +03:00
Elian Doran a154dc76ce server-ts: Port services/options 2024-04-03 23:28:26 +03:00
Elian Doran 532ed1d3f9 server-ts: Port services/setup 2024-04-03 23:18:39 +03:00
Elian Doran 984ce49168 server-ts: Port services/special_notes 2024-04-03 23:05:06 +03:00
Elian Doran 16283d4054 server-ts: Port services/spaced_update 2024-04-03 22:53:41 +03:00
Elian Doran 915de23e34 server-ts: Port services/anonymize 2024-04-03 22:51:07 +03:00
Elian Doran 53d4873c1f server-ts: Port services/import/zip 2024-04-03 22:46:14 +03:00
Elian Doran 764d251b0a server-ts: Port services/import/enex 2024-04-03 21:29:26 +03:00
Elian Doran aa233b8adb server-ts: Port consistency_checks 2024-04-03 20:48:54 +03:00
Elian Doran ed47c23e23 Merge branch 'feature/typescript_backend_3' into feature/typescript_backend_4 2024-04-03 20:21:55 +03:00
Elian Doran 5baabecdee Merge branch 'feature/typescript_backend_2' into feature/typescript_backend_3 2024-04-03 20:21:13 +03:00
Elian Doran 17c7e2d8e7 server-ts: Address further suggestions 2024-04-03 20:04:20 +03:00
Elian Doran 5d452a1525 server-ts: Address review 2024-04-03 19:22:49 +03:00
Elian Doran f857b8a9bb server-ts: Refactor out abstract init in entities 2024-04-03 19:05:10 +03:00
Elian Doran a354b54a08 server-ts: Fix getContent in updateNoteData 2024-04-03 18:53:56 +03:00
Elian Doran e96b56e061 server-ts: Fix build errors 2024-04-03 00:02:51 +03:00
Elian Doran 0daa4cc89a Merge branch 'feature/typescript_backend_3' into feature/typescript_backend_4 2024-04-02 23:57:01 +03:00
Elian Doran 99d50957dd server-ts: Address self-review 2024-04-02 23:55:02 +03:00
Elian Doran d4c8d24d50 server-ts: Address some review comments 2024-04-02 23:39:45 +03:00
Elian Doran a420129631 server-ts: Fix build errors after merge 2024-04-02 23:34:12 +03:00
Elian Doran 090d353fd0 Merge branch 'feature/typescript_backend_2' into feature/typescript_backend_3 2024-04-02 23:26:16 +03:00
Elian Doran b84b27692c server-ts: Fix some issues from self-review 2024-04-02 23:22:45 +03:00
Elian Doran adc384a971 Merge pull request #13 from TriliumNext/feature/typescript_backend
Convert backend to TypeScript (0% -> 19%)
2024-04-02 22:30:39 +03:00
Elian Doran 08f0c01eef server-ts: Solve build errors after merge 2024-03-30 11:09:45 +02:00
Elian Doran db2b33704f Merge branch 'feature/typescript_backend' into feature/typescript_backend_2 2024-03-30 10:54:06 +02:00
Elian Doran 3eb7ed5dda server-ts: Address requested changes 2024-03-30 10:49:40 +02:00
Elian Doran 5e5add7e47 Merge remote-tracking branch 'origin/develop' into feature/typescript_backend 2024-03-30 09:23:00 +02:00
Mattia Mascarello ac1e1ebe43 Forgot to translate a heading 2024-03-28 20:51:28 +01:00
Mattia Mascarello 499bfaea9b Added italian to other READMEs language section 2024-03-28 20:42:53 +01:00
Mattia Mascarello fa4772b91e proofreading 2024-03-28 20:38:20 +01:00
Mattia Mascarello fa7b190c6b Translated readme in italian 2024-03-28 19:23:01 +01:00
zadam 84feec2e7e Merge branch 'stable'
# Conflicts:
#	package-lock.json
2024-03-28 07:26:17 +01:00
zadam 3035473751 release 0.63.5
Publish Docker image / Push Docker image to multiple registries (push) Failing after 36s
2024-03-28 07:11:39 +01:00
zadam 399458b52f package lock 2024-03-28 07:08:31 +01:00
zadam becac5fbad fix rendering of math on non-root paths, closes #4713 2024-03-28 07:08:15 +01:00
zadam 1e26b31090 release 0.63.4
Publish Docker image / Push Docker image to multiple registries (push) Failing after 34s
2024-03-28 07:00:01 +01:00
zadam 0ebd03869d use "n space" instead of zero length space to make it obvious there is a character there 2024-03-28 06:57:44 +01:00
zadam a4a713f102 allow cancelling mention UI with escape, fixes #4692, #4684 2024-03-28 06:43:26 +01:00
zadam 83d5d6bbd8 fix copy link in browser, closes #4682 2024-03-27 20:42:36 +01:00
zadam 90f4c6b0d1 allow converting file attachments to file notes 2024-03-27 06:59:57 +01:00
Elian Doran 926b3e9650 Merge remote-tracking branch 'origin/develop' into feature/typescript_backend 2024-03-17 21:44:06 +02:00
Elian Doran cbad58201e server-ts: Solve requested changes 2024-03-17 21:40:14 +02:00
Elian Doran 040ed39a4e server-ts: Fix undefined in task_context 2024-03-17 21:37:40 +02:00
Elian Doran 9f6a8dc75c server-ts: Fix undefined in ws 2024-03-17 21:34:50 +02:00
zadam bfb8aa6481 remove eslint 2024-03-06 07:17:51 +01:00
zadam 2bb4cccd82 fix excalidraw 0.17 integration 2024-03-06 07:13:30 +01:00
zadam 6fad5f2b51 Merge branch 'master' into excali-17-2 2024-03-06 06:53:19 +01:00
zadam 36357bdf86 update mermaid 2024-03-06 06:52:41 +01:00
zadam 80eaf10656 remove husky 2024-03-06 06:51:25 +01:00
zadam f46ce0417d more prettier removals 2024-03-06 06:48:25 +01:00
zadam 6f1e6402f0 package upgrades + removal of prettier 2024-03-06 06:47:30 +01:00
zadam bdfa13a8a0 Merge pull request #4676 from st3iny/fix/invisible-unchecked-todo
fix: invisible unchecked to-do items
2024-03-06 06:32:23 +01:00
Richard Steinmetz d5622dfbf7 fix: invisible unchecked to-do items 2024-03-05 22:29:10 +01:00
zadam 0948853539 release 0.63.3
Publish Docker image / Push Docker image to multiple registries (push) Failing after 44s
2024-03-03 06:58:18 +01:00
zadam 0ad337c8e8 add API method to erase a revision #4662 2024-03-03 06:34:43 +01:00
zadam 9565b0b43d Merge pull request #4671 from AlexeiKharchev/master
Reduce warnings count caused by bin/copy-trilium.sh
2024-03-03 06:26:18 +01:00
zadam a115b14136 fix highlighting search results with regexp characters in fulltext string, closes #4665 2024-03-02 07:35:52 +01:00
Alexei Kharchev bb8bfc61ed Improved scriptes bin/copy-trilium.sh, bin/build-linux-x64.sh 2024-03-02 14:18:39 +08:00
zadam 2d19f073d9 fix searching fulltext with tags, closes #4661 2024-03-02 07:13:02 +01:00
Alexei Kharchev ff5d5d20d9 Reduce warnings count caused by bin/copy-trilium.sh 2024-03-02 11:49:17 +08:00
Elian Doran 8c5f680dca server-ts: Fix build errors 2024-02-25 15:06:43 +02:00
Elian Doran 7f0102181d server-ts: Port services/import/single 2024-02-25 14:52:20 +02:00
Elian Doran 59d618f06b server-ts: Port services/import/markdown 2024-02-25 08:12:07 +02:00
Elian Doran cc1a545e13 server-ts: Port services/import/opml 2024-02-25 08:07:17 +02:00
Elian Doran fd37fd3a45 server-ts: Port services/import/mime 2024-02-25 07:57:17 +02:00
Elian Doran 052a0a44f2 server-ts: Port services/import/utils 2024-02-25 07:54:51 +02:00
Elian Doran fa0ed35752 server-ts: Port services/image 2024-02-20 23:29:03 +02:00
Elian Doran 29d37c40c1 server-ts: Port services/export/zip 2024-02-19 23:08:43 +02:00
Elian Doran 1728365fa1 server-ts: Port services/export/single 2024-02-19 22:12:00 +02:00
Elian Doran cfeb0cc6f7 server-ts: Port services/export/opml 2024-02-19 22:07:21 +02:00
Elian Doran ec4bd6659a server-ts: Port services/export/md 2024-02-19 21:59:40 +02:00
Elian Doran 0903cf2646 Merge branch 'feature/typescript_backend_2' into feature/typescript_backend_3 2024-02-18 20:43:27 +02:00
Elian Doran cbc01e1a8d server-ts: FIXME -> TODO 2024-02-18 20:41:30 +02:00
Elian Doran 11c7533984 Merge branch 'feature/typescript_backend' into feature/typescript_backend_2 2024-02-18 20:39:18 +02:00
Elian Doran aff1c30557 server-ts: FIXME -> TODO 2024-02-18 20:29:23 +02:00
Elian Doran 3d9da26bb3 server-ts: Address review comments 2024-02-18 18:11:56 +02:00
Elian Doran 91ddabbb9b server-ts: Remove redundant file 2024-02-18 13:44:41 +02:00
Elian Doran 3030fbe60b server-ts: Port services/notes 2024-02-18 13:42:05 +02:00
Elian Doran 5f4f30f84b server-ts: Port services/options_init 2024-02-18 13:32:00 +02:00
Elian Doran 45cb7ced2c server-ts: Port services/host 2024-02-18 13:26:28 +02:00
Elian Doran dbccf6b433 server-ts: Port services/one_time_timer 2024-02-18 13:25:18 +02:00
Elian Doran 6df09cb157 server-ts: Port services/bulk_actions 2024-02-18 13:23:37 +02:00
Elian Doran 6cedad07e5 server-ts: Port services/cloning 2024-02-18 13:16:54 +02:00
Elian Doran e4556afcc9 server-ts: Port services/session_secret 2024-02-18 13:13:16 +02:00
Elian Doran d89b791914 server-ts: Port services/sync 2024-02-18 13:10:51 +02:00
Elian Doran 43c89c0e9d server-ts: Port services/content_hash 2024-02-18 12:50:58 +02:00
Elian Doran 0ba80b176c server-ts: Port services/sync_update 2024-02-18 12:40:30 +02:00
Elian Doran 3ea4b7a72b server-ts: Port services/tray 2024-02-18 12:28:32 +02:00
Elian Doran 330334dcb4 server-ts: Port services/window 2024-02-18 12:19:09 +02:00
Elian Doran ddcbb29a67 server-ts: Update script to display remaining filelist 2024-02-18 11:50:22 +02:00
Elian Doran 9ea4fcd667 server-ts: Port services/branches 2024-02-18 11:48:38 +02:00
Elian Doran 0d4fb42731 server-ts: Port services/tree 2024-02-18 11:47:32 +02:00
Elian Doran d8d729342d server-ts: Port services/attributes 2024-02-18 11:26:05 +02:00
Elian Doran 2fbd2e3c29 server-ts: Port services/search/services/search 2024-02-18 11:16:30 +02:00
Elian Doran 15169289f0 server-ts: Port services/search/services/parse 2024-02-18 02:27:04 +02:00
Elian Doran 29b3fb3646 server-ts: Port services/search/expressions/property_comparison 2024-02-18 01:50:16 +02:00
Elian Doran 533a597a5c server-ts: Port services/search/services/lex 2024-02-18 01:46:32 +02:00
Elian Doran deed58c2fc server-ts: Port services/search/services/handle_parens 2024-02-18 01:38:51 +02:00
Elian Doran 8acb64198c server-ts: Port services/search/services/build_comparator 2024-02-18 01:38:42 +02:00
Elian Doran f5b690d088 server-ts: Port services/search/expressions/relation_where 2024-02-18 01:19:50 +02:00
Elian Doran 0f7f0ceedc server-ts: Port services/search/expressions/parent_of 2024-02-18 01:18:20 +02:00
Elian Doran 87708aa9c3 server-ts: Port services/search/expressions/order_by_and_limit 2024-02-18 01:17:02 +02:00
Elian Doran c63d05b582 server-ts: Port services/search/expressions/or 2024-02-18 01:06:42 +02:00
Elian Doran 460982d290 server-ts: Port services/search/expressions/note_flat_text 2024-02-18 01:05:34 +02:00
Elian Doran 414964e791 server-ts: Port services/search/expressions/note_content_fulltext 2024-02-18 01:01:17 +02:00
Elian Doran 3df6acda32 server-ts: Port services/search/expressions/not 2024-02-18 00:51:18 +02:00
Elian Doran 571c9f544c server-ts: Port services/search/expressions/label_comparison 2024-02-18 00:50:14 +02:00
Elian Doran acb31b621f server-ts: Port services/search/expressions/is_hidden 2024-02-18 00:48:37 +02:00
Elian Doran 35886c3b00 server-ts: Port services/search/expressions/descendant_of 2024-02-18 00:47:25 +02:00
Elian Doran ccc51e0123 server-ts: Port services/search/expressions/child_of 2024-02-18 00:46:25 +02:00
Elian Doran 0df488667e server-ts: Port services/search/expressions/attribute_exists 2024-02-18 00:45:21 +02:00
Elian Doran 7018cc77a3 server-ts: Port services/search/expressions/and 2024-02-18 00:43:55 +02:00
Elian Doran 8d2eddd14d server-ts: Port services/search/expressions/true 2024-02-18 00:42:17 +02:00
Elian Doran 414515bc87 server-ts: Port services/search/expressions/ancestor 2024-02-18 00:40:15 +02:00
Elian Doran ce60fc0c3a server-ts: Port services/search/expressions/expression 2024-02-18 00:36:37 +02:00
Elian Doran 216f3f2c07 server-ts: Port services/search/value_extractor 2024-02-18 00:34:36 +02:00
Elian Doran 80e6ced5db server-ts: Port services/search/search_result 2024-02-18 00:30:16 +02:00
Elian Doran fbf77f3382 server-ts: Port services/search/search_context 2024-02-18 00:28:05 +02:00
Elian Doran 1010d11827 server-ts: Port services/hoisted_note 2024-02-18 00:22:46 +02:00
zadam 1f95e88cfd release 0.63.2-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 42s
2024-02-17 22:47:50 +01:00
Elian Doran 5d683721b1 server-ts: Change data type 2024-02-17 23:32:32 +02:00
Elian Doran de7f4de05b server-ts: Port services/notes & hidden_subtree 2024-02-17 23:02:19 +02:00
Elian Doran 669988953d server-ts: Port services/request 2024-02-17 21:58:35 +02:00
Elian Doran dc22d05657 server-ts: Port services/html_sanitizer 2024-02-17 21:33:47 +02:00
Elian Doran 00c692cf28 server-ts: Port services/note_types 2024-02-17 21:29:28 +02:00
Elian Doran 77fb7bc6e8 server-ts: Port services/erase 2024-02-17 21:13:04 +02:00
Elian Doran f31d788e2e server-ts: Port services/auth 2024-02-17 21:08:56 +02:00
Elian Doran 45582ebaac server-ts: Port services/meta/* 2024-02-17 21:01:31 +02:00
Elian Doran 748a551def server-ts: Port similarity 2024-02-17 20:55:36 +02:00
Elian Doran d35613f510 server-ts: Port becca_loader 2024-02-17 20:45:31 +02:00
Elian Doran 3d5ef81860 server-ts: Simplify deferred promise in sql_init 2024-02-17 20:33:18 +02:00
Elian Doran 9f99b4282a server-ts: Port becca/becca_service 2024-02-17 20:30:21 +02:00
Elian Doran 3b7812f829 server-ts: Port becca/entity_constructor 2024-02-17 20:28:05 +02:00
Elian Doran 1c7532df46 server-ts: Port sync_options 2024-02-17 20:24:32 +02:00
Elian Doran a029ee268a server-ts: Fix export 2024-02-17 20:06:54 +02:00
Elian Doran 1b58dbe401 server-ts: Port etapi_tokens service 2024-02-17 19:55:40 +02:00
Elian Doran 56ca0ea5d0 server-ts: Port migration, port, sql_init services 2024-02-17 19:51:22 +02:00
Elian Doran 246a90d73c server-ts: Port revisions service 2024-02-17 19:44:46 +02:00
Elian Doran a58abffe58 server-ts: Port migration service 2024-02-17 19:42:30 +02:00
Elian Doran 8936a3fa3b server-ts: Port backup service 2024-02-17 19:33:29 +02:00
Elian Doran 6b8ee084e6 server-ts: Port keyboard_actions 2024-02-17 19:29:15 +02:00
Elian Doran 5916a8b5b8 server-ts: Fix build errors 2024-02-17 19:20:32 +02:00
Elian Doran a183f21078 server-ts: Convert attribute_formatter 2024-02-17 19:15:50 +02:00
Elian Doran 9826fed905 server-ts: Port app* services 2024-02-17 19:09:36 +02:00
Elian Doran a06aa9df8a server-ts: Port anonymization service 2024-02-17 19:02:14 +02:00
Elian Doran 1e91db865b server-ts: Implement review comments 2024-02-17 18:55:41 +02:00
Elian Doran 8af5434462 server-ts: Add script to check progress 2024-02-17 13:32:43 +02:00
Elian Doran 6f0659c03c server-ts: Bring back nodemon 2024-02-17 13:32:43 +02:00
Elian Doran b8ccf5ba8f server-ts: Fix error with sanitize_attribute_name 2024-02-17 13:32:43 +02:00
Elian Doran 45a6c9558f server-ts: Fix references to js files for converted files 2024-02-17 13:32:43 +02:00
Elian Doran 4df599fec2 server-ts: Fix some build errors 2024-02-17 13:32:43 +02:00
Elian Doran 030aec2f3e server-ts: Fix more references to js files for converted files 2024-02-17 13:32:43 +02:00
Elian Doran 8b250e4a13 server-ts: Fix references to js files for converted files 2024-02-17 13:32:43 +02:00
Elian Doran 2f96dc2d9d server-ts: Fix most type errors in becca 2024-02-17 13:32:43 +02:00
Elian Doran 26388ad3b6 server-ts: Fix errors in becca-interface 2024-02-17 13:32:43 +02:00
Elian Doran 2c0063a5cc server-ts: Remove .js extensions in src/becca 2024-02-17 13:32:43 +02:00
Elian Doran 3a20bef1a9 server-ts: Fix more errors in becca entities 2024-02-17 13:32:42 +02:00
Elian Doran 9aec3390dd server-ts: Fix most errors in bnote 2024-02-17 13:32:42 +02:00
Elian Doran f9ba8ca87d server-ts: Fix errors in abstract_becca_entity 2024-02-17 13:32:42 +02:00
Elian Doran f51f070b2f server-ts: Port bbranch (with some build errors) 2024-02-17 13:32:42 +02:00
Elian Doran cf18e61a33 server-ts: Port ws service & dependencies 2024-02-17 13:32:42 +02:00
Elian Doran 4b1d2c6bad server-ts: Port options service 2024-02-17 13:32:42 +02:00
Elian Doran 06287da9d8 server-ts: Port battribute 2024-02-17 13:32:42 +02:00
Elian Doran eef8297ce1 server-ts: Port bblob 2024-02-17 13:32:42 +02:00
Elian Doran 2f15d79476 server-ts: Port betapi_token 2024-02-17 13:32:42 +02:00
Elian Doran 768aaf2d78 server-ts: Port boption 2024-02-17 13:32:42 +02:00
Elian Doran 6dd2cd39aa server-ts: Convert a few classes in becca 2024-02-17 13:32:42 +02:00
Elian Doran e04bd5aaf0 server-ts: Convert more classes, including entity_changes.js 2024-02-17 13:32:42 +02:00
Elian Doran cb14d4d8f9 server-ts: Convert blob.js 2024-02-17 13:32:42 +02:00
Elian Doran 85af0a24ee server-ts: Convert becca.js 2024-02-17 13:32:42 +02:00
Elian Doran 3a7d0d1f13 server-ts: Add some type fixes to sql.ts 2024-02-17 13:32:42 +02:00
Elian Doran 5309d4ad5c server-ts: instance_id.js -> ts 2024-02-17 13:32:42 +02:00
Elian Doran 786d851293 server-ts: events.js -> ts 2024-02-17 13:32:41 +02:00
Elian Doran b63e870038 server-ts: protected_session.js -> ts 2024-02-17 13:32:41 +02:00
Elian Doran c20d2273e6 server-ts: services/encryption/*.js -> ts 2024-02-17 13:32:41 +02:00
Elian Doran dc359b2a74 server-ts: resource_dir.js -> ts 2024-02-17 13:32:41 +02:00
Elian Doran d3c9e7e157 server-ts: errors/*.js -> .ts 2024-02-17 13:32:41 +02:00
Elian Doran 82a9808dea server-ts: sql.js -> sql.ts 2024-02-17 13:32:41 +02:00
Elian Doran e2a727ec8a server-ts: date_utils.js -> date_utils.ts 2024-02-17 13:32:41 +02:00
Elian Doran 7a9365457a server-ts: utils.js -> utils.ts 2024-02-17 13:32:41 +02:00
Elian Doran 28735fa16a server-ts: Fix build errors 2024-02-17 13:32:41 +02:00
Elian Doran ff2e05fe83 server-ts: Fix references to cls.js 2024-02-17 13:32:41 +02:00
Elian Doran 96b6d17d77 server-ts: Remove need for 'allowImportingTsExtensions' 2024-02-17 13:32:40 +02:00
Elian Doran 78f631373b server-ts: cls.js -> cls.ts 2024-02-17 13:32:40 +02:00
Elian Doran 981221d599 server-ts: data_dir.js -> data_dir.ts 2024-02-17 13:32:40 +02:00
Elian Doran bda11fad40 server-ts: Fix errors in log.ts 2024-02-17 13:32:40 +02:00
Elian Doran 39627a4fc4 server-ts: log.js -> log.ts 2024-02-17 13:32:40 +02:00
Elian Doran 094895ec72 server-ts: Enable ts-node instead of nodemon 2024-02-17 13:32:40 +02:00
zadam 15677f7178 Update README.md 2024-02-16 12:16:58 +01:00
zadam 3a0bb91b77 fix 2024-02-16 11:25:23 +01:00
zadam 157f894c9b Merge pull request #4642 from henrikx/patch-1
Fix ribbon tooltips getting stuck on the screen by setting a small delay before saving attributes in attributeeditor
2024-02-16 11:02:13 +01:00
zadam e6dec701c0 Merge remote-tracking branch 'origin/master' 2024-02-16 10:42:30 +01:00
zadam 450b52f6da JSDoc improvements 2024-02-16 10:42:25 +01:00
zadam 4ef31eaf3d Merge pull request #4635 from WantToLearnJapanese/WantToLearnJapanese-patch-unhoist-bookmark
Fix showing unhoist confirm dialogue for bookmarked notes.
2024-02-16 06:48:04 +01:00
zadam 2d865576cf Merge remote-tracking branch 'origin/master' 2024-02-16 06:46:38 +01:00
zadam 41e623b009 fix JSDoc, closes #4633 2024-02-16 06:46:32 +01:00
zadam 239786e7d1 Merge pull request #4632 from bavis-m/master
Add the -o option to the groupmod command used in start-docker.sh
2024-02-16 06:40:38 +01:00
zadam 89e1e47900 Merge remote-tracking branch 'origin/master' 2024-02-14 07:21:36 +01:00
zadam 67cb926233 PWA manifest fixes for extra auth, fixes #4611 2024-02-14 07:21:31 +01:00
henrikx 2f813dfc5d Update attribute_editor.js 2024-02-09 10:58:41 +01:00
WantToLearnJapanese a939599223 Fix showing unhoist confirm dialogue for bookmarked notes. 2024-02-02 16:36:54 +09:00
Mark fb10e0ad33 Add the -o option to the groupmod command used in start-docker.sh when USER_GID is set, otherwise we won't be added to existing groups (e.g. you want node to run in the users (100) group) 2024-02-01 11:56:37 -08:00
zadam 46bd5bc1ef Update README.md 2024-01-29 22:36:52 +01:00
zadam 5abfb5c08a revert unintended license changes 2024-01-28 23:09:57 +01:00
zadam 9357caeb5a activate parent note when deleting a note, #4601 2024-01-28 23:08:44 +01:00
zadam 6b58e59819 added keyboard shortcut for toggling the right pane, closes #4552 2024-01-28 08:58:40 +01:00
zadam c6df25ece8 fix pin button shadow, closes #4595 2024-01-28 08:36:16 +01:00
zadam ebd6276b5e CKEditor 41.0.0 2024-01-27 23:02:11 +01:00
zadam 92e8b155e4 Merge branch 'stable'
# Conflicts:
#	package.json
#	src/services/build.js
#	src/services/migration.js
2024-01-27 22:52:47 +01:00
zadam e76093e75c release 0.62.6
Publish Docker image / Push Docker image to multiple registries (push) Failing after 36s
2024-01-21 23:49:23 +01:00
zadam 4f8073daa7 Revert "don't tag beta images with latest #4590"
This reverts commit 47fb96faa8.
2024-01-21 23:48:56 +01:00
zadam 47fb96faa8 don't tag beta images with latest #4590 2024-01-21 23:42:57 +01:00
zadam 6e33553146 fix migration 2024-01-21 23:11:27 +01:00
zadam 807941e6a5 disable scanning for links while migration is running #4535 2024-01-21 20:50:38 +01:00
zadam 1e30c0702e add indexes sooner in the migration process to speed it up #4535 2024-01-21 11:13:45 +01:00
zadam 69b686ba3b basic emoji #4119 2024-01-21 10:44:23 +01:00
zadam ace5660809 add special characters to CKEditor build #4119 2024-01-21 10:33:16 +01:00
zadam 8bc99fd799 downgrades to try to fix flatpak build
Publish Docker image / Push Docker image to multiple registries (push) Failing after 37s
2024-01-12 00:17:04 +01:00
zadam f0c3a090a2 release 0.63.1-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 30s
2024-01-12 00:02:50 +01:00
zadam 17e063f01d updates 2024-01-12 00:02:45 +01:00
zadam 76c9873705 fix erase sync 2024-01-10 23:51:53 +01:00
zadam 2c7b774356 Merge branch 'stable' 2024-01-10 22:57:05 +01:00
zadam 390ad6d813 fix rendering image title in share renderer, closes #4578 2024-01-09 23:38:44 +01:00
zadam 77800d073f fix URL unescaping in improper place, #4566 2024-01-09 23:22:45 +01:00
zadam 1953c7896f support SVG image upload, fixes #4573 2024-01-09 23:13:33 +01:00
zadam dff4f73366 Merge pull request #4571 from Nriver/master
fix typo in keyboard shortcuts description
2024-01-09 22:53:41 +01:00
zadam cd43752f61 remove conflicting shortcut, fixes #4570 2024-01-09 22:52:13 +01:00
Nriver 23a5cea338 fix typo in keyboard shortcuts description 2024-01-08 10:20:23 +08:00
zadam e2cb3c0d14 Merge branch 'stable'
# Conflicts:
#	package.json
#	src/services/build.js
#	src/services/notes.js
2024-01-08 00:21:46 +01:00
zadam d6046efa1b release 0.62.5
Publish Docker image / Push Docker image to multiple registries (push) Failing after 45s
2024-01-08 00:05:13 +01:00
zadam ee608fcf46 unescape HTML before downloading images, #4566 2024-01-08 00:03:11 +01:00
zadam 894b08a1b8 correctly save attachment URL, #4566 2024-01-07 23:51:38 +01:00
zadam 4e549baedc fix auto-download of images, closes #4566 2024-01-07 23:45:40 +01:00
zadam 6b6e42e9ba document attachment ETAPI APIs in OpenAPI spec, fixes #4559 2024-01-07 23:11:55 +01:00
zadam 0404b78fb8 fix loading katex in share #4558 2024-01-07 22:52:16 +01:00
zadam d63d42d87c Merge branch 'stable' 2024-01-07 22:46:23 +01:00
zadam 37baa4cd74 Merge pull request #4550 from spasche/zip-export-sort-children
sort children during export to ensure a more stable format
2024-01-07 22:38:14 +01:00
zadam 68e03c434e release 0.63.0-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 48s
2024-01-04 00:49:06 +01:00
zadam 394530921e downgrade electron 2024-01-03 23:50:29 +01:00
zadam 57ccd5a954 stronger light anonymization 2024-01-03 22:10:29 +01:00
zadam a28d8843ac fix migration 2024-01-03 22:08:26 +01:00
Sylvain Pasche cb523faaad sort children during export to ensure a more stable format 2023-12-31 16:52:19 +01:00
zadam f704cacdee bugfixes to sync 2023-12-30 00:34:46 +01:00
zadam 8dbc592563 add "copy image" context menu to also attachments, fixes #4514 2023-12-28 00:02:09 +01:00
zadam 439743d2b0 convert absolute image attachment URLs to relative without domain, fixes #4509 2023-12-27 23:22:40 +01:00
zadam a3783131a2 Merge pull request #4522 from Nriver/master
fix decoding issue for request data chunks
2023-12-27 22:58:27 +01:00
zadam 8199073342 excali 17 2023-12-27 22:48:46 +01:00
zadam 33af9a3595 updates 2023-12-27 22:48:16 +01:00
Nriver 30c3c10524 fix decoding issue for request data chunks 2023-12-14 11:10:13 +08:00
zadam df85a5eee4 Merge branch 'stable'
# Conflicts:
#	src/routes/api/revisions.js
#	src/services/bulk_actions.js
2023-12-11 23:07:15 +01:00
zadam 0ac397e7ff fix setNoteToParent API breakage, closes #4505 2023-12-11 23:05:05 +01:00
zadam d243880099 release 0.62.4
Publish Docker image / Push Docker image to multiple registries (push) Failing after 41s
2023-12-07 00:03:59 +01:00
zadam 2e23c521c3 electron upgrade 2023-12-06 23:54:17 +01:00
zadam eb761b286f electron upgrade 2023-12-04 00:17:00 +01:00
zadam d0f6ff5f98 fix erasing revisions 2023-12-04 00:11:24 +01:00
zadam c35167f2f5 sometimes CPU info is not available #3957 2023-12-03 21:37:50 +01:00
zadam 84feaabc52 release 0.62.3
Publish Docker image / Push Docker image to multiple registries (push) Failing after 32s
2023-11-27 23:37:24 +01:00
zadam a6036859b8 normalize strings before calculation hashes, #4435 2023-11-27 23:23:55 +01:00
zadam 929f7f3114 add node version to app_info 2023-11-27 23:12:22 +01:00
zadam 9e914b9016 remove relation map from the demo document 2023-11-27 10:54:38 +01:00
zadam 947627d8a0 relation map deprecation - don't show it in menu to create new note 2023-11-27 10:50:17 +01:00
zadam ed00797179 Merge branch 'stable'
# Conflicts:
#	package-lock.json
2023-11-27 10:41:07 +01:00
zadam 93dcce2217 dragging notes from note tree will automatically insert them as images where appropriate (image, canvas, mermaid) 2023-11-27 10:38:19 +01:00
zadam 686af0c6a1 when canvas and mermaid are inserted using "include note", we insert them as images 2023-11-27 10:22:54 +01:00
zadam d07f02b95f contrary to what I believed encodeURIComponent() is available also in node.js, #4478 2023-11-27 10:15:29 +01:00
zadam ad74952194 fix thumbnails with chinese titles, closes #4478 2023-11-27 10:10:27 +01:00
zadam 10f3df3ed4 make sure content is string for post-processing 2023-11-26 23:51:04 +01:00
zadam 18e2e6779b remove title to fix closing highlights list, fixes #4471 2023-11-24 23:51:12 +01:00
zadam ed129c307b fix printing math, closes #4470 2023-11-24 00:17:20 +01:00
zadam 8742e4bfe9 make sure the promoted attributes don't take the whole screen in mobile, #4468 2023-11-24 00:04:49 +01:00
zadam 3b10bb742b pin versions 2023-11-22 20:46:20 +01:00
zadam 1f206a9c24 load panzoom from node_modules 2023-11-22 20:28:17 +01:00
zadam f026646bb5 load split.js from node_modules 2023-11-22 20:26:20 +01:00
zadam f9bfc8ad86 load printThis from node_modules 2023-11-22 20:22:16 +01:00
zadam e70539ff48 load jquery-hotkeys from node_modules 2023-11-22 20:15:21 +01:00
zadam a439be79b3 load jquery from node_modules 2023-11-22 20:11:41 +01:00
zadam edf2dfe8f9 load mermaid from node_modules 2023-11-22 20:09:04 +01:00
zadam 0e4c49ea5b load box icons from node_modules 2023-11-22 20:06:44 +01:00
zadam 52cfd138d1 load force-graph from node_modules 2023-11-22 20:02:35 +01:00
zadam 258b97f833 Merge remote-tracking branch 'origin/master' 2023-11-22 19:58:59 +01:00
zadam 837b17d62a load day.js from node_modules 2023-11-22 19:58:54 +01:00
zadam d82720f62f Merge pull request #4461 from Nriver/master
fix typo
2023-11-22 19:47:48 +01:00
zadam cf99345962 use .js extension for require() as a preparation for future migration to ESM 2023-11-22 19:34:48 +01:00
Nriver 9e54496d00 fix more typo 2023-11-22 10:41:44 +08:00
Nriver 8ae6598b8a fix typo 2023-11-22 10:37:23 +08:00
zadam 722299dd26 release 0.62.2
Publish Docker image / Push Docker image to multiple registries (push) Failing after 38s
2023-11-21 20:49:24 +01:00
zadam e2b1421bf3 electron upgrade 2023-11-21 20:48:43 +01:00
zadam 1f41d39bc7 docs 2023-11-21 20:46:48 +01:00
zadam ce39d3b4ce Merge branch 'stable'
# Conflicts:
#	docs/backend_api/BNote.html
#	docs/backend_api/BackendScriptApi.html
#	docs/backend_api/services_backend_script_api.js.html
#	docs/frontend_api/FAttribute.html
#	docs/frontend_api/FBranch.html
#	docs/frontend_api/FNote.html
#	docs/frontend_api/FrontendScriptApi.html
#	docs/frontend_api/entities_fattachment.js.html
#	docs/frontend_api/entities_fattribute.js.html
#	docs/frontend_api/entities_fblob.js.html
#	docs/frontend_api/entities_fbranch.js.html
#	docs/frontend_api/entities_fnote.js.html
#	docs/frontend_api/global.html
#	docs/frontend_api/index.html
#	docs/frontend_api/services_frontend_script_api.js.html
#	package.json
#	src/services/backend_script_api.js
#	src/services/build.js
2023-11-21 20:46:24 +01:00
zadam ef2ade849b release 0.61.15
Publish Docker image / Push Docker image to multiple registries (push) Failing after 47s
2023-11-20 23:23:12 +01:00
zadam 88067c071c add api.backupNow() to backend API, closes #4455 2023-11-20 23:14:53 +01:00
zadam f5018e9820 fix buggy http proxy initialization, closes #4453 2023-11-20 23:03:19 +01:00
zadam 1561f402f0 ckeditor 40.1.0 2023-11-20 22:29:05 +01:00
zadam 0d7889d212 Merge branch 'stable'
# Conflicts:
#	package-lock.json
2023-11-20 22:22:05 +01:00
zadam 19a10e59e9 fix edit history crossing note activation in canvas, #4437 2023-11-20 22:13:52 +01:00
zadam 746abb02d3 Merge branch 'stable'
# Conflicts:
#	package-lock.json
#	package.json
#	src/services/build.js
2023-11-16 23:57:25 +01:00
zadam 23351298c8 fix incorrect syntax/typo, closes #4443 2023-11-16 23:35:50 +01:00
zadam 426a8f75aa fix creating tree cycle by moving clone into another clone, closes #4442 2023-11-16 23:31:33 +01:00
zadam 999cf0d9e3 release 0.61.14
Publish Docker image / Push Docker image to multiple registries (push) Failing after 39s
2023-11-16 00:21:34 +01:00
zadam 0afc41060a template LABEL should not be inherited #4349 2023-11-16 00:11:14 +01:00
zadam 6e2d76c2b4 release 0.62.1-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 36s
2023-11-14 00:57:51 +01:00
zadam 3abf74a9f3 fix katex CSS loading 2023-11-14 00:57:19 +01:00
zadam 5d52498da1 Merge branch 'stable' 2023-11-14 00:19:15 +01:00
zadam cf068211ff change the way frontend detects content change which works even if no new blob is created, fixes #4434 2023-11-13 23:53:14 +01:00
zadam 0507c46ae9 revert general HTML support 2023-11-13 00:58:55 +01:00
zadam 69ed3644f9 add a note about hideHighlightWidget to options 2023-11-13 00:39:28 +01:00
zadam b0c5894691 added hideHighlightWidget to built in attributes 2023-11-13 00:36:08 +01:00
zadam f10fc7bd7f Revert "Add attribute disableHighlightsList to disable Highlights List Widget"
This reverts commit e7d98206f9.
2023-11-13 00:34:09 +01:00
zadam bdbaacaac9 Merge pull request #4421 from fang64/master
Add attribute disableHighlightsList to disable Highlights List Widget
2023-11-13 00:31:00 +01:00
zadam 2790f52e36 Merge pull request #4417 from ljgonzalez1/master
Migrate KaTeX@0.16.0 from `libraries` to KaTeX@0.16.9 in `node_modules`
2023-11-13 00:29:15 +01:00
zadam 6515dd7b23 fix assigning extension to attachment export filenames, closes #4415 2023-11-12 23:57:21 +01:00
zadam 5a38bf78e1 fix content renderer of protected canvas/mermaid notes, closes #4414 2023-11-12 23:43:04 +01:00
zadam 4bdb40904f fix loading reference link titles in read-only text notes, closes #4404 2023-11-12 22:57:04 +01:00
fang64 e7d98206f9 Add attribute disableHighlightsList to disable Highlights List Widget 2023-11-09 21:32:45 -05:00
Luis González 1939375161 Merge pull request #3 from ljgonzalez1/feat/migrate_katex_to_npm_v2
Feat/migrate katex to npm
2023-11-09 19:06:25 -03:00
Luis González ec737d02b2 feat(src/routes/assets.js): Add KaTex support to assets route. 2023-11-09 18:33:36 -03:00
Luis González 927e5ede0c feat(src/routes/assets.js): Add KaTex support to assets route. 2023-11-09 18:21:53 -03:00
Elian Doran 4c1bc10d0f Publish installer artifact 2023-11-09 21:00:53 +02:00
Elian Doran fe82b1d2d6 Start writing GitHub Actions workflow 2023-11-09 20:51:03 +02:00
Elian Doran a5c150baba Remove unused electron-forge config 2023-11-09 20:04:30 +02:00
Luis González 3470347523 feat(package.json & package-lock.json): Add 'katex' package and update project version 2023-11-09 14:23:39 -03:00
Luis González e25c86e947 Revert "🙈 gitignore" commits.
This reverts commits 30bd216500, 9a587e8c8c, 38e6008aa2, 5af1c7756c and c8d6f20c3b.

It reverts pr #2 from my branch
2023-11-09 13:16:50 -03:00
Luis González fb1478f2dd Merge pull request #2
Add OS and IDE files to the gitignore + Add documentation
2023-11-09 12:07:12 -03:00
Luis González c8d6f20c3b 🙈 gitignore(.gitignore): Include macOS and Linux system files 2023-11-09 11:59:04 -03:00
Luis González 5af1c7756c 🙈 gitignore(.idea/.gitignore): Ignore IntelliJ IDE specific files 2023-11-09 11:55:54 -03:00
Luis González 38e6008aa2 🙈 gitignore: Expand to ignore JetBrains IDEs, VisualStudioCode, and Kate templates. 2023-11-09 11:55:52 -03:00
Luis González 9a587e8c8c 🙈 gitignore: Add rules to maintain empty folders and all gitignore files. 2023-11-09 11:55:33 -03:00
Luis González 30bd216500 🙈 gitignore: Update documentation in gitignore and sort ignored folder/files by category. 2023-11-09 11:42:07 -03:00
Elian Doran e9282976d5 Fix application icon 2023-11-08 23:53:08 +02:00
Elian Doran 7cace222c0 Fix installer if webpack not run 2023-11-08 23:17:13 +02:00
Elian Doran df79f3d9c9 Add a custom setup banner 2023-11-08 23:08:38 +02:00
Elian Doran ddfa0d0749 Set up application icon 2023-11-08 22:40:38 +02:00
Luis González a3ce5b5d28 Merge pull request #1 from ljgonzalez1/feat/update_katex_0.16.9
Update Katex from 0.16.0 to 0.16.9
2023-11-08 17:16:59 -03:00
Luis González b17848609b Update Katex from 0.16.0 to 0.16.9 2023-11-08 17:15:15 -03:00
Elian Doran c0c5e30898 Add icon to setup 2023-11-08 22:10:22 +02:00
Elian Doran b1e0492e05 Prevent (re)start on install & uninstall 2023-11-08 21:56:02 +02:00
Elian Doran 2faee49bd9 Use package.json instead for consistency 2023-11-08 21:40:58 +02:00
Elian Doran 380b967407 Configure author & description for maker-squirrel 2023-11-08 21:40:04 +02:00
Elian Doran 145a09edd1 Set up Electron Forge
This should allow us to package Trilium for multiple platforms,
including generating a Windows installer which is our current target.
2023-11-08 21:28:04 +02:00
Elian Doran b07628abda Remove electron-builder dependency
The `electron-builder` dependency was introduced a while ago in #289,
but finally removed bcbbf4dc3e so there
should be no reason to keep it around.
2023-11-08 21:21:01 +02:00
zadam e9ece21d20 release 0.62.0-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 39s
2023-11-06 23:13:25 +01:00
zadam b700f069fe reduce flickering while hoisted 2023-11-06 23:11:57 +01:00
zadam 40fb6aa168 move the unhoist button to the right 2023-11-06 22:28:25 +01:00
zadam 341480e7cf scroll padding widget only on text and code notes 2023-11-06 22:26:17 +01:00
zadam bde311fd76 upgrades 2023-11-06 22:23:18 +01:00
zadam f8bc03feaf Merge branch 'stable' 2023-11-06 22:14:15 +01:00
zadam 7fc1eb5262 release 0.61.13
Publish Docker image / Push Docker image to multiple registries (push) Failing after 42s
2023-11-06 00:21:41 +01:00
zadam 531e9d4aff graceful handling of sync error 2023-11-06 00:15:35 +01:00
zadam e0d4766c2d fix recursion in the inline image processing 2023-11-05 21:50:08 +01:00
zadam ab4e83771c fix throwing empty error 2023-11-04 22:53:09 +01:00
zadam 803b6df40c release 0.61.12
Publish Docker image / Push Docker image to multiple registries (push) Failing after 46s
2023-11-04 00:16:19 +01:00
zadam 1ebdb0f5e1 emergency disabling of image compression since it appears to make problems in migration to 0.61 2023-11-04 00:10:54 +01:00
zadam df5951ce46 improve sync debug info 2023-11-04 00:02:31 +01:00
zadam 809ffa0c6e small refactor of ordinal() func 2023-11-03 13:49:18 +01:00
zadam 6dd466ddaf updates 2023-11-03 12:23:14 +01:00
zadam a45b801a84 reverted incomplete work on export per-directory metadata 2023-11-03 12:18:38 +01:00
zadam f8ade4d0c5 Merge remote-tracking branch 'origin/master' 2023-11-03 12:15:46 +01:00
zadam 889cb1d7b1 Merge branch 'stable'
# Conflicts:
#	package.json
2023-11-03 12:15:39 +01:00
zadam d3a477b8f2 release 0.61.11
Publish Docker image / Push Docker image to multiple registries (push) Failing after 42s
2023-11-03 11:46:53 +01:00
zadam 4db042736c Merge pull request #4371 from rauenzi/pwa-manifest
Update webmanifest for wider compatibility
2023-11-03 11:25:17 +01:00
zadam 612e4406b5 refactored TOC and Highlights close buttons and added a button to quickly access options 2023-11-03 10:44:14 +01:00
zadam 76f874ef6d refactoring of the complex note tree entitiesReloadedEvent 2023-11-03 08:58:57 +01:00
zadam f37f47ce5b fixes to stable sorting 2023-11-03 01:11:47 +01:00
zadam 45ed436426 added runOnBranchChange event #4108 2023-11-02 23:26:32 +01:00
Zack Rauen 9314cf87c5 Update manifest for wider compatibility
Partially fixes #920
2023-11-01 12:30:01 -04:00
zadam 0efc42081d more tests 2023-11-01 00:41:35 +01:00
zadam 7d80fe19e0 add backend API methods to access options, attachments, revisions, etapi tokens 2023-10-31 22:26:56 +01:00
zadam de8c351e25 reduce indent of TOC when larger headings are not being used, fixes #4363 2023-10-31 00:18:03 +01:00
zadam 695c9d5cf3 more note etapi tests 2023-10-30 23:51:53 +01:00
zadam 8690228d98 etapi test infrastructure plus a basic note creation test 2023-10-29 23:24:11 +01:00
zadam 01093d05d7 qswitch-electron, qswitch-server npm scripts 2023-10-29 18:39:53 +01:00
zadam 690caf7da1 Merge branch 'beta'
# Conflicts:
#	package-lock.json
#	package.json
2023-10-29 16:43:31 +01:00
zadam a9b63111ae qstart-electron, qstart-server npm scripts 2023-10-29 16:42:30 +01:00
zadam eb0a68d0ab note list should show the prefix, #4362 2023-10-29 01:02:55 +02:00
zadam 48e98b2ac3 add api.runAsyncOnBackendWithManualTransactionHandling() variant and add toast warnings about improper usage. 2023-10-29 00:51:23 +02:00
zadam ed1a731950 extra hint on "noproxy directly in the setting", #3934 2023-10-24 23:15:18 +02:00
zadam 4660c154e9 refactor 2023-10-24 23:10:52 +02:00
zadam ef974ab1f5 add shell as enabled by default #4347 2023-10-24 23:00:46 +02:00
zadam bacae67374 fix import 2023-10-24 00:14:15 +02:00
zadam cc20d17bd2 npm upgrades && docs 2023-10-24 00:13:20 +02:00
zadam 494b240015 Merge branch 'beta'
# Conflicts:
#	src/public/app/layouts/desktop_layout.js
2023-10-24 00:09:37 +02:00
zadam 1cd391a132 mermaid 10.5.1 2023-10-22 23:57:28 +02:00
zadam 1c15527d95 added "greater than 0" and "less than 2" for ancestor depth, fixes #4343 2023-10-22 23:52:21 +02:00
zadam 7af79ec33b limit mermaid width, #4340 2023-10-21 23:24:43 +02:00
zadam 4294c043d8 enabled CKEditor HTML support 2023-10-21 23:19:14 +02:00
zadam e5b925abf8 added extra elements to the html sanitizer 2023-10-21 18:03:06 +02:00
zadam 90c0a4a437 respect safeImport flag when sanitizing imported content 2023-10-21 17:54:07 +02:00
zadam 692f7868bc updated demo document so that canvas and mermaid have generated export attachments 2023-10-21 17:36:08 +02:00
zadam 5282af55f6 render attachment SVG when sharing mermaid 2023-10-21 17:32:07 +02:00
zadam aefc4c6bd2 ckeditor 40 2023-10-21 17:24:47 +02:00
zadam b39ba76505 add ability to insert mermaid diagram into text notes as image 2023-10-21 00:23:16 +02:00
zadam 9d918e7a54 fix image zooming 2023-10-20 23:44:30 +02:00
zadam 4773f9392b don't log known slow queries 2023-10-20 09:36:57 +02:00
zadam 5c10fc26be Merge branch 'beta'
# Conflicts:
#	package.json
#	src/public/app/layouts/desktop_layout.js
2023-10-20 09:15:48 +02:00
zadam 38db7f9db7 style tweaks #4338 2023-10-19 23:54:36 +02:00
zadam 5163e50e7d use mtime instead of ctime for backups #4321 2023-10-19 23:02:37 +02:00
zadam 5115b33446 release 0.61.10-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 35s
2023-10-19 09:33:51 +02:00
zadam b01fe5ead9 add canvas properties with a button to copy reference to clipboard which allows inserting canvas as an image into text notes 2023-10-19 09:20:23 +02:00
zadam b1d4a258a1 move FAB down in canvas 2023-10-19 09:03:49 +02:00
zadam ca041bb658 fix expanded status when moving note trees 2023-10-19 08:58:04 +02:00
zadam 52244ddc99 Merge branch 'beta'
# Conflicts:
#	docs/backend_api/BAttachment.html
#	docs/backend_api/BNote.html
#	docs/backend_api/BackendScriptApi.html
#	package-lock.json
#	package.json
2023-10-19 01:13:45 +02:00
zadam 87a60e325f added ctime to backup list #4321 2023-10-19 00:51:38 +02:00
zadam 0a172d8bc1 add api.runOutsideOfSync() to backend script API, #4327 2023-10-19 00:29:03 +02:00
zadam 67a12d3c4d improve sync error logging 2023-10-19 00:13:11 +02:00
zadam 5b2ba3646d removed maxTouchPoints condition for detection of mobile browsers, #4316 2023-10-18 23:23:20 +02:00
zadam 148bff9f77 show existing backups and anonymized DBs, #4321 2023-10-18 23:16:47 +02:00
zadam 2132cf3bdc nodejs 18.18.2 2023-10-18 09:40:00 +02:00
zadam d5271c17e3 fix sync bug 2023-10-18 09:37:36 +02:00
zadam b764761e58 run local dev with TRILIUM_SAFE_MODE as a safety precaution 2023-10-18 09:36:49 +02:00
zadam c666fc3b98 make sure exact noteId match comes on the top in search 2023-10-18 09:33:24 +02:00
zadam ba34df2e15 typo 2023-10-18 09:24:13 +02:00
zadam 840ac2d63e updates 2023-10-14 21:15:06 +02:00
zadam 5dd4586ebe added webViewSrc to builtin attrs 2023-10-14 21:09:20 +02:00
zadam bd7fa16e96 Merge remote-tracking branch 'origin/master' 2023-10-09 23:08:32 +03:00
zadam 846ac9305e don't anonymize option notes 2023-10-09 23:08:25 +03:00
zadam db8014c0ef Merge pull request #4298 from rauenzi/share
Add ~shareTemplate and #shareExternalLink
2023-10-09 22:28:20 +03:00
Zack Rauen a3540772dd Merge remote-tracking branch 'upstream/master' into share 2023-10-08 17:19:32 -04:00
zadam 137703ada4 add promoted attributes widget to the mobile version, closes #4314 2023-10-08 22:58:31 +03:00
Zack Rauen ec6b8476f9 Adjust shared notes search api 2023-10-08 14:54:37 -04:00
zadam d09d3f5a96 release 0.61.9-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 42s
2023-10-07 23:02:47 +03:00
zadam 3d15aeae58 def value 2023-10-07 23:02:33 +03:00
zadam 9765892d18 fix loading canvas notes created in 0.61.7-beta, closes #4313 2023-10-07 21:49:25 +03:00
zadam 00f5924251 jsdocs 2023-10-07 20:57:53 +03:00
zadam 99d0f22403 Merge branch 'beta'
# Conflicts:
#	package-lock.json
2023-10-07 20:51:26 +03:00
zadam 78f8a37587 added total result count to the note list widget 2023-10-06 22:02:09 +03:00
zadam 86d62866f2 catch JSON stringify error, #4310 2023-10-05 21:54:59 +02:00
zadam 1dc3fafcbf improve anonymization 2023-10-03 23:17:15 +02:00
zadam 7f06952d9e improve anonymization 2023-10-03 23:14:02 +02:00
zadam 78b6614eea fix docker-compose.yml #2239 2023-10-03 11:21:14 +02:00
zadam 9665e872c2 fix importing inline images within markdown within zip, closes #4301 2023-10-03 09:40:31 +02:00
zadam 9db0a062ed fix calculating revision attachment size 2023-10-03 09:05:30 +02:00
zadam 055bb39e4d Merge remote-tracking branch 'origin/beta' into beta 2023-10-02 22:02:31 +02:00
zadam 1261a06a30 order by note size + attachments + revisions, closes #4295 2023-10-02 22:02:25 +02:00
zadam 91eb3c45d5 added "save revision" to note actions menu 2023-10-02 15:29:45 +02:00
zadam 3944235592 -console.log 2023-10-02 15:25:12 +02:00
zadam 5be61e6142 saving / viewing canvas revisions 2023-10-02 15:24:40 +02:00
zadam 62ccf798ee allow deleting custom launchers, fixes #4291 2023-09-30 22:38:06 +02:00
Zack Rauen d259931bd2 Add new attributes in appropriate locations 2023-09-30 00:48:34 -04:00
Zack Rauen 7729aad1e9 Allow external link notes in share tree 2023-09-30 00:44:10 -04:00
zadam 70d6bd0157 release 0.61.8-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 38s
2023-09-29 00:54:45 +02:00
zadam e5555beea9 logging reason for frontend reload 2023-09-28 23:47:19 +02:00
zadam 9767b6269a upgrade code mirror to 5.65.15 and fix modes requiring multiplex or overlay, fixes #4279 2023-09-28 01:02:27 +02:00
zadam 7e486fda06 electron update 2023-09-28 00:27:00 +02:00
zadam 9f726304aa sync fix, #4288 2023-09-28 00:24:53 +02:00
Zack Rauen 614cc4dd82 Allow users to use their own share template 2023-09-27 14:34:07 -04:00
zadam 3e8f09d306 allow shrinking note title text in the tree to make space for the "add note" button https://github.com/zadam/trilium/discussions/4287 2023-09-26 00:14:28 +02:00
zadam 613b83e638 Merge pull request #4281 from rauenzi/jump-to-toc
Fix jump to ToC for nested headers
2023-09-25 23:33:00 +02:00
zadam 4ac609ff57 Merge pull request #4280 from rauenzi/promoted-alias
Add option for promoted aliases
2023-09-25 23:30:39 +02:00
zadam c14ce2c428 Merge pull request #4278 from Nriver/master
sort mime types alphabetically
2023-09-25 23:28:22 +02:00
zadam 984bd726e9 add support for "bottom" sort, closes #4277 2023-09-25 23:25:00 +02:00
zadam 964abf390b API docs 2023-09-25 23:11:24 +02:00
zadam af24758ad4 Merge branch 'beta'
# Conflicts:
#	docs/backend_api/BAttachment.html
#	docs/backend_api/BNote.html
#	docs/backend_api/becca_entities_bnote.js.html
#	docs/frontend_api/FAttribute.html
#	docs/frontend_api/FBranch.html
#	docs/frontend_api/FNote.html
#	docs/frontend_api/FrontendScriptApi.html
#	docs/frontend_api/entities_fattachment.js.html
#	docs/frontend_api/entities_fattribute.js.html
#	docs/frontend_api/entities_fblob.js.html
#	docs/frontend_api/entities_fbranch.js.html
#	docs/frontend_api/entities_fnote.js.html
#	docs/frontend_api/global.html
#	docs/frontend_api/index.html
#	docs/frontend_api/services_frontend_script_api.js.html
#	package-lock.json
2023-09-25 23:11:07 +02:00
zadam 528d94a8fb accept custom widgets as classes instead of instances, #4274 2023-09-25 23:05:54 +02:00
zadam be918628c3 global API docs 2023-09-25 23:04:03 +02:00
zadam 602b9ae64a API docs 2023-09-23 00:04:32 +02:00
zadam 602a166e36 added info, confirm, prompt dialogs 2023-09-23 00:04:16 +02:00
zadam 2e69cc8331 Merge pull request #4267 from rauenzi/tray
Add hotkey option to toggle hide to tray
2023-09-22 23:52:47 +02:00
zadam aaad858395 save scroll and zoom in canvas 2023-09-22 23:44:03 +02:00
Zack Rauen b266c327e4 Fix jump to ToC for nested headers 2023-09-22 05:52:06 -04:00
Zack Rauen 149462e3ab Add option for promoted alias 2023-09-22 04:58:06 -04:00
Nriver 237d309406 sort mime types alphabetically 2023-09-22 09:58:37 +08:00
zadam 48248224f8 release 0.61.7-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 39s
2023-09-21 23:38:18 +02:00
zadam 79e5e3b65f more logging for sync 2023-09-21 18:13:14 +02:00
zadam d0383f3044 remove debian packaging hack 2023-09-21 12:44:20 +02:00
zadam 62ecd1ad76 node 18.18.0 2023-09-21 12:29:11 +02:00
zadam 75b7706c2c mermaid 10.4.0 2023-09-21 12:24:44 +02:00
zadam 584b176643 hiding useless/misleading buttons from excalidraw 2023-09-21 12:03:40 +02:00
zadam a16555bbff don't save appState in canvas - app state should be reset after each load 2023-09-21 11:54:54 +02:00
zadam a749e24147 fix creating revisions for non-text notes #4176 2023-09-21 11:38:38 +02:00
zadam bb81f110dd improved error handling 2023-09-21 11:16:03 +02:00
zadam 5dd6f49104 chart js 0.16.0 2023-09-19 23:59:05 +02:00
zadam bc6be44b19 better error condition checks 2023-09-19 23:48:55 +02:00
zadam 8075265753 fix migration, closes #4262 2023-09-18 23:45:00 +02:00
Zack Rauen 9d69024758 Add hotkey option to toggle hide to tray
Fixes #3043
2023-09-18 04:38:23 -04:00
zadam 40ca949890 fixes for tooltip auto-disappearing handling 2023-09-14 00:40:49 +02:00
zadam 035113db4d Merge branch 'beta'
# Conflicts:
#	package-lock.json
2023-09-14 00:19:19 +02:00
zadam 4a67f63abd better error message in image attachment + upgrades 2023-09-14 00:18:56 +02:00
zadam d9666210f1 make sure that the hidden note is never selected when hoisted to root to avoid e.g. erroneous deletion 2023-09-13 16:57:24 +02:00
zadam 925bba134e formatting 2023-09-13 09:10:56 +02:00
zadam d46801ff1f refactoring, tab switching handling shouldn't be on the widget level 2023-09-13 09:01:55 +02:00
zadam 7848c7e319 Merge pull request #4251 from rauenzi/tab-navigation
Add keyboard shortcuts for tabs
2023-09-13 00:22:01 +02:00
zadam 65e53741e7 Merge pull request #4255 from Compositr/master
Add new datePattern and monthPattern replacers
2023-09-13 00:19:04 +02:00
Zack Rauen a83e8ff91a Switch back to window scope 2023-09-11 18:03:49 -04:00
Compositr 542e2579df feat: add new datePattern replacers for shortmonth
* `{shortMonth3}` 3-letter months, e.g. Sep, Oct, Nov, Dec
* `{shortMonth4}` 4-letter months, e.g. Sept, Octo, Nove, Dece
2023-09-12 07:35:46 +10:00
Compositr 81d64e020e feat: add new datePattern replacer {ordinal}
* {ordinal} is replaced with the ordinal date (e.g. 1st, 2nd, 3rd) etc.
2023-09-12 07:30:30 +10:00
zadam 9413cd2296 comment explaining scope in keyboard actions 2023-09-11 22:54:36 +02:00
zadam 5b85713bf3 saving export meta file per directory 2023-09-11 00:12:12 +02:00
Zack Rauen 15254e2dfc Add keyboard shortcuts for tabs 2023-09-08 22:53:21 -04:00
zadam 5f6d562bf8 add ability to excalidraw to follow links 2023-09-08 23:00:43 +02:00
zadam f37dc66074 add support for storing canvas libraries in note attachments plus storing exported SVG in attachment 2023-09-08 21:53:57 +02:00
zadam c881b39860 Merge branch 'beta'
# Conflicts:
#	package-lock.json
2023-09-08 01:10:12 +02:00
zadam 0b84524807 fix refreshing note actions on note/tab switch, closes #4247 2023-09-08 00:43:18 +02:00
zadam 5218f7b7a6 Merge pull request #4246 from SiriusXT/open-note-custom
Add openAttachmentCustom
2023-09-08 00:31:20 +02:00
zadam 8062bb7e2a fix reloading unprotected note title to the document.title after entering protected session, fixes #4244 2023-09-08 00:28:00 +02:00
zadam 806062c8d1 fix undelete attachments 2023-09-08 00:22:48 +02:00
zadam 83f19c0537 fix protecting attachments 2023-09-08 00:19:30 +02:00
siriusXT 0424728012 Add openAttachmentCustom 2023-09-07 06:33:51 +00:00
zadam 3a83d58b25 release 0.61.6-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 29s
2023-09-06 23:57:29 +02:00
zadam 6fa9d996e8 ckeditor 39.0.2 2023-09-06 23:23:42 +02:00
siriusXT 1ea3d238e0 Fix right click bookmark bug
(cherry picked from commit 92e43bc051)
2023-09-06 23:11:51 +02:00
zadam eb273b7dbb lib upgrades 2023-09-06 23:11:02 +02:00
zadam 55374ac4d9 Merge pull request #4240 from SiriusXT/LauncherWidget
Fix right click bookmark bug
2023-09-06 23:10:54 +02:00
zadam 8070c00b5f API docs 2023-09-06 23:05:03 +02:00
zadam da8025f1e4 Merge branch 'beta' 2023-09-06 23:00:45 +02:00
zadam d2263c68f8 provide note dates in the frontend API, fixes #4232 2023-09-06 22:54:31 +02:00
siriusXT 92e43bc051 Fix right click bookmark bug 2023-09-06 14:49:01 +00:00
zadam 40971afe4f API docs build 2023-09-06 09:25:00 +02:00
zadam 90fc4b8293 Merge branch 'beta'
# Conflicts:
#	docs/backend_api/BAttachment.html
#	docs/backend_api/BRevision.html
#	docs/backend_api/BackendScriptApi.html
#	docs/backend_api/becca_entities_battachment.js.html
#	docs/backend_api/becca_entities_bblob.js.html
#	docs/backend_api/becca_entities_brevision.js.html
#	docs/frontend_api/FNote.html
#	docs/frontend_api/FrontendScriptApi.html
#	docs/frontend_api/entities_fattachment.js.html
#	docs/frontend_api/entities_fblob.js.html
#	docs/frontend_api/services_frontend_script_api.js.html
#	package-lock.json
#	src/public/app/services/frontend_script_api.js
2023-09-06 09:24:41 +02:00
zadam 97d8b19868 add missing API docs 2023-09-06 09:23:13 +02:00
zadam 2bc7da91a6 add createLink() returns jsDoc, #4235 2023-09-06 09:20:32 +02:00
zadam 2b4cbb5f6b fix clipperInbox handling for new note creation, closes #4219 2023-09-05 23:24:01 +02:00
zadam 72b2a6ecb6 Merge pull request #4225 from SiriusXT/master
Click the button to reset the zoom level
2023-09-05 23:01:50 +02:00
zadam 7b662b04ff fix orderby with multiple labels, closes #4220 2023-09-05 23:00:08 +02:00
zadam f8e4a665bd fixed search parser tests 2023-09-05 22:48:20 +02:00
zadam f9a27dd90c add imageStyle alignBlockLeft, alignBlockRight, fixes #4215 2023-09-05 22:16:45 +02:00
zadam 641985737f fix FNote.getContent() #4210 2023-09-05 22:02:26 +02:00
zadam 121e4ba2ea fix displaying 1 / 0 in find widget 2023-09-05 21:00:24 +02:00
zadam 01474ecd2d sync fixes 2023-09-05 00:30:09 +02:00
zadam 82e4e28e7b fix 2023-09-04 23:57:42 +02:00
SnnBcd xt 06eb522a8c Click the button to reset the zoom level 2023-09-01 06:40:36 +00:00
SnnBcd xt 21098be307 Click the button to reset the zoom level 2023-09-01 03:30:39 +00:00
zadam 886ee0dbcb fix sync exception 2023-08-31 00:14:35 +02:00
zadam 6f7fbacca1 add "api.runOnFrontend()" to the backend script API 2023-08-30 23:18:16 +02:00
zadam f5ddabc042 Merge pull request #4202 from eliandoran/feature/jump_to_note_list
Use a list instead of dropdown for jump-to-note
2023-08-30 22:17:04 +02:00
vaifix 8da5b90aea Fix bug: Calendar display incorrect tooltips.
(cherry picked from commit 58fe3a62af)
2023-08-30 00:20:42 +02:00
zadam 23848526c0 Merge pull request #4197 from dvai/master
fix some bugs
2023-08-30 00:19:53 +02:00
zadam e7d57bc08f Merge remote-tracking branch 'origin/beta' into beta
# Conflicts:
#	package-lock.json
2023-08-30 00:11:52 +02:00
zadam 041758766a allow specifying date created in the ETAPI, #4199 2023-08-30 00:11:32 +02:00
Elian Doran 69980c798b note autocomplete: Use backspace icon for delete text 2023-08-28 23:07:08 +03:00
Elian Doran 4de6a803e9 jump to note list: Remove scroll when not needed 2023-08-28 22:30:42 +03:00
Elian Doran 748c5064b5 jump to note list: Improve scroll bar position 2023-08-28 22:21:54 +03:00
Elian Doran c6e8966ecd jump to note: Improve position of close button 2023-08-28 22:15:36 +03:00
Elian Doran 8c247ba7c6 jump to note list: Improve layout 2023-08-28 22:12:14 +03:00
Elian Doran 52b5711ecd jump to note: Add "Create and link child note" 2023-08-28 21:51:40 +03:00
vaifix 58fe3a62af Fix bug: Calendar display incorrect tooltips. 2023-08-28 20:43:03 +08:00
Elian Doran af4d0c3ba6 jump to note list: Improve layout slightly 2023-08-26 17:52:01 +03:00
Elian Doran 4bba0aa842 jump to note list: Re-enable styling 2023-08-26 17:52:01 +03:00
Elian Doran ae9af8ea23 jump to note list: Use a proper height to the container 2023-08-26 17:52:01 +03:00
Elian Doran eea29aba0e jump to note list: Don't close jump to note results on lost focus 2023-08-26 17:51:58 +03:00
Elian Doran abbd0b50eb jump to note list: Use a fixed container instead of dropdown 2023-08-26 17:51:47 +03:00
vaifix 739ab28763 Resolve autocomplete error 2023-08-25 13:01:53 +08:00
zadam c551eae651 Merge pull request #4188 from rauenzi/master
Update JSDoc & API Docs
2023-08-21 23:46:40 +02:00
Zack Rauen d5aea26960 Update API Docs 2023-08-21 04:18:14 -04:00
Zack Rauen d3730ac1a9 Fix and improve JSDoc for APIs 2023-08-21 04:15:53 -04:00
zadam f2a510e4c5 cleanup of old migrations, since upgrading to 0.61 is possible only from 0.60. 2023-08-18 15:56:38 +02:00
zadam 4717242dc7 force migration to 0.60 first before 0.61 #4132 2023-08-18 15:55:59 +02:00
zadam b5ef09e779 hide canvas buttons which don't work, #4182 2023-08-18 15:33:20 +02:00
zadam d706b3a447 fix saving revisions for non-text types, closes #4176 2023-08-17 16:39:57 +02:00
zadam 6c96cca3a5 add 200ms timeout to api.getTextEditor() and similar #4174 2023-08-17 16:31:04 +02:00
zadam c1865f8564 small refactor 2023-08-17 09:09:06 +02:00
zadam 515c5411a6 release 0.61.5-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 41s
2023-08-16 23:02:15 +02:00
zadam 3f7a5504c7 prettier config 2023-08-16 20:31:14 +02:00
zadam 8c7c37cf98 updates 2023-08-16 20:12:22 +02:00
zadam d93e00adce Merge pull request #4168 from soulsands/button-style
fix: launcher-button style
2023-08-16 00:02:26 +02:00
zadam 0e16e48db6 scroll beyond last line in text/code editor, fixes #2728 2023-08-15 22:50:13 +02:00
zadam c0f48c0e99 mermaid 10.3.1 2023-08-15 10:30:30 +02:00
zadam abedf2bba4 fix pasting into ckeditor, upgrade to v39.0.1 2023-08-15 10:25:23 +02:00
zadam bb0137b2fd fix displaying options / book on firefox, closes #4165 2023-08-15 10:25:23 +02:00
zadam 6c54c7d17d save enex images as attachment, fixes #4163 2023-08-15 10:25:23 +02:00
“soulsands” cd95adcecb fix: launcher-button style 2023-08-15 16:11:13 +08:00
zadam 90255ac55b release 0.61.4-beta 2023-08-10 23:49:37 +02:00
zadam e741c2826c release 0.61.4-beta 2023-08-10 23:48:27 +02:00
zadam 026992db78 release 0.61.4-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 39s
2023-08-10 23:46:42 +02:00
zadam 33780c1e17 fix note tooltip code rendering 2023-08-10 13:50:25 +02:00
zadam ede9c43f67 API docs 2023-08-10 13:40:26 +02:00
zadam 5c12ac4eee fix CKEditor crashing 2023-08-10 13:40:15 +02:00
zadam 522518cf0d disambiguous query 2023-08-09 23:12:31 +02:00
zadam 1d869d25c2 fix #clipperInbox, closes #4153 2023-08-09 23:00:42 +02:00
zadam a9cdd93cb4 added options to disable auto-opening of promoted attributes and edited notes ribbon tabs, closes #4151 2023-08-09 22:50:41 +02:00
zadam 4240da349d add shared info to mobile layout, closes #4147 2023-08-09 00:02:45 +02:00
zadam c257bc07a8 clipper now creates notes with image attachments instead of image notes 2023-08-09 00:01:31 +02:00
zadam 00eaa16985 clipper now creates notes with image attachments instead of image notes 2023-08-08 23:42:47 +02:00
zadam fefb059564 clipper now creates notes with image attachments instead of image notes 2023-08-08 23:07:59 +02:00
zadam 9166765ced fix include note sizing when in readonly mode, closes #4135 2023-08-08 22:56:45 +02:00
zadam 6ae7661603 note path validation 2023-08-02 23:23:31 +02:00
zadam 30e75056bd release 0.61.3-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 37s
2023-07-31 23:03:45 +02:00
zadam 530e56dcb5 fixed comment 2023-07-31 22:59:47 +02:00
zadam 63675bfbae make migration 223 NOOP 2023-07-30 21:54:01 +02:00
zadam 696ce38083 ckeditor 38.1.1 2023-07-30 00:32:16 +02:00
zadam 12014b9f4d sync fixes and refactorings 2023-07-29 23:35:08 +02:00
zadam e8b52f9e6c sync fixes and refactorings 2023-07-29 23:25:02 +02:00
zadam 04b125afc0 sync fixes and refactorings 2023-07-29 21:59:20 +02:00
zadam 2a7fe85020 VACUUM database after migration 2023-07-28 16:22:10 +02:00
zadam 119050e355 fix migration 2023-07-28 16:13:31 +02:00
zadam 72122d0f95 fix blobIds - they shouldn't contain + and / characters 2023-07-28 15:55:26 +02:00
zadam bd22863bb7 release 0.61.2-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 34s
2023-07-28 00:06:23 +02:00
zadam ce3834eb9e blob erasure is not synced, need to clean them up before each content hash check 2023-07-27 23:57:12 +02:00
zadam 8edb5428e5 small sync fixes and refactorings 2023-07-27 23:22:08 +02:00
zadam 527718eff7 add indices on blobId 2023-07-27 21:40:47 +02:00
zadam 5b0f487f3f handle ERR_* errors gracefully 2023-07-27 14:50:18 +02:00
zadam a3fa8341ba handle ERR_CONNECTION_RESET gracefully 2023-07-27 10:55:34 +02:00
zadam 04813743e2 fix zooming speed, closes #4121 2023-07-25 22:33:35 +02:00
zadam ddf75cd5e5 note tooltip displays the whole note with scrollbar, other behavior changes. closes #4120 2023-07-25 22:27:15 +02:00
zadam d0e5ad5b7e release 0.61.1-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 36s
2023-07-24 23:47:57 +02:00
zadam b4631e927c Merge remote-tracking branch 'origin/master' 2023-07-24 23:47:27 +02:00
zadam b7bc843a37 fix demo document statistics, closes #4117 2023-07-24 23:46:02 +02:00
zadam 98d65f8767 Merge pull request #4114 from SiriusXT/master
Fix bugs in highlights,v0.61.0-beta
2023-07-24 22:58:20 +02:00
zadam 0599891ec0 Merge pull request #4001 from dymani/reopen-in-place
Reopen recently closed tab/split in place
2023-07-24 22:52:14 +02:00
zadam cc06701565 swiftshader deletion is no longer needed 2023-07-24 22:33:36 +02:00
SnnBcd xt 40683985cd Fix bugs in highlights 2023-07-22 19:13:03 +00:00
zadam 074e13a889 release 0.61.0-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 39s
2023-07-22 17:51:08 +02:00
zadam 98b0baefe2 Merge remote-tracking branch 'origin/master' into next61
# Conflicts:
#	src/public/app/widgets/buttons/note_actions.js
2023-07-22 17:49:29 +02:00
zadam 3aad0ebc95 Merge remote-tracking branch 'origin/next61' into next61 2023-07-22 17:48:17 +02:00
zadam 479d720a6e upgrades 2023-07-22 17:48:09 +02:00
zadam e4892c9888 fixed order of multi-valued promoted attributes, closes #4105 2023-07-20 23:22:31 +02:00
zadam f8c9178c5d fix migration 2023-07-18 23:23:52 +02:00
zadam 83049c95c3 defensive copies of owned attrs 2023-07-17 22:56:36 +02:00
zadam bc8f531b33 fix a bug which caused immedate deletion of created attributes 2023-07-17 22:53:54 +02:00
zadam 23278f54cb force refresh before activating the attribute detail dialog, fixes #4077 2023-07-17 22:41:37 +02:00
zadam 18801fb3e1 more filtering of note actions based on note type 2023-07-17 22:32:07 +02:00
zadam dc0a0dcf09 Merge pull request #4098 from AndrewPluzhnikov/fix-search-in-text
Disable Search in note button in global search context.
2023-07-17 22:30:49 +02:00
zadam 04c306b360 support combination of shared and cloned in the note tree, fixes #4097 2023-07-17 22:26:41 +02:00
zadam d6a4f1db13 share tree should include branch prefixes, fixes #4096 2023-07-17 22:19:03 +02:00
zadam 84c4b368c8 updated better-sqlite binaries for node 18/electron 25 2023-07-17 21:39:25 +02:00
Andrew Pluzhnikov 4307f25205 Disable Search in note button in global search context.
This button doesn't actually do anything in the global search window, so
it should be greyed out/disabled.
2023-07-16 10:40:34 -07:00
zadam 48f03f7a1b API docs 2023-07-15 12:07:45 +02:00
zadam 9d24499fef upgrade excalidraw to 0.15.2 2023-07-15 12:01:09 +02:00
zadam df97b269a7 autocomplete upgrade to 0.38.1 2023-07-15 11:45:18 +02:00
zadam ee6fb98a0d jquery 3.7.0 2023-07-15 11:41:36 +02:00
zadam 13e30e5855 dayjs frontend update 2023-07-15 11:38:01 +02:00
zadam 5ab2ec0f13 little fixes for the datetime promoted attr 2023-07-15 11:29:29 +02:00
zadam 8465d7fa68 Merge remote-tracking branch 'origin/master' into next61 2023-07-15 11:27:42 +02:00
zadam d153fc7ba5 Merge pull request #4090 from harishkumarc/datetime-attribute
added date and time attribute capability
2023-07-15 11:26:53 +02:00
zadam 1a7c2d4c32 fix hiding toc with multiple splits, closes #4093 2023-07-15 11:19:05 +02:00
zadam b3381a3b53 reimplemented triggering search from URL, fixes #385 2023-07-15 10:59:30 +02:00
zadam ac0d61e9b4 add mindmap mermaid example to demo document 2023-07-15 10:44:38 +02:00
zadam b13a6ced19 cleanup 2023-07-15 10:33:29 +02:00
zadam b61aab06b5 nodejs upgrade 2023-07-15 10:32:26 +02:00
zadam 64b86b2666 use marked instead of commonmark to convert MD to HTML, which supports e.g. tables, closes #2026 2023-07-15 10:31:50 +02:00
zadam 27e6fa9526 Merge branch 'stable' into next61 2023-07-15 10:10:29 +02:00
zadam 3d31742285 fix FNote.isHiddenCompletely() which returned false for _hidden 2023-07-15 09:50:07 +02:00
zadam 2b2f4fbc07 comment 2023-07-15 09:48:30 +02:00
zadam 513bf252cd don't display export for backend log note, fixes #4076 2023-07-15 09:35:03 +02:00
zadam f591e954f3 capitalization of options titles 2023-07-15 09:26:18 +02:00
zadam 59de1925a9 decreased padding 2023-07-14 22:14:07 +02:00
zadam 6c1011341c add help button to attachment detail as well 2023-07-14 22:02:30 +02:00
zadam 906082a6b2 add help button to attachment list 2023-07-14 21:59:43 +02:00
zadam 30bcd1764a check the attachment after upload 2023-07-14 21:28:32 +02:00
zadam cea54aecad check the attachment after conversion 2023-07-14 21:18:56 +02:00
zadam ff6f2a4d44 zoom for the attachment images 2023-07-14 21:08:00 +02:00
zadam 5f6fded833 zoom for the attachment images 2023-07-14 21:06:15 +02:00
zadam fed5f1a7d2 fix content renderer for mermaid 2023-07-14 20:03:28 +02:00
zadam a06ee1ced1 added new mermaid diagram examples to the demo document 2023-07-14 20:00:53 +02:00
zadam 332b92791e upgrade mermaid to 10.2.4 2023-07-14 19:56:37 +02:00
zadam d4a9461460 force graph upgrade 2023-07-14 19:45:10 +02:00
zadam 2dac6ab281 DB migration should convert only "perfect candidates" to attachments 2023-07-14 18:24:15 +02:00
zadam 4d00404f55 more actions triggering new tab should respect current hoisting 2023-07-14 18:15:31 +02:00
zadam 3adab07ddb common style for options number inputs 2023-07-14 18:05:19 +02:00
zadam 3d0c3652ce file note should reload after uploading new revision 2023-07-14 17:55:28 +02:00
zadam c3f5bb5518 image note should reload after uploading new revision 2023-07-14 17:52:35 +02:00
zadam b2d460d5c1 update demo document with images converted to attachments 2023-07-14 17:06:38 +02:00
zadam d475346a09 renamed attachment's parentId to more fitting ownerId 2023-07-14 17:01:56 +02:00
zadam ca41806bc2 import and export fixes 2023-07-13 23:54:47 +02:00
zadam a748710b01 make file attachments accessible in revisions dialog 2023-07-10 20:30:04 +02:00
zadam ac9a4b3afc fixes in etapi tests 2023-07-10 19:10:07 +02:00
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
zadam 6ec6d66f17 Merge pull request #4084 from AndrewPluzhnikov/fix-868
Implement saving of global search string.
2023-07-09 23:52:36 +02:00
zadam 977089cc28 Merge pull request #4083 from viperdc/patch-1
Update docker_healthcheck.js
2023-07-09 23:47:55 +02:00
zadam c3f8975166 small refactorings of clipper code 2023-07-09 22:58:34 +02:00
zadam 639f80b603 Merge pull request #4075 from manto89/feature/add-clippings-existing
Feature/add clippings existing url
2023-07-09 22:43:34 +02:00
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
viperdc b8c9943deb Update docker_healthcheck.js
Correcting ini location for HTTPS health-check bypass.
2023-07-06 19:02:51 -04:00
manto89 bb6ab0fe45 Fix clipping html with parser when using web-clipper 2023-07-02 12:52:16 +02:00
manto89 0c86dece5f Fix clipType searching for web-clipper 2023-07-02 12:51:23 +02: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 f78d96a3d4 refactoring of server and suppressing error during conversion of attachment into note 2023-06-30 15:44:30 +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 fc564f6aed fix eslint validation 2023-06-30 00:02:25 +02:00
zadam eb34f9c64f small refactorings and fixes 2023-06-29 23:32:19 +02:00
zadam 48029cea7c small refactorings 2023-06-29 22:10:13 +02:00
zadam f4ec4e58c7 fixed image styles 2023-06-29 21:30:26 +02:00
zadam faa402fcda API docs 2023-06-29 20:54:58 +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 430f2975f8 make "excludeFromNoteMap" overridable with note.isLabelTruthy(), #4058 2023-06-29 00:04:30 +02:00
zadam dd8226ff4c comment 2023-06-28 21:33:09 +02:00
zadam 807b442c7a fix froca update of erased blob 2023-06-28 21:28:41 +02:00
zadam a452e4add5 sync fixes 2023-06-28 21:05:31 +02:00
zadam 48b30b985e attachment upload 2023-06-28 20:53:55 +02:00
zadam 05d2f4fe96 Merge branch 'stable' 2023-06-27 23:15:20 +02:00
zadam 85a75fc186 getOwnedAttributes() should not make a copy, consistent with similar methods 2023-06-27 23:03:17 +02:00
zadam ddda4d9867 fix constructing result note path in the jump to note dialog, closes #4054 2023-06-27 22:57:13 +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 8ee537e2eb API comments 2023-06-27 00:14:13 +02: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 cb2b97635a centering icons in note book vertically 2023-06-22 23:34:05 +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
zadam edae1a5d1c Merge pull request #4050 from kianmeng/fix-typos
Fix typos
2023-06-22 22:33:09 +02:00
zadam 08398a1417 fix search scripts, closes #4048 2023-06-22 22:30:26 +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
manto89 ebccd48013 Don't search note by url if url begins with 'about:' 2023-06-21 18:06:28 +02:00
manto89 54065672aa Normalize behaviour with the other create method for web-clipper 2023-06-21 16:10:06 +02:00
manto89 8394ce8002 Change method when adding a new note.
Add reference to new backend method
2023-06-21 13:09:49 +02:00
zadam 176784834f simple formatter for source view of text HTML notes 2023-06-20 23:59:36 +02:00
zadam a47004bb4e shift migrations after upmerge 2023-06-20 23:32:31 +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 defd997424 release 0.60.4
Publish Docker image / Push Docker image to multiple registries (push) Failing after 46s
2023-06-19 23:26:50 +02:00
zadam 5905950c17 fix notePosition assignment for new children of root 2023-06-19 00:29:36 +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
mechanarchy af053b61fc Ignore SQL comments in query console 2023-06-17 17:06:17 +10:00
zadam e22f77eae7 release 0.60.3
Publish Docker image / Push Docker image to multiple registries (push) Failing after 39s
2023-06-15 23:23:37 +02:00
zadam 3223e76787 etapi ZIP import 2023-06-15 23:21:40 +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 0496412f4a cleanup of unused options 2023-06-14 00:38:48 +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 2ebbc33081 fix revision rename DB migration 2023-06-13 23:39:42 +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 b97ebe9f03)
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 08ec866dd2)
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
Publish Docker image / Push Docker image to multiple registries (push) Failing after 40s
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 38839532d5 file upload WIP 2023-06-06 12:31:38 +02:00
zadam 0234ff5fca share support for attachment file download 2023-06-06 00:16:32 +02:00
zadam 44bcfd47c0 share support for attachment images 2023-06-05 23:05:05 +02:00
zadam 69c7eb14aa fixes 2023-06-05 21:14:33 +02:00
zadam 00453fc151 attachment ETAPI tests WIP 2023-06-05 17:00:58 +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 57702a07a2 attachment ETAPI support WIP 2023-06-05 09:44:36 +02:00
zadam 3b3f6082a7 attachment ETAPI support WIP 2023-06-05 09:23:42 +02:00
zadam 49241ab318 merge 2023-06-05 00:12:08 +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 cb9feab7b2 got rid of the hot/cold blob, all blobs are "cold" now 2023-06-04 22:50:07 +02:00
zadam b79631a35d setContent refactoring 2023-06-04 20:51:08 +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
zadam b46d5f4a71 add blobId to the ETAPI #4005 2023-06-04 12:00:04 +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
dymani 50ec17433d Fix move pane button after reopen split 2023-06-03 05:59:53 +08:00
dymani 2c8eb82d42 Reopen recently closed tab/split in place 2023-06-03 05:54:33 +08: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
zadam b5cfc28912 rename inheritableAttributeCache to __inheritableAttributeCache for consistency 2023-05-31 23:21:06 +02:00
zadam c802bf7d8b Merge pull request #3990 from mm21/master
Add ETAPI tests to repro inherited attribute issue #3989 and workaround
2023-05-31 22:55:57 +02:00
mm21 9e5a02094c Add ETAPI tests to repro inherited attribute issue and workaround 2023-05-31 17:11:42 +00:00
dymani 58253567cd Simplify noteContextReorder event call 2023-06-01 00:48:37 +08:00
SiriusXT 92d5aeae41 Show highlighted text in the right panel 2023-05-31 22:34:24 +08:00
SiriusXT d2d286a4ff Show highlighted text in the left pane 2023-05-31 21:47:43 +08:00
zadam a6ade790c6 script api docs 2023-05-31 14:35:08 +02:00
zadam a9dae7823f script api docs 2023-05-31 14:00:37 +02:00
SiriusXT 86861f6ec3 Show highlighted text in the left pane 2023-05-31 18:32:33 +08:00
zadam d26a0fae17 if a note context has sub contexts, then it has to be saved even if empty, fixes #3985 2023-05-31 00:03:20 +02:00
zadam 375dba3264 fixed infinite recursion with search notes 2023-05-30 23:54:11 +02:00
zadam 74044754e2 Merge remote-tracking branch 'origin/master' 2023-05-30 22:59:23 +02:00
zadam 64aed9b462 display icon for non-supported note types in content renderer 2023-05-30 22:52:48 +02:00
zadam 5428cafa50 Merge pull request #3963 from SiriusXT/master
keep this window on top
2023-05-30 22:37:10 +02:00
dymani 735852b3c1 Use noteContextReorder event instead 2023-05-31 01:53:55 +08:00
zadam f4b5d43899 inline file attachments when exporting single HTML file 2023-05-29 23:42:08 +02:00
zadam 235b779dec detect existing attachment in target note 2023-05-29 22:37:19 +02:00
dymani 2a39906993 Cleanup 2023-05-30 04:22:51 +08:00
dymani e1b67e20ec Add buttons to move split panes 2023-05-30 03:44:05 +08:00
zadam df17840dbc fixes attachments 2023-05-29 13:02:25 +02:00
zadam 9d52f80c2f linking attachments finished 2023-05-29 10:21:34 +02:00
zadam 0aa119af2c attachments WIP 2023-05-29 00:19:54 +02:00
zadam c2f70031d0 Merge branch 'master' into next61
# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/entities/fnote.js
#	src/public/app/services/link.js
2023-05-28 16:57:48 +02:00
SiriusXT 1a2beb941e keep this window on top 2023-05-27 14:23:50 +08:00
SiriusXT 01b2887b36 Keep this window on top. 2023-05-27 14:18:26 +08:00
SiriusXT 5286d4a97c Merge branch 'master' of https://github.com/SiriusXT/trilium 2023-05-27 14:14:31 +08:00
zadam bf6106f4dc release 0.60.1-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 39s
2023-05-26 23:11:53 +02:00
zadam 82efc92413 lib upgrades 2023-05-26 23:11:37 +02:00
zadam 34481df2e7 Merge remote-tracking branch 'origin/master' 2023-05-26 11:14:22 +02:00
zadam ad4631018a right click on external link should not open the link, fixes #3971 2023-05-26 11:13:49 +02:00
zadam ef89eede17 Merge pull request #3974 from soulsands/fix-edited-note
fix getEditedNotesOnDate
2023-05-26 11:05:57 +02:00
zadam 6878877acd Merge remote-tracking branch 'origin/master' 2023-05-26 10:55:50 +02:00
zadam 611a983461 images in note list preview should be shrinked to fit into view, fixes #3965 2023-05-26 10:54:08 +02:00
zadam 8e913cb453 wip 2023-05-26 10:36:05 +02:00
baiyongjie 9d49264258 cleaup 2023-05-26 14:54:13 +08:00
baiyongjie 6098d62dcc fix getEditedNotesOnDate 2023-05-26 14:36:21 +08:00
zadam 580ceec6b3 Merge pull request #3959 from soulsands/fix-search
fix search
2023-05-25 23:36:35 +02:00
SiriusXT 79dca12274 top 2023-05-23 20:50:03 +08:00
SiriusXT 66c25e7f29 Bring this window to the top 2023-05-23 15:55:35 +08:00
SiriusXT dc4983a013 Bring this window to the top 2023-05-23 15:49:03 +08:00
SiriusXT 039959a48b Put this window top. 2023-05-23 15:44:26 +08:00
SiriusXT 63be25f5bb put window on top 2023-05-23 11:14:23 +08:00
SiriusXT ce7489049f put window on top 2023-05-23 10:32:24 +08:00
baiyongjie b3d5938665 fix search 2023-05-23 09:30:55 +08:00
zadam 579ed7e194 attachment content rendering 2023-05-21 18:14:17 +02:00
zadam e20fac19ba attachment WIP 2023-05-20 23:46:45 +02:00
zadam 9e9fb2979f Merge branch 'master' into next61
# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/components/note_context.js
#	src/public/app/services/open.js
#	src/public/app/widgets/buttons/note_actions.js
#	src/public/app/widgets/find_in_code.js
#	src/public/app/widgets/type_widgets/canvas.js
#	src/services/options.js
2023-05-20 20:55:57 +02:00
zadam 7fc2824325 ignore husky install error 2023-05-20 14:23:22 +02:00
zadam 0728f540ab locked versions 2023-05-18 23:57:18 +02:00
zadam 4913a5a5fa release 0.60.0-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 37s
2023-05-18 23:31:57 +02:00
zadam 14dd2b8827 cleanup 2023-05-18 23:05:28 +02:00
zadam 4e9e7eba48 Merge remote-tracking branch 'origin/master' 2023-05-18 13:46:53 +02:00
zadam f3bc604516 Merge branch 'stable'
# Conflicts:
#	src/public/app/widgets/toc.js
2023-05-18 13:46:41 +02:00
zadam bd278e291a Merge pull request #3948 from soulsands/tooltip
Normalize tooltip style
2023-05-18 13:42:18 +02:00
zadam 074820dae5 cleanup of find in text implementation 2023-05-18 13:41:32 +02:00
zadam 1089e84f56 Merge pull request #3947 from SiriusXT/master
FindInText: Automatically search the selected text
2023-05-18 13:27:37 +02:00
baiyongjie ed3d81ce62 normalize tooltip style 2023-05-18 16:41:07 +08:00
SnnBcd xt 57aa0a0fe1 findInText: Automatically search the selected text 2023-05-18 07:29:21 +00:00
zadam 88a961180f cleanup note open custom 2023-05-17 23:57:32 +02:00
zadam 1f8798d7ac upgrades 2023-05-17 23:47:30 +02:00
zadam bd8429a0ba Merge pull request #3944 from SiriusXT/toc
toc scrolls smoothly
2023-05-17 23:13:41 +02:00
zadam af95d387b9 Merge remote-tracking branch 'origin/master' into next60
# Conflicts:
#	src/public/app/services/open.js
#	src/public/app/widgets/buttons/note_actions.js
2023-05-17 23:10:02 +02:00
zadam da348075e8 Merge pull request #3923 from soulsands/fix-include
fix included note display
2023-05-17 23:06:50 +02:00
SnnBcd xt d24d3af87d Other elements in the scroll-container (including text search) scroll smoothly 2023-05-17 12:03:38 +00:00
SnnBcd xt 085c0e76ca toc scrolls smoothly 2023-05-17 10:18:58 +00:00
zadam d7d98b29a7 Merge pull request #3940 from SiriusXT/open-note-custom
Open note custom
2023-05-16 23:55:17 +02:00
zadam cb3b03537c Merge pull request #3938 from meichthys/keyboardshortcut
Change KeybaordLauncher to KeyboardShortcut
2023-05-16 22:37:00 +02:00
SnnBcd xt 7c7bea5e3a Open notes with custom software. 2023-05-16 14:01:55 +00:00
SnnBcd xt 9fc474504b Open notes with custom software 2023-05-16 11:57:28 +00:00
SnnBcd xt 412fd105c9 open-note-custom-test 2023-05-16 06:22:15 +00:00
MeIchthys 470a0c7b21 Update launchbar_command_launcher.html to refer to shortcuts 2023-05-15 10:21:40 -04:00
MeIchthys 9968cba348 singluarify 'mirrors' 2023-05-15 10:15:14 -04:00
MeIchthys aee520a209 Change keyboardLauncher to keyboardShortcut 2023-05-15 10:12:43 -04:00
MeIchthys cf4201b084 update keyboardlauncher to keyboardShortcut 2023-05-15 10:11:07 -04:00
zadam 76196ed42c Merge remote-tracking branch 'origin/master' into next60 2023-05-14 17:32:59 +02:00
zadam 6089a369e3 added missing font files #3933 2023-05-13 16:29:18 +02:00
zadam 092db03729 update montserrat for better cyrillic support, fixes #3933 2023-05-13 16:28:32 +02:00
zadam 239c14a5df fix search in "view source", closes #3929 2023-05-13 16:00:41 +02:00
zadam 8a6002c6be fix search in "view source", closes #3929 2023-05-13 15:58:32 +02:00
zadam 38781d33ac Merge remote-tracking branch 'origin/master' into next60
# Conflicts:
#	src/public/app/widgets/type_widgets/editable_text.js
2023-05-13 15:43:35 +02:00
zadam 0518cdbe8e Merge pull request #3928 from meichthys/auto-flex-note-title
Auto flex note title in tree
2023-05-13 15:42:12 +02:00
MeIchthys 4849dacd52 auto flex note title in tree 2023-05-12 10:14:34 -04:00
baiyongjie 7cf47520d4 fix included note display 2023-05-11 10:54:20 +08:00
baiyongjie 8eb0a4e1cb fix cursor position when Jumping from note to included note
(cherry picked from commit 6a9aa5eeda)
2023-05-11 00:22:06 +02:00
zadam ad2a7a2da3 Merge pull request #3920 from soulsands/fix-include
fix cursor position when Jumping from note to included note
2023-05-11 00:21:21 +02:00
baiyongjie 6a9aa5eeda fix cursor position when Jumping from note to included note 2023-05-10 18:08:25 +08:00
zadam 04524ae8e4 Merge pull request #3918 from meichthys/ribbon_more_obvious
Make active ribbon item more obvious
2023-05-09 23:46:45 +02:00
zadam 04caba9f5b fix parsing the authentication header with password containing a colon, closes #3916 2023-05-09 23:44:43 +02:00
zadam cc1f831a6a don't allow setting image quality to empty value, #3894 2023-05-09 23:32:06 +02:00
zadam 331d280075 TOC scrolls smoothly (on readonly), #3911 2023-05-09 23:14:56 +02:00
MeIchthys 46ed61d38a Make active ribbon item more obvious 2023-05-09 16:29:04 -04:00
zadam ff5d3a5f0c import WIP 2023-05-09 00:05:27 +02:00
zadam 626af84f42 refactoring + uploading attachments WIP 2023-05-08 00:02:08 +02:00
zadam b05ce12e7b adding links to owning note and list to attachments 2023-05-07 23:32:30 +02:00
zadam 274505188b fix "go to note" from note autocomplete 2023-05-07 21:29:09 +02:00
zadam f85209a72f getting rid of attributes like data-note-path in favor of the whole nav state in URLs 2023-05-07 21:18:21 +02:00
zadam 291f0e79d9 make a special backup before migrating to 0.60 2023-05-07 15:46:17 +02:00
zadam 64db5e2542 cleanup of app.js, wwww 2023-05-07 15:23:46 +02:00
zadam c4a2ff5fa1 fix hamburger icon in canvas, #3780 2023-05-07 12:09:38 +02:00
zadam 9f5f0aeddd fix hamburger icon in canvas 2023-05-07 11:54:04 +02:00
zadam 4d5612e845 fix updating non-text notes 2023-05-07 11:20:51 +02:00
zadam 371f174756 run hiddenSubtreeService.checkHiddenSubtree() also periodically, useful for server deployments, #3907 2023-05-07 10:54:06 +02:00
zadam 5676ff9b2e Merge pull request #3909 from mm21/etapi-generated-client
Enable generated etapi client
2023-05-07 10:50:05 +02:00
zadam aa8c0fdad8 Merge pull request #3908 from mm21/etapi-attribute-position
Allow etapi to update attribute fields isInheritable, position
2023-05-07 10:48:25 +02:00
zadam 8284c673f9 can't allow opening externally on attachment list 2023-05-07 10:43:51 +02:00
zadam cc02546ed3 Merge remote-tracking branch 'origin/master' into next60
# Conflicts:
#	src/routes/api/options.js
#	src/services/import/zip.js
#	src/services/options_init.js
2023-05-07 09:41:33 +02:00
mm21 d09132dd60 Revert path param changes for POST 2023-05-07 00:32:42 +00:00
mm21 ec662d01d0 Revert "Update etapi test"
This reverts commit 4aeecfdfa9.
2023-05-07 00:18:39 +00:00
mm21 ad0b98e2a1 Omit attributeId/branchId path params from postAttribute/postBranch in etapi.openapi.yaml 2023-05-07 00:18:28 +00:00
mm21 3cafad3bf4 Remove isInheritable from PATCH 2023-05-06 23:42:48 +00:00
zadam fbea3ed94f Merge pull request #3901 from Nriver/master
customize search engine
2023-05-06 23:02:12 +02:00
zadam 0ab18e3069 Merge pull request #3897 from contributor/feature/ZipExportDocumentTitle
zip export/import improvements
2023-05-06 22:52:05 +02:00
zadam 2aa987c072 fixes for zip export/import in regard to attachments 2023-05-06 22:50:28 +02:00
zadam a06ddc439d improving import WIP 2023-05-06 15:07:38 +02:00
zadam f6944b8219 introducing meta types for import/export, fixes for attachments export 2023-05-06 14:38:45 +02:00
zadam fa3cbb4645 grammar 2023-05-05 23:41:11 +02:00
zadam 6dfc72c065 many small fixes from Intellij analysis 2023-05-05 23:17:23 +02:00
zadam 0af6f91d21 exposing blobs in APIs 2023-05-05 22:21:51 +02:00
mm21 4aeecfdfa9 Update etapi test 2023-05-05 18:41:29 +00:00
mm21 79d4dcf5f1 Enable generated etapi client 2023-05-05 18:33:26 +00:00
mm21 26a6ef8c03 Allow etapi to update attribute fields isInheritable, position 2023-05-05 18:27:26 +00:00
zadam 5e1f81e53e getting rid of note complement WIP 2023-05-05 16:37:39 +02:00
zadam 9cdcbb3125 fix runOnNoteContentChange event 2023-05-05 15:42:53 +02:00
zadam 35338e9ec6 fix runOnNoteContentChange event 2023-05-05 15:40:44 +02:00
zadam 78d83b8826 fix note size calculation with blobs 2023-05-05 15:18:55 +02:00
zadam 8edf06d28d small refactorings 2023-05-04 22:16:18 +02:00
zadam ecd2a5cbac Merge remote-tracking branch 'origin/master' into next60 2023-05-04 21:01:53 +02:00
zadam c0cf319521 upgrade electron to 25 and node to 18 2023-05-04 21:01:25 +02:00
contributor bb9631476e bump metaFile format version 2023-05-04 19:56:11 +03:00
contributor 386e8dd32e zip import - remove html tags added by Trilium 2023-05-04 19:56:02 +03:00
Nriver 61616f708f add default options for search engine options 2023-05-04 18:01:51 +08:00
Nriver 8ce499e958 add runtime check for search engine options 2023-05-04 16:20:09 +08:00
Nriver 22587ee6b5 customize search engine 2023-05-04 14:57:33 +08:00
zadam 9b32d86f78 take branch prefix into account while sorting, fixes #3896 2023-05-03 23:42:44 +02:00
zadam 5ea8226996 Merge pull request #3777 from PhilippOesch/#3689
change downdown border to light border
2023-05-03 23:25:35 +02:00
zadam fbffc6b2b5 inline attachment images into single HTML export 2023-05-03 23:17:07 +02:00
zadam cd01886eb2 attachment revision upload 2023-05-03 22:49:24 +02:00
contributor bb8fd2b054 zip export - set note title as document.title 2023-05-03 16:19:28 +03:00
zadam d8bc9c2982 attachment actions 2023-05-03 10:23:20 +02:00
zadam d232694dec tree context menu to convert notes into attachments 2023-05-02 23:04:41 +02:00
zadam 735ac55bb8 fixes, allowing conversion of note into an attachment 2023-05-02 22:46:39 +02:00
zadam c9aab9b479 Merge pull request #3893 from mirrorcult/2023-05-01/ensure-note-return-branch
Return created/existing branch in `EnsureNoteIsPresentInParent`
2023-05-02 21:12:43 +02:00
Kara 53c87f3d25 Return created/existing branch in EnsureNoteIsPresentInParent 2023-05-01 12:41:22 -05:00
zadam 4f1fafdf75 Merge pull request #3870 from soulsands/perf-count
perf: improve descendant count performance
2023-04-28 21:53:41 +02:00
zadam 330e7ac08e copying attachments WIP 2023-04-25 00:01:58 +02:00
zadam 49fb913eab erasing unused attachments 2023-04-24 21:22:34 +02:00
zadam 4b074365e7 Merge branch 'master' into next60 2023-04-24 20:21:45 +02:00
zadam 0896000fcd Merge branch 'stable' 2023-04-24 20:21:22 +02:00
Castor e007aba067 Update note_map.js 2023-04-24 13:43:19 +08:00
zadam a6eda2479f Merge pull request #3871 from soulsands/config-debug
chore: debugger config for vscode developers
2023-04-23 22:32:29 +02:00
zadam eff567ee48 wrong password login screen should return 401 so that it counts to the rate limiter, fixes #3867 2023-04-23 22:22:05 +02:00
zadam d3c2c314ac Merge pull request #3866 from soulsands/custom-match
fix:  match custom path strictly
2023-04-23 22:12:55 +02:00
baiyongjie 89681977b5 perf: improve descendant count performance 2023-04-23 15:36:34 +08:00
baiyongjie e10a7ea9a6 chore: debugger config for vscode developers 2023-04-23 15:26:46 +08:00
soulsands c3c6d73bb2 fix: match custom path strictly 2023-04-22 19:37:49 +08:00
zadam 5e2efca933 scheduled erasure of attachments WIP 2023-04-21 00:19:17 +02:00
zadam e71b0d82a1 scheduled attachment deletion WIP 2023-04-20 00:11:09 +02:00
zadam c6c162cdda restore revision with attachments 2023-04-19 22:47:33 +02:00
zadam 8b46d6c718 Merge branch 'stable' into next60 2023-04-19 22:03:44 +02:00
zadam e24d5a6f83 collapse command will collapse the whole tree, including the current active note path, fixes #3664 2023-04-19 21:24:51 +02:00
zadam e28fbf4617 fixes 2023-04-17 23:21:28 +02:00
zadam 0e4a040ed8 fixes of new attachment URLs 2023-04-17 22:40:53 +02:00
zadam b84670d503 Merge branch 'master' into next60 2023-04-17 22:27:21 +02:00
zadam 8725f7cfb2 Merge branch 'stable'
# Conflicts:
#	src/services/build.js
2023-04-17 22:26:01 +02:00
zadam 83d8908ee8 release 0.59.4
Publish Docker image / Push Docker image to multiple registries (push) Failing after 34s
2023-04-17 21:40:35 +02:00
zadam af9ef83742 Merge pull request #3827 from soulsands/eslint-format
Eslint  and formating enhancement
2023-04-17 20:44:47 +02:00
zadam 3eafdadd1f Merge branch 'master' into eslint-format 2023-04-17 20:44:34 +02:00
zadam 1d3272e9f8 fix displaying error message in mermaid, closes #3841 2023-04-16 23:41:40 +02:00
zadam 447b8f0f0c Merge pull request #3848 from soulsands/auto-reload
chore: dev auto reload
2023-04-16 23:30:23 +02:00
zadam aaf6e3bace Merge pull request #3847 from soulsands/perf-build
Perf: building improvement
2023-04-16 23:27:55 +02:00
zadam 44c61b8e7d Merge pull request #3846 from soulsands/highlighter
change match-hightlighter config
2023-04-16 23:27:24 +02:00
zadam 8226f62ded download offline images from libreoffice, fixes #3842 2023-04-16 23:11:18 +02:00
zadam d3b17f586d Merge pull request #3839 from soulsands/activate
Activating after removal of subContexts conforms to mainContexts
2023-04-16 22:11:32 +02:00
zadam a556ba0959 Merge pull request #3838 from soulsands/patch-1
chore: remove install in script switch-electron
2023-04-16 22:09:52 +02:00
zadam ad40cd72ff Merge pull request #3833 from soulsands/es-version
fix: upgrade version to support top level await
2023-04-16 20:51:17 +02:00
zadam 9a22c3fce7 Merge pull request #3837 from soulsands/fix-tree
fix: correct moving active node
2023-04-16 20:50:11 +02:00
zadam 63e044ffdf refactoring 2023-04-16 11:28:24 +02:00
zadam 2e794ee38f fixes 2023-04-16 09:26:52 +02:00
zadam a1d4e062ed refactoring of "some path" WIP 2023-04-16 09:22:24 +02:00
Castor d2d2a28885 Update ws.js 2023-04-15 19:42:09 +08:00
baiyongjie ead4242735 chore: dev auto reload 2023-04-15 17:58:40 +08:00
baiyongjie 30a8c6b579 perf: building improvement 2023-04-15 17:45:10 +08:00
baiyongjie 25df8f9c52 change match-hightlighter config 2023-04-15 11:01:24 +08:00
baiyongjie 65d2389b2e update eslint config & fix lint 2023-04-15 09:57:50 +08:00
zadam 7aa26580ba refactoring of "some path" WIP 2023-04-15 00:06:13 +02:00
zadam e4376bb9f2 isRoot check 2023-04-14 20:24:28 +02:00
zadam f01657e1dd refactorings 2023-04-14 16:49:06 +02:00
soulsands 0c08126752 activating after removal of subContexts conforms to mainContexts 2023-04-13 21:16:10 +08:00
Castor ea64adc2f9 chore: remove install in script switch-electron
hi.
No need to install since it's already in position.
2023-04-13 17:56:28 +08:00
baiyongjie ad8ec68443 fix: correct active tree node after moving an clone node 2023-04-13 11:05:53 +08:00
baiyongjie 5e5fe2ccf3 fix: upgrade version to support top level await 2023-04-12 10:05:26 +08:00
zadam 34ecd77bd4 note revision save also saves attachments 2023-04-11 23:24:39 +02:00
zadam 6cf0fe0b73 attachments have a position 2023-04-11 22:55:50 +02:00
zadam 3f8bf7cacc renamed openTabs to openNoteContexts 2023-04-11 22:00:04 +02:00
zadam 17128c5874 navigation state is more nicely and completely serialized into URL 2023-04-11 21:41:55 +02:00
zadam 9e71c44c76 open attachment by double click 2023-04-11 18:05:57 +02:00
zadam 54c0268593 attachment improvements 2023-04-11 17:45:51 +02:00
zadam a5f0b2a81e Merge remote-tracking branch 'origin/next60' into next60 2023-04-11 17:02:53 +02:00
zadam a154bea016 Merge branch 'master' into next60 2023-04-11 17:02:24 +02:00
soulsands 2a34c8fa66 Merge remote-tracking branch 'up/master' into eslint-format 2023-04-11 01:02:07 +08:00
zadam 15a11daf38 Merge branch 'master' into next60
# Conflicts:
#	package-lock.json
#	package.json
2023-04-10 18:52:30 +02:00
zadam 5e88e24693 package upgrades 2023-04-10 18:50:55 +02:00
soulsands 988c5c6a25 chore: config 2023-04-11 00:37:38 +08:00
soulsands d98c46a275 chore: share editor config 2023-04-11 00:21:24 +08:00
soulsands 185b206627 chore: husky 2023-04-11 00:21:24 +08:00
soulsands cfb04f7d8a chore: add eslint config 2023-04-11 00:21:24 +08:00
zadam dba0c9f373 Merge branch 'stable'
# Conflicts:
#	src/services/build.js
2023-04-09 23:30:41 +02:00
zadam ee60652746 eslint config 2023-04-09 23:08:24 +02:00
zadam fbc79eae62 Merge pull request #3818 from soulsands/fix-lint
Fix lint
2023-04-09 22:54:02 +02:00
zadam b356a634d1 Merge pull request #3817 from soulsands/add-font
feat: add Microsoft YaHei font (for Chinese)
2023-04-09 22:47:46 +02:00
zadam b2ed5a01b3 Merge pull request #3816 from soulsands/fix-attr-ui
fix:don't break words for CJK text
2023-04-09 22:47:02 +02:00
zadam 839b172b92 fix duplicating subtree with internal links, closes #3813 2023-04-09 22:45:31 +02:00
soulsands 745e120a0b fix: remove unused variable 2023-04-08 21:13:37 +08:00
soulsands a0ac603260 fix:Remove duplicates in character class 2023-04-08 21:07:48 +08:00
soulsands 181ddce887 fix: remove misleading await 2023-04-08 20:49:25 +08:00
soulsands 50043f889b fix: remove duplication 2023-04-08 20:00:42 +08:00
soulsands 49d1c5140e fix: equal 2023-04-08 19:54:59 +08:00
soulsands ab7a07a318 fix: remove extra params 2023-04-08 19:51:39 +08:00
soulsands 306e7abb47 feat: add Microsoft YaHei font (for Chinese) 2023-04-08 18:41:18 +08:00
soulsands cec4dfa6c3 fix:don't break words for CJK text 2023-04-08 14:56:37 +08:00
zadam 21813a7b83 Merge pull request #3814 from soulsands/persistent-cache
Perf: add persistent http cache in prod
2023-04-07 21:48:00 +02:00
zadam 293573a0cd don't update attribute detail while composing CJK characters, fixes #3812 2023-04-07 21:45:27 +02:00
soulsands 8695228537 perf: add persistent http cache in prod 2023-04-07 19:55:18 +08:00
zadam 24866a3e25 fix click events propagating from context menu being closed, fixes #3805
(cherry picked from commit e871edc8f3)
2023-04-06 23:16:32 +02:00
zadam e871edc8f3 fix click events propagating from context menu being closed, fixes #3805 2023-04-06 23:05:03 +02:00
zadam 517f1992a1 remove fallback resize window handlers, such old browsers are not supported 2023-04-06 21:30:37 +02:00
zadam e6adf3a522 Merge pull request #3808 from soulsands/fix-resize
Fix: correct note-map resizing
2023-04-06 21:28:01 +02:00
zadam 32e9fd291d promotes attributes tab should be always visible when available, fixes #3806 2023-04-06 21:25:13 +02:00
zadam 8229a97ffb capitalizing ribbon widget names #3806 2023-04-06 21:20:19 +02:00
soulsands 6612a3a550 fix: correct note-map resizing 2023-04-06 21:06:08 +08:00
zadam c44be53673 awaiting on triggered events/commands in the frontend API, fixes #3799 2023-04-05 22:07:08 +02:00
zadam 5d6d9ab6d6 wip attachment support 2023-04-03 23:47:24 +02:00
zadam d100b0dc07 allow #newNotesOnTop=false to negate previous setting, closes #3796 2023-04-03 21:08:32 +02:00
zadam a0e9ac73c9 Merge remote-tracking branch 'origin/stable' into stable
# Conflicts:
#	src/services/build.js
2023-04-03 21:00:02 +02:00
zadam 2bc78ccafb wip attachment widget 2023-04-01 23:55:04 +02:00
zadam 53aebf1448 wip attachment widget 2023-04-01 13:58:53 +02:00
zadam 2e9ce962df Merge pull request #3695 from Nriver/master
add natural sort for notes, introduce new label #sortNatural
2023-03-30 23:49:48 +02:00
zadam fa406d3ded wip attachment widget 2023-03-30 23:48:26 +02:00
Nriver 93ad83d2ae add #sortLocale label for natural sort. rephrase feature description. 2023-03-30 11:06:10 +08:00
zadam 72b1cc4d89 fixed loading of parent to froca when e.g. sharing (cloning into not yet loaded _share parent) 2023-03-29 23:16:45 +02:00
zadam e70cca4736 fix trailing slash in shared note in IE, closes #3782 2023-03-29 23:07:47 +02:00
zadam d354c91d7c sort icons by how much they are used, #3784 2023-03-29 22:40:50 +02:00
zadam 2d7b5e4aa2 Merge branch 'stable'
# Conflicts:
#	src/services/build.js
2023-03-29 22:37:44 +02:00
zadam b542a28673 Merge branch 'stable' 2023-03-27 23:35:40 +02:00
zadam ed52919f9e release 0.59.3
Publish Docker image / Push Docker image to multiple registries (push) Failing after 42s
2023-03-27 23:06:14 +02:00
zadam 45a74a046c release 0.59.3 2023-03-27 23:03:27 +02:00
zadam 3192531d4c don't trigger menu items on right click, #3764 2023-03-27 22:49:41 +02:00
Philipp Oeschger 351bb760ae change downdown border to light border 2023-03-27 01:42:50 +02:00
zadam 79a6baca6f adjust logo sizing/positioning 2023-03-26 23:23:13 +02:00
zadam f9645e8971 Merge branch 'stable' 2023-03-26 23:11:47 +02:00
zadam 7611c83148 Merge pull request #3773 from mm21/master
Add svg icons
2023-03-26 23:11:04 +02:00
zadam 9881e6de3e fix hangup on highlighting empty tokens, closes #3772 2023-03-26 23:09:15 +02:00
Matt 53b4f0e0d5 Add svg icons 2023-03-26 19:29:52 +00:00
zadam 9a645c24ca Merge pull request #3771 from eltociear/add-readme_ja
Add Japanese README
2023-03-26 21:10:21 +02:00
zadam 682d821b67 Merge pull request #3766 from meichthys/patch-7
Move .tree-actions left to accomodate wider windows scrollbar and adjust boarder
2023-03-26 20:58:59 +02:00
zadam 71afffaac1 Merge pull request #3765 from meichthys/patch-5
Add bottom border to note-book-header
2023-03-26 20:58:12 +02:00
zadam a099876088 fix escaping in sql console results 2023-03-26 20:50:37 +02:00
Ikko Eltociear Ashimine cf904a874e Add links 2023-03-26 20:34:46 +09:00
Ikko Eltociear Ashimine 5a32a7ce18 minor fix 2023-03-26 20:33:59 +09:00
Ikko Eltociear Ashimine 6d6221636c Add Japanese README 2023-03-26 20:25:17 +09:00
MeIchthys 8a4caaf6fb Add border to tree-actions section and adjust padding 2023-03-24 15:17:17 -04:00
MeIchthys fa6d1879dd Move .tree-actions left to accomodate wider windows scrollbar 2023-03-24 14:46:09 -04:00
MeIchthys 874b6c71a3 Add bottom border to note-book-header 2023-03-24 11:29:16 -04:00
zadam 9be524ef89 attachment improvements 2023-03-24 10:57:32 +01:00
zadam fd8a2d4d92 hide global menu after changing note/context 2023-03-24 09:32:06 +01:00
zadam 0b270ee87a remove "hide included images" feature since with attachments it's no longer necessary 2023-03-24 09:17:17 +01:00
zadam 5cc5859211 migrate images to attachments 2023-03-24 09:13:35 +01:00
zadam bd489d5780 node upgrades 2023-03-24 07:45:18 +01:00
zadam cd72ea524e promoted and inherited attributes should be shown grouped based on the owning note, #3761 2023-03-23 23:47:28 +01:00
zadam 56e8506cb9 Merge pull request #3756 from meichthys/note-book-card-margin
Use same margin all around note-book-card
2023-03-23 23:20:50 +01:00
MeIchthys c86be990d6 Use same margin all around note-book-card 2023-03-21 16:19:09 -04:00
zadam a24c56a9d5 fixes 2023-03-20 23:11:32 +01:00
zadam 95e38a037b scrollbar tweak color 2023-03-20 20:50:18 +01:00
zadam 256b800d0e scrollbar tweak color 2023-03-20 20:48:52 +01:00
zadam b3c4c850db Merge branch 'master' into next60 2023-03-20 20:21:30 +01:00
zadam 6b1f9d3243 add #newNotesOnTop, closes #3734
(cherry picked from commit d31b5ac99f)
2023-03-19 22:27:12 +01:00
dymani 117f1101e4 Fix typo in backend API createOrUpdateLauncher()
(cherry picked from commit b3f47bb2b6)
2023-03-19 22:27:12 +01:00
zadam 4284116280 Merge pull request #3736 from dymani/master
Fix typo in backend API createOrUpdateLauncher()
2023-03-19 22:26:16 +01:00
zadam d31b5ac99f add #newNotesOnTop, closes #3734 2023-03-19 22:23:58 +01:00
dymani b3f47bb2b6 Fix typo in backend API createOrUpdateLauncher() 2023-03-18 10:18:34 +08:00
zadam 64d8c7a657 add a check for the hidden note existence, #3728 2023-03-17 22:14:50 +01:00
zadam 4c3fcc3ea6 fix sanitization of autocomplete against XSS 2023-03-17 22:04:49 +01:00
zadam 5ad47d3866 fix cache invalidation upon note title change 2023-03-17 20:44:26 +01:00
zadam e698aa5822 uploading image to attachment 2023-03-16 20:13:34 +01:00
zadam 1fdb23746a uploading image to attachment 2023-03-16 18:34:39 +01:00
zadam 9cd5bdeb53 fix note revision 2023-03-16 17:49:35 +01:00
zadam e6183b9a1d improved saving 2023-03-16 17:43:37 +01:00
zadam d83005fe4d improved saving attachment 2023-03-16 16:37:31 +01:00
zadam 2b84f1be00 unify .setContent() .getContent() handling across notes, revisions, attachments 2023-03-16 15:19:26 +01:00
zadam bb45c67e60 Merge branch 'stable' into next60 2023-03-16 13:39:28 +01:00
zadam 147160ed45 fix dead references in consistency_checks.js 2023-03-16 13:30:33 +01:00
zadam 515fb4e5db blob WIP 2023-03-16 13:29:11 +01:00
zadam b6efc954bd blob WIP 2023-03-16 12:17:55 +01:00
zadam eee05a4d01 blob WIP 2023-03-16 12:11:00 +01:00
zadam dc97400dbf ancillary => attachment 2023-03-16 11:03:28 +01:00
zadam e16bedfab4 WIP blobs 2023-03-16 11:02:07 +01:00
zadam 5a8e216dec WIP blob 2023-03-15 22:44:08 +01:00
zadam 1faf8225c7 Merge branch 'master' into next60 2023-03-15 20:19:47 +01:00
zadam bfbb531863 Merge pull request #3719 from meichthys/patch-sqlconsole
Fixes #3718
2023-03-15 16:41:07 +01:00
MeIchthys 48ba73e06d Fixes #3718 2023-03-15 09:56:26 -04:00
zadam c922322ed3 Merge pull request #3152 from spasche/scrollbar-color
use same variable as Firefox for scrollbar thumb
2023-03-14 22:16:39 +01:00
zadam 53aaffd0f5 Merge pull request #3652 from eliandoran/fix/infinite_loop_autocompletion
Infinite loop when searching for '' in Jump to note
2023-03-14 22:13:40 +01:00
zadam 63a70f2ffa release 0.59.2
Publish Docker image / Push Docker image to multiple registries (push) Failing after 43s
2023-03-14 21:15:08 +01:00
zadam d8e9086bde Merge pull request #3710 from meichthys/patch-3
Capitalize Ribbon Widget titles for consistency
2023-03-14 21:12:38 +01:00
zadam af4470ead1 Merge pull request #3709 from PJB3005/23-03-14-mermaid-code-mode
Avoid EditableCode inheriting mode from previous notes.
2023-03-14 21:12:01 +01:00
zadam 7cda81ec68 fix default keyboard shortcuts for mac forward, back, closes #3708 2023-03-14 21:07:14 +01:00
MeIchthys b1153f8d01 Capitalize Inherited Attributes for consistency 2023-03-14 16:01:08 -04:00
MeIchthys 54e21bf249 Capitalize Owned Attributes title 2023-03-14 15:58:40 -04:00
Pieter-Jan Briers eebf329983 Avoid EditableCode inheriting mode from previous notes.
Previously, if CodeMirror doesn't support a mode explicitly the mode wouldn't be updated on refresh. This means editors like Mermaid would get their mode "inherited" from the previous mode you had open.

Now the mode is set to text/plain if CodeMirror doesn't support the note's MIME type.

P.S. some of the mermaid diagrams in the demo data have their MIME type incorrectly set to text/plain rather than text/mermaid, so it doesn't reproduce on all diagrams in the demo data.
2023-03-14 20:56:12 +01:00
zadam 7b1d6c3937 Merge pull request #3685 from holoword/holoword/issue3677
“Docker non-root healthcheck”
2023-03-14 20:44:35 +01:00
holo e6803e9a9b “Docker non-root healthcheck” 2023-03-15 00:01:25 +00:00
zadam 0b24011468 docker_healthcheck.js should not create log files, #3677 2023-03-14 20:32:35 +01:00
zadam 2699c995ee Merge pull request #3701 from meichthys/patch-2
Add `onenote` Scheme to html sanitizer
2023-03-14 20:23:21 +01:00
MeIchthys 697f6ee2a9 Add onenote Scheme to html sanitizer 2023-03-13 10:36:25 -04:00
zadam 35429f6a93 Merge pull request #3693 from meichthys/patch-1
📝Emojify Readme
2023-03-12 23:10:43 +01:00
zadam 29eae4eeb6 fixed jsdoc 2023-03-12 23:05:54 +01:00
zadam 8de67b6945 small fixes / refactoring 2023-03-12 21:37:13 +01:00
zadam 4f63284d41 Merge pull request #3699 from new-sashok724/unix-sockets
Support listening on the unix socket
2023-03-12 21:31:37 +01:00
zadam 0c806024fb added some extra allowed URI schemes, fixes #3692 2023-03-12 21:20:34 +01:00
Сашка724ая 9a08aa2ab5 Fix healthcheck and some messages 2023-03-11 20:57:16 +11:00
Сашка724ая 02f218389b support listening on unix sockets 2023-03-11 20:21:32 +11:00
Nriver d3ec9f022c add natural sort for notes, introduce new label #sortNatural 2023-03-10 14:35:36 +08:00
MeIchthys 4cd54e5a9a Emojify Readme 2023-03-09 11:51:13 -05:00
zadam 5225a99995 wip 2023-03-09 09:38:02 +01:00
zadam 929f8ef720 note ancillary/attachment backported from dev branch 2023-03-08 09:01:23 +01:00
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 46eebdc7aa Update README.md 2023-03-01 10:48:34 +01:00
zadam 700c6ffc75 Update README.md 2023-03-01 10:48:11 +01:00
zadam 6b013c05cc added awesome-trilium to README 2023-03-01 10:47:27 +01:00
zadam f541bf186c release 0.59.1
Publish Docker image / Push Docker image to multiple registries (push) Failing after 34s
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 ae6f2624a0 Merge pull request #3650 from eliandoran/fix/vertical_align_table_cells
Centered vertical align does not seem to work on merged table cells
2023-02-28 00:02:29 +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 7be9db8b84 fix ctrl+click opening note twice, closes #3630 2023-02-22 22:59:31 +01:00
zadam 69d7684b0d fix refreshing option cache on sync, closes #3623 2023-02-22 22:10:41 +01:00
zadam a88582c610 Update README-ZH_CN.md 2023-02-21 10:38:37 +01:00
zadam 3fd0c01c05 Update README.ru.md 2023-02-21 10:38:12 +01:00
zadam c16537aecf Update README.md 2023-02-21 10:37:53 +01:00
zadam 79f1eb6e5e improvements in the anonymization script 2023-02-20 21:21:32 +01:00
zadam fc67dd4d0a release 0.59.0-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 32s
2023-02-19 21:36:05 +01:00
zadam 232dad66d1 trim imported text 2023-02-19 21:34:37 +01:00
zadam ed30ec27e7 update demo API examples 2023-02-17 23:34:29 +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 760c7b73ad api docs 2023-02-17 16:30:14 +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 956682f2c7 update docs 2023-02-17 16:15:58 +01:00
zadam 4558e349b5 node update 2023-02-17 15:05:27 +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
Publish Docker image / Push Docker image to multiple registries (push) Failing after 46s
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 44629e6a0a upgrades 2023-02-10 12:29:07 +01:00
zadam 78d61f157e fix docker healthcheck 2023-02-10 12:20:27 +01:00
zadam 3c0ba09a62 fix docker build 2023-02-10 11:40:56 +01:00
zadam e57d325bd6 fix docker build 2023-02-10 11:24:31 +01:00
zadam 260bc93a66 reimplement docker healtcheck into node.js to take into account configuration, #3582 2023-02-10 11:09:56 +01:00
zadam a9296e2a39 update node.js to 18 2023-02-10 10:44:38 +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
Elian Doran 92f586486f Fix broken reference consistency check
If a branch was identified with a missing parent, the branch would be
moved to root. However, the ID of the branch would be changed as a
result of that, and this resulted in the creation of a new branch
instead of updating the old one. Deleting the old one first solves the
issue.
2023-02-05 01:12:13 +02:00
zadam 15607becc6 Merge branch 'master' into dev
# Conflicts:
#	package-lock.json
#	src/public/app/entities/fnote.js
#	src/services/notes.js
2023-02-02 23:35:41 +01:00
zadam e7c6d912a4 fix undeleting notes with a relation, closes #3583 2023-02-01 23:06:55 +01:00
zadam 290f7e2101 fix sharing of templates, #3562 2023-02-01 22:58:40 +01:00
zadam 460b5fb3a4 fix sharing of templates, #3562 2023-02-01 22:55:31 +01:00
zadam 88e09eb279 ocr wip 2023-02-01 21:07:23 +01:00
zadam 5e0fbea3b3 fix disabled: on attribtue changed script in demo document, fixes #3564 2023-02-01 07:29:37 +01:00
zadam 7b2c3afe4c always open the note in URL, closes #3571 2023-01-31 23:20:11 +01:00
zadam 2e181d0fb1 toggling the left pane will toggle the focus between tree and detail, #3563 2023-01-31 22:35:01 +01:00
zadam 68a03211ce fix padding on launcher when collapsed 2023-01-31 22:25:46 +01:00
zadam 37ba76fdd8 refactored note attachment into note ancillary 2023-01-28 13:13:46 +01:00
zadam 78954268ab small attribute optimizations 2023-01-27 16:59:59 +01:00
zadam b0528b62d8 small attribute optimizations 2023-01-27 16:57:23 +01:00
zadam 2b4dfaef7f small attribute optimizations 2023-01-27 08:46:04 +01:00
zadam ad887c4b12 added image OCR and parsing text from PDF (and OCR of PDF images) 2023-01-26 20:32:27 +01:00
zadam 63c62df787 ocr 2023-01-26 09:42:11 +01:00
zadam c68a67d148 ocr test 2023-01-25 15:20:53 +01:00
zadam bd8568809f export/import attachments 2023-01-25 09:55:29 +01:00
zadam 0bfb2631df fix saving mermaid attachment 2023-01-24 23:09:00 +01:00
zadam 3c57f08ef7 added checksum to note_attachment 2023-01-24 16:55:48 +01:00
zadam a7b103e07a add a button to temporarily hide TOC, closes #3555 2023-01-24 16:24:51 +01:00
zadam 64e7150765 fix undeleting note when its relation points to yet-undeleted note 2023-01-24 09:43:10 +01:00
zadam a888f9aa04 recalculate maxEntityChangeId after rollbacked transaction 2023-01-24 09:35:00 +01:00
zadam 2e9dbda077 Merge remote-tracking branch 'origin/master' into dev
# Conflicts:
#	package.json
2023-01-24 09:20:15 +01:00
zadam c474e65cae saving attachments when editing 2023-01-24 09:19:49 +01:00
zadam f59e19d93b fixes to note attachment handling 2023-01-23 23:37:58 +01:00
zadam 8a33645360 migrating canvas etc. 2023-01-23 16:57:28 +01:00
zadam 339d8a7378 initial implementation of note attachments 2023-01-22 23:36:05 +01:00
zadam f2a19c56b1 add excludeFromNoteMap to a day template instead of journal root, #3547 2023-01-21 11:13:40 +01:00
zadam a98fd509c6 release 0.58.7
Publish Docker image / Push Docker image to multiple registries (push) Failing after 41s
2023-01-17 23:14:58 +01:00
zadam a3149aecf4 fix migration for DBs which did not have _hidden tree created, closes #3536 2023-01-17 23:13:21 +01:00
zadam 6a6ae359b6 Merge branch 'master' into dev
# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/widgets/dialogs/note_revisions.js
#	src/services/handlers.js
#	src/services/hidden_subtree.js
#	src/services/search/services/parse.js
2023-01-17 22:20:10 +01:00
zadam 2fa1d812f6 _hidden note does not inherit attributes from root, fixes #3537 2023-01-17 22:14:53 +01:00
zadam ef825371cf fix "root" note in autocomplete when hoisted into another subtree 2023-01-17 21:15:05 +01:00
zadam b567775129 small fixes of steel blue theme 2023-01-17 21:06:30 +01:00
zadam 58d71bf8e3 release 0.58.6
Publish Docker image / Push Docker image to multiple registries (push) Failing after 36s
2023-01-16 22:39:28 +01:00
zadam 9fd0b85ff2 doc note for the back/forward launchers 2023-01-16 22:37:21 +01:00
zadam a5e21ea5f3 simplified/fixed close tab button 2023-01-16 22:28:55 +01:00
zadam 98620887d4 fix demo steel blue main menu icon 2023-01-16 22:19:36 +01:00
zadam 9eff08144c extra check that hidden tree is not created until migration is completed 2023-01-16 08:06:19 +01:00
zadam 4ba72bc8d3 fixed standalone anonymize script 2023-01-15 21:05:03 +01:00
zadam f50a9c250a many small issues found by intellij analysis 2023-01-15 21:04:17 +01:00
zadam 743979266a fix history navigation buttons in server, #3527 2023-01-15 19:46:32 +01:00
zadam 4f98c960ec fix note revision for images 2023-01-15 19:23:28 +01:00
zadam 424b624ea9 small mermaid fixes 2023-01-15 13:48:01 +01:00
zadam a004a8b092 fix loading custom themes in Options, closes #3528 2023-01-15 12:54:38 +01:00
zadam df0f52aff9 clarified comment 2023-01-14 23:16:57 +01:00
zadam f7bd72ba2f release 0.58.5
Publish Docker image / Push Docker image to multiple registries (push) Failing after 37s
2023-01-14 23:02:39 +01:00
zadam 038c0e78a6 fix options check in froca 2023-01-14 23:01:02 +01:00
zadam 2a2cbcd68b fix duplicate unique key in migration, #3526 2023-01-14 22:57:39 +01:00
zadam be654e7a31 fix duplicate unique key in migration, #3526 2023-01-14 22:55:22 +01:00
zadam 32bd74fe27 build website improvements 2023-01-14 22:50:04 +01:00
zadam 14da697a4e put firing of the runOnNoteContentChange on entity level instead of service level, #3436 2023-01-14 12:57:50 +01:00
zadam 2525857c20 fix null content when protecting notes, closes #3523 2023-01-14 00:01:24 +01:00
zadam c97ada3434 docs improvements 2023-01-13 23:54:47 +01:00
zadam c924790f3e Merge remote-tracking branch 'origin/dev' into dev 2023-01-13 21:11:36 +01:00
zadam a110f24b05 Merge branch 'master' into dev 2023-01-13 21:11:23 +01:00
zadam 8eaef3e1d8 add runOnNoteContentChange into the autocomplete 2023-01-13 14:28:41 +01:00
zadam 082caf98e8 restore all "named" notes quickly after their deletion, #3517 2023-01-13 11:53:25 +01:00
zadam 60602a2264 fix creating notes into options, #3517 2023-01-13 11:34:35 +01:00
zadam 9479f1c1a1 toggling archived notes caused appearance of hidden subtree, fixes #3519 2023-01-13 11:25:58 +01:00
zadam 88bc7402a2 hidden notes should not appear in the global search unless hoisted into it, #3516 2023-01-13 10:09:41 +01:00
zadam e7b3c3239b fix migration of bookmarks to also migrate bookmarkFolder #3514 2023-01-13 08:43:18 +01:00
zadam 4f4c3ef3f3 fix enex checkboxes for mac, closes #3511 2023-01-12 16:45:11 +01:00
zadam d7b0719788 script to build the docs website 2023-01-12 16:37:30 +01:00
zadam 7a457e4509 Merge remote-tracking branch 'origin/master' into dev 2023-01-12 15:25:59 +01:00
zadam decfeb366c zoom factor should be rounded to 1 floating point digit 2023-01-12 08:27:08 +01:00
zadam 420175f5ef release 0.58.4
Publish Docker image / Push Docker image to multiple registries (push) Failing after 37s
2023-01-11 23:44:33 +01:00
zadam bdfdc0402d update content should parse out links #3509 2023-01-11 23:22:51 +01:00
zadam bb8496cb3f ETAPI method to create note revision, #3509 2023-01-11 23:18:51 +01:00
zadam 4bdb94fbaa ancestorDepth should be treated as string in ETAPI, fixes #3510 2023-01-11 23:08:57 +01:00
zadam 05c04a35a7 API docs integrate into user docs 2023-01-10 22:48:56 +01:00
zadam 4385a02f6b transform 2023-01-10 16:51:50 +01:00
zadam 397dd68666 Merge remote-tracking branch 'origin/dev' into dev 2023-01-10 16:33:35 +01:00
zadam edbb60f2b5 Merge branch 'master' into dev
# Conflicts:
#	src/routes/api/sender.js
#	src/services/import/enex.js
2023-01-10 16:33:31 +01:00
zadam 5bf9c253f2 toc fix 2023-01-10 16:16:13 +01:00
zadam b0cc177d84 make heading regex in TOC case insensitive 2023-01-10 15:06:21 +01:00
zadam c60f25fb7c more flexible heading regex 2023-01-10 00:00:46 +01:00
zadam 4ab90b694f fix 2023-01-09 23:15:02 +01:00
zadam 87636f27ba Merge branch 'master' into dev
# Conflicts:
#	src/routes/api/sender.js
#	src/services/import/enex.js
2023-01-09 23:02:19 +01:00
zadam 571cb6d0eb fix dynamic module import 2023-01-09 22:32:49 +01:00
zadam f738787202 expand regex to account for more attributes in en-media tag in ENEX import, fixes #3503 2023-01-08 20:50:08 +01:00
zadam 4ae1b6e07b sender route should respect inbox, #3502 2023-01-08 20:40:38 +01:00
zadam 41b8f6882c note content renderer should load reference link titles, fixes #3499 2023-01-08 20:31:55 +01:00
zadam 43c5163f66 renamed closing commands 2023-01-08 13:58:51 +01:00
zadam 8a2a9b2ea6 Merge branch 'stable'
# Conflicts:
#	src/services/import/enex.js
2023-01-08 13:24:10 +01:00
zadam c70272e756 fix creation date in ENEX import for mac files, closes #3496 2023-01-08 13:23:07 +01:00
zadam 843f5d0da1 gitignore 2023-01-08 12:54:55 +01:00
zadam 2242397280 fix 2023-01-08 12:46:26 +01:00
zadam 8a641e1b4f added "inherit" relation, #3493 2023-01-06 20:31:55 +01:00
zadam f86fb0d0a2 added TRILIUM_SYNC_SERVER_HOST env. variable to prevent prod sync issues 2023-01-06 15:14:04 +01:00
zadam a863da1dce becca should also keep correct branch order, e.g. for export, #2346 2023-01-06 15:07:18 +01:00
zadam d7cae7d5bb improvements in API docs generation 2023-01-05 23:38:41 +01:00
zadam 19f4870280 transform api docs script WIP 2023-01-05 16:52:39 +01:00
zadam ac51d0d569 Merge branch 'master' into dev
# Conflicts:
#	package-lock.json
#	package.json
2023-01-05 16:17:33 +01:00
zadam 218f526a92 fix order by note content size, closes #3488 2023-01-05 15:52:07 +01:00
zadam 161b45aa12 Merge pull request #3489 from Nriver/master
use api.showMessage instead of alert
2023-01-05 15:24:42 +01:00
zadam 397629587c Merge remote-tracking branch 'origin/master' 2023-01-05 15:23:31 +01:00
zadam 034098fd06 don't use alert, #3483 2023-01-05 15:23:22 +01:00
Nriver e03cc01e15 use api.showMessage instead of alert 2023-01-05 09:02:40 +08:00
zadam 0995c56506 release 0.58.3-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 42s
2023-01-04 22:36:31 +01:00
zadam 3a5fa2954d Merge remote-tracking branch 'origin/master' 2023-01-03 22:36:56 +01:00
zadam 398480415e package-lock.json 2023-01-03 22:36:41 +01:00
zadam 81013ed21a Merge branch 'stable'
# Conflicts:
#	package-lock.json
#	package.json
2023-01-03 22:35:45 +01:00
zadam 53360c147a npm script improvements 2023-01-03 22:34:31 +01:00
zadam 9e47da3f03 Merge pull request #3150 from zadam/dependabot/npm_and_yarn/json-schema-and-jsprim-0.4.0
Bump json-schema and jsprim
2023-01-03 22:32:36 +01:00
zadam faefe10c15 Merge pull request #3423 from zadam/dependabot/npm_and_yarn/terser-5.16.1
Bump terser from 5.10.0 to 5.16.1
2023-01-03 22:32:15 +01:00
zadam a4d3150a24 Merge pull request #2739 from zadam/dependabot/npm_and_yarn/nanoid-3.3.1
Bump nanoid from 3.1.30 to 3.3.1
2023-01-03 22:31:57 +01:00
zadam e1f0676891 Merge pull request #3197 from zadam/dependabot/npm_and_yarn/dump-db/minimist-1.2.7
Bump minimist from 1.2.5 to 1.2.7 in /dump-db
2023-01-03 22:31:08 +01:00
zadam 792ac9b77d Merge pull request #3408 from zadam/dependabot/npm_and_yarn/qs-6.5.3
Bump qs from 6.5.2 to 6.5.3
2023-01-03 22:30:42 +01:00
zadam bbbd2f7e82 Merge pull request #3481 from contributor/feature/safeVsCodeLaunch
Safe Vs Code debug launch
2023-01-03 22:29:36 +01:00
zadam d910191e83 Merge pull request #3480 from contributor/feature/pageUrlSanitizeUrl
Fix pageUrl and clipping selection can create multiple notes for the same Url
2023-01-03 22:28:37 +01:00
zadam e8a9389e6d remove console.log 2023-01-03 21:44:47 +01:00
zadam 6dce13bc34 export root note fix, #2346 2023-01-03 21:30:49 +01:00
contributor 71cdea3902 fix vscode launch can break release app data 2023-01-03 21:39:35 +02:00
contributor 85a6e8b47e fix clipping selection can create multiple notes for the same Url
sanitize was replacing '&' char to '&'and changing actual Url
2023-01-03 21:18:23 +02:00
contributor f02ad63e97 npm i @braintree/sanitize-url 2023-01-03 21:18:23 +02:00
contributor 977399a73e refac: better naming 2023-01-03 21:18:23 +02:00
zadam 5d4a2f2064 jsdoc 2023-01-03 15:02:01 +01:00
zadam c5ab6fa2fa jsdoc fixes to make export simpler 2023-01-03 14:31:46 +01:00
zadam b80bf0ffb6 docs updated 2023-01-03 13:54:27 +01:00
zadam bff7434921 rename becca entities to have B-prefix, #3476 2023-01-03 13:52:37 +01:00
zadam da161c7ce0 rename shaca entities to have F-prefix, #3476 2023-01-03 13:40:21 +01:00
zadam 977a47bc27 rename froca entities to have F-prefix, #3476 2023-01-03 13:35:10 +01:00
zadam 957640f163 Merge branch 'master' into dev 2023-01-02 22:53:03 +01:00
zadam 291ef87c9b fix edit button 2023-01-02 22:32:05 +01:00
zadam 115bf0af4d fix button paddings 2023-01-02 21:08:20 +01:00
zadam e40f1fd11a fix inclusion of the image into the correct position in ENEX import, closes #3468 2023-01-01 21:02:54 +01:00
zadam 797ddf6205 search hit with exact note title match gets a strong score boost, closes #3470 2022-12-30 23:14:48 +01:00
zadam ca4e1c19a7 make utils.normalize null-safe, #3469 2022-12-30 21:00:42 +01:00
zadam d2b906bc1b global menu can open the user guide 2022-12-30 17:41:45 +01:00
zadam 94dcaae12d renamed Help to User Guide 2022-12-30 17:28:19 +01:00
zadam df47679c7f added option for help sha256 2022-12-30 17:10:07 +01:00
zadam d6f3b79f20 improvs 2022-12-29 23:12:38 +01:00
zadam c7556d9163 backend api for ZIP export 2022-12-29 21:15:34 +01:00
zadam 16c3833a36 fix 2022-12-29 14:25:25 +01:00
zadam 007e45ad8c fix import and replace tree 2022-12-29 14:21:35 +01:00
zadam b9b8b35342 Merge branch 'master' into dev
# Conflicts:
#	src/services/import/zip.js
2022-12-29 10:27:23 +01:00
zadam dd82b0f958 Merge remote-tracking branch 'origin/master' 2022-12-29 10:25:54 +01:00
zadam f150c223bc improved ZIP import validation and error handling 2022-12-29 10:25:49 +01:00
zadam e76290e598 Merge branch 'master' into dev 2022-12-29 10:07:04 +01:00
zadam 4f771cfa7a Merge pull request #3467 from contributor/feature/enex-pageUrl
Evernote import - use pageUrl attribute for enex source-url
2022-12-29 09:57:43 +01:00
contributor aa3b26c965 Evernote import - use pageUrl attribute for enex source-url 2022-12-29 01:27:17 +02:00
zadam f4cf04232f release 0.58.2-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 37s
2022-12-29 00:12:54 +01:00
zadam d36cf47974 no-dir npm scripts 2022-12-28 23:17:59 +01:00
zadam f809da58ec fix occurrences of 'root' branch 2022-12-28 13:09:49 +01:00
zadam ff1f01be8c erase deleted notes in the migration 2022-12-28 12:58:53 +01:00
zadam 0ddaa8f5c2 migration fixes 2022-12-27 21:17:40 +01:00
zadam 620bed73bb put back the removed widgets, the BC break is not worth it 2022-12-27 15:05:12 +01:00
zadam c177d2b97b fix migration 2022-12-27 14:52:32 +01:00
zadam 0758c82983 hidden subtree is now built as "predictable" to avoid duplicating it in sync 2022-12-27 14:44:28 +01:00
zadam ecc2ed7d73 formatting 2022-12-27 10:22:50 +01:00
zadam 4b779d7512 small refactors in sync 2022-12-27 09:53:25 +01:00
zadam 701911b766 release 0.58.1-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 39s
2022-12-26 23:57:31 +01:00
zadam 5fea90491c zip import WIP 2022-12-26 23:46:39 +01:00
zadam d665b7e584 import refactoring 2022-12-26 22:51:16 +01:00
zadam 7a8bbdced8 fix cursor in the textarea, closes #3459 2022-12-26 20:07:04 +01:00
zadam affd8062e2 escape note titles in note map 2022-12-26 10:52:28 +01:00
zadam 45b94ecaeb zip import refactoring 2022-12-26 10:38:31 +01:00
zadam acda37e334 wip import zip as help 2022-12-25 23:36:56 +01:00
zadam 2cfc43a4fd Merge pull request #3456 from WPum/patch-1
sync chinese readme with the english version
2022-12-25 19:53:34 +01:00
WPum fb789b7bd8 sync chinese readme with the english version 2022-12-25 23:42:44 +08:00
zadam b906efb23b fix ZIP import without metadata 2022-12-25 14:10:12 +01:00
zadam f249d6cb26 fix sorting after cloning/moving notes into sorted parent, closes #3453 2022-12-25 13:46:31 +01:00
zadam afb6e860ea fix docs 2022-12-25 13:06:06 +01:00
zadam 435e042ae9 fix docs 2022-12-25 13:03:22 +01:00
zadam d64df5e3e7 fix comment 2022-12-25 13:03:04 +01:00
zadam bd59802ca4 create new sortNotes backend API method and deprecate old sortNotesByTitle 2022-12-25 13:01:50 +01:00
zadam 7c98ade72b fix missing doc resources for launchers, closes #3455 2022-12-25 11:58:24 +01:00
zadam c6485f8e03 fix assuming that trilium is exposed on the root path, closes #3452 2022-12-25 10:48:51 +01:00
zadam a083917db1 fix context menu in browser for launchers, closes #3454 2022-12-25 10:33:31 +01:00
zadam 3b5f2b86d5 release 0.58.0-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 40s
2022-12-24 22:09:05 +01:00
zadam f08fbf7bca fix migration 2022-12-24 21:25:34 +01:00
zadam e2b227df34 make initialization of launchers more robust 2022-12-24 14:42:35 +01:00
zadam 4c51588270 custom widget launchers should not be initialized in safe mode 2022-12-24 13:57:42 +01:00
zadam b13ea72152 autorefresh bookmarks on #bookmarkFolder change 2022-12-24 13:31:38 +01:00
zadam 5a2907b670 delete preview takes into account strong/weak branches 2022-12-24 13:15:19 +01:00
zadam b6f7c604c7 fix share migration 2022-12-24 12:54:17 +01:00
zadam c5fb2cccd5 fix bookmark's ID 2022-12-24 12:26:32 +01:00
zadam 1d1e6ae782 disallow dropping notes before/after available/visible launchers 2022-12-24 07:22:05 +01:00
zadam bff33932d9 fix migration to not rely on branchId 2022-12-24 07:17:22 +01:00
zadam 392b89e6dd exported links to "named" notes should be preserved upon import 2022-12-23 23:08:30 +01:00
zadam 5ae0a5cf1e randomize existing fixed branchIds so it's clear they should not be relied upon 2022-12-23 21:13:00 +01:00
zadam 1a1fb126c1 randomize existing fixed branchIds so it's clear they should not be relied upon 2022-12-23 20:55:37 +01:00
zadam 5c4db266a4 code should not rely on fixed branch IDs since they can change after move 2022-12-23 20:40:58 +01:00
zadam e5e0add1a2 fixed history navigation buttons 2022-12-23 20:17:04 +01:00
zadam e1d20b8ff8 fix relation map buttons 2022-12-23 19:47:49 +01:00
zadam c6a05d8853 fix calendar widget when hoisted into hidden subtree 2022-12-23 15:46:33 +01:00
zadam c34bccf7e8 note map can display notes if hoisted in hidden subtree 2022-12-23 15:32:11 +01:00
zadam 0441e7396a small fixes 2022-12-23 15:07:48 +01:00
zadam 698eb53006 small fixes 2022-12-23 14:18:40 +01:00
zadam 3804d2df8c search should find notes in hidden subtree when hoisted into it 2022-12-23 14:02:18 +01:00
zadam 7147cc267e small fixes 2022-12-22 23:38:57 +01:00
zadam 29713de6cd small fixes 2022-12-22 23:11:12 +01:00
zadam 46f40ee534 fix options 2022-12-22 22:52:04 +01:00
zadam a882ad41c5 small fixes 2022-12-22 21:01:52 +01:00
zadam 062e8c4b84 allow configuration of log, backup etc. directories per env variables, closes #3446 2022-12-22 19:50:00 +01:00
zadam 0f0ca51bd6 updated launcher info pages 2022-12-22 19:02:41 +01:00
zadam af654a171f execute all DB migrations in one transaction 2022-12-22 18:53:04 +01:00
zadam 186e06bc01 descs for execute button 2022-12-22 18:37:32 +01:00
zadam 4cc9bdf5e4 Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	package-lock.json
2022-12-22 18:16:06 +01:00
zadam e05e4bec32 fix old migration to avoid unique constraints problems, closes #3447 2022-12-22 15:11:20 +01:00
zadam 5a3882f388 fixed comments 2022-12-22 14:59:20 +01:00
zadam 8ec2547b4a backend API to create a launcher 2022-12-22 14:57:00 +01:00
zadam 059c339c09 fix warnings in ckeditor 2022-12-21 23:10:13 +01:00
zadam 724f99f17c add prefix "_" to "named" IDs 2022-12-21 16:11:00 +01:00
zadam 1b24276a4a always use template strings instead of string concatenation 2022-12-21 15:19:05 +01:00
zadam ea006993f6 added a "script executor" ribbon widget 2022-12-20 23:46:44 +01:00
zadam 7a46159539 code buttons into the floating buttons (WIP) 2022-12-20 23:20:59 +01:00
zadam 50faa40bad apply color label also on note map, #3443 2022-12-20 20:41:51 +01:00
zadam 9d9305300c scale the whole edit widget, not just the icon 2022-12-20 20:25:52 +01:00
zadam c89455f93f edit button grows and shakes on the first display #2483 2022-12-20 20:20:24 +01:00
zadam 7c6d67f1ad migration comments 2022-12-19 23:49:41 +01:00
zadam 8c4dda45ef bookmark buttons should behave similarly as other launcher buttons in respect to context menu, ctrl-click, left click 2022-12-19 23:19:47 +01:00
zadam db5e76fe8c allow access to share api root note only if there's share index, #3434 2022-12-19 21:39:12 +01:00
zadam 5413a1aa79 create new runOnNoteContentChange event, #3436 2022-12-18 23:53:47 +01:00
zadam e41104208a added today launcher 2022-12-18 23:25:35 +01:00
zadam 5fca606730 added note hoisting option to the note launcher 2022-12-18 22:05:06 +01:00
zadam 0de0b6fd06 sync status widget fix 2022-12-18 20:29:17 +01:00
zadam db6dbc7821 can't create non-launcher notes into the launcher subtree 2022-12-18 20:12:43 +01:00
zadam e5171e434b fix small gap between menu and submenu where hover can disappear 2022-12-18 19:45:36 +01:00
zadam 2df7d99a91 routes refactoring 2022-12-18 16:12:29 +01:00
zadam 6def541e78 improve compatibility with common js, #3436 2022-12-18 12:58:26 +01:00
zadam 5af506e268 reimplementation of frontend's api.addButtonToToolbar() to smoothen the upgrade 2022-12-17 21:46:51 +01:00
zadam 967919b400 fix note preloading in tab loading 2022-12-17 13:33:57 +01:00
zadam 575f09d97f fix display of title buttons 2022-12-17 13:28:53 +01:00
zadam c28383de4f full search shows search errors, closes #3221 2022-12-17 13:07:42 +01:00
zadam c496519095 Merge remote-tracking branch 'origin/master' 2022-12-17 11:58:36 +01:00
zadam ecaa9a1d56 quick search shows search errors #3221 2022-12-17 11:58:30 +01:00
zadam d34a0a9fc0 hidden subtree is not archived anymore 2022-12-16 16:00:49 +01:00
zadam b202b43bf5 added watchdog for CKEditor to recover from crashes, fixes #3227 2022-12-15 21:45:47 +01:00
zadam 648dd73fa1 mermaid 9.3.0 2022-12-15 20:37:59 +01:00
zadam 1640a8aa7d Merge remote-tracking branch 'origin/master' 2022-12-15 18:58:54 +01:00
zadam 698a6bf91c ckeditor 35.4.0 2022-12-15 18:58:47 +01:00
dependabot[bot] c409d7ff2a Bump qs from 6.5.2 to 6.5.3
Bumps [qs](https://github.com/ljharb/qs) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.5.2...v6.5.3)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-15 15:39:13 +00:00
dependabot[bot] f8dd175837 Bump terser from 5.10.0 to 5.16.1
Bumps [terser](https://github.com/terser/terser) from 5.10.0 to 5.16.1.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/compare/v5.10.0...v5.16.1)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-15 15:39:04 +00:00
zadam 195c6a4089 backend log improvements 2022-12-15 16:38:05 +01:00
zadam 6c431ae5ed fix enex import splitting image/resource into multiple chunks, closes #3424 2022-12-15 14:14:21 +01:00
zadam 8c01a77a7a docs update 2022-12-14 23:51:56 +01:00
zadam 239c68a33c docs update 2022-12-14 23:51:28 +01:00
dependabot[bot] df3212c304 Bump minimist from 1.2.5 to 1.2.7 in /dump-db
Bumps [minimist](https://github.com/minimistjs/minimist) from 1.2.5 to 1.2.7.
- [Release notes](https://github.com/minimistjs/minimist/releases)
- [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/minimistjs/minimist/compare/v1.2.5...v1.2.7)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-14 22:50:02 +00:00
zadam 4026c2be4f Merge branch 'next58'
# Conflicts:
#	src/public/app/widgets/note_tree.js
#	src/services/tree.js
2022-12-14 23:48:58 +01:00
zadam c6614bc85b removed logging 2022-12-14 23:45:55 +01:00
zadam 31b3af4129 label update should trigger parent resort, fixes #3366 2022-12-14 23:44:26 +01:00
zadam c4b0c44919 change of archived label should force a reload of the parents since it can change its visibility status, fixes #3422 2022-12-14 19:26:39 +01:00
zadam 223ca95829 added error logs to bug report template 2022-12-14 12:28:08 +01:00
zadam b9ae68d559 small fixes 2022-12-14 12:26:04 +01:00
zadam e7470e31a0 Merge branch 'stable' 2022-12-14 11:20:55 +01:00
zadam 1b6d0c9bbc global menu improvements 2022-12-14 10:29:14 +01:00
zadam 75639c53f0 unhoist button on the left 2022-12-14 10:18:29 +01:00
zadam 587387dd46 improved error handling in case of errors during initial tabs loading 2022-12-14 10:00:33 +01:00
zadam ffb3c044fa release 0.57.5
Publish Docker image / Push Docker image to multiple registries (push) Failing after 32s
2022-12-13 23:08:52 +01:00
DynamoFox 921f75beba Fix missing share.js in public/app-dist folder; Delete unused public/app folder (Docker build)
(cherry picked from commit f45478260e)
2022-12-13 22:40:28 +01:00
zadam f739259407 Merge pull request #3410 from DynamoFox/fix-missing-sharejs-file
Fix missing share.js in public/app-dist folder; Delete unused public/app folder (Docker build)
2022-12-13 22:39:28 +01:00
zadam 173b28062e advanced submenu is available in mobile 2022-12-13 22:29:26 +01:00
zadam 4f51f73b89 mobile interface should not create new tabs 2022-12-13 21:45:57 +01:00
zadam ca968a9e31 hoisting support in mobile view WIP 2022-12-13 16:57:46 +01:00
zadam 2957e1d78a improvements in mobile layout for launchbar 2022-12-12 23:48:34 +01:00
zadam d1b989ac12 Merge remote-tracking branch 'origin/stable' into next58 2022-12-12 21:43:56 +01:00
zadam e3047ee450 Merge remote-tracking branch 'origin/master' into next58 2022-12-12 21:43:45 +01:00
DynamoFox f45478260e Fix missing share.js in public/app-dist folder; Delete unused public/app folder (Docker build) 2022-12-12 21:39:10 +01:00
zadam 1bfd26ee8f release 0.57.4
Publish Docker image / Push Docker image to multiple registries (push) Failing after 43s
2022-12-11 23:24:24 +01:00
zadam bbdb7375ff Merge pull request #3406 from deajan/fix-powershell-exec-policy
Fix powershell exec policy
2022-12-11 23:16:37 +01:00
zadam 23322455a3 mobile layout now has launchbar 2022-12-11 22:26:18 +01:00
zadam c1d4d3fc8a mobile layout improvements 2022-12-11 21:27:03 +01:00
Orsiris de Jong fc40e54261 Remove unnecessary powershell scripts 2022-12-11 18:24:29 +01:00
Orsiris de Jong 87e833d373 Use inline powershell launcher, add unicode support for batch 2022-12-11 18:23:50 +01:00
zadam dcfa9c4c0b mobile layout has floating buttons 2022-12-11 13:54:12 +01:00
zadam c231b3cb79 styling changes of buttons 2022-12-11 13:20:37 +01:00
zadam 1f468f81cc Merge remote-tracking branch 'origin/next58' into next58
# Conflicts:
#	src/public/app/components/note_context.js
2022-12-10 14:37:02 +01:00
zadam 494f8d2153 fix reopening the very last tab, closes #3397 2022-12-10 14:35:58 +01:00
zadam 0f822b2761 global note map should not rehoist 2022-12-09 16:54:22 +01:00
zadam 5ac332960e note launchers by default open in the active note context but follow the same logic with ctrl/middle click as links 2022-12-09 16:48:00 +01:00
zadam dfb462cf35 introduced new exception classes for structured error reporting 2022-12-09 16:13:22 +01:00
zadam 342ae6e5e2 introduced new exception classes for structured error reporting 2022-12-09 16:04:13 +01:00
zadam eaf195e0c8 Merge remote-tracking branch 'origin/stable' into next58 2022-12-09 15:19:06 +01:00
zadam 9460cfdc55 Merge remote-tracking branch 'origin/master' into next58 2022-12-09 15:18:51 +01:00
zadam c44bc60667 when opening a note from hidden subtree, make sure we're hoisted 2022-12-08 23:36:49 +01:00
zadam 8d6801bb85 new split should keep the hoisted note 2022-12-08 23:29:08 +01:00
zadam c22b6b29e0 options fixes 2022-12-08 15:29:14 +01:00
zadam 44997f5cd1 options fixes 2022-12-08 15:18:41 +01:00
zadam 95f4195ca7 shortcuts layout fix 2022-12-08 14:27:21 +01:00
zadam 73eb585398 fixed migrations 2022-12-08 13:45:56 +01:00
DynamoFox 57d381b990 Fix missing boxicons icons; Add missing boxicons LICENSE file from upstream
(cherry picked from commit d06d4ba437)
2022-12-08 00:01:09 +01:00
zadam e5ba6ff496 Merge pull request #3394 from DynamoFox/fix-missing-boxicons-icons
Fix missing boxicons icons; Add missing boxicons LICENSE file from upstream
2022-12-08 00:00:20 +01:00
zadam 128023d34e attempt to fix the ws crash, #3374 2022-12-07 23:58:22 +01:00
zadam 653f80f7d8 WIP 2022-12-07 23:37:40 +01:00
DynamoFox d06d4ba437 Fix missing boxicons icons; Add missing boxicons LICENSE file from upstream 2022-12-07 20:32:19 +01:00
zadam 2a68bdb690 raw conversion of all options tabs 2022-12-07 16:02:08 +01:00
zadam 5f6a10ef22 options widget work 2022-12-07 15:37:53 +01:00
zadam 2ad19ddd36 generate hidden subtree declaratively 2022-12-07 12:46:41 +01:00
zadam 5fc9f5f3f9 improvements 2022-12-06 23:48:44 +01:00
zadam b9632a7814 rename note types to camelCase 2022-12-06 23:01:42 +01:00
zadam f336435adb appearance options broken up into individual widgets 2022-12-06 22:43:35 +01:00
zadam 9e83368f87 appearance tab in hidden subtree 2022-12-06 17:05:21 +01:00
zadam d619a7a2d7 rename "widget" type to "content-widget" 2022-12-06 16:23:49 +01:00
zadam 012fb1f50b rename "widget" type to "content-widget" 2022-12-06 16:23:30 +01:00
zadam d64b575e60 added isBeingDeleted to be able to recognize that note is being deleted while still leaving it accessible 2022-12-06 16:11:43 +01:00
zadam aec2c2d5cd appearance options as a special note 2022-12-05 23:57:29 +01:00
zadam 0d06d5ccee dump-db should not contain node_modules in release artifacts 2022-12-04 23:49:16 +01:00
zadam 74fdaad032 mobile fix 2022-12-04 22:59:09 +01:00
zadam d3bf0c1d8e bookmark migration 2022-12-04 20:05:18 +01:00
zadam 27ce273d29 bookmarks use cloning 2022-12-04 13:16:05 +01:00
zadam cd60ad4267 improvements 2022-12-03 21:11:49 +01:00
zadam 56e01046c8 Merge branch 'master' into next58 2022-12-03 13:28:21 +01:00
zadam 518a413de7 fix internal link creation, closes #3376 2022-12-03 13:26:33 +01:00
zadam 29923af17d Merge remote-tracking branch 'origin/next58' into next58 2022-12-03 13:01:10 +01:00
zadam 99a5774148 Merge branch 'master' into next58
# Conflicts:
#	package-lock.json
2022-12-03 13:01:03 +01:00
zadam 46fdd15857 release 0.57.3
Publish Docker image / Push Docker image to multiple registries (push) Failing after 36s
2022-12-02 22:44:40 +01:00
zadam 42cd333694 clarification on the 5 minute sync auth leeway 2022-12-02 22:12:07 +01:00
zadam aaa69f696b Merge remote-tracking branch 'origin/master' 2022-12-02 22:07:41 +01:00
zadam 8ce9dcf4aa fix webmanifest and robots.txt 2022-12-02 22:06:18 +01:00
zadam 130ded91ff Merge pull request #3375 from DynamoFox/fix-dockerfile-to-generate-webpack-bundle
Fix missing webpack bundle generation in Docker container build
2022-12-02 21:09:50 +01:00
DynamoFox 851465da62 Fix missing webpack bundle generation in Docker container build 2022-12-02 18:15:03 +01:00
zadam b85f335561 launcher improvements 2022-12-02 16:46:14 +01:00
zadam 7b36709e18 Merge remote-tracking branch 'origin/master' into next58 2022-12-02 15:28:04 +01:00
zadam 0d50cdb0f5 Merge remote-tracking branch 'origin/next58' into next58 2022-12-02 15:27:30 +01:00
zadam eec2ff043e Merge branch 'master' into next58 2022-12-02 15:27:09 +01:00
zadam 0480f391d3 release 0.57.2
Publish Docker image / Push Docker image to multiple registries (push) Failing after 37s
2022-12-01 22:56:29 +01:00
zadam 36c98e919a fix cursor jumping problem when having same note open in two tabs, closes #3365 2022-12-01 22:50:53 +01:00
zadam 0e68e8069b launcher improvements 2022-12-01 16:22:04 +01:00
zadam 7aa801fc1f notes with #keyboardShortcut don't need reload to take effect 2022-12-01 13:24:34 +01:00
zadam fc080f785b moving components to its own directory 2022-12-01 13:07:23 +01:00
zadam 1a6c9be065 renamed shortcuts to launchers 2022-12-01 10:16:57 +01:00
zadam b55c2d3dbc shortcut improvements 2022-12-01 10:03:04 +01:00
zadam 720fb0f73e refactorted shortcut handling into a service 2022-12-01 00:17:15 +01:00
zadam 0985314fb7 shortcut improvements 2022-11-30 16:57:51 +01:00
zadam e759b4846a shortcut improvements 2022-11-29 16:16:57 +01:00
zadam dacc2444c4 Merge pull request #3357 from agentydragon/stuff
Add Ctrl+PgUp/Dn for tab switching, pointer to Electron docs
2022-11-29 00:06:03 +01:00
zadam 8ea3608bf1 each stripped tag will be replace by a space, #3355 2022-11-29 00:00:45 +01:00
zadam eecfce3cc9 shortcuts use templates 2022-11-28 23:39:23 +01:00
Rai a402c79287 Add Ctrl+PgUp/Dn for tab switching, pointer to Electron docs 2022-11-27 19:33:05 -08:00
zadam a459230aa9 shortcuts improvements 2022-11-27 23:43:25 +01:00
zadam e4f57ab2fe fix path resolution bug when path is outside of hosted subtree 2022-11-27 15:50:01 +01:00
zadam 6a9ac6f90a shortcuts improvements 2022-11-26 14:57:39 +01:00
zadam 6883b71ce7 shortcut improvements 2022-11-25 15:29:57 +01:00
zadam 70552d58ac global menu styling improvements 2022-11-25 09:21:56 +01:00
zadam c7bda4d0be global menu ref 2022-11-24 22:59:09 +01:00
zadam e4e20c8007 Revert "open window before loading becca"
This reverts commit 2fbcd9aaf7.
2022-11-23 23:49:49 +01:00
zadam 2fbcd9aaf7 open window before loading becca 2022-11-23 23:31:05 +01:00
zadam ee667634ab Merge branch 'stable' 2022-11-23 22:48:52 +01:00
zadam 7a8c69a6f9 fix jumping cursor position after closing a dialog, fixes #3325 2022-11-23 22:48:32 +01:00
zadam 723db97094 fix jumping cursor position after closing a dialog, fixes #3325 2022-11-23 22:47:20 +01:00
zadam 65be882b49 optimize initial render 2022-11-22 23:53:08 +01:00
zadam 48765cc87d optimize initial render 2022-11-22 22:45:50 +01:00
zadam e2f6191229 upgrades 2022-11-22 20:48:04 +01:00
zadam 19126b7c6d Merge branch 'master' into next58
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
#	package-lock.json
#	package.json
#	src/public/app/layouts/desktop_layout.js
2022-11-22 20:46:08 +01:00
zadam a76bef1a28 docker should use webpacked frontend files, fixes #3322 2022-11-21 21:15:04 +01:00
zadam a259bd8c3a release 0.57.1-beta 2022-11-20 23:43:38 +01:00
zadam 4001953fd7 Merge remote-tracking branch 'origin/master' 2022-11-20 23:43:31 +01:00
zadam 9a6df54832 release 0.57.1-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 33s
2022-11-20 23:43:17 +01:00
zadam 29327bbc5d Merge pull request #3333 from DynamoFox/rate-limit-other-auth-routes
Rate limit some more ETAPI auth routes; loginRateLimiter now doesn't count successful auth to ETAPI routes
2022-11-20 23:35:10 +01:00
zadam bcb3a707f4 option tabs refactored 2022-11-20 23:20:42 +01:00
zadam 0a67af4f46 refactoring option templates to use "options-section" class 2022-11-20 20:33:50 +01:00
zadam b3c0b36ba6 refactor imageoptions to use updateOption() 2022-11-20 20:11:27 +01:00
zadam a3783b0113 options dialog refactoring into more standard widget structure 2022-11-20 18:29:15 +01:00
DynamoFox 059dca905c Rate limit some more ETAPI auth routes; loginRateLimiter now doesn't count successful auth to ETAPI routes 2022-11-19 18:45:26 +01:00
zadam 02d908df1e added option to disable tray, closes #2612 2022-11-18 21:47:14 +01:00
zadam 1a95e459eb moved options to new tabs Images/Spellcheck 2022-11-18 21:38:36 +01:00
zadam ae0c5a0c09 moved auto read only options to code/text tabs 2022-11-18 21:27:25 +01:00
zadam 6f238f5f1a create "disableTray" option 2022-11-18 21:08:32 +01:00
zadam 6cec8bcda8 "erase" button to the right 2022-11-17 23:14:01 +01:00
zadam d388b4d814 add "erase all deleted notes now" also to recent changes 2022-11-17 23:12:36 +01:00
zadam d9dac00a01 add TRILIUM_NO_UPLOAD_LIMIT to disable the upload limit, #3164 2022-11-17 22:54:45 +01:00
zadam 4961d9bb89 avoid errors on dead backlinks, #3289 2022-11-14 21:03:14 +01:00
zadam 89e319c7a2 fix backlink generation for drag & dropped links, fixes #3314 2022-11-14 20:30:52 +01:00
zadam f7e56cbffe release 0.57.0-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 35s
2022-11-12 20:40:45 +01:00
zadam 3f115a7657 api docs 2022-11-12 20:40:40 +01:00
zadam 8fad8a1ce9 enabled advanced list features, fixes #3308 2022-11-10 23:22:37 +01:00
zadam 1b242a905b use CMD/meta key for opening link in a new tab on mac, #3303 2022-11-10 23:16:41 +01:00
zadam c6e766f5c6 added a context menu for image to copy, #1954 2022-11-09 23:41:25 +01:00
zadam 055bd77bd6 Remove "Content of this note cannot be displayed" in the book format, fixes #3301 2022-11-08 23:06:56 +01:00
zadam 76f34e3eaf small tweaks of linewrap option 2022-11-08 22:55:11 +01:00
zadam acf3f5013c Merge pull request #3299 from Banbury/code-options-linebreak
Added option to toggle line wrapping for Code notes
2022-11-08 22:49:02 +01:00
zadam 7f6edefad4 note about using password to login to web, #3297 2022-11-08 22:42:36 +01:00
zadam 60fc621cd4 add keyboard action to force creating note revisions, #2147 2022-11-08 22:36:15 +01:00
zadam bf4776a33c note hoisting should be done on "hovered", not active note, closes #2124 2022-11-08 22:19:16 +01:00
zadam 81a59f48e6 Merge remote-tracking branch 'origin/master' 2022-11-08 21:28:58 +01:00
zadam 68eb04741d remove console.log 2022-11-08 21:27:49 +01:00
Banbury 1037d814ec Added option to toggle line wrapping for Code notes 2022-11-08 14:48:17 +01:00
zadam e201f3536a fix jsdoc for createNoteLink 2022-11-08 10:11:52 +01:00
zadam 3cb368c4de search link map will display only direct results 2022-11-07 23:56:53 +01:00
zadam df9f6ce33a link map improvements 2022-11-07 23:19:38 +01:00
zadam b3c87156c2 library upgrades 2022-11-07 21:26:13 +01:00
zadam d29a633529 fix 2022-11-07 21:11:42 +01:00
zadam c92b451033 cleanup of hidden notes 2022-11-06 15:18:32 +01:00
zadam 3122d0cc6b move share root to hidden subtree 2022-11-06 14:44:26 +01:00
zadam f1eaa20e47 note map fixes 2022-11-06 14:38:41 +01:00
zadam 1d8b02055e Merge branch 'stable' 2022-11-06 14:24:37 +01:00
zadam a7f4bf8289 fix updating note detail after change from another client, closes #3292 2022-11-06 14:19:40 +01:00
zadam 8b0c60a046 improvements to notemap in relation to search 2022-11-05 22:32:50 +01:00
zadam 3d4776f577 better titles in delete dialog, #3290 2022-11-05 15:30:15 +01:00
zadam 8a539dc514 don't filter on root hoisted note 2022-11-03 21:40:42 +01:00
zadam a707e7abf4 Merge pull request #3288 from eliandoran/feature/filter_edited_notes_when_hoisted
Filter "Edited notes" when hoisted or in a workspace
2022-11-03 21:38:56 +01:00
zadam 0fc9b2f203 fix codemirror loading, closes #3282 2022-11-03 21:14:56 +01:00
Elian Doran 9a4b72606d Filter "Edited Notes" when hoisted or in a workspace
Previously, when the user opened a day note the "Edited Notes" section would indicate all
the notes edited in that day, regardless of whether the user was inside a workspace or
hoisted a note.

Now the "Edited Notes" section filters out the notes if the user has a hoisted note.
2022-11-03 20:28:56 +02:00
zadam 0a02e5be83 Merge remote-tracking branch 'origin/master' 2022-11-01 22:49:45 +01:00
zadam 2467464433 add possibility to define a share index, closes #3265 2022-11-01 22:49:37 +01:00
zadam eb68ab6776 Merge branch 'stable' 2022-11-01 19:10:16 +01:00
zadam 44b85d252d fix paste after, closes #3276 2022-11-01 13:39:29 +01:00
zadam 38d6fddc61 redirect /share to /share/, closes #3264 2022-10-30 09:05:12 +01:00
zadam 299007f66e Merge pull request #3256 from DeerTears/patch-1
Fix spelling mistake in README.md
2022-10-29 14:35:52 +02:00
Emberlynn Bland 47a92c8be8 Fix spelling mistake
"bult-in" -> "built-in"
2022-10-28 19:20:43 -06:00
zadam 9bc6cf7067 Merge pull request #3253 from nemec/master
Allow Mac users to close and re-open window
2022-10-28 20:08:38 +02:00
zadam 521d95021b fix refocusing find widget, closes #3252 2022-10-28 20:05:53 +02:00
Dan Nemec 5bc4d07aad Allow Mac users to close and re-open window 2022-10-27 19:59:41 -05:00
zadam 51aa9a0d6e Merge branch 'stable' 2022-10-27 23:04:55 +02:00
zadam 64d3ec940c release 0.56.2
Publish Docker image / Push Docker image to multiple registries (push) Failing after 39s
2022-10-27 22:41:15 +02:00
zadam 6c37f2ce71 package-lock.json 2022-10-27 22:41:01 +02:00
zadam 75bd38885b use trilium version number in asset paths to avoid caching issues 2022-10-27 20:34:53 +02:00
zadam b499640db8 use trilium version number in asset paths to avoid caching issues WIP 2022-10-26 23:50:54 +02:00
zadam 999a9da299 upgrade mermaid to 9.1.7
(cherry picked from commit 441a59305b)
2022-10-26 20:16:16 +02:00
zadam 441a59305b upgrade mermaid to 9.1.7 2022-10-26 20:15:42 +02:00
zadam b74f5a0a33 Merge branch 'stable' 2022-10-26 20:12:22 +02:00
zadam 7d732eb73b fix deleting note from task manager, closes #3239 2022-10-26 19:14:49 +02:00
zadam 44b68326a0 close hanging autocomplete on dialog close, fixes #3241 2022-10-26 16:52:44 +02:00
zadam d5732d7731 api docs 2022-10-26 16:52:00 +02:00
zadam 4e3d48fe7d allow specifying rootNote for date API functions, #3237 2022-10-26 14:23:56 +02:00
zadam c7acfd4d4e fix clicking internal link in the ckeditor toolbar, closes #3236 2022-10-26 14:11:20 +02:00
zadam af6d738d56 updated boxicons to 2.1.4, update icon index + search also within term array, fixes #3233 2022-10-25 23:01:09 +02:00
zadam 06e6fec4ca increment db and sync version due to new note type 2022-10-23 21:16:15 +02:00
zadam 12943cc808 Merge branch 'master' into next57
# Conflicts:
#	package-lock.json
2022-10-23 21:13:09 +02:00
zadam bbde7141b0 fix wrong display of included note in read only text, closes #3225 2022-10-23 14:34:37 +02:00
zadam f6ad1c6aa7 release 0.56.1
Publish Docker image / Push Docker image to multiple registries (push) Failing after 40s
2022-10-22 23:07:24 +02:00
zadam c1127ec429 fix running of runOnNoteCreation hook, #3219 2022-10-22 21:34:38 +02:00
dependabot[bot] 6ec734df13 Bump json-schema and jsprim
Bumps [json-schema](https://github.com/kriszyp/json-schema) and [jsprim](https://github.com/joyent/node-jsprim). These dependencies needed to be updated together.

Updates `json-schema` from 0.2.3 to 0.4.0
- [Release notes](https://github.com/kriszyp/json-schema/releases)
- [Commits](https://github.com/kriszyp/json-schema/compare/v0.2.3...v0.4.0)

Updates `jsprim` from 1.4.1 to 1.4.2
- [Release notes](https://github.com/joyent/node-jsprim/releases)
- [Changelog](https://github.com/TritonDataCenter/node-jsprim/blob/v1.4.2/CHANGES.md)
- [Commits](https://github.com/joyent/node-jsprim/compare/v1.4.1...v1.4.2)

---
updated-dependencies:
- dependency-name: json-schema
  dependency-type: indirect
- dependency-name: jsprim
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-22 14:03:30 +00:00
zadam 867f7f3f59 don't display "workspace templates", #3219 2022-10-22 16:03:21 +02:00
zadam 1c52303bb3 don't display "workspace templates", #3219 2022-10-22 16:01:15 +02:00
zadam 876e6caa23 better handling of incorrect operators 2022-10-22 15:58:15 +02:00
zadam 34f07b4376 better inbox desc 2022-10-22 15:22:42 +02:00
zadam ffc28c8485 better inbox desc 2022-10-22 15:22:03 +02:00
zadam 913e9ef6e0 Merge remote-tracking branch 'origin/master' 2022-10-22 15:01:17 +02:00
zadam 14fb9c76b0 fix backlinks in day note subtree, fixes #3158 2022-10-22 15:01:10 +02:00
zadam c5435009d7 Merge pull request #3213 from agentydragon/both-protos
Check both http and https in DockerHealthcheck
2022-10-22 14:00:45 +02:00
Rai 1d3132e447 Check both http and https in DockerHealthcheck
I've been getting Docker reporting my Trilium container as unhealthy
because wget was trying to talk HTTP to it while it was expecting
HTTPS.
2022-10-20 23:29:23 -07:00
zadam 63eb22c7ac fix print color to black, closes #3202 2022-10-20 22:32:06 +02:00
zadam 657c54efd4 fix print color to black, closes #3202 2022-10-20 22:31:08 +02:00
zadam 4f1f632a7d fix activating notes in the hidden subtree 2022-10-16 23:11:46 +02:00
zadam 7e83d3a54d Merge remote-tracking branch 'origin/master' into next57 2022-10-16 21:25:03 +02:00
zadam c11cf41f30 don't create app icon for flatpak/debian linux builds, fixes #3201 2022-10-16 20:52:10 +02:00
zadam 8d30d5d689 Merge remote-tracking branch 'origin/master' into next57 2022-10-16 11:24:24 +02:00
zadam 01910d3231 flathub release script 2022-10-15 21:09:27 +02:00
zadam e22af42cd0 release 0.56.0-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 37s
2022-10-15 12:49:56 +02:00
zadam 70c9292413 codemirror 5.65.9 2022-10-15 12:22:09 +02:00
zadam c16f7a5e02 Merge branch 'master' into next55
# Conflicts:
#	electron.js
#	package-lock.json
#	package.json
#	src/public/app/layouts/desktop_layout.js
#	src/public/app/widgets/note_tree.js
#	src/services/port.js
2022-10-15 12:09:25 +02:00
zadam b9c22fcbc8 Merge remote-tracking branch 'origin/master' 2022-10-15 12:03:13 +02:00
zadam 4012ec7498 Merge branch 'stable'
# Conflicts:
#	src/public/app/widgets/attribute_widgets/attribute_detail.js
2022-10-15 12:03:03 +02:00
zadam 7d6d466284 Merge pull request #3199 from DaiYuANg/master
update pwa manifest support deploy in sub folder
2022-10-15 12:00:41 +02:00
DaiYuANg 36842f4a58 update pwa manifest support deploy in sub folder 2022-10-15 13:01:48 +08:00
zadam dc62cf4805 ckeditor 35.2.1 2022-10-14 22:39:28 +02:00
zadam ed8acc7ee3 switch-server, switch-electron npm scripts to ease rebuilding better-sqlite3 2022-10-14 21:59:43 +02:00
zadam 4116fe0a20 fix propagation of noteTypeMimeChanged event to global scope to fix e.g. edit button switching depending on note type 2022-10-14 20:36:40 +02:00
zadam a4e99662cb edit button should get refreshed based on type change 2022-10-13 23:52:53 +02:00
zadam c6d4eb486e fix toc with > 10 items on the same level, closes #3182 2022-10-09 22:20:11 +02:00
zadam c2308b7a5d fix comment 2022-10-09 21:34:01 +02:00
zadam 3e07c08043 basic auth etapi should require "etapi" username 2022-10-09 21:33:32 +02:00
zadam 5a3c50d9fb extra null relation checks in notemap 2022-10-08 22:24:58 +02:00
zadam 3e4a9f63fa support basic auth in ETAPI 2022-10-08 20:59:11 +02:00
zadam 6d4ef4ee3d improved error handling of wrong port configuration, #3177 2022-10-01 15:32:30 +02:00
zadam 20ff5627d8 ckeditor 35.1.0 2022-09-28 22:55:53 +02:00
zadam 1d26fd6bf0 added "note color" 2022-09-25 14:19:30 +02:00
zadam a9c0daa51a FIXME comment on virtual branches 2022-09-24 23:03:38 +02:00
zadam e3b2bbdca5 Merge remote-tracking branch 'origin/master' 2022-09-24 22:38:27 +02:00
zadam d905f7cc26 include icon into reference links 2022-09-24 22:38:20 +02:00
zadam fe3f24cdb0 Merge pull request #3161 from oc013/docker-compose-example
Update docker-compose sample to use node user home dir and pull directly from docker hub
2022-09-24 13:14:28 +02:00
oc013 971c709e87 Update docker-compose sample to use node user home dir 2022-09-23 21:12:50 -04:00
zadam 7f78937543 keyboardShortcut attr detail help 2022-09-23 22:51:17 +02:00
zadam 41dac2bd1b keyboardShortcut attr detail help 2022-09-23 22:50:49 +02:00
zadam 85bf2a5706 fix hidden backlinks, closes #3158 2022-09-22 23:29:20 +02:00
zadam ce7937a3a3 Merge remote-tracking branch 'origin/master' 2022-09-22 22:53:29 +02:00
zadam 7bb9d33245 0 offset of context menu, fixes #3157 2022-09-22 22:53:22 +02:00
zadam 1be89c094b Merge pull request #3153 from charlesdagenais/master
improve "open" button behaviour for files when in browser
2022-09-22 22:48:33 +02:00
Charles Dagenais 73ad557784 improve "open" button behaviour for files when in browser 2022-09-21 21:56:59 -04:00
zadam 9f744153e3 fix TODO script example 2022-09-22 00:00:32 +02:00
zadam 0c196ae3a5 fix deleting / erasing note 2022-09-21 23:58:54 +02:00
Sylvain Pasche a904e82d72 use same variable as Firefox for scrollbar thumb
Use --active-item-background-color variable for scrollbar thumb
background color on WebKit browsers (which is already used for Firefox).
This should improve visibility of the scrollbar.
2022-09-21 23:29:17 +02:00
zadam 15ed381f85 release 0.55.1
Publish Docker image / Push Docker image to multiple registries (push) Failing after 35s
2022-09-21 22:43:34 +02:00
zadam 180051d252 added "scrolling-container" class, fixes #3147 2022-09-19 23:15:54 +02:00
zadam a19c58703f Merge remote-tracking branch 'origin/master' 2022-09-19 23:12:20 +02:00
zadam fc43d9222a fix erasing notes - becca should be reloaded afterwards, closes #3146 2022-09-19 23:12:12 +02:00
zadam af6bf08243 Merge pull request #3143 from charlesdagenais/master
add file properties widget in mobile layout
2022-09-19 22:44:23 +02:00
zadam fb6a0bc2a6 Merge pull request #3142 from spasche/zip-import-skip-bad-url
let import continue when malformed URLs are encountered
2022-09-19 22:42:31 +02:00
Charles Dagenais 1f61c1b3b6 add file properties info in mobile view 2022-09-18 12:40:00 -04:00
Sylvain Pasche fc69f3b8f3 let import continue when malformed URLs are encountered
In case of malformed URLs in imported HTML, keep original URL instead
of having the import get stuck.
2022-09-18 18:18:42 +02:00
zadam d4658b9c2a bring back the possibility to close the floating buttons again, closes #3116 2022-09-18 14:57:44 +02:00
zadam 84f72edf1d use button CSS variables in more places 2022-09-18 13:52:19 +02:00
zadam 552d872047 more standard window-all-closed handling 2022-09-18 10:05:49 +02:00
zadam 47235965d5 api log close button 2022-09-18 08:48:01 +02:00
zadam 24e4455e91 Merge remote-tracking branch 'origin/master' 2022-09-17 23:06:43 +02:00
zadam ea35b0c800 Merge branch 'api-log-capture' 2022-09-17 23:06:42 +02:00
zadam 1a30087426 api log implementation 2022-09-17 23:06:17 +02:00
zadam 5e9d004ca2 Merge pull request #3139 from jph/add-methods-to-etapi-spec
Add another ETAPI method to the api spec file.
2022-09-17 14:13:31 +02:00
jph 513d1c020c Add another ETAPI method to the api spec file. 2022-09-17 10:47:44 +10:00
zadam 05231bd1c2 stop #workspaceTemplate from being inherited (should have the same special behavior as #template) 2022-09-16 23:03:02 +02:00
zadam b816773d02 add #workspaceTemplate which works as workspace-scoped template, closes #3137 2022-09-16 22:44:52 +02:00
zadam 3c49ea6cb1 make context sub-menu scrollable, fix #3136 2022-09-16 22:12:09 +02:00
zadam 539eac4be7 Merge pull request #3134 from jph/add-note-content-to-api-spec
Add get note content to ETAPI spec
2022-09-16 21:08:53 +02:00
James Hynes 8a6ead6d86 fix a couple of api shortcomings
* add note content to openapi spec file
* add test for get note content api endpoint
2022-09-16 13:18:01 +10:00
zadam 01a7ed8311 fix zooming in server install 2022-09-15 23:10:54 +02:00
zadam cf6330dee6 allow deleting notes from note actions button, closes #3131 2022-09-15 23:09:24 +02:00
zadam 6c39b6f548 fix "excludeFromNoteMap" on journal instead of "excludeFromTreeMap" 2022-09-15 00:04:26 +02:00
zadam e7ef1b86cc zoom buttons in main menu, closes #2894 2022-09-14 23:28:29 +02:00
zadam 3663d56917 api log capture WIP 2022-09-14 16:50:52 +02:00
zadam 135064a18f drag & drop from tree will insert links to notes, closes #227 2022-09-13 23:36:59 +02:00
zadam 7233f58767 flatpak release script fixes 2022-09-12 23:14:00 +02:00
zadam 78238381a7 release 0.55.0-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 46s
2022-09-12 22:37:41 +02:00
zadam ca03c41205 flatpak release script should support beta channel 2022-09-12 22:35:22 +02:00
zadam 9b8474a728 Merge branch 'stable'
# Conflicts:
#	package-lock.json
2022-09-12 21:44:49 +02:00
zadam ecfce409d8 fix "ghost split", closes #3115 2022-09-07 23:39:35 +02:00
zadam b091e2222e separated editable code buttons into separate widget which also fixes scrolling issue 2022-09-04 23:09:42 +02:00
zadam e8b8198eb8 added Montserrat-Regular.ttf to fix boldness on mac, closes #3094 2022-09-04 16:50:45 +02:00
zadam 261f1f0bf2 fix electron 2022-09-04 14:01:34 +02:00
zadam 8588ed5eec remove port scanning for an available port #3036 2022-09-04 14:00:39 +02:00
zadam f161488c13 focus existing window on port conflict, closes #3036 2022-09-04 14:00:34 +02:00
zadam 563808144e small fixes to tray and closing windows 2022-09-04 13:59:58 +02:00
zadam 3c1f826ead add support for the persistent #sortDirection and #sortFoldersFirst (one time UI action exists), closes #3046 2022-09-04 13:59:34 +02:00
zadam b2a63afc28 limit max imported file size to 250 MiB, #3108 2022-09-03 15:11:03 +02:00
zadam 86d3a695ac fix handling of parenthesis without explicit AND operator, closes #3096 2022-08-28 14:40:24 +02:00
zadam 7f566178d3 Merge pull request #3095 from agentydragon/trilium-docs-noformat
Add some docs to note.js
2022-08-28 13:51:33 +02:00
Rai 4af55d055e revert 2022-08-27 13:46:16 -07:00
Rai be000be960 Merge branch 'master' into trilium-docs-noformat 2022-08-27 13:45:22 -07:00
Rai afb6180cce update docs 2022-08-27 13:42:44 -07:00
Rai d63156a0d6 Add some docs to note.js (for backend scripting docs) 2022-08-27 13:40:01 -07:00
zadam 2556cd5aaa fix share.js in case there's no menu 2022-08-27 21:34:21 +02:00
zadam 7109a12afd Merge branch 'stable'
# Conflicts:
#	bin/release-flatpack.sh
2022-08-27 13:19:29 +02:00
zadam 700e9fd912 fix release-flatpack.sh 2022-08-26 23:52:09 +02:00
zadam 6547b66228 release 0.54.3
Publish Docker image / Push Docker image to multiple registries (push) Failing after 37s
2022-08-26 22:16:49 +02:00
zadam e9090b9154 added a release flatpack script
(cherry picked from commit e70a7bad1a)
2022-08-26 22:09:48 +02:00
zadam 5b73fe949e defensive programming, #3089 2022-08-26 22:08:05 +02:00
zadam 35fab7a23c fixes overwriting attributes after clicking on a relation in the attribute editor, closes #3090 2022-08-26 22:02:40 +02:00
zadam bf6d79f4ad Merge pull request #3088 from DynamoFox/fix-update-button-if-update-checking-is-disabled
Fix the update to latest version button in the dropdown menu if update checking is disabled
2022-08-24 23:24:19 +02:00
zadam 24286c2a6c remove all alert() usages, fixes #3086 2022-08-24 23:20:05 +02:00
DynamoFox 09641d9465 Fix the update to latest version button in the dropdown menu, now it doesn't appear at all if update checking was disabled 2022-08-24 22:07:04 +02:00
zadam e70a7bad1a added a release flatpack script 2022-08-23 23:48:13 +02:00
zadam d386966342 Merge remote-tracking branch 'origin/master' 2022-08-23 22:32:43 +02:00
zadam 09cfaeb9c4 focus autocomplete on new tab even if there are workspaces, fixes #3083 2022-08-23 22:32:27 +02:00
zadam 934b1ad8c6 Merge pull request #3080 from DynamoFox/rate-limit-etapi-login-route
Rate limit the /auth/login route of ETAPI
2022-08-22 19:37:59 +02:00
zadam 80dcb45415 disable compression for electron / desktop builds 2022-08-22 19:29:58 +02:00
zadam ad8b7f67b1 Merge remote-tracking branch 'origin/master' 2022-08-22 19:27:43 +02:00
zadam 67b8f3206c Merge pull request #3078 from sigaloid/master
Add compression middleware
2022-08-22 19:27:16 +02:00
DynamoFox b965f77f4a Rate limit the /auth/login route of ETAPI 2022-08-22 11:50:58 +02:00
sigaloid 84fc00465e Fix minor typo 2022-08-20 20:33:10 -04:00
Matt 9b0c8a19f9 Merge branch 'zadam:master' into master 2022-08-20 21:30:54 +00:00
sigaloid 8e7d26bf4f Add compression 2022-08-20 17:30:35 -04:00
zadam df351a8d09 trilium safe mode now disables GPU usage 2022-08-20 22:39:59 +02:00
zadam 9ce0421ae7 Merge pull request #3075 from sigaloid/master
Filter excludeFromNoteMap from backlinks
2022-08-20 22:31:37 +02:00
sigaloid c85ec957ec Filter excludeFromNoteMap from backlinks 2022-08-18 23:12:58 -04:00
zadam e93dd176c0 Merge pull request #3074 from sigaloid/master
Add shareDescription tag for HTML meta tags
2022-08-18 23:11:56 +02:00
sigaloid 10676a8d0c Add shareDescription 2022-08-17 15:18:34 -04:00
zadam 8abcf571e8 fixes for undefined parent note #3066 2022-08-16 23:46:56 +02:00
zadam 78bca2477d fix creating virtual "none" note in becca, closes #3066 2022-08-16 23:38:11 +02:00
zadam f241bc564c Merge pull request #3065 from sigaloid/master
Add Flatpak to README
2022-08-15 23:46:40 +02:00
sigaloid 65942213de Add Flatpak to README 2022-08-15 12:01:55 -04:00
zadam 28f620d51d update demo document, closes #3061 2022-08-14 15:05:10 +02:00
zadam aebdbdf8be fix falsy check in setting custom widget positions, closes #3060 2022-08-14 15:00:18 +02:00
zadam bb3734052a Merge pull request #3058 from eliandoran/bugfix/upload_filename_encoding
Fix UTF-8 file name encoding for uploads (fixes #3013)
2022-08-14 14:53:44 +02:00
zadam 9a691c8227 Merge pull request #3057 from eliandoran/bugfix/max_content_width
Fix max content width not working (fixes #3056)
2022-08-14 14:52:49 +02:00
zadam 3bd2732cee Merge pull request #3059 from eliandoran/bugfix/relation_map_crash
Fix relation map crash on missing inverse pair (fixes #3055)
2022-08-14 14:50:52 +02:00
Elian Doran ddb57e35f3 Fix relation map crash on missing inverse pair (fixes #3055) 2022-08-14 04:30:00 +03:00
Elian Doran d1f3ce0957 Fix UTF-8 file name encoding for uploads (fixes #3013) 2022-08-14 04:14:34 +03:00
Elian Doran d73da33b08 Fix max content width not working (fixes #3056) 2022-08-14 02:43:09 +03:00
zadam 201ef7fcd5 fix "show recent note" button, closes #3051 2022-08-09 21:49:37 +02:00
zadam 5705efc998 fix electron 2022-08-09 21:34:18 +02:00
zadam 2694bcff67 launchbar WIP 2022-08-08 23:13:31 +02:00
zadam df7c089344 Merge branch 'master' into next55 2022-08-08 20:45:35 +02:00
zadam 6dee1f38f7 Merge pull request #3048 from DaiYuANg/master
add manifest.webmanifest into desktop make pwa install on ipad
2022-08-08 20:28:29 +02:00
DaiYuANg 87e2f50c6d add manifest.webmanifest into desktop make pwa install on ipad 2022-08-08 21:51:04 +08:00
zadam 616e2c1c29 add support for the persistent #sortDirection and #sortFoldersFirst (one time UI action exists), closes #3046 2022-08-07 23:51:23 +02:00
zadam 2335e40262 release 0.54.2 2022-08-07 23:20:59 +02:00
zadam 3a07c5fcc0 release 0.54.2 2022-08-07 23:18:03 +02:00
zadam 3c26e00fe1 launchbar WIP 2022-08-07 15:34:59 +02:00
zadam fc920becac launchbar WIP 2022-08-07 13:23:03 +02:00
zadam 8d608c3c1c launchbar WIP 2022-08-06 23:49:25 +02:00
zadam 08aa65bddb launchbar WIP 2022-08-06 15:00:56 +02:00
zadam 54900b35dc launchbar WIP 2022-08-06 13:47:27 +02:00
zadam 7696702a2a launchbar WIP 2022-08-05 19:15:28 +02:00
zadam 42cade17cb launchbar WIP 2022-08-05 16:44:26 +02:00
zadam 7565458332 launchbar WIP 2022-08-04 23:00:32 +02:00
zadam b86dbc088d small fixes to tray and closing windows 2022-08-04 21:19:57 +02:00
zadam 0681ec9057 Merge pull request #3038 from DynamoFox/support-reverse-proxy-trust
Add optional support to trust reverse proxies (via X-Forwarded-For)
2022-08-04 21:14:48 +02:00
DynamoFox 912f79f1af Add optional support to trust reverse proxies (via X-Forwarded-For) 2022-08-04 00:19:54 +02:00
zadam 82c596d1e3 Merge branch 'master' into next55 2022-08-03 22:23:58 +02:00
zadam b6f1611218 less accented backlinks background (in dark mode esp.) 2022-08-03 19:24:26 +02:00
zadam 869c910801 fix "bulk actions" dialog title 2022-08-03 19:17:13 +02:00
zadam b3097b59c7 remove port scanning for an available port #3036 2022-08-03 00:19:29 +02:00
zadam 5ec359e929 focus existing window on port conflict, closes #3036 2022-08-02 22:53:06 +02:00
zadam ffd73c0e57 release 0.54.1-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 47s
2022-08-02 21:56:34 +02:00
zadam 12af3d05f0 hoisted note should be expanded after tree collapse 2022-08-02 20:38:48 +02:00
zadam 30b2d15f3d fix creating new calendar on each date note request 2022-08-02 18:25:05 +02:00
zadam 23c06ebed8 fix backend script error reporting, closes #3033 2022-08-02 18:15:54 +02:00
zadam 8acd3851b0 cssClass label cannot be applied on the root widget because of note splits, fixes #3032 2022-08-02 17:33:52 +02:00
zadam 1f6222a653 fix notemap resize + upgrade of force-graph 2022-08-02 17:17:27 +02:00
zadam 8a39699acd fix note map with noteId = 'none' 2022-08-02 17:01:49 +02:00
zadam dff2d3e989 launchbar WIP 2022-08-02 17:01:09 +02:00
zadam 53affed8d3 fix note map with noteId = 'none' 2022-08-02 17:00:47 +02:00
zadam a316ac5b35 fix docker build 2022-08-02 00:20:08 +02:00
zadam aed0a8126c release 0.54.0-beta
Publish Docker image / Push Docker image to multiple registries (push) Failing after 39s
2022-08-01 22:37:40 +02:00
zadam edff1be16d added 197 NOOP migration to make sure the old versions don't attempt to process protected notes with 16 byte IV 2022-08-01 22:28:02 +02:00
zadam 0beee408cf fix following links with no href 2022-08-01 22:26:03 +02:00
zadam e5fdd5128a fix password protected notes rejection 2022-08-01 19:56:09 +02:00
zadam 46deceedc9 optional basic auth for shared notes, closes #2781 2022-07-31 21:45:32 +02:00
zadam 3ebfaec1bc allow per workspace calendars, fixes #2959 2022-07-31 09:33:14 +02:00
zadam 4c93334d90 fix focusing ribbon tabs when using keyboard navigation on the tree 2022-07-30 23:43:20 +02:00
zadam 7c90f1a56d increasing DB and sync version because of encryption IV change 2022-07-30 23:29:30 +02:00
zadam c727a2bc1b fix error message on removing bulk actions from search, closes #3027 2022-07-30 14:06:25 +02:00
zadam 6c43b92bf1 mermaid export button WIP 2022-07-29 00:32:28 +02:00
zadam ef6b7a85d5 don't display mermaid if the note is encrypted without protected session 2022-07-28 23:59:41 +02:00
zadam 6d990de450 Merge remote-tracking branch 'origin/stable' 2022-07-28 23:48:05 +02:00
zadam 91bc9eec93 cleanup 2022-07-28 22:44:55 +02:00
zadam 698ffd886d cleanup 2022-07-28 22:44:28 +02:00
zadam 5a37547b37 use 16 bytes IV for newly encrypted data, closes #3017 2022-07-28 22:42:02 +02:00
zadam 80887fd3c1 export notes via ETAPI, #3012 2022-07-24 21:30:29 +02:00
zadam 5444cc2009 floating button container WIP 2022-07-24 14:30:42 +02:00
zadam b8a89ee52a rename "backlinks.js" as it's not liked by some adblockers, #3003 2022-07-21 21:46:47 +02:00
zadam bed0db9fa0 prevent zooming the whole app when ctrl + zoom on the canvas note, fixes #3002 2022-07-20 23:39:40 +02:00
zadam 1afa32502f add CSS variables for CKEditor table caption, fixes #2998 2022-07-20 23:22:07 +02:00
zadam d825a1a45a remove checkForUpdates from login screen 2022-07-20 00:11:12 +02:00
zadam 0e41f9d1bc Merge pull request #3000 from sigaloid/master
Add config setting to disable update check
2022-07-20 00:05:34 +02:00
zadam 0f92468ab2 bootstrap 4.6.2 2022-07-20 00:03:21 +02:00
zadam f890e9917f add #toc label to control Table of Contents visibility per note, #2985 2022-07-19 23:56:29 +02:00
zadam 8902cb3117 prevent paste on middle click, fixes #2995 2022-07-19 23:41:22 +02:00
zadam 61a0397963 Merge remote-tracking branch 'origin/master' 2022-07-19 23:32:21 +02:00
zadam 8f5983fa01 add jsdocs to note.cloneTo, closes #2996 2022-07-19 23:32:03 +02:00
sigaloid fb1b6ea34a Fix login setting 2022-07-19 17:08:58 -04:00
sigaloid cce55eee63 Make updates default checked 2022-07-19 16:59:27 -04:00
sigaloid 20975fc635 Add option to check for updates when setting up server 2022-07-19 16:55:57 -04:00
sigaloid e42c527a19 Add default setting 2022-07-19 16:23:10 -04:00
sigaloid 500946c10b Fix type 2022-07-19 16:09:59 -04:00
sigaloid f3662d1048 Add network configuration 2022-07-19 16:01:27 -04:00
zadam 82d71797a7 Merge pull request #2994 from thfrei/excalidraw-v012
wip: Excalidraw Upgrade v0.11-v0.12
2022-07-17 21:09:27 +02:00
Tom Free e82fa5ee82 better comments for constructor 2022-07-17 14:16:17 +02:00
Tom Free 3e7aa3d762 remove obsolete code, update doc 2022-07-17 14:09:58 +02:00
zadam 57c5b6d61f added an option to define a "min TOC headings", #2985 2022-07-16 00:15:45 +02:00
zadam e6358afb62 mitigate flickering in note tooltip, #2988 2022-07-15 23:35:17 +02:00
Tom Free 4ca59dcc5c upgrade to excalidraw v0.12, fix breaking changes 2022-07-14 23:49:30 +02:00
zadam 9114b1befb make sure the headings in TOC contain text only, https://github.com/zadam/trilium-web-clipper/issues/42 2022-07-14 23:39:16 +02:00
zadam 52812c27a1 useMaxWidth for mermaid pie widget, fixes #2984 2022-07-14 23:00:35 +02:00
zadam 377922eccf added getTargetNote to froca's attribute, fixes #2981 2022-07-11 23:15:16 +02:00
zadam 0d2a112839 fix build revision in the about dialog, closes #2980 2022-07-11 23:05:03 +02:00
zadam ea20d23d11 Merge branch 'stable' 2022-07-10 23:47:04 +02:00
zadam 1dfc37704f fix note title escaping in export dialog 2022-07-10 22:32:00 +02:00
zadam 27261683bb added excalidraw mention to README.md 2022-07-10 22:21:55 +02:00
zadam 1e5c18f6ff focus icon search input after showing up, closes #2979 2022-07-10 22:13:21 +02:00
zadam 5cbcf6e6be etapi fix misleading error message 2022-07-10 22:09:13 +02:00
zadam 0c4e5d2a19 find box can be used also on render notes 2022-07-10 22:01:21 +02:00
zadam 570fabdc4a add highlighting to search results, closes #2977 2022-07-10 15:52:02 +02:00
zadam 89a4165c77 fixes in event propagation 2022-07-10 15:01:05 +02:00
zadam 1ad406ced5 electron search is not used anymore 2022-07-10 12:22:52 +02:00
zadam 7cdc181b47 upgrade to KaTeX 0.16.0 2022-07-09 22:35:04 +02:00
zadam af16a5856a Merge branch 'next54' 2022-07-09 22:30:43 +02:00
zadam 6972ae889a converted relation map buttons to floating pattern 2022-07-03 23:10:13 +02:00
zadam 19c65e240e Merge remote-tracking branch 'origin/master' into next54 2022-07-03 22:38:45 +02:00
zadam aa4dade1e5 fix dragging out tab creating multiple windows, closes #2944 2022-06-29 22:38:35 +02:00
zadam 42e262a1c2 10x speed-up of event propagation 2022-06-23 23:03:35 +02:00
zadam ae46b3df58 fix typo in the custom widget location 2022-06-23 22:17:47 +02:00
zadam e51276f532 floating buttons WIP 2022-06-21 23:27:34 +02:00
dependabot[bot] 102bfcebd0 Bump nanoid from 3.1.30 to 3.3.1
Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.30 to 3.3.1.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.1.30...3.3.1)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-22 20:26:50 +00:00
1218 changed files with 147799 additions and 289241 deletions
+3
View File
@@ -5,3 +5,6 @@
/docs
/npm-debug.log
node_modules
src/**/*.ts
!src/services/asset_path.ts
+10 -4
View File
@@ -5,9 +5,9 @@ labels: "Type: Bug"
body:
- type: input
attributes:
label: Trilium Version
description: What version of Trilium are you using?
placeholder: 0.48.0-beta
label: TriliumNext Version
description: What version of TriliumNext are you using?
placeholder: 0.90.0-beta
validations:
required: true
- type: dropdown
@@ -24,7 +24,7 @@ body:
- type: dropdown
attributes:
label: What is your setup?
description: https://github.com/zadam/trilium/wiki#choose-the-setup
description: https://triliumnext.github.io/Docs/Wiki/quick-start.html
options:
- Local (no sync)
- Local + server sync
@@ -44,3 +44,9 @@ body:
description: A clear and concise description of the bug and any additional information.
validations:
required: true
- type: textarea
attributes:
label: Error logs
description: Please provide error logs, see [wiki page](https://triliumnext.github.io/Docs/Wiki/error-logs.html) for instructions on how to submit them.
validations:
required: false
+33
View File
@@ -0,0 +1,33 @@
name: Dev
on:
push:
branches-ignore:
- 'develop'
- 'feature/update**'
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
build_docker:
name: Build Docker image
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up node & dependencies
uses: actions/setup-node@v4
with:
node-version: 20
cache: "npm"
- run: npm ci
- name: Run the TypeScript build
run: npx tsc
- name: Create server-package.json
run: cat package.json | grep -v electron > server-package.json
- uses: docker/setup-buildx-action@v3
- uses: docker/build-push-action@v6
with:
context: .
cache-from: type=gha
cache-to: type=gha,mode=max
+249
View File
@@ -0,0 +1,249 @@
on:
push:
branches:
- "develop"
- "feature/update**"
- "feature/server_esm**"
paths-ignore:
- "docs/**"
- "bin/**"
tags:
- "v*"
workflow_dispatch:
env:
GHCR_REGISTRY: ghcr.io
DOCKERHUB_REGISTRY: docker.io
IMAGE_NAME: ${{ github.repository_owner }}/notes
TEST_TAG: ${{ github.repository_owner }}/notes:test
permissions:
contents: read
packages: write
jobs:
test_docker:
name: Check Docker build
runs-on: ubuntu-latest
strategy:
matrix:
include:
- dockerfile: Dockerfile.alpine
- dockerfile: Dockerfile
steps:
- name: Checkout the repository
uses: actions/checkout@v4
- name: Set IMAGE_NAME to lowercase
run: echo "IMAGE_NAME=${IMAGE_NAME,,}" >> $GITHUB_ENV
- name: Set TEST_TAG to lowercase
run: echo "TEST_TAG=${TEST_TAG,,}" >> $GITHUB_ENV
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Set up node & dependencies
uses: actions/setup-node@v4
with:
node-version: 20
cache: "npm"
- run: npm ci
- name: Run the TypeScript build
run: npx tsc
- name: Create server-package.json
run: cat package.json | grep -v electron > server-package.json
- name: Build and export to Docker
uses: docker/build-push-action@v6
with:
context: .
file: ${{ matrix.dockerfile }}
load: true
tags: ${{ env.TEST_TAG }}
cache-from: type=gha
cache-to: type=gha,mode=max
- name: Validate container run output
run: |
CONTAINER_ID=$(docker run -d --log-driver=journald --rm --name trilium_local ${{ env.TEST_TAG }})
echo "Container ID: $CONTAINER_ID"
- name: Wait for the healthchecks to pass
uses: stringbean/docker-healthcheck-action@v1
with:
container: trilium_local
wait-time: 50
require-status: running
require-healthy: true
# Print the entire log of the container thus far, regardless if the healthcheck failed or succeeded
- name: Print entire log
if: always()
run: |
journalctl -u docker CONTAINER_NAME=trilium_local --no-pager
build:
name: Build Docker images
runs-on: ubuntu-latest
needs:
- test_docker
permissions:
contents: read
packages: write
attestations: write
id-token: write
strategy:
fail-fast: false
matrix:
include:
- dockerfile: Dockerfile.alpine
platform: linux/amd64
- dockerfile: Dockerfile
platform: linux/arm64
- dockerfile: Dockerfile
platform: linux/arm/v7
steps:
- name: Prepare
run: |
platform=${{ matrix.platform }}
echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
- name: Set IMAGE_NAME to lowercase
run: echo "IMAGE_NAME=${IMAGE_NAME,,}" >> $GITHUB_ENV
- name: Set TEST_TAG to lowercase
run: echo "TEST_TAG=${TEST_TAG,,}" >> $GITHUB_ENV
- name: Checkout repository
uses: actions/checkout@v4
- name: Docker meta
id: meta
uses: docker/metadata-action@v4
with:
images: |
${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}
${{ env.DOCKERHUB_REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=ref,event=branch
type=ref,event=tag
type=sha
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Set up node & dependencies
uses: actions/setup-node@v4
with:
node-version: 20
cache: "npm"
- run: npm ci
- name: Run the TypeScript build
run: npx tsc
- name: Create server-package.json
run: cat package.json | grep -v electron > server-package.json
- name: Login to GHCR
uses: docker/login-action@v2
with:
registry: ${{ env.GHCR_REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Login to DockerHub
uses: docker/login-action@v2
with:
registry: ${{ env.DOCKERHUB_REGISTRY }}
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push by digest
id: build
uses: docker/build-push-action@v6
with:
context: .
file: ${{ matrix.dockerfile }}
platforms: ${{ matrix.platform }}
labels: ${{ steps.meta.outputs.labels }}
outputs: type=image,name=${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true
- name: Export digest
run: |
mkdir -p /tmp/digests
digest="${{ steps.build.outputs.digest }}"
touch "/tmp/digests/${digest#sha256:}"
- name: Upload digest
uses: actions/upload-artifact@v4
with:
name: digests-${{ env.PLATFORM_PAIR }}
path: /tmp/digests/*
if-no-files-found: error
retention-days: 1
merge:
name: Merge manifest lists
runs-on: ubuntu-latest
needs:
- build
steps:
- name: Download digests
uses: actions/download-artifact@v4
with:
path: /tmp/digests
pattern: digests-*
merge-multiple: true
- name: Set IMAGE_NAME to lowercase
run: echo "IMAGE_NAME=${IMAGE_NAME,,}" >> $GITHUB_ENV
- name: Set TEST_TAG to lowercase
run: echo "TEST_TAG=${TEST_TAG,,}" >> $GITHUB_ENV
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Docker meta
id: meta
uses: docker/metadata-action@v4
with:
images: |
${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}
${{ env.DOCKERHUB_REGISTRY }}/${{ env.IMAGE_NAME }}
- name: Login to GHCR
uses: docker/login-action@v2
with:
registry: ${{ env.GHCR_REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Login to DockerHub
uses: docker/login-action@v2
with:
registry: ${{ env.DOCKERHUB_REGISTRY }}
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Create manifest list and push
working-directory: /tmp/digests
run: |
# Extract the branch or tag name from the ref
REF_NAME=$(echo "${GITHUB_REF}" | sed 's/refs\/heads\///' | sed 's/refs\/tags\///')
# Create and push the manifest list with both the branch/tag name and the commit SHA
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-t ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}:${REF_NAME} \
$(printf '${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}@sha256:%s ' *)
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-t ${{ env.DOCKERHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${REF_NAME} \
$(printf '${{ env.DOCKERHUB_REGISTRY }}/${{ env.IMAGE_NAME }}@sha256:%s ' *)
- name: Inspect image
run: |
docker buildx imagetools inspect ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}
docker buildx imagetools inspect ${{ env.DOCKERHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}
+100
View File
@@ -0,0 +1,100 @@
name: Main
on:
push:
branches:
- "feature/update**"
- "feature/server_esm**"
paths-ignore:
- "docs/**"
- ".github/workflows/main-docker.yml"
workflow_dispatch:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
make-electron:
name: Make Electron
strategy:
fail-fast: false
matrix:
arch: [x64, arm64]
os:
- name: macos
image: macos-latest
extension: dmg
- name: linux
image: ubuntu-latest
extension: deb
- name: windows
image: windows-latest
extension: exe
runs-on: ${{ matrix.os.image }}
steps:
- uses: actions/checkout@v4
- name: Set up node & dependencies
uses: actions/setup-node@v4
with:
node-version: 20
- name: Set up Python for appdmg to be installed
if: ${{ matrix.os.name == 'macos' }}
run: brew install python-setuptools
- name: Install dependencies
run: npm ci
- name: Update build info
run: npm run update-build-info
- name: Run electron-forge
run: npm run make-electron -- --arch=${{ matrix.arch }}
- name: Prepare artifacts (Unix)
if: runner.os != 'windows'
run: |
mkdir -p upload
file=$(find out/make -name '*.zip' -print -quit)
cp "$file" "upload/TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}-${{ github.ref_name }}.zip"
file=$(find out/make -name '*.${{ matrix.os.extension }}' -print -quit)
cp "$file" "upload/TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}-${{ github.ref_name }}.${{ matrix.os.extension }}"
- name: Prepare artifacts (Windows)
if: runner.os == 'windows'
run: |
mkdir upload
$file = Get-ChildItem -Path out/make -Filter '*.zip' -Recurse | Select-Object -First 1
Copy-Item -Path $file.FullName -Destination "upload/TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}-${{ github.ref_name }}.zip"
$file = Get-ChildItem -Path out/make -Filter '*.${{ matrix.os.extension }}' -Recurse | Select-Object -First 1
Copy-Item -Path $file.FullName -Destination "upload/TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}-${{ github.ref_name }}.${{ matrix.os.extension }}"
- name: Publish artifacts
uses: actions/upload-artifact@v4
with:
name: TriliumNextNotes ${{ matrix.os.name }} ${{ matrix.arch }}.zip
path: upload/*.zip
- name: Publish installer artifacts
uses: actions/upload-artifact@v4
with:
name: TriliumNextNotes ${{ matrix.os.name }} ${{ matrix.arch }}.${{matrix.os.extension}}
path: upload/*.${{ matrix.os.extension }}
build_linux_server-x64:
name: Build Linux Server x86_64
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up node & dependencies
uses: actions/setup-node@v4
with:
node-version: 20
cache: "npm"
- name: Install dependencies
run: npm ci
- name: Run Linux server build (x86_64)
run: |
npm run update-build-info
./bin/build-server.sh
- name: Prepare artifacts
if: runner.os != 'windows'
run: |
mkdir -p upload
file=$(find dist -name '*.tar.xz' -print -quit)
cp "$file" "upload/TriliumNextNotes-linux-x64-${{ github.ref_name }}.tar.xz"
- uses: actions/upload-artifact@v4
with:
name: TriliumNextNotes linux server x64
path: upload/TriliumNextNotes-linux-x64-${{ github.ref_name }}.tar.xz
+122
View File
@@ -0,0 +1,122 @@
name: Nightly Release
on:
# This can be used to automatically publish nightlies at UTC nighttime
schedule:
- cron: '0 2 * * *' # run at 2 AM UTC
# This can be used to allow manually triggering nightlies from the web interface
workflow_dispatch:
jobs:
nightly-electron:
name: Deploy nightly
strategy:
fail-fast: false
matrix:
arch: [x64, arm64]
os:
- name: macos
image: macos-latest
extension: dmg
- name: linux
image: ubuntu-latest
extension: deb
- name: windows
image: windows-latest
extension: exe
runs-on: ${{ matrix.os.image }}
steps:
- uses: actions/checkout@v4
- name: Set up node & dependencies
uses: actions/setup-node@v4
with:
node-version: 20
- name: Set up Python for appdmg to be installed
if: ${{ matrix.os.name == 'macos' }}
run: brew install python-setuptools
- name: Install dependencies
run: npm ci
- name: Update build info
run: npm run update-build-info
- name: Run electron-forge
run: npm run make-electron -- --arch=${{ matrix.arch }}
- name: Prepare artifacts (Unix)
if: runner.os != 'windows'
run: |
mkdir -p upload
file=$(find out/make -name '*.zip' -print -quit)
cp "$file" "upload/TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}.zip"
file=$(find out/make -name '*.${{ matrix.os.extension }}' -print -quit)
cp "$file" "upload/TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}.${{ matrix.os.extension }}"
- name: Prepare artifacts (Windows)
if: runner.os == 'windows'
run: |
mkdir upload
$file = Get-ChildItem -Path out/make -Filter '*.zip' -Recurse | Select-Object -First 1
Copy-Item -Path $file.FullName -Destination "upload/TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}.zip"
$file = Get-ChildItem -Path out/make -Filter '*.${{ matrix.os.extension }}' -Recurse | Select-Object -First 1
Copy-Item -Path $file.FullName -Destination "upload/TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}.${{ matrix.os.extension }}"
- name: Publish artifacts
uses: actions/upload-artifact@v4
with:
name: TriliumNextNotes ${{ matrix.os.name }} ${{ matrix.arch }}
path: upload/*.zip
overwrite: true
- name: Publish installer artifacts
uses: actions/upload-artifact@v4
with:
name: TriliumNextNotes ${{ matrix.os.name }} ${{ matrix.arch }}
path: upload/*.${{ matrix.os.extension }}
overwrite: true
- name: Deploy release
uses: WebFreak001/deploy-nightly@v3.1.0
with:
# upload_url: # find out this value by opening https://api.github.com/repos/<owner>/<repo>/releases in your browser and copy the full "upload_url" value including the {?name,label} part
# release_id: # same as above (id can just be taken out the upload_url, it's used to find old releases)
asset_path: upload/TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}.zip # path to archive to upload
asset_name: TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}-nightly.zip # name to upload the release as, use $$ to insert date (YYYYMMDD) and 6 letter commit hash
asset_content_type: application/zip # required by GitHub API
- name: Deploy installer release
uses: WebFreak001/deploy-nightly@v3.1.0
with:
# upload_url: # find out this value by opening https://api.github.com/repos/<owner>/<repo>/releases in your browser and copy the full "upload_url" value including the {?name,label} part
# release_id: # same as above (id can just be taken out the upload_url, it's used to find old releases)
asset_path: upload/TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}.${{ matrix.os.extension }} # path to archive to upload
asset_name: TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}-nightly.${{ matrix.os.extension }} # name to upload the release as, use $$ to insert date (YYYYMMDD) and 6 letter commit hash
asset_content_type: application/zip # required by GitHub API
nightly-server:
name: Deploy server nightly
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up node & dependencies
uses: actions/setup-node@v4
with:
node-version: 20
cache: "npm"
- name: Install dependencies
run: npm ci
- name: Run Linux server build (x86_64)
run: |
npm run update-build-info
./bin/build-server.sh
- name: Prepare artifacts
if: runner.os != 'windows'
run: |
mkdir -p upload
file=$(find dist -name '*.tar.xz' -print -quit)
cp "$file" "upload/TriliumNextNotes-linux-x64-${{ github.ref_name }}.tar.xz"
- uses: actions/upload-artifact@v4
with:
name: TriliumNextNotes linux server x64
path: upload/TriliumNextNotes-linux-x64-${{ github.ref_name }}.tar.xz
overwrite: true
- name: Deploy release
uses: WebFreak001/deploy-nightly@v3.1.0
with:
# upload_url: # find out this value by opening https://api.github.com/repos/<owner>/<repo>/releases in your browser and copy the full "upload_url" value including the {?name,label} part
# release_id: # same as above (id can just be taken out the upload_url, it's used to find old releases)
asset_path: upload/TriliumNextNotes-linux-x64-${{ github.ref_name }}.tar.xz # path to archive to upload
asset_name: TriliumNextNotes-linux-x64-nightly.zip # name to upload the release as, use $$ to insert date (YYYYMMDD) and 6 letter commit hash
asset_content_type: application/zip # required by GitHub API
+27
View File
@@ -0,0 +1,27 @@
name: Playwright Tests
on:
push:
branches: [ main, master ]
pull_request:
branches: [ main, master ]
jobs:
test:
timeout-minutes: 60
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: lts/*
- name: Install dependencies
run: npm ci
- name: Install Playwright Browsers
run: npx playwright install --with-deps
- name: Run Playwright tests
run: npx playwright test
- uses: actions/upload-artifact@v4
if: always()
with:
name: playwright-report
path: playwright-report/
retention-days: 30
+95
View File
@@ -0,0 +1,95 @@
name: Release
on:
push:
tags:
- "v*"
workflow_dispatch:
permissions:
contents: write
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
make-electron:
name: Make Electron
strategy:
fail-fast: false
matrix:
arch: [x64, arm64]
os:
- name: macos
image: macos-latest
extension: dmg
- name: linux
image: ubuntu-latest
extension: deb
- name: windows
image: windows-latest
extension: exe
runs-on: ${{ matrix.os.image }}
steps:
- uses: actions/checkout@v4
- name: Set up node & dependencies
uses: actions/setup-node@v4
with:
node-version: 20
- name: Set up Python for appdmg to be installed
if: ${{ matrix.os.name == 'macos' }}
run: brew install python-setuptools
- name: Install dependencies
run: npm ci
- name: Update build info
run: npm run update-build-info
- name: Run electron-forge
run: npm run make-electron -- --arch=${{ matrix.arch }}
- name: Prepare artifacts (Unix)
if: runner.os != 'windows'
run: |
mkdir -p upload
file=$(find out/make -name '*.zip' -print -quit)
cp "$file" "upload/TriliumNextNotes-${{ github.ref_name }}-${{ matrix.os.name }}-${{ matrix.arch }}.zip"
file=$(find out/make -name '*.${{ matrix.os.extension }}' -print -quit)
cp "$file" "upload/TriliumNextNotes-${{ github.ref_name }}-${{ matrix.os.name }}-${{ matrix.arch }}.${{ matrix.os.extension }}"
- name: Prepare artifacts (Windows)
if: runner.os == 'windows'
run: |
mkdir upload
$file = Get-ChildItem -Path out/make -Filter '*.zip' -Recurse | Select-Object -First 1
Copy-Item -Path $file.FullName -Destination "upload/TriliumNextNotes-${{ github.ref_name }}-${{ matrix.os.name }}-${{ matrix.arch }}.zip"
$file = Get-ChildItem -Path out/make -Filter '*.${{ matrix.os.extension }}' -Recurse | Select-Object -First 1
Copy-Item -Path $file.FullName -Destination "upload/TriliumNextNotes-${{ github.ref_name }}-${{ matrix.os.name }}-${{ matrix.arch }}.${{ matrix.os.extension }}"
- name: Publish release
uses: softprops/action-gh-release@v2
with:
draft: true
fail_on_unmatched_files: true
files: upload/*.*
build_linux_server-x64:
name: Build Linux Server x86_64
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up node & dependencies
uses: actions/setup-node@v4
with:
node-version: 20
cache: "npm"
- name: Install dependencies
run: npm ci
- name: Run Linux server build (x86_64)
run: |
npm run update-build-info
./bin/build-server.sh
- name: Prepare artifacts
if: runner.os != 'windows'
run: |
mkdir -p upload
file=$(find dist -name '*.tar.xz' -print -quit)
cp "$file" "upload/TriliumNextNotes-${{ github.ref_name }}-server-linux-x64.tar.xz"
- name: Publish release
uses: softprops/action-gh-release@v2
with:
draft: true
fail_on_unmatched_files: true
files: upload/*.*
+21
View File
@@ -1,13 +1,34 @@
.DS_Store
node_modules/
dist/
build/
src/public/app-dist/
npm-debug.log
yarn-error.log
*.db
!integration-tests/db/document.db
integration-tests/db/log
integration-tests/db/sessions
integration-tests/db/backup
integration-tests/db/session_secret.txt
config.ini
cert.key
cert.crt
server-package.json
.idea/httpRequests/
.idea/shelf/
data/
data-test/
tmp/
.eslintcache
out/
images/app-icons/mac/*.png
/test-results/
/playwright-report/
/blob-report/
/playwright/.cache/
/playwright/.auth/
+1 -1
View File
@@ -2,7 +2,7 @@ image:
file: .gitpod.dockerfile
tasks:
- before: nvm install 16.15.0 && nvm use 16.15.0
- before: nvm install 20.15.1 && nvm use 20.15.1
init: npm install
command: npm run start-server
+5 -3
View File
@@ -6,8 +6,10 @@
<option name="TAB_SIZE" value="2" />
</value>
</option>
<JSCodeStyleSettings version="0">
<option name="USE_EXPLICIT_JS_EXTENSION" value="TRUE" />
</JSCodeStyleSettings>
<codeStyleSettings language="JSON">
<indentOptions>
<option name="INDENT_SIZE" value="4" />
</indentOptions>
</codeStyleSettings>
</code_scheme>
</component>
+2 -2
View File
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
<data-source source="LOCAL" name="SQLite - document.db" uuid="30cef30d-e704-484d-a4ca-5d3bfc2ece63">
<data-source source="LOCAL" name="document.db" uuid="2a4ac1e6-b828-4a2a-8e4a-3f59f10aff26">
<driver-ref>sqlite.xerial</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.sqlite.JDBC</jdbc-driver>
<jdbc-url>jdbc:sqlite:$PROJECT_DIR$/../trilium-data/document.db</jdbc-url>
<jdbc-url>jdbc:sqlite:$PROJECT_DIR$/data/document.db</jdbc-url>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
</component>
+15
View File
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GitToolBoxProjectSettings">
<option name="commitMessageIssueKeyValidationOverride">
<BoolValueOverride>
<option name="enabled" value="true" />
</BoolValueOverride>
</option>
<option name="commitMessageValidationEnabledOverride">
<BoolValueOverride>
<option name="enabled" value="true" />
</BoolValueOverride>
</option>
</component>
</project>
+1 -1
View File
@@ -1,7 +1,7 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="JSUnfilteredForInLoop" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
<option name="processCode" value="true" />
<option name="processLiterals" value="true" />
+1 -2
View File
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_18" default="true" project-jdk-name="openjdk-18" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_16" default="true" project-jdk-name="openjdk-16" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
+1
View File
@@ -0,0 +1 @@
save-prefix = ''
+14
View File
@@ -0,0 +1,14 @@
{
"printWidth": 200,
"tabWidth": 4,
"useTabs": false,
"semi": true,
"singleQuote": true,
"quoteProps": "as-needed",
"trailingComma": "none",
"bracketSpacing": false,
"arrowParens": "always",
"proseWrap": "preserve",
"htmlWhitespaceSensitivity": "css",
"endOfLine": "lf"
}
+5
View File
@@ -0,0 +1,5 @@
{
"recommendations": [
"lokalise.i18n-ally"
]
}
+33
View File
@@ -0,0 +1,33 @@
# An array of strings which contain Language Ids defined by VS Code
# You can check available language ids here: https://code.visualstudio.com/docs/languages/identifiers
languageIds:
- javascript
- typescript
- html
# An array of RegExes to find the key usage. **The key should be captured in the first match group**.
# You should unescape RegEx strings in order to fit in the YAML file
# To help with this, you can use https://www.freeformatter.com/json-escape.html
usageMatchRegex:
# The following example shows how to detect `t("your.i18n.keys")`
# the `{key}` will be placed by a proper keypath matching regex,
# you can ignore it and use your own matching rules as well
- "[^\\w\\d]t\\(['\"`]({key})['\"`]"
# A RegEx to set a custom scope range. This scope will be used as a prefix when detecting keys
# and works like how the i18next framework identifies the namespace scope from the
# useTranslation() hook.
# You should unescape RegEx strings in order to fit in the YAML file
# To help with this, you can use https://www.freeformatter.com/json-escape.html
scopeRangeRegex: "useTranslation\\(\\s*\\[?\\s*['\"`](.*?)['\"`]"
# An array of strings containing refactor templates.
# The "$1" will be replaced by the keypath specified.
refactorTemplates:
- t("$1")
- ${t("$1")}
- <%= t("$1") %>
# If set to true, only enables this custom framework (will disable all built-in frameworks)
monopoly: true
+7
View File
@@ -0,0 +1,7 @@
# Review comments generated by i18n-ally. Please commit this file.
reviews:
help.inPageSearch:
description: >-
Describes the shortcut which triggers a search within the current
page/note only
+13 -7
View File
@@ -1,18 +1,24 @@
{
"version": "0.2.0",
"configurations": [
// nodemon should be installed globally, use npm i -g nodemon
{
"type": "node",
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"name": "nodemon start-server",
"program": "${workspaceFolder}/src/www",
"request": "launch",
"name": "start-server",
"restart": true,
"runtimeExecutable": "nodemon",
"env": {
"TRILIUM_ENV": "dev",
"TRILIUM_DATA_DIR": "./data"
},
"skipFiles": [
"<node_internals>/**"
],
"env": {
"TRILIUM_ENV": "dev"
},
"type": "node",
"outputCapture": "std",
"program": "${workspaceFolder}/src/www"
}
},
]
}
+21
View File
@@ -0,0 +1,21 @@
{
"editor.formatOnSave": false,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"files.eol": "\n",
"typescript.tsdk": "node_modules/typescript/lib",
"i18n-ally.sourceLanguage": "en",
"i18n-ally.keystyle": "nested",
"i18n-ally.localesPaths": [
"./src/public/translations",
"./translations"
],
"[jsonc]": {
"editor.defaultFormatter": "vscode.json-language-features"
},
"[javascript]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
},
"[typescript]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
},
}
+17
View File
@@ -0,0 +1,17 @@
{
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "errors",
"problemMatcher": "$tsc-watch",
"isBackground": true,
"presentation": {
"revealProblems": "never"
},
"runOptions": {
"runOn": "folderOpen"
}
}
]
}
-6
View File
@@ -1,6 +0,0 @@
#!/bin/sh
if wget --spider -S "127.0.0.1:8080/api/health-check" 2>&1 | awk 'NR==2' | grep -w "HTTP/1.1 200 OK" ; then
exit 0
else
exit 1
fi
+47 -24
View File
@@ -1,37 +1,60 @@
# !!! Don't try to build this Dockerfile directly, run it through bin/build-docker.sh script !!!
FROM node:16.15.0-alpine
FROM node:20.15.1-bullseye-slim
# Configure system dependencies
RUN apt-get update && apt-get install -y --no-install-recommends \
autoconf \
automake \
g++ \
gcc \
libtool \
make \
nasm \
libpng-dev \
python3 \
gosu \
&& rm -rf /var/lib/apt/lists/*
# Create app directory
WORKDIR /usr/src/app
COPY server-package.json package.json
# Install app dependencies
RUN set -x \
&& apk add --no-cache --virtual .build-dependencies \
autoconf \
automake \
g++ \
gcc \
libtool \
make \
nasm \
libpng-dev \
python3 \
&& npm install --production \
&& apk del .build-dependencies
# Some setup tools need to be kept
RUN apk add --no-cache su-exec shadow
# Bundle app source
COPY . .
COPY server-package.json package.json
# Add application user and setup proper volume permissions
RUN adduser -s /bin/false node; exit 0
# Copy TypeScript build artifacts into the original directory structure.
# Copy the healthcheck
RUN cp -R build/src/* src/. && \
cp build/docker_healthcheck.js . && \
rm -r build && \
rm docker_healthcheck.ts
# Install app dependencies
RUN apt-get purge -y --auto-remove \
autoconf \
automake \
g++ \
gcc \
libtool \
make \
nasm \
libpng-dev \
python3 \
&& rm -rf /var/lib/apt/lists/*
RUN npm install && \
npm run webpack && \
npm prune --omit=dev
RUN cp src/public/app/share.js src/public/app-dist/. && \
cp -r src/public/app/doc_notes src/public/app-dist/. && \
rm -rf src/public/app && rm src/services/asset_path.ts
# Some setup tools need to be kept
RUN apt-get update && apt-get install -y --no-install-recommends \
gosu \
&& rm -rf /var/lib/apt/lists/*
# Start the application
EXPOSE 8080
CMD [ "./start-docker.sh" ]
HEALTHCHECK CMD sh DockerHealthcheck.sh
HEALTHCHECK --start-period=10s CMD exec gosu node node docker_healthcheck.js
+53
View File
@@ -0,0 +1,53 @@
# !!! Don't try to build this Dockerfile directly, run it through bin/build-docker.sh script !!!
FROM node:20.15.1-alpine
# Configure system dependencies
RUN apk add --no-cache --virtual .build-dependencies \
autoconf \
automake \
g++ \
gcc \
libtool \
make \
nasm \
libpng-dev \
python3
# Create app directory
WORKDIR /usr/src/app
# Bundle app source
COPY . .
COPY server-package.json package.json
# Copy TypeScript build artifacts into the original directory structure.
# Copy the healthcheck
RUN cp -R build/src/* src/. && \
cp build/docker_healthcheck.js . && \
rm -r build && \
rm docker_healthcheck.ts
# Install app dependencies
RUN set -x && \
npm install && \
apk del .build-dependencies && \
npm run webpack && \
npm prune --omit=dev && \
cp src/public/app/share.js src/public/app-dist/. && \
cp -r src/public/app/doc_notes src/public/app-dist/. && \
rm -rf src/public/app && \
rm src/services/asset_path.ts
# Some setup tools need to be kept
RUN apk add --no-cache su-exec shadow
# Add application user and setup proper volume permissions
RUN adduser -s /bin/false node; exit 0
# Start the application
EXPOSE 8080
CMD [ "./start-docker.sh" ]
HEALTHCHECK --start-period=10s CMD exec su-exec node node docker_healthcheck.js
+72 -41
View File
@@ -1,66 +1,97 @@
# Trilium笔记
# TriliumNext Notes
[English](https://github.com/zadam/trilium/blob/master/README.md) | [Chinese](https://github.com/zadam/trilium/blob/master/README-ZH_CN.md) | [Russian](https://github.com/zadam/trilium/blob/master/README.ru.md)
[English](./README.md) | [Chinese](./README-ZH_CN.md) | [Russian](./README.ru.md) | [Japanese](./README.ja.md) | [Italian](./README.it.md) | [Spanish](./README.es.md)
[![Join the chat at https://gitter.im/trilium-notes/Lobby](https://badges.gitter.im/trilium-notes/Lobby.svg)](https://gitter.im/trilium-notes/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Trilium Notes是一个分层的笔记应用程序,专注于建立大型个人知识库。请参阅[屏幕截图](https://github.com/zadam/trilium/wiki/Screenshot-tour)以快速了解:
TriliumNext Notes 是一个层次化的笔记应用程序,专注于建立大型个人知识库。请参阅[屏幕截图](https://triliumnext.github.io/Docs/Wiki/screenshot-tour)以快速了解:
![](https://raw.githubusercontent.com/wiki/zadam/trilium/images/screenshot.png)
<a href="https://triliumnext.github.io/Docs/Wiki/screenshot-tour"><img src="https://github.com/TriliumNext/Docs/blob/main/Wiki/images/screenshot.png?raw=true" alt="Trilium Screenshot" width="1000"></a>
Ukraine is currently suffering from Russian aggression, please consider donating to [one of these charities](https://old.reddit.com/r/ukraine/comments/s6g5un/want_to_support_ukraine_heres_a_list_of_charities/).
## ⚠️ 为什么选择TriliumNext
<img src="https://upload.wikimedia.org/wikipedia/commons/4/49/Flag_of_Ukraine.svg" alt="drawing" width="600"/>
[原始的Trilium项目目前处于维护模式](https://github.com/zadam/trilium/issues/4620)
## 特性
## 🗭 与我们讨论
* 笔记可以排列成任意深的树。单个笔记可以放在树中的多个位置(请参阅[克隆](https://github.com/zadam/trilium/wiki/Cloning-notes)
* 丰富的所见即所得笔记编辑功能,包括带有markdown[自动格式化功能的](https://github.com/zadam/trilium/wiki/Text-notes#autoformat)表格,图像和[数学](https://github.com/zadam/trilium/wiki/Text-notes#math-support)
* 支持编辑[使用源代码的笔记](https://github.com/zadam/trilium/wiki/Code-notes),包括语法高亮显示
* 笔记之间快速[导航](https://github.com/zadam/trilium/wiki/Note-navigation),全文搜索和[笔记挂起](https://github.com/zadam/trilium/wiki/Note-hoisting)
* 无缝[笔记版本控制](https://github.com/zadam/trilium/wiki/Note-revisions)
* 笔记[属性](https://github.com/zadam/trilium/wiki/Attributes)可用于笔记组织,查询和高级[脚本编写](https://github.com/zadam/trilium/wiki/Scripts)
* [同步](https://github.com/zadam/trilium/wiki/Synchronization)与自托管同步服务器
* 具有按笔记粒度的强大的[笔记加密](https://github.com/zadam/trilium/wiki/Protected-notes)
* [关系图](https://github.com/zadam/trilium/wiki/Relation-map)和[链接图](https://github.com/zadam/trilium/wiki/Link-map),用于可视化笔记及其关系
* [脚本](https://github.com/zadam/trilium/wiki/Scripts)-请参阅[高级展示](https://github.com/zadam/trilium/wiki/Advanced-showcases)
* 可用性和性能均能很好地扩展至超过10万个笔记
* 针对智能手机和平板电脑进行触摸优化的[移动前端](https://github.com/zadam/trilium/wiki/Mobile-frontend)
* [夜间主题](https://github.com/zadam/trilium/wiki/Themes)
* [Evernote](https://github.com/zadam/trilium/wiki/Evernote-import)和[Markdown导入导出](https://github.com/zadam/trilium/wiki/Markdown)
* [Web Clipper](https://github.com/zadam/trilium/wiki/Web-clipper)可轻松保存Web内容
欢迎加入我们的官方讨论和社区。我们专注于Trilium的开发,乐于听取您对功能、建议或问题的意见!
## 构建
- [Matrix](https://matrix.to/#/#triliumnext:matrix.org)(用于同步讨论)
- [Github Discussions](https://github.com/TriliumNext/Notes/discussions)(用于异步讨论)
- [Wiki](https://triliumnext.github.io/Docs/)(用于常见操作问题和用户指南)
Trilium是作为桌面应用程序(Linux和Windows)或服务器上托管的Web应用程序(Linux)提供的。Mac OS桌面版本可用,但[不受支持](https://github.com/zadam/trilium/wiki/FAQ#mac-os-support)
上面链接的两个房间是镜像的,所以您可以在任意平台上使用XMPP或者Matrix来和我们交流
* 如果要在桌面上使用Trilium,请从[最新版本](https://github.com/zadam/trilium/releases/latest)下载适用于您平台的二进制[版本](https://github.com/zadam/trilium/releases/latest),解压缩该软件包并运行`trilium`可执行文件。
* 如果要在服务器上安装Trilium,请遵循[此页面](https://github.com/zadam/trilium/wiki/Server-installation)。
* 当前仅支持(经过测试)最新的Chrome和Firefox浏览器。
### 非官方社区
## 文档
[Trilium Rocks](https://discord.gg/aqdX9mXX4r)
[有关文档页面的完整列表,请参见Wiki。](https://github.com/zadam/trilium/wiki/)
## 🎁 特性
[中文Wiki在这里](https://github.com/baddate/trilium/wiki/)
* 笔记可以排列成任意深的树。单个笔记可以放在树中的多个位置(请参阅[克隆](https://triliumnext.github.io/Docs/Wiki/cloning-notes)
* 丰富的所见即所得笔记编辑功能,包括带有 Markdown [自动格式化功能的](https://triliumnext.github.io/Docs/Wiki/text-notes#autoformat)表格,图像和[数学公式](https://triliumnext.github.io/Docs/Wiki/text-notes#math-support)
* 支持编辑[使用源代码的笔记](https://triliumnext.github.io/Docs/Wiki/code-notes),包括语法高亮显示
* 笔记之间快速[导航](https://triliumnext.github.io/Docs/Wiki/note-navigation),全文搜索和[提升笔记](https://triliumnext.github.io/Docs/Wiki/note-hoisting)
* 无缝[笔记版本控制](https://triliumnext.github.io/Docs/Wiki/note-revisions)
* 笔记[属性](https://triliumnext.github.io/Docs/Wiki/attributes)可用于笔记组织,查询和高级[脚本编写](https://triliumnext.github.io/Docs/Wiki/scripts)
* [同步](https://triliumnext.github.io/Docs/Wiki/synchronization)与自托管同步服务器
* 有一个[第三方提供的同步服务器托管服务](https://trilium.cc/paid-hosting)
* 公开地[分享](https://triliumnext.github.io/Docs/Wiki/sharing)(发布)笔记到互联网
* 具有按笔记粒度的强大的[笔记加密](https://triliumnext.github.io/Docs/Wiki/protected-notes)
* 使用自带的 Excalidraw 来绘制图表(笔记类型“画布”)
* [关系图](https://triliumnext.github.io/Docs/Wiki/relation-map)和[链接图](https://triliumnext.github.io/Docs/Wiki/link-map),用于可视化笔记及其关系
* [脚本](https://triliumnext.github.io/Docs/Wiki/scripts) - 请参阅[高级功能展示](https://triliumnext.github.io/Docs/Wiki/advanced-showcases)
* 可用于自动化的 [REST API](https://triliumnext.github.io/Docs/Wiki/etapi)
* 在拥有超过 10 万条笔记时仍能保持良好的可用性和性能
* 针对智能手机和平板电脑进行优化的[用于移动设备的前端](https://triliumnext.github.io/Docs/Wiki/mobile-frontend)
* [夜间主题](https://triliumnext.github.io/Docs/Wiki/themes)
* [Evernote](https://triliumnext.github.io/Docs/Wiki/evernote-import) 和 [Markdown 导入导出](https://triliumnext.github.io/Docs/Wiki/markdown)功能
* 使用[网页剪藏](https://triliumnext.github.io/Docs/Wiki/web-clipper)轻松保存互联网上的内容
您还可以阅读[个人知识库模式](https://github.com/zadam/trilium/wiki/Patterns-of-personal-knowledge-base),以获取有关如何使用Trilium的灵感。
✨ 查看以下第三方资源,获取更多关于TriliumNext的好东西:
## 贡献
- [awesome-trilium](https://github.com/Nriver/awesome-trilium):提供第三方主题、脚本、插件等资源的列表。
- [TriliumRocks!](https://trilium.rocks/):提供教程、指南等更多内容。
使用基于浏览器的开发环境
## 🏗 构建
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/zadam/trilium)
Trilium 可以用作桌面应用程序(Linux 和 Windows)或服务器(Linux)上托管的 Web 应用程序。虽然有 macOS 版本的桌面应用程序,但它[不受支持](https://triliumnext.github.io/Docs/Wiki/faq#mac-os-support)。
或在本地克隆并运行
* 如果要在桌面上使用 Trilium,请从[最新版本](https://github.com/TriliumNext/Notes/releases/latest)下载适用于您平台的二进制版本,解压缩该软件包并运行`trilium`可执行文件。
* 如果要在服务器上安装 Trilium,请参考[此页面](https://triliumnext.github.io/Docs/Wiki/server-installation)。
* 当前仅支持(测试过)最近发布的 Chrome 和 Firefox 浏览器。
```
Trilium 也提供 Flatpak
[<img width="240" src="https://flathub.org/assets/badges/flathub-badge-en.png">](https://flathub.org/apps/details/com.github.zadam.trilium)
## 📝 文档
[有关文档页面的完整列表,请参见 Wiki。](https://triliumnext.github.io/Docs/)
* [Wiki 的中文翻译版本](https://github.com/baddate/trilium/wiki/)
您还可以阅读[个人知识库模式](https://triliumnext.github.io/Docs/Wiki/patterns-of-personal-knowledge),以获取有关如何使用 Trilium 的灵感。
## 💻 贡献
或者克隆本仓库到本地,并运行
```shell
npm install
npm run start-server
```
## 致谢
## 👏 致谢
* [CKEditor 5](https://github.com/ckeditor/ckeditor5) - 市上最好的所见即所得编辑器,互动性强且聆听能力强的团队
* [FancyTree](https://github.com/mar10/fancytree) - 一个非常丰富的关于树的库,强大没有对手。没有它,Trilium Notes将不会如此。
* [CKEditor 5](https://github.com/ckeditor/ckeditor5) - 市上最好的所见即所得编辑器,拥有互动性强且聆听能力强的团队
* [FancyTree](https://github.com/mar10/fancytree) - 一个非常丰富的关于树的库,强大没有对手。没有它,Trilium Notes 将不会如此。
* [CodeMirror](https://github.com/codemirror/CodeMirror) - 支持大量语言的代码编辑器
* [jsPlumb](https://github.com/jsplumb/jsplumb)强大的可视化连接库。- 用于[关系图](https://github.com/zadam/trilium/wiki/Relation-map)和[链接图](https://github.com/zadam/trilium/wiki/Link-map)
* [jsPlumb](https://github.com/jsplumb/jsplumb) - 强大的可视化连接库。用于[关系图](https://triliumnext.github.io/Docs/Wiki/relation-map)和[链接图](https://triliumnext.github.io/Docs/Wiki/link-map)
## 🤝 捐赠
你可以通过 GitHub Sponsors[PayPal](https://paypal.me/za4am) 或者比特币 (bitcoin:bc1qv3svjn40v89mnkre5vyvs2xw6y8phaltl385d2) 来捐赠。
## 🔑 许可证
本程序是自由软件:你可以再发布本软件和/或修改本软件,只要你遵循 Free Software Foundation 发布的 GNU Affero General Public License 的第三版或者任何(由你选择)更晚的版本。
+106
View File
@@ -0,0 +1,106 @@
# TriliumNext Notes
[English](./README.md) | [Chinese](./README-ZH_CN.md) | [Russian](./README.ru.md) | [Japanese](./README.ja.md) | [Italian](./README.it.md) | [Spanish](./README.es.md)
TriliumNext Notes es una aplicación de toma de notas jerárquicas multi-plataforma y de código libre con un enfoque en la construcción de grandes bases de conocimiento personal.
Vea estas [capturas de pantalla](https://triliumnext.github.io/Docs/Wiki/screenshot-tour) para un vistazo rápido:
<a href="https://triliumnext.github.io/Docs/Wiki/screenshot-tour"><img src="https://github.com/TriliumNext/Docs/blob/main/Wiki/images/screenshot.png?raw=true" alt="Trilium Screenshot" width="1000"></a>
## ⚠️ ¿Por qué usar TriliumNext?
[El proyecto Trilium original está en modo de mantenimiento](https://github.com/zadam/trilium/issues/4620)
### ¿Cómo migrar desde Trilium?
No hay pasos de migración especiales para migrar de una instancia de zadam/Trilium a una instancia de TriliumNext/Notes. Simplemente actualice su instancia de Trilium a la última versión e [instale TriliumNext/Notes como de costumbre](#-Instalación)
## 💬 Discuta con nosotros
Siéntase libre de unirse a nuestras conversaciones oficiales. ¡Nos encantaría escuchar de las características, sugerencias o problemas que pueda tener!
- [Matrix](https://matrix.to/#/#triliumnext:matrix.org) (Para discusiones síncronas)
- La sala `General` es replicada a [XMPP](xmpp:discuss@trilium.thisgreat.party?join)
- [Discusiones de GitHub](https://github.com/TriliumNext/Notes/discussions) (Para discusiones asíncronas)
- [Wiki](https://triliumnext.github.io/Docs/) (Para preguntas frecuentes y guías de usuario)
## 🎁 Características
- Las notas pueden ser acomodadas en un árbol de profundidad arbitraria. Una sola nota puede ser colocada en múltiples lugares del árbol (vea [clonar](https://triliumnext.github.io/Docs/Wiki/cloning-notes)
- Edición de notas WYSIWYG enriquecida que incluye, por ejemplo, tablas, imágenes y [matemáticas](https://triliumnext.github.io/Docs/Wiki/text-notes) con [autoformato](https://triliumnext.github.io/Docs/Wiki/text-notes#autoformat) markdown
- Soporte para editar [notas con código fuente](https://triliumnext.github.io/Docs/Wiki/code-notes), incluyendo resaltado de sintaxis
- Rápida y sencilla [navegación entre notas](https://triliumnext.github.io/Docs/Wiki/note-navigation), búsqueda de texto completo y [elevación de notas](https://triliumnext.github.io/Docs/Wiki/note-hoisting)
- [Versionado de notas](https://triliumnext.github.io/Docs/Wiki/note-revisions) sutil
- Los [atributos](https://triliumnext.github.io/Docs/Wiki/attributes) de las notas pueden utilizarse para organización, realizar consultas y [scripts](https://triliumnext.github.io/Docs/Wiki/scripts) avanzados
- [Sincronización](https://triliumnext.github.io/Docs/Wiki/synchronization) con servidor de sincronización propio
- existe un [servicio de terceros para alojar el servidor de sincronización](https://trilium.cc/paid-hosting)
- [Compartir](https://triliumnext.github.io/Docs/Wiki/sharing) (publicar) notas al Internet público
- Fuerte [encriptación de notas](https://triliumnext.github.io/Docs/Wiki/protected-notes) con granularidad para cada nota
- Esbozo de diagramas con Excalidraw incorporado (tipo de nota «canvas»)
- [Mapas de relaciones](<https://triliumnext.github.io/Docs/Wiki/relation-map>) y [mapas de enlaces](https://triliumnext.github.io/Docs/Wiki/link-map) para visualizar las notas y sus relaciones
- [Scripting](https://triliumnext.github.io/Docs/Wiki/scripts) - vea [casos de uso avanzados](https://triliumnext.github.io/Docs/Wiki/advanced-showcases)
- [REST API](https://triliumnext.github.io/Docs/Wiki/etapi) para automatización
- Escala bien tanto en uso como en rendimiento a partir de 100,000 notas
- [Interfaz móvil](https://triliumnext.github.io/Docs/Wiki/mobile-frontend) optimizada para teléfonos inteligentes y tabletas
- [Tema nocturno](https://triliumnext.github.io/Docs/Wiki/themes)
- Importación y exportación de [Evernote](https://triliumnext.github.io/Docs/Wiki/evernote-import) y [Markdown](https://triliumnext.github.io/Docs/Wiki/markdown)
- [Web Clipper](https://triliumnext.github.io/Docs/Wiki/web-clipper) para guardar fácilmente contenido web
✨ Consulte los/las siguientes recursos/comunidades de terceros para obtener más información sobre complementos para TriliumNext:
- [awesome-trilium](https://github.com/Nriver/awesome-trilium) para temas, scripts, plugins y más de terceros.
- [TriliumRocks!](https://trilium.rocks/) para tutoriales, guías y mucho más.
## 🏗 Instalación
### Escritorio
Para usar TriliumNext en su máquina de escritorio (Linux, MacOS y Windows) tiene algunas opciones:
- Descargue la versión binaria para su plataforma desde la [página de lanzamientos](https://github.com/TriliumNext/Notes/releases/latest), descomprima el paquete y ejecute el ejecutable `trilium`.
- Acceda a TriliumNext a través de la interfaz web de una instalación de servidor (ver más abajo)
- Actualmente solo las últimas versiones de Chrome y Firefox son compatibles (y están probadas).
- (Próximamente) TriliumNext también se proporcionará como un Flatpak
### Móvil
Para usar TriliumNext en un dispositivo móvil:
- Utilice un navegador web móvil para acceder a la interfaz móvil de una instalación de servidor (ver más abajo)
- El uso de una aplicación móvil aún no está soportado ([vea aquí](https://github.com/TriliumNext/Notes/issues/72)) para seguir las mejoras móviles.
### Servidor
Para instalar TriliumNext en su servidor (incluyendo vía Docker desde [Dockerhub](https://hub.docker.com/r/triliumnext/notes)) siga la [documentación de instalación de servidor](https://triliumnext.github.io/Docs/Wiki/server-installation).
## 📝 Documentación
[Vea la Wiki para la lista completa de páginas de documentación.](https://triliumnext.github.io/Docs)
También puede leer [Patrones para una base de conocimiento personal](https://triliumnext.github.io/Docs/Wiki/patterns-of-personal-knowledge) para obtener un poco de inspiración de como podría usar TriliumNext.
## 💻 Contribuir
Clone localmente y ejecute
```shell
npm install
npm run start-server
```
## 👏 Reconocimientos
- [CKEditor 5](https://github.com/ckeditor/ckeditor5) - el mejor editor WYSIWYG en el mercado, equipo muy interactivo y atento
- [FancyTree](https://github.com/mar10/fancytree) - biblioteca de árbol muy rica en funciones sin competencia real. TriliumNext Notes no sería lo mismo sin esta.
- [CodeMirror](https://github.com/codemirror/CodeMirror) - editor de código con soporte para una gran cantidad de lenguajes
- [jsPlumb](https://github.com/jsplumb/jsplumb) - biblioteca de conectividad visual sin competencia. Usado en [mapas de relación](https://triliumnext.github.io/Docs/Wiki/Relation-map) y [mapas de enlace](https://triliumnext.github.io/Docs/Wiki/Link-map)
## 🤝 Soporte
Puede apoyar al desarrollador original de Trilium usando GitHub Sponsors, [PayPal](https://paypal.me/za4am) o Bitcoin (bitcoin:bc1qv3svjn40v89mnkre5vyvs2xw6y8phaltl385d2).
Apoyo para la organización TriliumNext será posible en un futuro próximo.
## 🔑 Licencia
Este programa es software libre: puede redistribuirlo y/o modificarlo bajo los términos de la Licencia Pública General de Affero GNU publicada por la Free Software Foundation, ya sea la versión 3 de la Licencia, o (a su elección) cualquier versión posterior.
+93
View File
@@ -0,0 +1,93 @@
# TriliumNext Notes
[English](./README.md) | [Chinese](./README-ZH_CN.md) | [Russian](./README.ru.md) | [Japanese](./README.ja.md) | [Italian](./README.it.md) | [Spanish](./README.es.md)
TriliumNext Notes è un'applicazione per appunti ad organizzazione gerarchica, studiata per la costruzione di archivi di conoscenza personali di grandi dimensioni.
Vedi [fotografie](https://triliumnext.github.io/Docs/Wiki/screenshot-tour) per una panoramica veloce:
<a href="https://triliumnext.github.io/Docs/Wiki/screenshot-tour"><img src="https://github.com/TriliumNext/Docs/blob/main/Wiki/images/screenshot.png?raw=true" alt="Trilium Screenshot" width="1000"></a>
## ⚠️ Perchè TriliumNext?
[Il progetto originale Trilium è in modalità di manutenzione](https://github.com/zadam/trilium/issues/4620)
## 🗭 Discuti con noi
Sentiti libero di unirti alle nostre discussioni ufficiali e alla nostra comunità. Siamo concentrati sullo sviluppo di Trilium e ci piacerebbe sapere quali funzioni, suggerimenti o eventuali problemi hai!
- [Matrix](https://matrix.to/#/#triliumnext:matrix.org) (Per discussioni sincrone)
- [Discussioni Github](https://github.com/TriliumNext/Notes/discussions) (Per discussioni asincrone)
- [Wiki](https://triliumnext.github.io/Docs/) (Per le domande più comuni e le guide per l'utente)
Le due stanze linkate sopra sono connesse e contengono gli stessi messaggi, quindi puoi usare XMPP o Matrix da qualsiasi client tu preferisca, praticamente su qualsiasi piattaforma!
### Comunità non ufficiali
[Trilium Rocks](https://discord.gg/aqdX9mXX4r)
## 🎁 Funzionalità
* Gli appunti possono essere organizzati in un albero di profondità arbitraria. Un singolo appunto può essere collocato in più posti nell'albero (vedi [clonazione](https://triliumnext.github.io/Docs/Wiki/cloning-notes))
* Ricco editor visuale (WYSIWYG), con supporto -tra l'altro- per tabelle, immagini ed [espressioni matematiche](https://triliumnext.github.io/Docs/Wiki/text-notes#math-support) e con [formattazione automatica](https://triliumnext.github.io/Docs/Wiki/text-notes#autoformat) per markdown
* Supporto per la modifica di [appunti con codice sorgente](https://triliumnext.github.io/Docs/Wiki/code-notes), con evidenziazione della sintassi
* [Navigazione veloce](https://triliumnext.github.io/Docs/Wiki/note-navigation) tra gli appunti, ricerca testuale completa e [fissaggio degli appunti](https://triliumnext.github.io/Docs/Wiki/note-hoisting)
* Supporto integrato ed automatico per le [revisioni degli appunti](https://triliumnext.github.io/Docs/Wiki/note-revisions)
* Gli [attributi](https://triliumnext.github.io/Docs/Wiki/attributes) degli appunti possono essere utilizzati per l'organizzazione, per l'interrogazione e per lo scripting avanzato (prorgrammazione).
* [Sincronizzazione](https://triliumnext.github.io/Docs/Wiki/synchronization) con un server di sincronizzazione auto-ospitato
* c'è un [servizio di terze parti per ospitare server di sincronizzazione](https://trilium.cc/paid-hosting)
* [Condivisione](https://triliumnext.github.io/Docs/Wiki/sharing) (pubblicazione) di appunti sull'internet pubblico
* Robusta [crittografia](https://triliumnext.github.io/Docs/Wiki/protected-notes) configurabile singolarmente per ogni appunto
* Disegno di diagrammi con Excalidraw (tipo di appunto "canvas")
* [Mappe relazionali](https://triliumnext.github.io/Docs/Wiki/relation-map) e [mappe di collegamenti](https://triliumnext.github.io/Docs/Wiki/link-map) per visualizzare gli appunti e le loro relazioni
* [Scripting](https://triliumnext.github.io/Docs/Wiki/scripts) - vedi [Esempi avanzati](https://triliumnext.github.io/Docs/Wiki/advanced-showcases)
* [API REST](https://triliumnext.github.io/Docs/Wiki/etapi) per l'automazione
* Si adatta bene sia in termini di usabilità che di prestazioni fino ad oltre 100 000 appunti
* Interfaccia utente ottimizzata per il [mobile](https://triliumnext.github.io/Docs/Wiki/mobile-frontend) (smartphone e tablet)
* [Tema Notturno](https://triliumnext.github.io/Docs/Wiki/themes)
* Supporto per importazione ed esportazione da e per [Evernote](https://triliumnext.github.io/Docs/Wiki/evernote-import) e [Markdown import](https://triliumnext.github.io/Docs/Wiki/markdown)
* [Web Clipper](https://triliumnext.github.io/Docs/Wiki/web-clipper) per il salvataggio facile di contenuti web
✨ Dai un'occhiata alle seguenti risorse di terze parti per scoprire altre bellezze legate a TriliumNext:
-[awesome-trilium](https://github.com/Nriver/awesome-trilium) per temi, script, plugin e altro di terze parti.
- [TriliumRocks!](https://trilium.rocks/) per tutorial, guide e molto altro.
## 🏗 Rilasci
Trilium è fornito come applicazione desktop (Linux e Windows) o come applicazione web ospitata sul tuo server (Linux). La versione desktop per Mac OS è disponibile, ma [non è supportata](https://triliumnext.github.io/Docs/Wiki/faq#mac-os-support).
* Se vuoi usare Trilium sul tuo desktop, scarica il rilascio binario per la tua piattaforma dall'[ultimo rilascio](https://github.com/TriliumNext/Notes/releases/latest), decomprimi l'archivio e avvia l'eseguibile ```trilium```.
* Se vuoi installare Trilium su un server, segui [questa pagina](https://triliumnext.github.io/Docs/Wiki/server-installation).
* Per ora solo Chrome e Firefox sono i browser supportati (testati).
TriliumNext sarà fornito anche come Flatpak:
<img width="240" src="https://flathub.org/assets/badges/flathub-badge-en.png">
## 📝 Documentazione
[Vedi la wiki per una lista completa delle pagine di documentazione.](https://triliumnext.github.io/Docs/)
Puoi anche leggere ["Patterns of personal knowledge base"](https://triliumnext.github.io/Docs/Wiki/patterns-of-personal-knowledge) per avere un'ispirazione su come potresti utilizzare Trilium.
## 💻 Contribuire
Clona localmente ed esegui
```shell
npm install
npm run start-server
```
## 👏 Riconoscimenti
* [CKEditor 5](https://github.com/ckeditor/ckeditor5) - miglior editor visuale (WYSIWYG) sul mercato, squadra di sviluppo attenta e reattiva
* [FancyTree](https://github.com/mar10/fancytree) - libreria per alberi molto ricca di funzionalità, senza pari. Trilium Notes non sarebbe lo stesso senza di essa.
* [CodeMirror](https://github.com/codemirror/CodeMirror) - editor di codice con supporto per un'enorme quantità di linguaggi.
* [jsPlumb](https://github.com/jsplumb/jsplumb) - libreria per la connettività visuale senza pari. Utilizzata per [mappe relazionali](https://triliumnext.github.io/Docs/Wiki/relation-map) e [mappe di collegamenti](https://triliumnext.github.io/Docs/Wiki/link-map).
## 🤝 Supporto
Puoi sostenere lo sviluppatore originale di Trilium utilizzando gli sponsor di GitHub, [PayPal](https://paypal.me/za4am) o Bitcoin (bitcoin:bc1qv3svjn40v89mnkre5vyvs2xw6y8phaltl385d2).
Il supporto all'organizzazione TriliumNext sarà possibile nel prossimo futuro.
## 🔑 Licenza
Questo programma è software libero: è possibile redistribuirlo e/o modificarlo nei termini della GNU Affero General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della Licenza, o (a propria scelta) qualsiasi versione successiva.
+73
View File
@@ -0,0 +1,73 @@
# TriliumNext Notes
[English](./README.md) | [Chinese](./README-ZH_CN.md) | [Russian](./README.ru.md) | [Japanese](./README.ja.md) | [Italian](./README.it.md) | [Spanish](./README.es.md)
Trilium Notes は、大規模な個人知識ベースの構築に焦点を当てた、階層型ノートアプリケーションです。概要は[スクリーンショット](https://triliumnext.github.io/Docs/Wiki/screenshot-tour)をご覧ください:
<a href="https://triliumnext.github.io/Docs/Wiki/screenshot-tour"><img src="https://raw.githubusercontent.com/wiki/zadam/trilium/images/screenshot.png" alt="Trilium Screenshot" width="1000"></a>
## 🎁 特徴
* ノートは、任意の深さのツリーに配置できます。単一のノートをツリー内の複数の場所に配置できます ([cloning](https://triliumnext.github.io/Docs/Wiki/cloning-notes) を参照)
* マークダウン[オートフォーマット](https://triliumnext.github.io/Docs/Wiki/text-notes#autoformat)による、表、画像、[数学](https://triliumnext.github.io/Docs/Wiki/text-notes#math-support)などの豊富な WYSIWYG ノート編集機能
* シンタックスハイライトを含む[ソースコード付きノート](https://triliumnext.github.io/Docs/Wiki/code-notes)の編集をサポート
* [ノート間のナビゲーション](https://triliumnext.github.io/Docs/Wiki/note-navigation)、全文検索、[ノートホイスト](https://triliumnext.github.io/Docs/Wiki/note-hoisting)が高速かつ簡単に行えます
* シームレスな[ノートのバージョン管理](https://triliumnext.github.io/Docs/Wiki/note-revisions)
* ノート[属性](https://triliumnext.github.io/Docs/Wiki/Attributes)は、ノート整理、クエリ、高度な[スクリプト](https://triliumnext.github.io/Docs/Wiki/scripts)に使用できます
* 自己ホスト型同期サーバーとの[同期](https://triliumnext.github.io/Docs/Wiki/synchronization)
* [同期サーバーをホストするサードパーティ・サービス](https://trilium.cc/paid-hosting)があります
* 公開インターネットへのノートの[共有](https://triliumnext.github.io/Docs/Wiki/sharing)(公開)
* ノートごとの粒度を持つ強力な[ノート暗号化](https://triliumnext.github.io/Docs/Wiki/protected-notes)
* 組み込みの Excalidraw を使用した図のスケッチ (ノート タイプ"キャンバス")
* ノートとその関係を可視化するための[関係図](https://triliumnext.github.io/Docs/Wiki/relation-map)と[リンクマップ](https://triliumnext.github.io/Docs/Wiki/link-map)
* [スクリプティング](https://triliumnext.github.io/Docs/Wiki/scripts) - [高度なショーケース](https://triliumnext.github.io/Docs/Wiki/advanced-showcases)を参照
* 自動化のための [REST API](https://triliumnext.github.io/Docs/Wiki/etapi)
* ユーザビリティとパフォーマンスの両方で 100 000 ノート以上に拡張可能
* スマートフォンとタブレット向けのタッチ最適化[モバイルフロントエンド](https://triliumnext.github.io/Docs/Wiki/mobile-frontend)
* [ナイトテーマ](https://triliumnext.github.io/Docs/Wiki/themes)
* [Evernote](https://triliumnext.github.io/Docs/Wiki/evernote-import) と [Markdown のインポートとエクスポート](https://triliumnext.github.io/Docs/Wiki/Markdown)
* Web コンテンツを簡単に保存するための [Web クリッパー](https://triliumnext.github.io/Docs/Wiki/web-clipper)
サードパーティのテーマ、スクリプト、プラグインなどは、 [awesome-trilium](https://github.com/Nriver/awesome-trilium) をチェックしてください。
## 🏗 ビルド
Trilium は、デスクトップアプリケーション(Linux、Windows)またはサーバー上でホストされるウェブアプリケーション(Linux)として提供されます。 Mac OS のデスクトップビルドも利用可能ですが、 [unsupported](https://triliumnext.github.io/Docs/Wiki/faq#mac-os-support) となっています。
* デスクトップで Trilium を使用したい場合は、 [latest release](https://github.com/TriliumNext/Notes/releases/latest) からお使いのプラットフォームのバイナリリリースをダウンロードし、パッケージを解凍して ``trilium`` の実行ファイルを実行してください。
* サーバーに Trilium をインストールする場合は、[このページ](https://triliumnext.github.io/Docs/Wiki/server-installation)に従ってください。
* 現在、対応(動作確認)しているブラウザは、最近の Chrome と Firefox のみです。
Trilium は Flatpak としても提供されます:
[<img width="240" src="https://flathub.org/assets/badges/flathub-badge-en.png">](https://flathub.org/apps/details/com.github.zadam.trilium)
## 📝 ドキュメント
[ドキュメントページの全リストはwikiをご覧ください。](https://triliumnext.github.io/Docs/)
また、[個人的な知識基盤のパターン](https://triliumnext.github.io/Docs/Wiki/patterns-of-personal-knowledge)を読むと、 Trilium の使い方のヒントを得ることができます。
## 💻 コントリビュート
または、ローカルにクローンして実行
```shell
npm install
npm run start-server
```
## 📢 シャウトアウト
* [CKEditor 5](https://github.com/ckeditor/ckeditor5) - 市場で最高の WYSIWYG エディター、非常にインタラクティブで聞き上手なチーム
* [FancyTree](https://github.com/mar10/fancytree) - 真の競争相手がいない、非常に機能豊富なツリーライブラリです。 Trilium Notes は、これなしでは成り立たないでしょう。
* [CodeMirror](https://github.com/codemirror/CodeMirror) - 膨大な数の言語をサポートするコードエディタ
* [jsPlumb](https://github.com/jsplumb/jsplumb) - 競合のないビジュアルコネクティビティライブラリです。[関係図](https://triliumnext.github.io/Docs/Wiki/relation-map)、[リンク図](https://triliumnext.github.io/Docs/Wiki/link-map)で使用。
## 🤝 サポート
GitHub スポンサー、[PayPal](https://paypal.me/za4am)もしくは Bitcoin (bitcoin:bc1qv3svjn40v89mnkre5vyvs2xw6y8phaltl385d2) にて Trilium をサポートすることができます。
## 🔑 ライセンス
このプログラムはフリーソフトウェアです:フリーソフトウェア財団が発行した GNU Affero General Public License のバージョン3、またはそれ以降のバージョンのいずれかに従って、再配布および/または改変することができます。
+81 -43
View File
@@ -1,74 +1,112 @@
# Trilium Notes
# TriliumNext Notes
[English](https://github.com/zadam/trilium/blob/master/README.md) | [Chinese](https://github.com/zadam/trilium/blob/master/README-ZH_CN.md) | [Russian](https://github.com/zadam/trilium/blob/master/README.ru.md)
[English](./README.md) | [Chinese](./README-ZH_CN.md) | [Russian](./README.ru.md) | [Japanese](./README.ja.md) | [Italian](./README.it.md) | [Spanish](./README.es.md)
[![Join the chat at https://gitter.im/trilium-notes/Lobby](https://badges.gitter.im/trilium-notes/Lobby.svg)](https://gitter.im/trilium-notes/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases. See [screenshots](https://github.com/zadam/trilium/wiki/Screenshot-tour) for quick overview:
TriliumNext Notes is an open-source, cross-platform hierarchical note taking application with focus on building large personal knowledge bases.
![](https://raw.githubusercontent.com/wiki/zadam/trilium/images/screenshot.png)
See [screenshots](https://triliumnext.github.io/Docs/Wiki/screenshot-tour) for quick overview:
Ukraine is currently suffering from Russian aggression, please consider donating to [one of these charities](https://old.reddit.com/r/ukraine/comments/s6g5un/want_to_support_ukraine_heres_a_list_of_charities/).
<a href="https://triliumnext.github.io/Docs/Wiki/screenshot-tour"><img src="https://github.com/TriliumNext/Docs/blob/main/Wiki/images/screenshot.png?raw=true" alt="Trilium Screenshot" width="1000"></a>
<img src="https://upload.wikimedia.org/wikipedia/commons/4/49/Flag_of_Ukraine.svg" alt="drawing" width="600"/>
## ⚠️ Why TriliumNext?
## Features
[The original Trilium project is in maintenance mode](https://github.com/zadam/trilium/issues/4620)
* Notes can be arranged into arbitrarily deep tree. Single note can be placed into multiple places in the tree (see [cloning](https://github.com/zadam/trilium/wiki/Cloning-notes))
* Rich WYSIWYG note editing including e.g. tables, images and [math](https://github.com/zadam/trilium/wiki/Text-notes#math-support) with markdown [autoformat](https://github.com/zadam/trilium/wiki/Text-notes#autoformat)
* Support for editing [notes with source code](https://github.com/zadam/trilium/wiki/Code-notes), including syntax highlighting
* Fast and easy [navigation between notes](https://github.com/zadam/trilium/wiki/Note-navigation), full text search and [note hoisting](https://github.com/zadam/trilium/wiki/Note-hoisting)
* Seamless [note versioning](https://github.com/zadam/trilium/wiki/Note-revisions)
* Note [attributes](https://github.com/zadam/trilium/wiki/Attributes) can be used for note organization, querying and advanced [scripting](https://github.com/zadam/trilium/wiki/Scripts)
* [Synchronization](https://github.com/zadam/trilium/wiki/Synchronization) with self-hosted sync server
### Migrating from Trilium?
There are no special migration steps to migrate from a zadam/Trilium instance to a TriliumNext/Notes instance. Just upgrade your Trilium instance to the latest version and [install TriliumNext/Notes as usual](#-installation)
## 💬 Discuss with us
Feel free to join our official conversations. We would love to hear what features, suggestions, or issues you may have!
- [Matrix](https://matrix.to/#/#triliumnext:matrix.org) (For synchronous discussions)
- The `General` Matrix room is also bridged to [XMPP](xmpp:discuss@trilium.thisgreat.party?join)
- [Github Discussions](https://github.com/TriliumNext/Notes/discussions) (For Asynchronous discussions)
- [Wiki](https://triliumnext.github.io/Docs/) (For common how-to questions and user guides)
## 🎁 Features
* Notes can be arranged into arbitrarily deep tree. Single note can be placed into multiple places in the tree (see [cloning](https://triliumnext.github.io/Docs/Wiki/cloning-notes))
* Rich WYSIWYG note editing including e.g. tables, images and [math](https://triliumnext.github.io/Docs/Wiki/text-notes) with markdown [autoformat](https://triliumnext.github.io/Docs/Wiki/text-notes#autoformat)
* Support for editing [notes with source code](https://triliumnext.github.io/Docs/Wiki/code-notes), including syntax highlighting
* Fast and easy [navigation between notes](https://triliumnext.github.io/Docs/Wiki/note-navigation), full text search and [note hoisting](https://triliumnext.github.io/Docs/Wiki/note-hoisting)
* Seamless [note versioning](https://triliumnext.github.io/Docs/Wiki/note-revisions)
* Note [attributes](https://triliumnext.github.io/Docs/Wiki/attributes) can be used for note organization, querying and advanced [scripting](https://triliumnext.github.io/Docs/Wiki/scripts)
* [Synchronization](https://triliumnext.github.io/Docs/Wiki/synchronization) with self-hosted sync server
* there's a [3rd party service for hosting synchronisation server](https://trilium.cc/paid-hosting)
* [Sharing](https://github.com/zadam/trilium/wiki/Sharing) (publishing) notes to public internet
* Strong [note encryption](https://github.com/zadam/trilium/wiki/Protected-notes) with per-note granularity
* [Relation maps](https://github.com/zadam/trilium/wiki/Relation-map) and [link maps](https://github.com/zadam/trilium/wiki/Link-map) for visualizing notes and their relations
* [Scripting](https://github.com/zadam/trilium/wiki/Scripts) - see [Advanced showcases](https://github.com/zadam/trilium/wiki/Advanced-showcases)
* [REST API](https://github.com/zadam/trilium/wiki/ETAPI) for automation
* [Sharing](https://triliumnext.github.io/Docs/Wiki/sharing) (publishing) notes to public internet
* Strong [note encryption](https://triliumnext.github.io/Docs/Wiki/protected-notes) with per-note granularity
* Sketching diagrams with built-in Excalidraw (note type "canvas")
* [Relation maps](https://triliumnext.github.io/Docs/Wiki/relation-map) and [link maps](https://triliumnext.github.io/Docs/Wiki/link-map) for visualizing notes and their relations
* [Scripting](https://triliumnext.github.io/Docs/Wiki/scripts) - see [Advanced showcases](https://triliumnext.github.io/Docs/Wiki/advanced-showcases)
* [REST API](https://triliumnext.github.io/Docs/Wiki/etapi) for automation
* Scales well in both usability and performance upwards of 100 000 notes
* Touch optimized [mobile frontend](https://github.com/zadam/trilium/wiki/Mobile-frontend) for smartphones and tablets
* [Night theme](https://github.com/zadam/trilium/wiki/Themes)
* [Evernote](https://github.com/zadam/trilium/wiki/Evernote-import) and [Markdown import & export](https://github.com/zadam/trilium/wiki/Markdown)
* [Web Clipper](https://github.com/zadam/trilium/wiki/Web-clipper) for easy saving of web content
* Touch optimized [mobile frontend](https://triliumnext.github.io/Docs/Wiki/mobile-frontend) for smartphones and tablets
* [Night theme](https://triliumnext.github.io/Docs/Wiki/themes)
* [Evernote](https://triliumnext.github.io/Docs/Wiki/evernote-import) and [Markdown import & export](https://triliumnext.github.io/Docs/Wiki/markdown)
* [Web Clipper](https://triliumnext.github.io/Docs/Wiki/web-clipper) for easy saving of web content
## Builds
✨ Check out the following third-party resources/communities for more TriliumNext related goodies:
Trilium is provided as either desktop application (Linux and Windows) or web application hosted on your server (Linux). Mac OS desktop build is available, but it is [unsupported](https://github.com/zadam/trilium/wiki/FAQ#mac-os-support).
- [awesome-trilium](https://github.com/Nriver/awesome-trilium) for 3rd party themes, scripts, plugins and more.
- [TriliumRocks!](https://trilium.rocks/) for tutorials, guides, and much more.
* If you want to use Trilium on the desktop, download binary release for your platform from [latest release](https://github.com/zadam/trilium/releases/latest), unzip the package and run ```trilium``` executable.
* If you want to install Trilium on server, follow [this page](https://github.com/zadam/trilium/wiki/Server-installation).
* Currently only recent Chrome and Firefox are supported (tested) browsers.
## 🏗 Installation
## Documentation
### Desktop
[See wiki for complete list of documentation pages.](https://github.com/zadam/trilium/wiki/)
To use TriliumNext on your desktop machine (Linux, MacOS, and Windows) you have a few options:
You can also read [Patterns of personal knowledge base](https://github.com/zadam/trilium/wiki/Patterns-of-personal-knowledge-base) to get some inspiration on how you might use Trilium.
* Download the binary release for your platform from the [latest release page](https://github.com/TriliumNext/Notes/releases/latest), unzip the package and run the ```trilium``` executable.
* Access TriliumNext via the web interface of a server installation (see below)
* Currently only the latest versions of Chrome & Firefox are supported (and tested).
* (Coming Soon) TriliumNext will also be provided as a Flatpak
## Contribute
### Mobile
Use a browser based dev environment
To use TriliumNext on a mobile device:
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/zadam/trilium)
* Use a mobile web browser to access the mobile interface of a server installation (see below)
* Use of a mobile app is not yet supported ([see here](https://github.com/TriliumNext/Notes/issues/72)) to track mobile improvements.
Or clone locally and run
```
### Server
To install TriliumNext on your own server (including via Docker from [Dockerhub](https://hub.docker.com/r/triliumnext/notes)) follow [the server installation docs](https://triliumnext.github.io/Docs/Wiki/server-installation).
## 📝 Documentation
[See wiki for complete list of documentation pages.](https://triliumnext.github.io/Docs)
You can also read [Patterns of personal knowledge base](https://triliumnext.github.io/Docs/Wiki/patterns-of-personal-knowledge) to get some inspiration on how you might use TriliumNext.
## 💻 Contribute
### Code
```shell
git clone https://github.com/TriliumNext/Notes.git
cd Notes
npm install
npm run start-server
```
## Shoutouts
### Documentation
Head on over to our [Docs repo](https://github.com/TriliumNext/Docs)
## 👏 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.
* [FancyTree](https://github.com/mar10/fancytree) - very feature rich tree library without real competition. TriliumNext 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://github.com/zadam/trilium/wiki/Relation-map) and [link maps](https://github.com/zadam/trilium/wiki/Link-map)
* [jsPlumb](https://github.com/jsplumb/jsplumb) - visual connectivity library without competition. Used in [relation maps](https://triliumnext.github.io/Docs/Wiki/Relation-map) and [link maps](https://triliumnext.github.io/Docs/Wiki/Link-map)
## Donating
## 🤝 Support
You can donate using GitHub Sponsors, [PayPal](https://paypal.me/za4am) or Bitcoin (bitcoin:bc1qv3svjn40v89mnkre5vyvs2xw6y8phaltl385d2).
You can support the original Trilium developer using GitHub Sponsors, [PayPal](https://paypal.me/za4am) or Bitcoin (bitcoin:bc1qv3svjn40v89mnkre5vyvs2xw6y8phaltl385d2).
Support for the TriliumNext organization will be possible in the near future.
## License
## 🔑 License
This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+32 -40
View File
@@ -1,67 +1,59 @@
# Trilium Notes
# TriliumNext Notes
[English](https://github.com/zadam/trilium/blob/master/README.md) | [Chinese](https://github.com/zadam/trilium/blob/master/README-ZH_CN.md) | [Russian](https://github.com/zadam/trilium/blob/master/README.ru.md)
[English](./README.md) | [Chinese](./README-ZH_CN.md) | [Russian](./README.ru.md) | [Japanese](./README.ja.md) | [Italian](./README.it.md) | [Spanish](./README.es.md)
[![Join the chat at https://gitter.im/trilium-notes/Lobby](https://badges.gitter.im/trilium-notes/Lobby.svg)](https://gitter.im/trilium-notes/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Trilium Notes – это приложение для заметок с иерархической структурой, ориентированное на создание больших персональных баз знаний. Для быстрого ознакомления посмотрите [скриншот-тур](https://github.com/zadam/trilium/wiki/Screenshot-tour):
Trilium Notes – это приложение для заметок с иерархической структурой, ориентированное на создание больших персональных баз знаний. Для быстрого ознакомления посмотрите [скриншот-тур](https://triliumnext.github.io/Docs/Wiki/screenshot-tour):
![](https://raw.githubusercontent.com/wiki/zadam/trilium/images/screenshot.png)
<a href="https://triliumnext.github.io/Docs/Wiki/screenshot-tour"><img src="https://github.com/TriliumNext/Docs/blob/main/Wiki/images/screenshot.png?raw=true" alt="Trilium Screenshot" width="1000"></a>
Ukraine is currently suffering from Russian aggression, please consider donating to [one of these charities](https://old.reddit.com/r/ukraine/comments/s6g5un/want_to_support_ukraine_heres_a_list_of_charities/).
## 🎁 Возможности
<img src="https://upload.wikimedia.org/wikipedia/commons/4/49/Flag_of_Ukraine.svg" alt="drawing" width="600"/>
## Возможности
* Заметки можно расположить в виде дерева произвольной глубины. Отдельную заметку можно разместить в нескольких местах дерева (см. [клонирование](https://github.com/zadam/trilium/wiki/Cloning-notes))
* Продвинутый визуальный редактор (WYSIWYG) позволяет работать с таблицами, изображениями, [формулами](https://github.com/zadam/trilium/wiki/Text-notes#math-support) и разметкой markdown, имеет [автоформатирование](https://github.com/zadam/trilium/wiki/Text-notes#autoformat)
* Редактирование [заметок с исходным кодом](https://github.com/zadam/trilium/wiki/Code-notes), включая подсветку синтаксиса
* Быстрая и простая [навигация между заметками](https://github.com/zadam/trilium/wiki/Note-navigation), полнотекстовый поиск и [выделение заметок](https://github.com/zadam/trilium/wiki/Note-hoisting) в отдельный блок
* Бесшовное [версионирование заметки](https://github.com/zadam/trilium/wiki/Note-revisions)
* Специальные [атрибуты](https://github.com/zadam/trilium/wiki/Attributes) позволяют гибко организовать структуру, используются для поиска и продвинутого [скриптинга](https://github.com/zadam/trilium/wiki/Scripts)
* [Синхронизация](https://github.com/zadam/trilium/wiki/Synchronization) заметок со своим сервером
* Надёжное [шифрование](https://github.com/zadam/trilium/wiki/Protected-notes) с детализацией по каждой заметке
* [Карты связей](https://github.com/zadam/trilium/wiki/Relation-map) и [карты ссылок](https://github.com/zadam/trilium/wiki/Link-map) для визуализации их взяимосвязей
* [Скрипты](https://github.com/zadam/trilium/wiki/Scripts) - см. [продвинутые примеры](https://github.com/zadam/trilium/wiki/Advanced-showcases)
* Заметки можно расположить в виде дерева произвольной глубины. Отдельную заметку можно разместить в нескольких местах дерева (см. [клонирование](https://triliumnext.github.io/Docs/Wiki/cloning-notes))
* Продвинутый визуальный редактор (WYSIWYG) позволяет работать с таблицами, изображениями, [формулами](https://triliumnext.github.io/Docs/Wiki/text-notes#math-support) и разметкой markdown, имеет [автоформатирование](https://triliumnext.github.io/Docs/Wiki/text-notes#autoformat)
* Редактирование [заметок с исходным кодом](https://triliumnext.github.io/Docs/Wiki/code-notes), включая подсветку синтаксиса
* Быстрая и простая [навигация между заметками](https://triliumnext.github.io/Docs/Wiki/note-navigation), полнотекстовый поиск и [выделение заметок](https://triliumnext.github.io/Docs/Wiki/note-hoisting) в отдельный блок
* Бесшовное [версионирование заметки](https://triliumnext.github.io/Docs/Wiki/note-revisions)
* Специальные [атрибуты](https://triliumnext.github.io/Docs/Wiki/attributes) позволяют гибко организовать структуру, используются для поиска и продвинутого [скриптинга](https://triliumnext.github.io/Docs/Wiki/scripts)
* [Синхронизация](https://triliumnext.github.io/Docs/Wiki/synchronization) заметок со своим сервером
* Надёжное [шифрование](https://triliumnext.github.io/Docs/Wiki/protected-notes) с детализацией по каждой заметке
* [Карты связей](https://triliumnext.github.io/Docs/Wiki/relation-map) и [карты ссылок](https://triliumnext.github.io/Docs/Wiki/link-map) для визуализации их взяимосвязей
* [Скрипты](https://triliumnext.github.io/Docs/Wiki/scripts) - см. [продвинутые примеры](https://triliumnext.github.io/Docs/Wiki/advanced-showcases)
* Хорошо масштабируется, как по удобству использования, так и по производительности до 100000 заметок
* Оптимизированный [мобильный фронтенд](https://github.com/zadam/trilium/wiki/Mobile-frontend) смартфонов и планшетов
* [Темная тема](https://github.com/zadam/trilium/wiki/Themes)
* Импорт и экпорт [Evernote](https://github.com/zadam/trilium/wiki/Evernote-import) и данных в [markdown](https://github.com/zadam/trilium/wiki/Markdown) формате
* [Web Clipper](https://github.com/zadam/trilium/wiki/Web-clipper) для удобного сохранения веб-контента
* Оптимизированный [мобильный фронтенд](https://triliumnext.github.io/Docs/Wiki/mobile-frontend) смартфонов и планшетов
* [Темная тема](https://triliumnext.github.io/Docs/Wiki/themes)
* Импорт и экпорт [Evernote](https://triliumnext.github.io/Docs/Wiki/evernote-import) и данных в [markdown](https://triliumnext.github.io/Docs/Wiki/markdown) формате
* [Web Clipper](https://triliumnext.github.io/Docs/Wiki/web-clipper) для удобного сохранения веб-контента
## Сборки
## 🏗 Сборки
Trilium предоставляется в виде десктопного приложения (Linux и Windows) или веб-приложения, размещенного на вашем сервере (Linux). Доступна сборка Mac OS, но она [не поддерживается](https://github.com/zadam/trilium/wiki/FAQ#mac-os-support).
Trilium предоставляется в виде десктопного приложения (Linux и Windows) или веб-приложения, размещенного на вашем сервере (Linux). Доступна сборка Mac OS, но она [не поддерживается](https://triliumnext.github.io/Docs/Wiki/faq#mac-os-support).
* Если вы хотите использовать Trilium на десктопе, скачайте архив для своей платформы со страницы [релизов](https://github.com/zadam/trilium/releases/latest), распакуйте и запустите исполняемый файл ```trilium```.
* Если вы хотите установить Trilium на сервере, следуйте этой [инструкции](https://github.com/zadam/trilium/wiki/Server-installation).
* Если вы хотите использовать Trilium на десктопе, скачайте архив для своей платформы со страницы [релизов](https://github.com/TriliumNext/Notes/releases/latest), распакуйте и запустите исполняемый файл ```trilium```.
* Если вы хотите установить Trilium на сервере, следуйте этой [инструкции](https://triliumnext.github.io/Docs/Wiki/server-installation).
* В данный момент поддерживаются (протестированы) последние версии браузеров Chrome и Firefox.
## Документация
## 📝 Документация
[Полный список страниц документации доступен в Wiki.](https://github.com/zadam/trilium/wiki/)
[Полный список страниц документации доступен в Wiki.](https://triliumnext.github.io/Docs/)
Вы также можете ознакомиться с [шаблонами персональных баз знаний](https://github.com/zadam/trilium/wiki/Patterns-of-personal-knowledge-base), чтобы получить представление о том, как можно использовать Trilium.
Вы также можете ознакомиться с [шаблонами персональных баз знаний](https://triliumnext.github.io/Docs/Wiki/patterns-of-personal-knowledge), чтобы получить представление о том, как можно использовать Trilium.
## Участвуйте в разработке
Используйте онлайн среду разработки в браузере
[![Открыть в Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/zadam/trilium)
## 💻 Участвуйте в разработке
Или склонируйте на своё устройство и запустите
```
```shell
npm install
npm run start-server
```
## Благодарности
## 👏 Благодарности
* [CKEditor 5](https://github.com/ckeditor/ckeditor5) - лучший WYSIWYG редактор, очень активная и внимательная команда.
* [FancyTree](https://github.com/mar10/fancytree) - многофункциональная библиотека для создания древовидных структур. Вне конкуренции. Без него Trilium Notes не были бы таким.
* [CodeMirror](https://github.com/codemirror/CodeMirror) - редактор кода с поддержкой огромного количество языков.
* [jsPlumb](https://github.com/jsplumb/jsplumb) - библиотека для визуализации связей. Вне конкуренции. Используется в [картах связей](https://github.com/zadam/trilium/wiki/Relation-map) и [картах ссылок](https://github.com/zadam/trilium/wiki/Link-map).
* [jsPlumb](https://github.com/jsplumb/jsplumb) - библиотека для визуализации связей. Вне конкуренции. Используется в [картах связей](https://triliumnext.github.io/Docs/Wiki/relation-map) и [картах ссылок](https://triliumnext.github.io/Docs/Wiki/link-map).
## Лицензия
## 🔑 Лицензия
Эта программа является бесплатным программным обеспечением: вы можете распространять и/или изменять ее в соответствии с условиями GNU Affero General Public License, опубликованной Free Software Foundation, либо версии 3 Лицензии, либо (по вашему выбору) любой более поздней версии.
+1 -1
View File
@@ -10,4 +10,4 @@ Description above is a general rule and may be altered on case by case basis.
## Reporting a Vulnerability
You can report low severity vulnerabilities as GitHub issues, more severe vulnerabilities should be reported to the email zadam.apps@gmail.com
You can report low severity vulnerabilities as GitHub issues, more severe vulnerabilities should be reported to the email [contact@eliandoran.me](mailto:contact@eliandoran.me)
+10
View File
@@ -0,0 +1,10 @@
#!/usr/bin/env bash
cloc HEAD \
--git --md \
--include-lang=javascript,typescript \
--found=filelist.txt \
--exclude-dir=public,libraries,views,docs
grep -R \.js$ filelist.txt
rm filelist.txt
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-22
View File
@@ -1,22 +0,0 @@
#!/usr/bin/env bash
echo "Packaging debian x64 distribution..."
VERSION=`jq -r ".version" package.json`
./node_modules/.bin/electron-installer-debian --config bin/deb-options.json --options.version=${VERSION} --arch amd64
# hacky stop-gag measure to produce debian compatible XZ compressed debs until this is fixed: https://github.com/electron-userland/electron-installer-debian/issues/272
cd dist
ar x trilium_${VERSION}_amd64.deb
rm trilium_${VERSION}_amd64.deb
# recompress
< control.tar.zst zstd -d | xz > control.tar.xz
< data.tar.zst zstd -d | xz > data.tar.xz
# create deb archive (I really do not know, what argument "sdsd" is for but something is required for ar to create the archive as desired)
ar -m -c -a sdsd trilium_${VERSION}_amd64.deb debian-binary control.tar.xz data.tar.xz
rm control* data* debian-binary
echo "Converted to XZ deb"
+7 -2
View File
@@ -1,12 +1,17 @@
#!/usr/bin/env bash
set -e # Fail on any command error
VERSION=`jq -r ".version" package.json`
SERIES=${VERSION:0:4}-latest
cat package.json | grep -v electron > server-package.json
sudo docker build -t zadam/trilium:$VERSION --network host -t zadam/trilium:$SERIES .
echo "Compiling typescript..."
npx tsc
sudo docker build -t triliumnext/notes:$VERSION --network host -t triliumnext/notes:$SERIES .
if [[ $VERSION != *"beta"* ]]; then
sudo docker tag zadam/trilium:$VERSION zadam/trilium:latest
sudo docker tag triliumnext/notes:$VERSION triliumnext/notes:latest
fi
-52
View File
@@ -1,52 +0,0 @@
#!/usr/bin/env bash
SRC_DIR=./dist/trilium-linux-x64-src
if [ "$1" != "DONTCOPY" ]
then
./bin/copy-trilium.sh $SRC_DIR
fi
rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
echo "Copying required linux-x64 binaries"
cp -r bin/better-sqlite3/linux-desktop-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
echo "Packaging linux x64 electron build"
./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite
BUILD_DIR=./dist/trilium-linux-x64
rm -rf $BUILD_DIR
mv "./dist/Trilium Notes-linux-x64" $BUILD_DIR
cp images/app-icons/png/128x128.png $BUILD_DIR/icon.png
# removing software WebGL binaries because they are pretty huge and not necessary
rm -r $BUILD_DIR/swiftshader
cp bin/tpl/anonymize-database.sql $BUILD_DIR/
cp -r dump-db $BUILD_DIR/
cp bin/tpl/trilium-portable.sh $BUILD_DIR/
chmod 755 $BUILD_DIR/trilium-portable.sh
cp bin/tpl/trilium-safe-mode.sh $BUILD_DIR/
chmod 755 $BUILD_DIR/trilium-safe-mode.sh
cp bin/tpl/trilium-no-cert-check.sh $BUILD_DIR/
chmod 755 $BUILD_DIR/trilium-no-cert-check.sh
echo "Packaging linux x64 electron distribution..."
VERSION=`jq -r ".version" package.json`
cd dist
tar cJf trilium-linux-x64-${VERSION}.tar.xz trilium-linux-x64
cd ..
bin/build-debian.sh
-37
View File
@@ -1,37 +0,0 @@
#!/usr/bin/env bash
SRC_DIR=./dist/trilium-mac-x64-src
if [ "$1" != "DONTCOPY" ]
then
./bin/copy-trilium.sh $SRC_DIR
fi
echo "Copying required mac binaries"
cp -r bin/better-sqlite3/mac-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
echo "Packaging mac x64 electron build"
./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=darwin --arch=x64 --overwrite --icon=images/app-icons/mac/icon.icns
BUILD_DIR=./dist/trilium-mac-x64
rm -rf $BUILD_DIR
# Mac build has by default useless directory level
mv "./dist/Trilium Notes-darwin-x64" $BUILD_DIR
cp bin/tpl/anonymize-database.sql $BUILD_DIR/
cp -r dump-db $BUILD_DIR/
echo "Zipping mac x64 electron distribution..."
VERSION=`jq -r ".version" package.json`
cd dist
rm trilium-mac-x64-${VERSION}.zip
zip -r9 --symlinks trilium-mac-x64-${VERSION}.zip trilium-mac-x64
+5 -5
View File
@@ -1,7 +1,9 @@
#!/usr/bin/env bash
set -e # Fail on any command error
PKG_DIR=dist/trilium-linux-x64-server
NODE_VERSION=16.15.0
NODE_VERSION=20.15.1
if [ "$1" != "DONTCOPY" ]
then
@@ -20,10 +22,7 @@ rm -r $PKG_DIR/node/lib/node_modules/npm
rm -r $PKG_DIR/node/include/node
rm -r $PKG_DIR/node_modules/electron*
rm -r $PKG_DIR/webpack*
rm -r $PKG_DIR/electron.js
cp -r bin/better-sqlite3/linux-server-better_sqlite3.node $PKG_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
rm -r $PKG_DIR/electron*.js
printf "#!/bin/sh\n./node/bin/node src/www" > $PKG_DIR/trilium.sh
chmod 755 $PKG_DIR/trilium.sh
@@ -31,6 +30,7 @@ chmod 755 $PKG_DIR/trilium.sh
cp bin/tpl/anonymize-database.sql $PKG_DIR/
cp -r dump-db $PKG_DIR/
rm -rf $PKG_DIR/dump-db/node_modules
VERSION=`jq -r ".version" package.json`
-39
View File
@@ -1,39 +0,0 @@
#!/usr/bin/env bash
SRC_DIR=./dist/trilium-windows-x64-src
if [ "$1" != "DONTCOPY" ]
then
./bin/copy-trilium.sh $SRC_DIR
fi
echo "Copying required windows binaries"
cp -r bin/better-sqlite3/win-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
echo "Packaging windows x64 electron build"
./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=win32 --arch=x64 --overwrite --icon=images/app-icons/win/icon.ico
BUILD_DIR=./dist/trilium-windows-x64
rm -rf $BUILD_DIR
mv "./dist/Trilium Notes-win32-x64" $BUILD_DIR
# removing software WebGL binaries because they are pretty huge and not necessary
rm -r $BUILD_DIR/swiftshader
cp bin/tpl/anonymize-database.sql $BUILD_DIR/
cp -r dump-db $BUILD_DIR/
cp bin/tpl/trilium-{portable,no-cert-check,safe-mode}.{bat,ps1} $BUILD_DIR/
echo "Zipping windows x64 electron distribution..."
VERSION=`jq -r ".version" package.json`
cd dist
zip -r9 trilium-windows-x64-${VERSION}.zip trilium-windows-x64
+30
View File
@@ -1,5 +1,32 @@
#!/usr/bin/env bash
set -e # Fail on any command error
if ! command -v jq &> /dev/null; then
echo "Missing command: jq"
exit 1
fi
if ! command -v fakeroot &> /dev/null; then
echo "Missing command: fakeroot"
exit 1
fi
if ! command -v dpkg-deb &> /dev/null; then
echo "Missing command: dpkg-deb"
exit 1
fi
if dpkg-deb 2>&1 | grep BusyBox &> /dev/null; then
echo "The dpkg-deb binary provided by BusyBox is not compatible. The Debian tool needs to be used instead."
exit 1
fi
if ! command -v wine &> /dev/null; then
echo "Missing command: wine"
exit 1
fi
echo "Deleting existing builds"
rm -rf dist/*
@@ -13,11 +40,14 @@ cp -r $SRC_DIR ./dist/trilium-linux-x64-src
cp -r $SRC_DIR ./dist/trilium-linux-x64-server
cp -r $SRC_DIR ./dist/trilium-windows-x64-src
cp -r $SRC_DIR ./dist/trilium-mac-x64-src
cp -r $SRC_DIR ./dist/trilium-mac-arm64-src
bin/build-win-x64.sh DONTCOPY
bin/build-mac-x64.sh DONTCOPY
bin/build-mac-arm64.sh DONTCOPY
bin/build-linux-x64.sh DONTCOPY
bin/build-server.sh DONTCOPY
+102
View File
@@ -0,0 +1,102 @@
import fs from "fs-extra";
import path from "path";
const DEST_DIR = "./dist";
const DEST_DIR_SRC = path.join(DEST_DIR, "src");
const DEST_DIR_NODE_MODULES = path.join(DEST_DIR, "node_modules");
const VERBOSE = process.env.VERBOSE;
function log(...args) {
if (VERBOSE) {
console.log(args);
}
}
async function copyNodeModuleFileOrFolder(source: string) {
const adjustedSource = source.substring(13);
const destination = path.join(DEST_DIR_NODE_MODULES, adjustedSource);
log(`Copying ${source} to ${destination}`);
await fs.ensureDir(path.dirname(destination));
await fs.copy(source, destination);
}
const copy = async () => {
for (const srcFile of fs.readdirSync("build")) {
const destFile = path.join(DEST_DIR, path.basename(srcFile));
log(`Copying source ${srcFile} -> ${destFile}.`);
fs.copySync(path.join("build", srcFile), destFile, { recursive: true });
}
const filesToCopy = ["config-sample.ini"];
for (const file of filesToCopy) {
log(`Copying ${file}`);
await fs.copy(file, path.join(DEST_DIR, file));
}
const dirsToCopy = ["images", "libraries", "db"];
for (const dir of dirsToCopy) {
log(`Copying ${dir}`);
await fs.copy(dir, path.join(DEST_DIR, dir));
}
const srcDirsToCopy = ["./src/public", "./src/views", "./build"];
for (const dir of srcDirsToCopy) {
log(`Copying ${dir}`);
await fs.copy(dir, path.join(DEST_DIR_SRC, path.basename(dir)));
}
const nodeModulesFile = [
"node_modules/react/umd/react.production.min.js",
"node_modules/react/umd/react.development.js",
"node_modules/react-dom/umd/react-dom.production.min.js",
"node_modules/react-dom/umd/react-dom.development.js",
"node_modules/katex/dist/katex.min.js",
"node_modules/katex/dist/contrib/mhchem.min.js",
"node_modules/katex/dist/contrib/auto-render.min.js",
];
for (const file of nodeModulesFile) {
await copyNodeModuleFileOrFolder(file);
}
const nodeModulesFolder = [
"node_modules/@excalidraw/excalidraw/dist/",
"node_modules/katex/dist/",
"node_modules/dayjs/",
"node_modules/force-graph/dist/",
"node_modules/boxicons/css/",
"node_modules/boxicons/fonts/",
"node_modules/mermaid/dist/",
"node_modules/jquery/dist/",
"node_modules/jquery-hotkeys/",
"node_modules/print-this/",
"node_modules/split.js/dist/",
"node_modules/panzoom/dist/",
"node_modules/i18next/",
"node_modules/i18next-http-backend/",
"node_modules/eslint/bin/",
"node_modules/jsplumb/dist/",
"node_modules/vanilla-js-wheel-zoom/dist/",
"node_modules/mark.js/dist/",
"node_modules/knockout/build/output/",
"node_modules/normalize.css/",
"node_modules/jquery.fancytree/dist/",
"node_modules/bootstrap/dist/",
"node_modules/autocomplete.js/dist/",
"node_modules/codemirror/lib/",
"node_modules/codemirror/addon/",
"node_modules/codemirror/mode/",
"node_modules/codemirror/keymap/",
"node_modules/mind-elixir/dist/"
];
for (const folder of nodeModulesFolder) {
await copyNodeModuleFileOrFolder(folder);
}
};
copy()
.then(() => console.log("Copying complete!"))
.catch((err) => console.error("Error during copy:", err));
+54 -36
View File
@@ -1,57 +1,75 @@
#!/usr/bin/env bash
set -e # Fail on any command error
shopt -s globstar
if [[ $# -eq 0 ]] ; then
echo "Missing argument of target directory"
exit 1
fi
if ! [[ $(which npm) ]]; then
echo "Missing npm"
exit 1
fi
n exec 16.15.0 npm run webpack
# Trigger the TypeScript build
echo TypeScript build start
npx tsc
echo TypeScript build finished
DIR=$1
# Copy the TypeScript artifacts
DIR="$1"
rm -rf "$DIR"
mkdir -pv "$DIR"
rm -rf $DIR
mkdir $DIR
echo Webpack start
npm run webpack
echo Webpack finish
echo "Copying Trilium to build directory $DIR"
cp -r dump-db $DIR/
rm -rf $DIR/dump-db/node_modules
for d in 'images' 'libraries' 'src' 'db'; do
cp -r "$d" "$DIR"/
done
cp -r images $DIR/
cp -r libraries $DIR/
cp -r src $DIR/
cp -r db $DIR/
cp -r package.json $DIR/
cp -r package-lock.json $DIR/
cp -r README.md $DIR/
cp -r LICENSE $DIR/
cp -r config-sample.ini $DIR/
cp -r electron.js $DIR/
cp webpack-* $DIR/
for f in 'package.json' 'package-lock.json' 'README.md' 'LICENSE' 'config-sample.ini'; do
cp "$f" "$DIR"/
done
# Patch package.json main
sed -i 's/.\/dist\/electron-main.js/electron-main.js/g' "$DIR/package.json"
script_dir=$(realpath $(dirname $0))
cp -R "$script_dir/../build/src" "$DIR"
cp "$script_dir/../build/electron-main.js" "$DIR"
# run in subshell (so we return to original dir)
(cd $DIR && n exec 16.15.0 npm install --only=prod)
(cd $DIR && npm install --omit=dev)
# cleanup of useless files in dependencies
rm -r $DIR/node_modules/image-q/demo
rm -r $DIR/node_modules/better-sqlite3/Release
rm -r $DIR/node_modules/better-sqlite3/deps/sqlite3.tar.gz
rm -r $DIR/node_modules/@jimp/plugin-print/fonts
rm -r $DIR/node_modules/jimp/browser
rm -r $DIR/node_modules/jimp/fonts
if [[ -d "$DIR"/node_modules ]]; then
# cleanup of useless files in dependencies
for d in 'image-q/demo' \
'@excalidraw/excalidraw/dist/excalidraw-assets-dev' '@excalidraw/excalidraw/dist/excalidraw.development.js' '@excalidraw/excalidraw/dist/excalidraw-with-preact.development.js' \
'mermaid/dist/mermaid.js' \
'boxicons/svg' 'boxicons/node_modules/react'/* \
'@jimp/plugin-print/fonts' 'jimp/browser' 'jimp/fonts'; do
[[ -e "$DIR"/node_modules/"$d" ]] && rm -r "$DIR"/node_modules/"$d"
done
# delete all tests (there are often large images as test file for jimp etc.)
find $DIR/node_modules -name test -exec rm -rf {} \;
find $DIR/node_modules -name docs -exec rm -rf {} \;
find $DIR/node_modules -name demo -exec rm -rf {} \;
# delete all tests (there are often large images as test file for jimp etc.)
for d in 'test' 'docs' 'demo' 'example'; do
find "$DIR"/node_modules -name "$d" -exec rm -rf {} +
done
fi
find $DIR/libraries -name "*.map" -type f -delete
find $DIR/node_modules -name "*.map" -type f -delete
find $DIR -name "*.ts" -type f -delete
cp $DIR/src/public/app/share.js $DIR/src/public/app-dist/
d="$DIR"/src/public
[[ -d "$d"/app-dist ]] || mkdir -pv "$d"/app-dist
cp "$d"/app/share.js "$d"/app-dist/
cp -r "$d"/app/doc_notes "$d"/app-dist/
rm -rf $DIR/src/public/app
sed -i -e 's/app\/desktop.js/app-dist\/desktop.js/g' $DIR/src/views/desktop.ejs
sed -i -e 's/app\/mobile.js/app-dist\/mobile.js/g' $DIR/src/views/mobile.ejs
sed -i -e 's/app\/setup.js/app-dist\/setup.js/g' $DIR/src/views/setup.ejs
sed -i -e 's/app\/share.js/app-dist\/share.js/g' $DIR/src/views/share/*.ejs
rm -rf "$d"/app
unset f d DIR
+3 -3
View File
@@ -1,7 +1,7 @@
#!/usr/bin/env node
const anonymizationService = require('../src/services/anonymization');
const fs = require('fs');
const path = require('path');
import anonymizationService from '../src/services/anonymization.js';
import fs from 'fs';
import path from 'path';
fs.writeFileSync(path.resolve(__dirname, 'tpl', 'anonymize-database.sql'), anonymizationService.getFullAnonymizationScript());
+45
View File
@@ -0,0 +1,45 @@
#!/usr/bin/env bash
if ! command -v magick &> /dev/null; then
echo "This tool requires ImageMagick to be installed in order to create the icons."
exit 1
fi
if ! command -v inkscape &> /dev/null; then
echo "This tool requires Inkscape to be render sharper SVGs than ImageMagick."
exit 1
fi
if ! command -v icnsutil &> /dev/null; then
echo "This tool requires icnsutil to be installed in order to generate macOS icons."
exit 1
fi
script_dir=$(realpath $(dirname $0))
cd "${script_dir}/../images/app-icons"
inkscape -w 180 -h 180 "../icon-color.svg" -o "./ios/apple-touch-icon.png"
# Build PNGs
inkscape -w 128 -h 128 "../icon-color.svg" -o "./png/128x128.png"
inkscape -w 256 -h 256 "../icon-color.svg" -o "./png/256x256.png"
inkscape -w 256 -h 256 "../icon-purple.svg" -o "./png/256x256-dev.png"
# Build Mac .icns
declare -a sizes=("16" "32" "512" "1024")
for size in "${sizes[@]}"; do
inkscape -w $size -h $size "../icon-color.svg" -o "./png/${size}x${size}.png"
done
mkdir -p fakeapp.app
npx iconsur set fakeapp.app -l -i "png/1024x1024.png" -o "mac/1024x1024.png" -s 0.8
declare -a sizes=("16x16" "32x32" "128x128" "512x512")
for size in "${sizes[@]}"; do
magick "mac/1024x1024.png" -resize "${size}" "mac/${size}.png"
done
icnsutil compose -f "mac/icon.icns" ./mac/*.png
# Build Windows icon
magick -background none "../icon-color.svg" -define icon:auto-resize=16,32,48,64,128,256 "./icon.ico"
# Build Squirrel splash image
magick "./png/256x256.png" -background "#ffffff" -gravity center -extent 640x480 "./win/setup-banner.gif"
+2 -1
View File
@@ -1,6 +1,7 @@
{
"src": "dist/trilium-linux-x64",
"dest": "dist/",
"compression": "xz",
"name": "trilium",
"productName": "Trilium Notes",
"genericName": "Note taker",
@@ -11,4 +12,4 @@
"bin": "trilium",
"icon": "dist/trilium-linux-x64/icon.png",
"categories": [ "Office" ]
}
}
+3
View File
@@ -0,0 +1,3 @@
SHARE_PROTOCOL=http
SHARE_HOST=notes.johnsmith.me
ROOT_NOTE_ID=4yYHqKbLovVX
+2
View File
@@ -0,0 +1,2 @@
output
.env
+23
View File
@@ -0,0 +1,23 @@
/**
* Fetch note with given ID from backend
*
* @param noteId of the given note to be fetched. If false, fetches current note.
*/
async function fetchNote(noteId = null) {
if (!noteId) {
noteId = document.body.getAttribute("data-note-id");
}
const resp = await fetch(`api/notes/${noteId}`);
return await resp.json();
}
document.addEventListener('DOMContentLoaded', () => {
const toggleMenuButton = document.getElementById('toggleMenuButton');
const layout = document.getElementById('layout');
if (toggleMenuButton && layout) {
toggleMenuButton.addEventListener('click', () => layout.classList.toggle('showMenu'));
}
}, false);
@@ -0,0 +1,551 @@
/* !!!!!! TRILIUM CUSTOM CHANGES !!!!!! */
.printed-content .ck-widget__selection-handle, .printed-content .ck-widget__type-around { /* gets rid of triangles: https://github.com/zadam/trilium/issues/1129 */
display: none;
}
/*
* CKEditor 5 (v41.0.0) content styles.
* Generated on Fri, 26 Jan 2024 10:23:49 GMT.
* For more information, check out https://ckeditor.com/docs/ckeditor5/latest/installation/advanced/content-styles.html
*/
:root {
--ck-color-image-caption-background: hsl(0, 0%, 97%);
--ck-color-image-caption-text: hsl(0, 0%, 20%);
--ck-color-mention-background: hsla(341, 100%, 30%, 0.1);
--ck-color-mention-text: hsl(341, 100%, 30%);
--ck-color-selector-caption-background: hsl(0, 0%, 97%);
--ck-color-selector-caption-text: hsl(0, 0%, 20%);
--ck-highlight-marker-blue: hsl(201, 97%, 72%);
--ck-highlight-marker-green: hsl(120, 93%, 68%);
--ck-highlight-marker-pink: hsl(345, 96%, 73%);
--ck-highlight-marker-yellow: hsl(60, 97%, 73%);
--ck-highlight-pen-green: hsl(112, 100%, 27%);
--ck-highlight-pen-red: hsl(0, 85%, 49%);
--ck-image-style-spacing: 1.5em;
--ck-inline-image-style-spacing: calc(var(--ck-image-style-spacing) / 2);
--ck-todo-list-checkmark-size: 16px;
}
/* @ckeditor/ckeditor5-table/theme/tablecolumnresize.css */
.ck-content .table .ck-table-resized {
table-layout: fixed;
}
/* @ckeditor/ckeditor5-table/theme/tablecolumnresize.css */
.ck-content .table table {
overflow: hidden;
}
/* @ckeditor/ckeditor5-table/theme/tablecolumnresize.css */
.ck-content .table td,
.ck-content .table th {
overflow-wrap: break-word;
position: relative;
}
/* @ckeditor/ckeditor5-table/theme/table.css */
.ck-content .table {
margin: 0.9em auto;
display: table;
}
/* @ckeditor/ckeditor5-table/theme/table.css */
.ck-content .table table {
border-collapse: collapse;
border-spacing: 0;
width: 100%;
height: 100%;
border: 1px double hsl(0, 0%, 70%);
}
/* @ckeditor/ckeditor5-table/theme/table.css */
.ck-content .table table td,
.ck-content .table table th {
min-width: 2em;
padding: .4em;
border: 1px solid hsl(0, 0%, 75%);
}
/* @ckeditor/ckeditor5-table/theme/table.css */
.ck-content .table table th {
font-weight: bold;
background: hsla(0, 0%, 0%, 5%);
}
/* @ckeditor/ckeditor5-table/theme/table.css */
.ck-content[dir="rtl"] .table th {
text-align: right;
}
/* @ckeditor/ckeditor5-table/theme/table.css */
.ck-content[dir="ltr"] .table th {
text-align: left;
}
/* @ckeditor/ckeditor5-table/theme/tablecaption.css */
.ck-content .table > figcaption {
display: table-caption;
caption-side: top;
word-break: break-word;
text-align: center;
color: var(--ck-color-selector-caption-text);
background-color: var(--ck-color-selector-caption-background);
padding: .6em;
font-size: .75em;
outline-offset: -1px;
}
/* @ckeditor/ckeditor5-page-break/theme/pagebreak.css */
.ck-content .page-break {
position: relative;
clear: both;
padding: 5px 0;
display: flex;
align-items: center;
justify-content: center;
}
/* @ckeditor/ckeditor5-page-break/theme/pagebreak.css */
.ck-content .page-break::after {
content: '';
position: absolute;
border-bottom: 2px dashed hsl(0, 0%, 77%);
width: 100%;
}
/* @ckeditor/ckeditor5-page-break/theme/pagebreak.css */
.ck-content .page-break__label {
position: relative;
z-index: 1;
padding: .3em .6em;
display: block;
text-transform: uppercase;
border: 1px solid hsl(0, 0%, 77%);
border-radius: 2px;
font-family: Helvetica, Arial, Tahoma, Verdana, Sans-Serif;
font-size: 0.75em;
font-weight: bold;
color: hsl(0, 0%, 20%);
background: hsl(0, 0%, 100%);
box-shadow: 2px 2px 1px hsla(0, 0%, 0%, 0.15);
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
/* @ckeditor/ckeditor5-media-embed/theme/mediaembed.css */
.ck-content .media {
clear: both;
margin: 0.9em 0;
display: block;
min-width: 15em;
}
/* @ckeditor/ckeditor5-list/theme/todolist.css */
.ck-content .todo-list {
list-style: none;
}
/* @ckeditor/ckeditor5-list/theme/todolist.css */
.ck-content .todo-list li {
position: relative;
margin-bottom: 5px;
}
/* @ckeditor/ckeditor5-list/theme/todolist.css */
.ck-content .todo-list li .todo-list {
margin-top: 5px;
}
/* @ckeditor/ckeditor5-list/theme/todolist.css */
.ck-content .todo-list .todo-list__label > input {
-webkit-appearance: none;
display: inline-block;
position: relative;
width: var(--ck-todo-list-checkmark-size);
height: var(--ck-todo-list-checkmark-size);
vertical-align: middle;
border: 0;
left: -25px;
margin-right: -15px;
right: 0;
margin-left: 0;
}
/* @ckeditor/ckeditor5-list/theme/todolist.css */
.ck-content[dir=rtl] .todo-list .todo-list__label > input {
left: 0;
margin-right: 0;
right: -25px;
margin-left: -15px;
}
/* @ckeditor/ckeditor5-list/theme/todolist.css */
.ck-content .todo-list .todo-list__label > input::before {
display: block;
position: absolute;
box-sizing: border-box;
content: '';
width: 100%;
height: 100%;
border: 1px solid hsl(0, 0%, 20%);
border-radius: 2px;
transition: 250ms ease-in-out box-shadow;
}
/* @ckeditor/ckeditor5-list/theme/todolist.css */
.ck-content .todo-list .todo-list__label > input::after {
display: block;
position: absolute;
box-sizing: content-box;
pointer-events: none;
content: '';
left: calc( var(--ck-todo-list-checkmark-size) / 3 );
top: calc( var(--ck-todo-list-checkmark-size) / 5.3 );
width: calc( var(--ck-todo-list-checkmark-size) / 5.3 );
height: calc( var(--ck-todo-list-checkmark-size) / 2.6 );
border-style: solid;
border-color: transparent;
border-width: 0 calc( var(--ck-todo-list-checkmark-size) / 8 ) calc( var(--ck-todo-list-checkmark-size) / 8 ) 0;
transform: rotate(45deg);
}
/* @ckeditor/ckeditor5-list/theme/todolist.css */
.ck-content .todo-list .todo-list__label > input[checked]::before {
background: hsl(126, 64%, 41%);
border-color: hsl(126, 64%, 41%);
}
/* @ckeditor/ckeditor5-list/theme/todolist.css */
.ck-content .todo-list .todo-list__label > input[checked]::after {
border-color: hsl(0, 0%, 100%);
}
/* @ckeditor/ckeditor5-list/theme/todolist.css */
.ck-content .todo-list .todo-list__label .todo-list__label__description {
vertical-align: middle;
}
/* @ckeditor/ckeditor5-list/theme/todolist.css */
.ck-content .todo-list .todo-list__label.todo-list__label_without-description input[type=checkbox] {
position: absolute;
}
/* @ckeditor/ckeditor5-list/theme/todolist.css */
.ck-editor__editable.ck-content .todo-list .todo-list__label > input,
.ck-editor__editable.ck-content .todo-list .todo-list__label > span[contenteditable=false] > input {
cursor: pointer;
}
/* @ckeditor/ckeditor5-list/theme/todolist.css */
.ck-editor__editable.ck-content .todo-list .todo-list__label > input:hover::before, .ck-editor__editable.ck-content .todo-list .todo-list__label > span[contenteditable=false] > input:hover::before {
box-shadow: 0 0 0 5px hsla(0, 0%, 0%, 0.1);
}
/* @ckeditor/ckeditor5-list/theme/todolist.css */
.ck-editor__editable.ck-content .todo-list .todo-list__label > span[contenteditable=false] > input {
-webkit-appearance: none;
display: inline-block;
position: relative;
width: var(--ck-todo-list-checkmark-size);
height: var(--ck-todo-list-checkmark-size);
vertical-align: middle;
border: 0;
left: -25px;
margin-right: -15px;
right: 0;
margin-left: 0;
}
/* @ckeditor/ckeditor5-list/theme/todolist.css */
.ck-editor__editable.ck-content[dir=rtl] .todo-list .todo-list__label > span[contenteditable=false] > input {
left: 0;
margin-right: 0;
right: -25px;
margin-left: -15px;
}
/* @ckeditor/ckeditor5-list/theme/todolist.css */
.ck-editor__editable.ck-content .todo-list .todo-list__label > span[contenteditable=false] > input::before {
display: block;
position: absolute;
box-sizing: border-box;
content: '';
width: 100%;
height: 100%;
border: 1px solid hsl(0, 0%, 20%);
border-radius: 2px;
transition: 250ms ease-in-out box-shadow;
}
/* @ckeditor/ckeditor5-list/theme/todolist.css */
.ck-editor__editable.ck-content .todo-list .todo-list__label > span[contenteditable=false] > input::after {
display: block;
position: absolute;
box-sizing: content-box;
pointer-events: none;
content: '';
left: calc( var(--ck-todo-list-checkmark-size) / 3 );
top: calc( var(--ck-todo-list-checkmark-size) / 5.3 );
width: calc( var(--ck-todo-list-checkmark-size) / 5.3 );
height: calc( var(--ck-todo-list-checkmark-size) / 2.6 );
border-style: solid;
border-color: transparent;
border-width: 0 calc( var(--ck-todo-list-checkmark-size) / 8 ) calc( var(--ck-todo-list-checkmark-size) / 8 ) 0;
transform: rotate(45deg);
}
/* @ckeditor/ckeditor5-list/theme/todolist.css */
.ck-editor__editable.ck-content .todo-list .todo-list__label > span[contenteditable=false] > input[checked]::before {
background: hsl(126, 64%, 41%);
border-color: hsl(126, 64%, 41%);
}
/* @ckeditor/ckeditor5-list/theme/todolist.css */
.ck-editor__editable.ck-content .todo-list .todo-list__label > span[contenteditable=false] > input[checked]::after {
border-color: hsl(0, 0%, 100%);
}
/* @ckeditor/ckeditor5-list/theme/todolist.css */
.ck-editor__editable.ck-content .todo-list .todo-list__label.todo-list__label_without-description input[type=checkbox] {
position: absolute;
}
/* @ckeditor/ckeditor5-list/theme/list.css */
.ck-content ol {
list-style-type: decimal;
}
/* @ckeditor/ckeditor5-list/theme/list.css */
.ck-content ol ol {
list-style-type: lower-latin;
}
/* @ckeditor/ckeditor5-list/theme/list.css */
.ck-content ol ol ol {
list-style-type: lower-roman;
}
/* @ckeditor/ckeditor5-list/theme/list.css */
.ck-content ol ol ol ol {
list-style-type: upper-latin;
}
/* @ckeditor/ckeditor5-list/theme/list.css */
.ck-content ol ol ol ol ol {
list-style-type: upper-roman;
}
/* @ckeditor/ckeditor5-list/theme/list.css */
.ck-content ul {
list-style-type: disc;
}
/* @ckeditor/ckeditor5-list/theme/list.css */
.ck-content ul ul {
list-style-type: circle;
}
/* @ckeditor/ckeditor5-list/theme/list.css */
.ck-content ul ul ul {
list-style-type: square;
}
/* @ckeditor/ckeditor5-list/theme/list.css */
.ck-content ul ul ul ul {
list-style-type: square;
}
/* @ckeditor/ckeditor5-image/theme/image.css */
.ck-content .image {
display: table;
clear: both;
text-align: center;
margin: 0.9em auto;
min-width: 50px;
}
/* @ckeditor/ckeditor5-image/theme/image.css */
.ck-content .image img {
display: block;
margin: 0 auto;
max-width: 100%;
min-width: 100%;
height: auto;
}
/* @ckeditor/ckeditor5-image/theme/image.css */
.ck-content .image-inline {
/*
* Normally, the .image-inline would have "display: inline-block" and "img { width: 100% }" (to follow the wrapper while resizing).;
* Unfortunately, together with "srcset", it gets automatically stretched up to the width of the editing root.
* This strange behavior does not happen with inline-flex.
*/
display: inline-flex;
max-width: 100%;
align-items: flex-start;
}
/* @ckeditor/ckeditor5-image/theme/image.css */
.ck-content .image-inline picture {
display: flex;
}
/* @ckeditor/ckeditor5-image/theme/image.css */
.ck-content .image-inline picture,
.ck-content .image-inline img {
flex-grow: 1;
flex-shrink: 1;
max-width: 100%;
}
/* @ckeditor/ckeditor5-image/theme/imageresize.css */
.ck-content img.image_resized {
height: auto;
}
/* @ckeditor/ckeditor5-image/theme/imageresize.css */
.ck-content .image.image_resized {
max-width: 100%;
display: block;
box-sizing: border-box;
}
/* @ckeditor/ckeditor5-image/theme/imageresize.css */
.ck-content .image.image_resized img {
width: 100%;
}
/* @ckeditor/ckeditor5-image/theme/imageresize.css */
.ck-content .image.image_resized > figcaption {
display: block;
}
/* @ckeditor/ckeditor5-image/theme/imagecaption.css */
.ck-content .image > figcaption {
display: table-caption;
caption-side: bottom;
word-break: break-word;
color: var(--ck-color-image-caption-text);
background-color: var(--ck-color-image-caption-background);
padding: .6em;
font-size: .75em;
outline-offset: -1px;
}
/* @ckeditor/ckeditor5-image/theme/imagestyle.css */
.ck-content .image-style-block-align-left,
.ck-content .image-style-block-align-right {
max-width: calc(100% - var(--ck-image-style-spacing));
}
/* @ckeditor/ckeditor5-image/theme/imagestyle.css */
.ck-content .image-style-align-left,
.ck-content .image-style-align-right {
clear: none;
}
/* @ckeditor/ckeditor5-image/theme/imagestyle.css */
.ck-content .image-style-side {
float: right;
margin-left: var(--ck-image-style-spacing);
max-width: 50%;
}
/* @ckeditor/ckeditor5-image/theme/imagestyle.css */
.ck-content .image-style-align-left {
float: left;
margin-right: var(--ck-image-style-spacing);
}
/* @ckeditor/ckeditor5-image/theme/imagestyle.css */
.ck-content .image-style-align-center {
margin-left: auto;
margin-right: auto;
}
/* @ckeditor/ckeditor5-image/theme/imagestyle.css */
.ck-content .image-style-align-right {
float: right;
margin-left: var(--ck-image-style-spacing);
}
/* @ckeditor/ckeditor5-image/theme/imagestyle.css */
.ck-content .image-style-block-align-right {
margin-right: 0;
margin-left: auto;
}
/* @ckeditor/ckeditor5-image/theme/imagestyle.css */
.ck-content .image-style-block-align-left {
margin-left: 0;
margin-right: auto;
}
/* @ckeditor/ckeditor5-image/theme/imagestyle.css */
.ck-content p + .image-style-align-left,
.ck-content p + .image-style-align-right,
.ck-content p + .image-style-side {
margin-top: 0;
}
/* @ckeditor/ckeditor5-image/theme/imagestyle.css */
.ck-content .image-inline.image-style-align-left,
.ck-content .image-inline.image-style-align-right {
margin-top: var(--ck-inline-image-style-spacing);
margin-bottom: var(--ck-inline-image-style-spacing);
}
/* @ckeditor/ckeditor5-image/theme/imagestyle.css */
.ck-content .image-inline.image-style-align-left {
margin-right: var(--ck-inline-image-style-spacing);
}
/* @ckeditor/ckeditor5-image/theme/imagestyle.css */
.ck-content .image-inline.image-style-align-right {
margin-left: var(--ck-inline-image-style-spacing);
}
/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
.ck-content .marker-yellow {
background-color: var(--ck-highlight-marker-yellow);
}
/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
.ck-content .marker-green {
background-color: var(--ck-highlight-marker-green);
}
/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
.ck-content .marker-pink {
background-color: var(--ck-highlight-marker-pink);
}
/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
.ck-content .marker-blue {
background-color: var(--ck-highlight-marker-blue);
}
/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
.ck-content .pen-red {
color: var(--ck-highlight-pen-red);
background-color: transparent;
}
/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
.ck-content .pen-green {
color: var(--ck-highlight-pen-green);
background-color: transparent;
}
/* @ckeditor/ckeditor5-block-quote/theme/blockquote.css */
.ck-content blockquote {
overflow: hidden;
padding-right: 1.5em;
padding-left: 1.5em;
margin-left: 0;
margin-right: 0;
font-style: italic;
border-left: solid 5px hsl(0, 0%, 80%);
}
/* @ckeditor/ckeditor5-block-quote/theme/blockquote.css */
.ck-content[dir="rtl"] blockquote {
border-left: 0;
border-right: solid 5px hsl(0, 0%, 80%);
}
/* @ckeditor/ckeditor5-basic-styles/theme/code.css */
.ck-content code {
background-color: hsla(0, 0%, 78%, 0.3);
padding: .15em;
border-radius: 2px;
}
/* @ckeditor/ckeditor5-font/theme/fontsize.css */
.ck-content .text-tiny {
font-size: .7em;
}
/* @ckeditor/ckeditor5-font/theme/fontsize.css */
.ck-content .text-small {
font-size: .85em;
}
/* @ckeditor/ckeditor5-font/theme/fontsize.css */
.ck-content .text-big {
font-size: 1.4em;
}
/* @ckeditor/ckeditor5-font/theme/fontsize.css */
.ck-content .text-huge {
font-size: 1.8em;
}
/* @ckeditor/ckeditor5-mention/theme/mention.css */
.ck-content .mention {
background: var(--ck-color-mention-background);
color: var(--ck-color-mention-text);
}
/* @ckeditor/ckeditor5-horizontal-line/theme/horizontalline.css */
.ck-content hr {
margin: 15px 0;
height: 4px;
background: hsl(0, 0%, 87%);
border: 0;
}
/* @ckeditor/ckeditor5-code-block/theme/codeblock.css */
.ck-content pre {
padding: 1em;
color: hsl(0, 0%, 20.8%);
background: hsla(0, 0%, 78%, 0.3);
border: 1px solid hsl(0, 0%, 77%);
border-radius: 2px;
text-align: left;
direction: ltr;
tab-size: 4;
white-space: pre-wrap;
font-style: normal;
min-width: 200px;
}
/* @ckeditor/ckeditor5-code-block/theme/codeblock.css */
.ck-content pre code {
background: unset;
padding: 0;
border-radius: 0;
}
@media print {
/* @ckeditor/ckeditor5-page-break/theme/pagebreak.css */
.ck-content .page-break {
padding: 0;
}
/* @ckeditor/ckeditor5-page-break/theme/pagebreak.css */
.ck-content .page-break::after {
display: none;
}
}
@@ -0,0 +1,165 @@
body {
font-family: 'Lucida Grande', 'Lucida Sans Unicode', arial, sans-serif;
line-height: 1.5;
}
#layout {
max-width: 1200px;
margin: 0 auto;
display: flex;
flex-direction: row-reverse;
}
#menu {
padding: 25px;
flex-basis: 0;
flex-grow: 1;
overflow: auto;
}
#menu p {
margin: 0;
}
#menu > p {
font-weight: bold;
font-size: 110%;
}
#menu ul {
padding-left: 20px;
}
#main {
flex-basis: 0;
flex-grow: 3;
overflow: auto;
padding: 10px 20px 20px 20px;
}
#parentLink {
float: right;
margin-top: 20px;
}
#title {
margin: 0;
padding-top: 10px;
}
img {
max-width: 100%;
}
pre {
white-space: pre-wrap;
word-wrap: anywhere;
}
iframe.pdf-view {
width: 100%;
height: 800px;
}
#toggleMenuButton {
display: none;
position: fixed;
top: 8px;
left: 5px;
width: 1.4em;
border-radius: 5px;
border: 1px solid #aaa;
font-size: 2rem;
z-index: 10;
height: auto;
color: black;
cursor: pointer;
}
#childLinks.grid ul {
list-style-type: none;
display: flex;
flex-wrap: wrap;
padding: 0;
}
#childLinks.grid ul li {
width: 180px;
height: 140px;
padding: 10px;
}
#childLinks.grid ul li a {
display: flex;
flex-direction: column;
height: 100%;
width: 100%;
border: 1px solid #ddd;
border-radius: 5px;
justify-content: center;
align-content: center;
text-align: center;
font-size: large;
}
#childLinks.grid ul li a:hover {
background: #eee;
}
#childLinks.list ul {
list-style-type: none;
display: inline-flex;
flex-wrap: wrap;
padding: 0;
margin-top: 5px;
}
#childLinks.list ul li {
margin-right: 20px;
}
#noteClippedFrom {
padding: 10px 0 10px 0;
margin: 20px 0 20px 0;
color: #666;
border: 1px solid #ddd;
border-left: 0;
border-right: 0;
}
#toggleMenuButton::after {
position: relative;
top: -2px;
left: 1px;
}
@media (max-width: 48em) {
#layout.showMenu #menu {
display: block;
margin-top: 40px;
}
#toggleMenuButton {
display: block;
}
#layout.showMenu #main {
display: none;
}
#title {
padding-left: 60px;
}
#layout.showMenu #toggleMenuButton::after {
content: "«";
}
#toggleMenuButton::after {
content: "»";
}
#menu {
display: none;
}
}
+10
View File
@@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="refresh" content="0; url=./{{ROOT_NOTE_ID}}.html" />
</head>
<body>
</body>
</html>
+43
View File
@@ -0,0 +1,43 @@
#!/usr/bin/env bash
script_dir=$(realpath $(dirname $0))
cd "$script_dir"
env_file="$script_dir/.env"
if [ ! -f "$env_file" ]; then
echo "Missing .env file, cannot proceed."
exit 1
fi
output_dir="$script_dir/../../docs"
mkdir -p "$output_dir"
rm -f "$output_dir"/*
rm -rf "$output_dir"/{assets,share}
source "$env_file"
# Download everything in output/notes.example.com/share/...
share_url="$SHARE_PROTOCOL://$SHARE_HOST/share/$ROOT_NOTE_ID"
wget -rpEk -e robots=off "$share_url" -P "$output_dir"
if [ $? -ne 0 ]; then
echo -e \\nDownloading failed, make sure you are using the real wget package and not the busybox one.
exit 1
fi
# Get rid of the domain in the output folder
mv "$output_dir/$SHARE_HOST"/* "$output_dir/"
rmdir "$output_dir/$SHARE_HOST"
# Create home page with redirect
index_dest_path="$output_dir/index.html"
cp index.template.html "$index_dest_path"
sed -i "s/{{ROOT_NOTE_ID}}/$ROOT_NOTE_ID/g" "$index_dest_path"
# Rewrite links to get rid of the share folder
sed -i "s/<link href=\"\\.\\./<link href=\"\\./g" "$output_dir/share"/*.html
sed -i "s/<script src=\"\\.\\./<script src=\"\\./g" "$output_dir/share"/*.html
sed -i "s/rel=\"shortcut icon\" href=\"\\.\\./rel=\"shortcut icon\" href=\"\\./g" "$output_dir/share"/*.html
cp -r "$output_dir/share"/* "$output_dir"
rm -r "$output_dir/share"
+8
View File
@@ -0,0 +1,8 @@
#!/usr/bin/env bash
LISTEN_ADDRESS=127.0.0.1:8088
script_dir=$(realpath $(dirname $0))
output_dir="$script_dir/../../docs"
echo "Preview the documentation at http://$LISTEN_ADDRESS"
httpd -fv -p "$LISTEN_ADDRESS" -h "$output_dir"
+1 -1
View File
@@ -2,6 +2,6 @@
SCHEMA_FILE_PATH=db/schema.sql
sqlite3 ~/trilium-data/document.db .schema | grep -v "sqlite_sequence" > "$SCHEMA_FILE_PATH"
sqlite3 ./data/document.db .schema | grep -v "sqlite_sequence" > "$SCHEMA_FILE_PATH"
echo "DB schema exported to $SCHEMA_FILE_PATH"
+57
View File
@@ -0,0 +1,57 @@
#!/usr/bin/env bash
if [[ $# -eq 0 ]] ; then
echo "Missing argument of new version"
exit 1
fi
VERSION=$1
if ! [[ ${VERSION} =~ ^[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}(-.+)?$ ]] ;
then
echo "Version ${VERSION} isn't in format X.Y.Z"
exit 1
fi
VERSION_DATE=$(git log -1 --format=%aI "v${VERSION}" | cut -c -10)
VERSION_COMMIT=$(git rev-list -n 1 "v${VERSION}")
# expecting the directory at a specific path
cd ~/trilium-flathub || exit
if ! git diff-index --quiet HEAD --; then
echo "There are uncommitted changes"
exit 1
fi
BASE_BRANCH=master
if [[ "$VERSION" == *"beta"* ]]; then
BASE_BRANCH=beta
fi
git switch "${BASE_BRANCH}"
git pull
BRANCH=b${VERSION}
git branch "${BRANCH}"
git switch "${BRANCH}"
echo "Updating files with version ${VERSION}, date ${VERSION_DATE} and commit ${VERSION_COMMIT}"
flatpak-node-generator npm ../trilium/package-lock.json
xmlstarlet ed --inplace --update "/component/releases/release/@version" --value "${VERSION}" --update "/component/releases/release/@date" --value "${VERSION_DATE}" ./com.github.zadam.trilium.metainfo.xml
yq --inplace "(.modules[0].sources[0].tag = \"v${VERSION}\") | (.modules[0].sources[0].commit = \"${VERSION_COMMIT}\")" ./com.github.zadam.trilium.yml
git add ./generated-sources.json
git add ./com.github.zadam.trilium.metainfo.xml
git add ./com.github.zadam.trilium.yml
git commit -m "release $VERSION"
git push --set-upstream origin "${BRANCH}"
gh pr create --fill -B "${BASE_BRANCH}"
gh pr merge --auto --merge --delete-branch
+9 -31
View File
@@ -7,6 +7,11 @@ if [[ $# -eq 0 ]] ; then
exit 1
fi
if ! command -v jq &> /dev/null; then
echo "Missing command: jq"
exit 1
fi
VERSION=$1
if ! [[ ${VERSION} =~ ^[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}(-.+)?$ ]] ;
@@ -22,13 +27,14 @@ fi
echo "Releasing Trilium $VERSION"
jq '.version = "'$VERSION'"' package.json|sponge package.json
jq '.version = "'$VERSION'"' package.json > package.json.tmp
mv package.json.tmp package.json
git add package.json
echo 'module.exports = { buildDate:"'`date --iso-8601=seconds`'", buildRevision: "'`git log -1 --format="%H"`'" };' > src/services/build.js
npm run update-build-info
git add src/services/build.js
git add src/services/build.ts
TAG=v$VERSION
@@ -41,31 +47,3 @@ echo "Tagging commit with $TAG"
git tag $TAG
git push origin $TAG
bin/build.sh
LINUX_X64_BUILD=trilium-linux-x64-$VERSION.tar.xz
DEBIAN_X64_BUILD=trilium_${VERSION}_amd64.deb
WINDOWS_X64_BUILD=trilium-windows-x64-$VERSION.zip
MAC_X64_BUILD=trilium-mac-x64-$VERSION.zip
SERVER_BUILD=trilium-linux-x64-server-$VERSION.tar.xz
echo "Creating release in GitHub"
EXTRA=
if [[ $TAG == *"beta"* ]]; then
EXTRA=--prerelease
fi
echo "$GITHUB_CLI_AUTH_TOKEN" | gh auth login --with-token
gh release create "$TAG" \
--title "$TAG release" \
--notes "" \
$EXTRA \
"dist/$DEBIAN_X64_BUILD" \
"dist/$LINUX_X64_BUILD" \
"dist/$WINDOWS_X64_BUILD" \
"dist/$MAC_X64_BUILD" \
"dist/$SERVER_BUILD"
+44 -11
View File
@@ -1,17 +1,50 @@
UPDATE etapi_tokens SET tokenHash = 'API token hash value';
UPDATE notes SET title = 'title' WHERE title NOT IN ('root', 'hidden', 'share');
UPDATE note_contents SET content = 'text' WHERE content IS NOT NULL;
UPDATE note_revisions SET title = 'title';
UPDATE note_revision_contents SET content = 'text' WHERE content IS NOT NULL;
UPDATE notes SET title = 'title'
WHERE noteId NOT IN ('root', '_hidden', '_share')
AND SUBSTR(noteId, 1, 8) != '_options'
AND SUBSTR(noteId, 1, 3) != '_lb';
UPDATE blobs SET content = 'text' WHERE content IS NOT NULL;
UPDATE revisions SET title = 'title';
UPDATE attributes SET name = 'name', value = 'value' WHERE type = 'label' AND name NOT IN('inbox', 'disableVersioning', 'calendarRoot', 'archived', 'excludeFromExport', 'disableInclusion', 'appCss', 'appTheme', 'hidePromotedAttributes', 'readOnly', 'autoReadOnlyDisabled', 'hoistedCssClass', 'cssClass', 'iconClass', 'keyboardShortcut', 'run', 'runOnInstance', 'runAtHour', 'customRequestHandler', 'customResourceProvider', 'widget', 'noteInfoWidgetDisabled', 'linkMapWidgetDisabled', 'noteRevisionsWidgetDisabled', 'whatLinksHereWidgetDisabled', 'similarNotesWidgetDisabled', 'workspace', 'workspaceIconClass', 'workspaceTabBackgroundColor', 'searchHome', 'hoistedInbox', 'hoistedSearchHome', 'sqlConsoleHome', 'datePattern', 'pageSize', 'viewType', 'mapRootNoteId', 'bookmarked', 'bookmarkFolder', 'sorted', 'top', 'fullContentWidth', 'shareHiddenFromTree', 'shareAlias', 'shareOmitDefaultCss', 'shareRoot', 'internalLink', 'imageLink', 'relationMapLink', 'includeMapLink', 'runOnNoteCreation', 'runOnNoteTitleChange', 'runOnNoteChange', 'runOnChildNoteCreation', 'runOnAttributeCreation', 'runOnAttributeChange', 'template', 'widget', 'renderNote', 'shareCss', 'shareJs', 'shareFavicon');
UPDATE attributes SET name = 'name' WHERE type = 'relation' AND name NOT IN ('inbox', 'disableVersioning', 'calendarRoot', 'archived', 'excludeFromExport', 'disableInclusion', 'appCss', 'appTheme', 'hidePromotedAttributes', 'readOnly', 'autoReadOnlyDisabled', 'hoistedCssClass', 'cssClass', 'iconClass', 'keyboardShortcut', 'run', 'runOnInstance', 'runAtHour', 'customRequestHandler', 'customResourceProvider', 'widget', 'noteInfoWidgetDisabled', 'linkMapWidgetDisabled', 'noteRevisionsWidgetDisabled', 'whatLinksHereWidgetDisabled', 'similarNotesWidgetDisabled', 'workspace', 'workspaceIconClass', 'workspaceTabBackgroundColor', 'searchHome', 'hoistedInbox', 'hoistedSearchHome', 'sqlConsoleHome', 'datePattern', 'pageSize', 'viewType', 'mapRootNoteId', 'bookmarked', 'bookmarkFolder', 'sorted', 'top', 'fullContentWidth', 'shareHiddenFromTree', 'shareAlias', 'shareOmitDefaultCss', 'shareRoot', 'internalLink', 'imageLink', 'relationMapLink', 'includeMapLink', 'runOnNoteCreation', 'runOnNoteTitleChange', 'runOnNoteChange', 'runOnChildNoteCreation', 'runOnAttributeCreation', 'runOnAttributeChange', 'template', 'widget', 'renderNote', 'shareCss', 'shareJs', 'shareFavicon');
UPDATE attributes SET name = 'name', value = 'value' WHERE type = 'label'
AND name NOT IN
('inbox', 'disableVersioning', 'calendarRoot', 'archived', 'excludeFromExport', 'disableInclusion', 'appCss',
'appTheme', 'hidePromotedAttributes', 'readOnly', 'autoReadOnlyDisabled', 'cssClass', 'iconClass',
'keyboardShortcut', 'run', 'runOnInstance', 'runAtHour', 'customRequestHandler', 'customResourceProvider',
'widget', 'noteInfoWidgetDisabled', 'linkMapWidgetDisabled', 'revisionsWidgetDisabled',
'whatLinksHereWidgetDisabled', 'similarNotesWidgetDisabled', 'workspace', 'workspaceIconClass',
'workspaceTabBackgroundColor', 'workspaceCalendarRoot', 'workspaceTemplate', 'searchHome', 'workspaceInbox',
'workspaceSearchHome', 'sqlConsoleHome', 'datePattern', 'pageSize', 'viewType', 'mapRootNoteId',
'bookmarkFolder', 'sorted', 'sortDirection', 'sortFoldersFirst', 'sortNatural', 'sortLocale', 'top',
'fullContentWidth', 'shareHiddenFromTree', 'shareExternalLink', 'shareOmitDefaultCss', 'shareRoot', 'shareDescription',
'shareRaw', 'shareDisallowRobotIndexing', 'shareIndex', 'displayRelations', 'hideRelations', 'titleTemplate',
'template', 'toc', 'color', 'keepCurrentHoisting', 'executeButton', 'executeDescription', 'newNotesOnTop',
'clipperInbox', 'internalLink', 'imageLink', 'relationMapLink', 'includeMapLink', 'runOnNoteCreation',
'runOnNoteTitleChange', 'runOnNoteChange', 'runOnNoteContentChange', 'runOnNoteDeletion', 'runOnBranchCreation', 'runOnBranchChange',
'runOnBranchDeletion', 'runOnChildNoteCreation', 'runOnAttributeCreation', 'runOnAttributeChange', 'template',
'inherit', 'widget', 'renderNote', 'shareCss', 'shareJs', 'shareTemplate', 'shareFavicon');
UPDATE attributes SET name = 'name' WHERE type = 'relation'
AND name NOT IN
('inbox', 'disableVersioning', 'calendarRoot', 'archived', 'excludeFromExport', 'disableInclusion', 'appCss',
'appTheme', 'hidePromotedAttributes', 'readOnly', 'autoReadOnlyDisabled', 'cssClass', 'iconClass',
'keyboardShortcut', 'run', 'runOnInstance', 'runAtHour', 'customRequestHandler', 'customResourceProvider',
'widget', 'noteInfoWidgetDisabled', 'linkMapWidgetDisabled', 'revisionsWidgetDisabled',
'whatLinksHereWidgetDisabled', 'similarNotesWidgetDisabled', 'workspace', 'workspaceIconClass',
'workspaceTabBackgroundColor', 'workspaceCalendarRoot', 'workspaceTemplate', 'searchHome', 'workspaceInbox',
'workspaceSearchHome', 'sqlConsoleHome', 'datePattern', 'pageSize', 'viewType', 'mapRootNoteId',
'bookmarkFolder', 'sorted', 'sortDirection', 'sortFoldersFirst', 'sortNatural', 'sortLocale', 'top',
'fullContentWidth', 'shareHiddenFromTree', 'shareExternalLink', 'shareOmitDefaultCss', 'shareRoot', 'shareDescription',
'shareRaw', 'shareDisallowRobotIndexing', 'shareIndex', 'displayRelations', 'hideRelations', 'titleTemplate',
'template', 'toc', 'color', 'keepCurrentHoisting', 'executeButton', 'executeDescription', 'newNotesOnTop',
'clipperInbox', 'internalLink', 'imageLink', 'relationMapLink', 'includeMapLink', 'runOnNoteCreation',
'runOnNoteTitleChange', 'runOnNoteChange', 'runOnNoteContentChange', 'runOnNoteDeletion', 'runOnBranchCreation', 'runOnBranchChange',
'runOnBranchDeletion', 'runOnChildNoteCreation', 'runOnAttributeCreation', 'runOnAttributeChange', 'template',
'inherit', 'widget', 'renderNote', 'shareCss', 'shareJs', 'shareTemplate', 'shareFavicon');
UPDATE branches SET prefix = 'prefix' WHERE prefix IS NOT NULL AND prefix != 'recovered';
UPDATE options SET value = 'anonymized' WHERE name IN
('documentId', 'documentSecret', 'encryptedDataKey',
'passwordVerificationHash', 'passwordVerificationSalt',
'passwordDerivedKeySalt', 'username', 'syncServerHost', 'syncProxy')
AND value != '';
('documentId', 'documentSecret', 'encryptedDataKey',
'passwordVerificationHash', 'passwordVerificationSalt',
'passwordDerivedKeySalt', 'username', 'syncServerHost', 'syncProxy')
AND value != '';
VACUUM;
+20 -2
View File
@@ -1,5 +1,23 @@
@echo off
:: Try to get powershell to launch Trilium since it deals with UTF-8 characters in current path
:: If there's no powershell available, fallback to unicode enabled command interpreter
WHERE powershell.exe > NUL 2>&1
IF %ERRORLEVEL% NEQ 0 GOTO BATCH ELSE GOTO POWERSHELL
:POWERSHELL
powershell -ExecutionPolicy Bypass -NonInteractive -NoLogo "Set-Item -Path Env:NODE_TLS_REJECT_UNAUTHORIZED -Value 0; ./trilium.exe"
GOTO END
:BATCH
:: Make sure we support UTF-8 characters
chcp 65001
:: Get Current Trilium executable directory and compute data directory
SET DIR=%~dp0
set NODE_TLS_REJECT_UNAUTHORIZED=0
cd %DIR%
WHERE powershell.exe
IF %ERRORLEVEL% NEQ 0 (start trilium.exe) ELSE (powershell.exe ./trilium-no-cert-check.ps1)
start trilium.exe
GOTO END
:END
-2
View File
@@ -1,2 +0,0 @@
Set-Item -Path Env:NODE_TLS_REJECT_UNAUTHORIZED -Value 0
./trilium.exe
+20 -2
View File
@@ -1,5 +1,23 @@
@echo off
:: Try to get powershell to launch Trilium since it deals with UTF-8 characters in current path
:: If there's no powershell available, fallback to unicode enabled command interpreter
WHERE powershell.exe > NUL 2>&1
IF %ERRORLEVEL% NEQ 0 GOTO BATCH ELSE GOTO POWERSHELL
:POWERSHELL
powershell -ExecutionPolicy Bypass -NonInteractive -NoLogo "Set-Item -Path Env:TRILIUM_DATA_DIR -Value './trilium-data'; ./trilium.exe"
GOTO END
:BATCH
:: Make sure we support UTF-8 characters
chcp 65001
:: Get Current Trilium executable directory and compute data directory
SET DIR=%~dp0
SET TRILIUM_DATA_DIR=%DIR%\trilium-data
cd %DIR%
WHERE powershell.exe
IF %ERRORLEVEL% NEQ 0 (start trilium.exe) ELSE (powershell.exe ./trilium-portable.ps1)
start trilium.exe
GOTO END
:END
-2
View File
@@ -1,2 +0,0 @@
Set-Item -Path Env:TRILIUM_DATA_DIR -Value './trilium-data'
./trilium.exe
+20 -2
View File
@@ -1,5 +1,23 @@
@echo off
:: Try to get powershell to launch Trilium since it deals with UTF-8 characters in current path
:: If there's no powershell available, fallback to unicode enabled command interpreter
WHERE powershell.exe > NUL 2>&1
IF %ERRORLEVEL% NEQ 0 GOTO BATCH ELSE GOTO POWERSHELL
:POWERSHELL
powershell -ExecutionPolicy Bypass -NonInteractive -NoLogo "Set-Item -Path Env:TRILIUM_SAFE_MODE -Value 1; ./trilium.exe --disable-gpu"
GOTO END
:BATCH
:: Make sure we support UTF-8 characters
chcp 65001
:: Get Current Trilium executable directory and compute data directory
SET DIR=%~dp0
SET TRILIUM_SAFE_MODE=1
cd %DIR%
WHERE powershell.exe
IF %ERRORLEVEL% NEQ 0 (start trilium.exe) ELSE (powershell.exe ./trilium-safe-mode.ps1)
start trilium.exe --disable-gpu
GOTO END
:END
-2
View File
@@ -1,2 +0,0 @@
Set-Item -Path Env:TRILIUM_SAFE_MODE -Value 1
./trilium.exe
+1 -1
View File
@@ -3,5 +3,5 @@
DIR=`dirname "$0"`
export TRILIUM_SAFE_MODE=1
"$DIR/trilium"
"$DIR/trilium" --disable-gpu
+25
View File
@@ -0,0 +1,25 @@
import child_process from "child_process";
import fs from "fs";
function getBuildDate() {
const now = new Date();
now.setMilliseconds(0);
return now
.toISOString()
.replace(".000", "");
}
function getGitRevision() {
return child_process.execSync('git log -1 --format="%H"')
.toString("utf-8")
.trimEnd();
}
const output = `\
export default {
buildDate: "${getBuildDate()}",
buildRevision: "${getGitRevision()}"
};
`;
fs.writeFileSync("src/services/build.ts", output);
+7 -1
View File
@@ -16,8 +16,14 @@ noBackup=false
# host=0.0.0.0
# port setting is relevant only for web deployments, desktop builds run on a fixed port (changeable with TRILIUM_PORT environment variable)
port=8080
# true for TLS/SSL/HTTPS (secure), false for HTTP (unsecure).
# true for TLS/SSL/HTTPS (secure), false for HTTP (insecure).
https=false
# path to certificate (run "bash bin/generate-cert.sh" to generate self-signed certificate). Relevant only if https=true
certPath=
keyPath=
# setting to give trust to reverse proxies, a comma-separated list of trusted rev. proxy IPs can be specified (CIDR notation is permitted),
# alternatively 'true' will make use of the leftmost IP in X-Forwarded-For, ultimately an integer can be used to tell about the number of hops between
# Trilium (which is hop 0) and the first trusted rev. proxy.
# once set, expressjs will use the X-Forwarded-For header set by the rev. proxy to determinate the real IPs of clients.
# expressjs shortcuts are supported: loopback(127.0.0.1/8, ::1/128), linklocal(169.254.0.0/16, fe80::/10), uniquelocal(10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, fc00::/7)
trustedReverseProxy=false
-6
View File
@@ -1,11 +1,5 @@
- drop branches.utcDateCreated - not used for anything
- drop options.utcDateCreated - not used for anything
- isDeleted = 0 by default
- rename openTabs to openNoteContexts
- migrate black theme to dark theme
- unify readOnly handling to a single attribute:
* readOnly - like now
* readOnly=auto - like without readOnly (used to override inherited readOnly)
* readOnly=never - like autoReadOnlyDisabled
- remove focusOnAttributesKeyboardShortcut
- rename white theme to "light" theme (it's not completely white and matches well to dark theme)
BIN
View File
Binary file not shown.
-1
View File
@@ -1 +0,0 @@
module.exports = () => console.log("NOOP, moved to migration 0189");
@@ -1,4 +0,0 @@
-- black theme has been removed, dark is closest replacement
UPDATE options SET value = 'dark' WHERE name = 'theme' AND value = 'black';
UPDATE options SET value = 'light' WHERE name = 'theme' AND value = 'white';
@@ -1,2 +0,0 @@
ALTER TABLE branches DROP COLUMN utcDateCreated;
ALTER TABLE options DROP COLUMN utcDateCreated;
@@ -1,33 +0,0 @@
CREATE TABLE IF NOT EXISTS "mig_entity_changes" (
`id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
`entityName` TEXT NOT NULL,
`entityId` TEXT NOT NULL,
`hash` TEXT NOT NULL,
`isErased` INT NOT NULL,
`changeId` TEXT NOT NULL,
`sourceId` TEXT NOT NULL,
`isSynced` INTEGER NOT NULL,
`utcDateChanged` TEXT NOT NULL
);
INSERT INTO mig_entity_changes (id, entityName, entityId, hash, isErased, changeId, sourceId, isSynced, utcDateChanged)
SELECT id, entityName, entityId, hash, isErased, '', sourceId, isSynced, utcDateChanged FROM entity_changes;
-- delete duplicates https://github.com/zadam/trilium/issues/2534
DELETE FROM mig_entity_changes WHERE isErased = 0 AND id IN (
SELECT id FROM mig_entity_changes ec
WHERE (
SELECT COUNT(*) FROM mig_entity_changes
WHERE ec.entityName = mig_entity_changes.entityName
AND ec.entityId = mig_entity_changes.entityId
) > 1
);
DROP TABLE entity_changes;
ALTER TABLE mig_entity_changes RENAME TO entity_changes;
CREATE UNIQUE INDEX `IDX_entityChanges_entityName_entityId` ON "entity_changes" (
`entityName`,
`entityId`
);
@@ -1,8 +0,0 @@
UPDATE branches SET branchId = 'hidden' where branchId = (
SELECT branchId FROM branches
WHERE parentNoteId = 'root'
AND noteId = 'hidden'
AND isDeleted = 0
ORDER BY utcDateModified
LIMIT 1
);
@@ -1 +0,0 @@
DELETE FROM options WHERE name = 'username';
@@ -1,15 +0,0 @@
CREATE TABLE IF NOT EXISTS "etapi_tokens"
(
etapiTokenId TEXT PRIMARY KEY NOT NULL,
name TEXT NOT NULL,
tokenHash TEXT NOT NULL,
utcDateCreated TEXT NOT NULL,
utcDateModified TEXT NOT NULL,
isDeleted INT NOT NULL DEFAULT 0);
INSERT INTO etapi_tokens (etapiTokenId, name, tokenHash, utcDateCreated, utcDateModified, isDeleted)
SELECT apiTokenId, 'Trilium Sender', token, utcDateCreated, utcDateCreated, isDeleted FROM api_tokens;
DROP TABLE api_tokens;
UPDATE entity_changes SET entityName = 'etapi_tokens' WHERE entityName = 'api_tokens';
-10
View File
@@ -1,10 +0,0 @@
module.exports = () => {
const sql = require('../../src/services/sql');
const crypto = require('crypto');
for (const {etapiTokenId, token} of sql.getRows("SELECT etapiTokenId, tokenHash AS token FROM etapi_tokens")) {
const tokenHash = crypto.createHash('sha256').update(token).digest('base64');
sql.execute(`UPDATE etapi_tokens SET tokenHash = ? WHERE etapiTokenId = ?`, [tokenHash, etapiTokenId]);
}
};
@@ -1,24 +0,0 @@
CREATE TABLE IF NOT EXISTS "mig_entity_changes" (
`id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
`entityName` TEXT NOT NULL,
`entityId` TEXT NOT NULL,
`hash` TEXT NOT NULL,
`isErased` INT NOT NULL,
`changeId` TEXT NOT NULL,
`componentId` TEXT NOT NULL,
`instanceId` TEXT NOT NULL,
`isSynced` INTEGER NOT NULL,
`utcDateChanged` TEXT NOT NULL
);
INSERT INTO mig_entity_changes (id, entityName, entityId, hash, isErased, changeId, componentId, instanceId, isSynced, utcDateChanged)
SELECT id, entityName, entityId, hash, isErased, changeId, '', '', isSynced, utcDateChanged FROM entity_changes;
DROP TABLE entity_changes;
ALTER TABLE mig_entity_changes RENAME TO entity_changes;
CREATE UNIQUE INDEX `IDX_entityChanges_entityName_entityId` ON "entity_changes" (
`entityName`,
`entityId`
);
@@ -1 +0,0 @@
CREATE INDEX `IDX_entity_changes_changeId` ON `entity_changes` (`changeId`);
@@ -1,15 +0,0 @@
const becca = require('../../src/becca/becca');
const beccaLoader = require('../../src/becca/becca_loader');
const cls = require('../../src/services/cls');
module.exports = () => {
cls.init(() => {
beccaLoader.load();
for (const note of Object.values(becca.notes)) {
if (note.hasLabel('calendarRoot')) {
note.addLabel('excludeFromNoteMap', "", true);
}
}
});
};
@@ -1,2 +0,0 @@
-- removing potential remnants of recent notes in entity changes, see https://github.com/zadam/trilium/issues/2842
DELETE FROM entity_changes WHERE entityName = 'recent_notes';
@@ -1,2 +0,0 @@
UPDATE attributes SET value = replace(value, 'setLabelValue', 'updateLabelValue') WHERE name = 'action' AND type = 'label';
UPDATE attributes SET value = replace(value, 'setRelationTarget', 'updateRelationTarget') WHERE name = 'action' AND type = 'label';
+13
View File
@@ -0,0 +1,13 @@
CREATE TABLE IF NOT EXISTS "blobs" (
`blobId` TEXT NOT NULL,
`content` TEXT NULL DEFAULT NULL,
`dateModified` TEXT NOT NULL,
`utcDateModified` TEXT NOT NULL,
PRIMARY KEY(`blobId`)
);
ALTER TABLE notes ADD blobId TEXT DEFAULT NULL;
ALTER TABLE note_revisions ADD blobId TEXT DEFAULT NULL;
CREATE INDEX IF NOT EXISTS IDX_notes_blobId on notes (blobId);
CREATE INDEX IF NOT EXISTS IDX_note_revisions_blobId on note_revisions (blobId);
@@ -0,0 +1,62 @@
module.exports = () => {
const sql = require('../../src/services/sql');
const utils = require('../../src/services/utils');
const existingBlobIds = new Set();
for (const noteId of sql.getColumn(`SELECT noteId FROM note_contents`)) {
const row = sql.getRow(`SELECT noteId, content, dateModified, utcDateModified FROM note_contents WHERE noteId = ?`, [noteId]);
const blobId = utils.hashedBlobId(row.content);
if (!existingBlobIds.has(blobId)) {
existingBlobIds.add(blobId);
sql.insert('blobs', {
blobId,
content: row.content,
dateModified: row.dateModified,
utcDateModified: row.utcDateModified
});
sql.execute("UPDATE entity_changes SET entityName = 'blobs', entityId = ? WHERE entityName = 'note_contents' AND entityId = ?", [blobId, row.noteId]);
} else {
// duplicates
sql.execute("DELETE FROM entity_changes WHERE entityName = 'note_contents' AND entityId = ?", [row.noteId]);
}
sql.execute('UPDATE notes SET blobId = ? WHERE noteId = ?', [blobId, row.noteId]);
}
for (const noteRevisionId of sql.getColumn(`SELECT noteRevisionId FROM note_revision_contents`)) {
const row = sql.getRow(`SELECT noteRevisionId, content, utcDateModified FROM note_revision_contents WHERE noteRevisionId = ?`, [noteRevisionId]);
const blobId = utils.hashedBlobId(row.content);
if (!existingBlobIds.has(blobId)) {
existingBlobIds.add(blobId);
sql.insert('blobs', {
blobId,
content: row.content,
dateModified: row.utcDateModified,
utcDateModified: row.utcDateModified
});
sql.execute("UPDATE entity_changes SET entityName = 'blobs', entityId = ? WHERE entityName = 'note_revision_contents' AND entityId = ?", [blobId, row.noteRevisionId]);
} else {
// duplicates
sql.execute("DELETE FROM entity_changes WHERE entityName = 'note_revision_contents' AND entityId = ?", [row.noteId]);
}
sql.execute('UPDATE note_revisions SET blobId = ? WHERE noteRevisionId = ?', [blobId, row.noteRevisionId]);
}
const notesWithoutBlobIds = sql.getColumn("SELECT noteId FROM notes WHERE blobId IS NULL");
if (notesWithoutBlobIds.length > 0) {
throw new Error("BlobIds were not filled correctly in notes: " + JSON.stringify(notesWithoutBlobIds));
}
const noteRevisionsWithoutBlobIds = sql.getColumn("SELECT noteRevisionId FROM note_revisions WHERE blobId IS NULL");
if (noteRevisionsWithoutBlobIds.length > 0) {
throw new Error("BlobIds were not filled correctly in note revisions: " + JSON.stringify(noteRevisionsWithoutBlobIds));
}
};
@@ -0,0 +1,4 @@
DROP TABLE note_contents;
DROP TABLE note_revision_contents;
DELETE FROM entity_changes WHERE entityName IN ('note_contents', 'note_revision_contents');
@@ -0,0 +1,26 @@
CREATE TABLE IF NOT EXISTS "revisions" (`revisionId` TEXT NOT NULL PRIMARY KEY,
`noteId` TEXT NOT NULL,
type TEXT DEFAULT '' NOT NULL,
mime TEXT DEFAULT '' NOT NULL,
`title` TEXT NOT NULL,
`isProtected` INT NOT NULL DEFAULT 0,
blobId TEXT DEFAULT NULL,
`utcDateLastEdited` TEXT NOT NULL,
`utcDateCreated` TEXT NOT NULL,
`utcDateModified` TEXT NOT NULL,
`dateLastEdited` TEXT NOT NULL,
`dateCreated` TEXT NOT NULL);
INSERT INTO revisions (revisionId, noteId, type, mime, title, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, blobId)
SELECT noteRevisionId, noteId, type, mime, title, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, blobId FROM note_revisions;
DROP TABLE note_revisions;
CREATE INDEX `IDX_revisions_noteId` ON `revisions` (`noteId`);
CREATE INDEX `IDX_revisions_utcDateCreated` ON `revisions` (`utcDateCreated`);
CREATE INDEX `IDX_revisions_utcDateLastEdited` ON `revisions` (`utcDateLastEdited`);
CREATE INDEX `IDX_revisions_dateCreated` ON `revisions` (`dateCreated`);
CREATE INDEX `IDX_revisions_dateLastEdited` ON `revisions` (`dateLastEdited`);
CREATE INDEX IF NOT EXISTS IDX_revisions_blobId on revisions (blobId);
UPDATE entity_changes SET entityName = 'revisions' WHERE entityName = 'note_revisions';
+23
View File
@@ -0,0 +1,23 @@
CREATE TABLE IF NOT EXISTS "attachments"
(
attachmentId TEXT not null primary key,
ownerId TEXT not null,
role TEXT not null,
mime TEXT not null,
title TEXT not null,
isProtected INT not null DEFAULT 0,
position INT default 0 not null,
blobId TEXT DEFAULT null,
dateModified TEXT NOT NULL,
utcDateModified TEXT not null,
utcDateScheduledForErasureSince TEXT DEFAULT NULL,
isDeleted INT not null,
deleteId TEXT DEFAULT NULL);
CREATE INDEX IDX_attachments_ownerId_role
on attachments (ownerId, role);
CREATE INDEX IDX_attachments_utcDateScheduledForErasureSince
on attachments (utcDateScheduledForErasureSince);
CREATE INDEX IF NOT EXISTS IDX_attachments_blobId on attachments (blobId);
@@ -0,0 +1,27 @@
module.exports = () => {
const beccaLoader = require('../../src/becca/becca_loader');
const becca = require('../../src/becca/becca');
const cls = require('../../src/services/cls');
const log = require('../../src/services/log');
const sql = require('../../src/services/sql');
cls.init(() => {
// emergency disabling of image compression since it appears to make problems in migration to 0.61
sql.execute(`UPDATE options SET value = 'false' WHERE name = 'compressImages'`);
beccaLoader.load();
for (const note of Object.values(becca.notes)) {
try {
const attachment = note.convertToParentAttachment({ autoConversion: true });
if (attachment) {
log.info(`Auto-converted note '${note.noteId}' into attachment '${attachment.attachmentId}'.`);
}
}
catch (e) {
log.error(`Cannot convert note '${note.noteId}' to attachment: ${e.message} ${e.stack}`);
}
}
});
};
@@ -0,0 +1,2 @@
DELETE FROM options WHERE name = 'hideIncludedImages_main';
DELETE FROM entity_changes WHERE entityName = 'options' AND entityId = 'hideIncludedImages_main';
@@ -0,0 +1,2 @@
UPDATE options SET name = 'openNoteContexts' WHERE name = 'openTabs';
UPDATE entity_changes SET entityId = 'openNoteContexts' WHERE entityName = 'options' AND entityId = 'openTabs';
+1
View File
@@ -0,0 +1 @@
SELECT 1;
+14
View File
@@ -0,0 +1,14 @@
UPDATE blobs SET blobId = REPLACE(blobId, '+', 'X');
UPDATE blobs SET blobId = REPLACE(blobId, '/', 'Y');
UPDATE notes SET blobId = REPLACE(blobId, '+', 'X');
UPDATE notes SET blobId = REPLACE(blobId, '/', 'Y');
UPDATE attachments SET blobId = REPLACE(blobId, '+', 'X');
UPDATE attachments SET blobId = REPLACE(blobId, '/', 'Y');
UPDATE revisions SET blobId = REPLACE(blobId, '+', 'X');
UPDATE revisions SET blobId = REPLACE(blobId, '/', 'Y');
UPDATE entity_changes SET entityId = REPLACE(entityId, '+', 'X') WHERE entityName = 'blobs';
UPDATE entity_changes SET entityId = REPLACE(entityId, '/', 'Y') WHERE entityName = 'blobs';
@@ -0,0 +1,3 @@
CREATE INDEX IF NOT EXISTS IDX_notes_blobId on notes (blobId);
CREATE INDEX IF NOT EXISTS IDX_revisions_blobId on revisions (blobId);
CREATE INDEX IF NOT EXISTS IDX_attachments_blobId on attachments (blobId);

Some files were not shown because too many files have changed in this diff Show More