merge: integrate dev branch, resolve package.json and lockfile conflicts
Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com>
This commit is contained in:
1 parent
1e438ec3c3
commit
6cbf72462a
117 files changed
+4495
-1648
No files matched your search
@@ -48,26 +48,26 @@
|
||||
"@homarr/translation": "workspace:^0.1.0",
|
||||
"@homarr/ui": "workspace:^0.1.0",
|
||||
"@homarr/validation": "workspace:^0.1.0",
|
||||
"@mantine/charts": "^8.3.15",
|
||||
"@mantine/core": "^8.3.15",
|
||||
"@mantine/hooks": "^8.3.15",
|
||||
"@tabler/icons-react": "^3.37.1",
|
||||
"@tiptap/extension-color": "3.20.0",
|
||||
"@tiptap/extension-highlight": "3.20.0",
|
||||
"@tiptap/extension-image": "3.20.0",
|
||||
"@tiptap/extension-link": "^3.20.0",
|
||||
"@tiptap/extension-placeholder": "^3.20.0",
|
||||
"@tiptap/extension-table": "3.20.0",
|
||||
"@tiptap/extension-table-cell": "3.20.0",
|
||||
"@tiptap/extension-table-header": "3.20.0",
|
||||
"@tiptap/extension-table-row": "3.20.0",
|
||||
"@tiptap/extension-task-item": "3.20.0",
|
||||
"@tiptap/extension-task-list": "3.20.0",
|
||||
"@tiptap/extension-text-align": "3.20.0",
|
||||
"@tiptap/extension-text-style": "3.20.0",
|
||||
"@tiptap/extension-underline": "3.20.0",
|
||||
"@tiptap/react": "^3.20.0",
|
||||
"@tiptap/starter-kit": "^3.20.0",
|
||||
"@mantine/charts": "^8.3.16",
|
||||
"@mantine/core": "^8.3.16",
|
||||
"@mantine/hooks": "^8.3.16",
|
||||
"@tabler/icons-react": "^3.40.0",
|
||||
"@tiptap/extension-color": "3.20.1",
|
||||
"@tiptap/extension-highlight": "3.20.1",
|
||||
"@tiptap/extension-image": "3.20.1",
|
||||
"@tiptap/extension-link": "^3.20.1",
|
||||
"@tiptap/extension-placeholder": "^3.20.1",
|
||||
"@tiptap/extension-table": "3.20.1",
|
||||
"@tiptap/extension-table-cell": "3.20.1",
|
||||
"@tiptap/extension-table-header": "3.20.1",
|
||||
"@tiptap/extension-table-row": "3.20.1",
|
||||
"@tiptap/extension-task-item": "3.20.1",
|
||||
"@tiptap/extension-task-list": "3.20.1",
|
||||
"@tiptap/extension-text-align": "3.20.1",
|
||||
"@tiptap/extension-text-style": "3.20.1",
|
||||
"@tiptap/extension-underline": "3.20.1",
|
||||
"@tiptap/react": "^3.20.1",
|
||||
"@tiptap/starter-kit": "^3.20.1",
|
||||
"clsx": "^2.1.1",
|
||||
"dayjs": "^1.11.19",
|
||||
"mantine-form-zod-resolver": "^1.3.0",
|
||||
@@ -85,7 +85,7 @@
|
||||
"@homarr/prettier-config": "workspace:^0.1.0",
|
||||
"@homarr/tsconfig": "workspace:^0.1.0",
|
||||
"@types/video.js": "^7.3.58",
|
||||
"eslint": "^9.39.3",
|
||||
"eslint": "^9.39.4",
|
||||
"typescript": "^5.9.3"
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user