Skip to content

Merge main into dev after 1.5.1 release #592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 26, 2025
Merged

Merge main into dev after 1.5.1 release #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48006bd
Release/1.5.1 (#589)
j-chmielewski Sep 24, 2025
017204f
Merge branch 'main' into main-1.5.1-merger
j-chmielewski Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nix/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
makeDesktopItem,
}: let
pname = "defguard-client";
version = "1.5.0"; # TODO: Get this from Cargo.toml or git
version = "1.5.1"; # TODO: Get this from Cargo.toml or git

desktopItem = makeDesktopItem {
name = pname;
Expand Down
22 changes: 11 additions & 11 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "defguard-client",
"private": false,
"version": "1.5.0",
"version": "1.5.1",
"type": "module",
"scripts": {
"dev": "npm-run-all --parallel vite typesafe-i18n",
Expand Down Expand Up @@ -52,7 +52,7 @@
"@react-hook/resize-observer": "^2.0.2",
"@stablelib/base64": "^2.0.1",
"@stablelib/x25519": "^2.0.1",
"@tanstack/query-core": "^5.87.4",
"@tanstack/query-core": "^5.90.2",
"@tanstack/react-virtual": "3.13.12",
"@tauri-apps/api": "^2.8.0",
"@tauri-apps/plugin-clipboard-manager": "^2.3.0",
Expand Down Expand Up @@ -83,22 +83,22 @@
"lodash-es": "^4.17.21",
"merge-refs": "^2.0.0",
"millify": "^6.1.0",
"motion": "^12.23.12",
"motion": "^12.23.21",
"p-timeout": "^6.1.4",
"prop-types": "^15.8.1",
"radash": "^12.1.1",
"react": "^19.1.1",
"react-auth-code-input": "^3.2.1",
"react-click-away-listener": "^2.4.0",
"react-dom": "^19.1.1",
"react-hook-form": "^7.62.0",
"react-hook-form": "^7.63.0",
"react-loading-skeleton": "^3.5.0",
"react-markdown": "^10.1.0",
"react-qr-code": "^2.0.18",
"react-router-dom": "^6.30.1",
"react-use-websocket": "^4.13.0",
"react-virtualized-auto-sizer": "^1.0.26",
"recharts": "^3.2.0",
"recharts": "^3.2.1",
"rehype-sanitize": "^6.0.0",
"rxjs": "^7.8.2",
"use-breakpoint": "^4.0.6",
Expand All @@ -109,16 +109,16 @@
"@biomejs/biome": "^2.2.4",
"@hookform/devtools": "^4.4.0",
"@svgr/cli": "^8.1.0",
"@tanstack/react-query": "^5.87.4",
"@tanstack/react-query-devtools": "^5.87.4",
"@tanstack/react-query": "^5.90.2",
"@tanstack/react-query-devtools": "^5.90.2",
"@tauri-apps/cli": "^2.8.4",
"@types/file-saver": "^2.0.7",
"@types/lodash-es": "^4.17.12",
"@types/node": "^24.4.0",
"@types/node": "^24.5.2",
"@types/react": "^19.1.13",
"@types/react-dom": "^19.1.9",
"@vitejs/plugin-react": "^5.0.2",
"@vitejs/plugin-react-swc": "^4.0.1",
"@vitejs/plugin-react": "^5.0.3",
"@vitejs/plugin-react-swc": "^4.1.0",
"autoprefixer": "^10.4.21",
"npm-run-all": "^4.1.5",
"postcss": "^8.5.6",
Expand All @@ -127,7 +127,7 @@
"typedoc": "^0.28.13",
"typesafe-i18n": "^5.26.2",
"typescript": "^5.9.2",
"vite": "^7.1.5"
"vite": "^7.1.7"
},
"volta": {
"node": "20.5.1"
Expand Down
Loading