Skip to content

Commit

Permalink
Merge branch 'dev' into password-requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
Meierschlumpf committed Aug 18, 2024
2 parents 2cb9c68 + 3eb9096 commit 7cbb35d
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 62 deletions.
4 changes: 2 additions & 2 deletions apps/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@xterm/addon-canvas": "^0.7.0",
"@xterm/addon-fit": "0.10.0",
"@xterm/xterm": "^5.5.0",
"chroma-js": "^2.6.0",
"chroma-js": "^3.0.0",
"clsx": "^2.1.1",
"dayjs": "^1.11.12",
"dotenv": "^16.4.5",
Expand All @@ -74,7 +74,7 @@
"@homarr/prettier-config": "workspace:^0.1.0",
"@homarr/tsconfig": "workspace:^0.1.0",
"@types/chroma-js": "2.4.4",
"@types/node": "^20.14.15",
"@types/node": "^20.15.0",
"@types/prismjs": "^1.26.4",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import {
IconBox,
IconBoxAlignTop,
IconChevronDown,
IconPackageImport,
IconPencil,
IconPencilOff,
IconPlus,
Expand Down Expand Up @@ -95,7 +94,6 @@ const AddMenu = () => {
<Menu.Item leftSection={<IconBox size={20} />} onClick={handleSelectItem}>
{t("item.action.create")}
</Menu.Item>
<Menu.Item leftSection={<IconPackageImport size={20} />}>{t("item.action.import")}</Menu.Item>

<Menu.Divider />

Expand Down
2 changes: 1 addition & 1 deletion apps/tasks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@homarr/eslint-config": "workspace:^0.2.0",
"@homarr/prettier-config": "workspace:^0.1.0",
"@homarr/tsconfig": "workspace:^0.1.0",
"@types/node": "^20.14.15",
"@types/node": "^20.15.0",
"dotenv-cli": "^7.4.2",
"eslint": "^9.9.0",
"prettier": "^3.3.3",
Expand Down
Loading

0 comments on commit 7cbb35d

Please sign in to comment.