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

Merge remote-tracking branch 'origin/main' into react/settings

Browse Source 
; Conflicts:
;	apps/client/package.json
;	apps/client/src/translations/en/translation.json
;	apps/client/src/translations/tw/translation.json
;	pnpm-lock.yaml
This commit is contained in:
Elian Doran
2025-08-19 13:50:27 +03:00
parent 3e17ff5e7b c5ec928aac
commit cddf9f0242
53 changed files with 2330 additions and 972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/ckeditor5-admonition/package.json
View File

@@ -35,7 +35,7 @@
"@ckeditor/ckeditor5-dev-build-tools": "43.1.0",
"@ckeditor/ckeditor5-inspector": ">=4.1.0",
"@ckeditor/ckeditor5-package-tools": "^4.0.0",
"@typescript-eslint/eslint-plugin": "~8.39.0",
"@typescript-eslint/eslint-plugin": "~8.40.0",
"@typescript-eslint/parser": "^8.0.0",
"@vitest/browser": "^3.0.5",
"@vitest/coverage-istanbul": "^3.0.5",

2
packages/ckeditor5-footnotes/package.json
View File

@@ -36,7 +36,7 @@
"@ckeditor/ckeditor5-dev-build-tools": "43.1.0",
"@ckeditor/ckeditor5-inspector": ">=4.1.0",
"@ckeditor/ckeditor5-package-tools": "^4.0.0",
"@typescript-eslint/eslint-plugin": "~8.39.0",
"@typescript-eslint/eslint-plugin": "~8.40.0",
"@typescript-eslint/parser": "^8.0.0",
"@vitest/browser": "^3.0.5",
"@vitest/coverage-istanbul": "^3.0.5",

2
packages/ckeditor5-keyboard-marker/package.json
View File

@@ -38,7 +38,7 @@
"@ckeditor/ckeditor5-dev-build-tools": "43.1.0",
"@ckeditor/ckeditor5-inspector": ">=4.1.0",
"@ckeditor/ckeditor5-package-tools": "^4.0.0",
"@typescript-eslint/eslint-plugin": "~8.39.0",
"@typescript-eslint/eslint-plugin": "~8.40.0",
"@typescript-eslint/parser": "^8.0.0",
"@vitest/browser": "^3.0.5",
"@vitest/coverage-istanbul": "^3.0.5",

2
packages/ckeditor5-math/package.json
View File

@@ -39,7 +39,7 @@
"@ckeditor/ckeditor5-dev-utils": "43.1.0",
"@ckeditor/ckeditor5-inspector": ">=4.1.0",
"@ckeditor/ckeditor5-package-tools": "^4.0.0",
"@typescript-eslint/eslint-plugin": "~8.39.0",
"@typescript-eslint/eslint-plugin": "~8.40.0",
"@typescript-eslint/parser": "^8.0.0",
"@vitest/browser": "^3.0.5",
"@vitest/coverage-istanbul": "^3.0.5",

2
packages/ckeditor5-mermaid/package.json
View File

@@ -38,7 +38,7 @@
"@ckeditor/ckeditor5-dev-build-tools": "43.1.0",
"@ckeditor/ckeditor5-inspector": ">=4.1.0",
"@ckeditor/ckeditor5-package-tools": "^4.0.0",
"@typescript-eslint/eslint-plugin": "~8.39.0",
"@typescript-eslint/eslint-plugin": "~8.40.0",
"@typescript-eslint/parser": "^8.0.0",
"@vitest/browser": "^3.0.5",
"@vitest/coverage-istanbul": "^3.0.5",

2
packages/commons/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@triliumnext/commons",
"version": "0.97.2",
"version": "0.98.0",
"description": "Shared library between the clients (e.g. browser, Electron) and the server, mostly for type definitions and utility methods.",
"private": true,
"type": "module",

2
packages/turndown-plugin-gfm/package.json
View File

@@ -57,7 +57,7 @@
}
},
"devDependencies": {
"turndown": "7.2.0",
"turndown": "7.2.1",
"turndown-attendant": "0.0.3"
}
}