zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-09-20 15:45:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
6102 commits 38 branches 306 tags 138 MiB
Commit graph

6102 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zadam f50a9c250a many small issues found by intellij analysis 2023-01-15 21:04:17 +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 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 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 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 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