Skip to content

Commit

Permalink
Merge branch 'develop' into feat/vshn-credits
Browse files Browse the repository at this point in the history
  • Loading branch information
nimdanitro authored Jan 7, 2025
2 parents 3cc17c7 + e63c622 commit 698fd5c
Show file tree
Hide file tree
Showing 3 changed files with 112 additions and 103 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
## [unreleased]

### ⚙️ Other

- *(deps)* Bump uuid from 11.0.3 to 11.0.4 in /ui ([#618](https://github.com/f-eld-ch/sitrep/issues/618)) - ([f957449](https://github.com/f-eld-ch/sitrep/commit/f957449d94a90608d7aedb1f1cc9d014b906fdab))
- *(deps)* Bump react-markdown from 9.0.1 to 9.0.3 in /ui ([#619](https://github.com/f-eld-ch/sitrep/issues/619)) - ([c817101](https://github.com/f-eld-ch/sitrep/commit/c8171015620cb4b69d7f3b840ac3055fe0483c06))
- *(deps)* Bump i18next from 24.2.0 to 24.2.1 in /ui ([#620](https://github.com/f-eld-ch/sitrep/issues/620)) - ([7dde835](https://github.com/f-eld-ch/sitrep/commit/7dde835b7ee3b94ab41b50c610ff2235e8c55cf0))


## [25.1.0](https://github.com/f-eld-ch/sitrep/compare/v24.12.1..v25.1.0) - 2025-01-06

### ⛰️ Features
Expand Down
18 changes: 9 additions & 9 deletions ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"graphql": "^16.10.0",
"hat": "^0.0.3",
"html-react-parser": "^5.2.2",
"i18next": "^24.2.0",
"i18next": "^24.2.1",
"i18next-browser-languagedetector": "^8.0.2",
"lodash": "^4.17.21",
"mapbox-gl-style-switcher": "^1.0.11",
Expand All @@ -37,10 +37,10 @@
"react-dom": "^18.3.1",
"react-i18next": "^15.4.0",
"react-map-gl": "~7.1.8",
"react-markdown": "^9.0.1",
"react-markdown": "^9.0.3",
"react-router": "^7.1.1",
"usehooks-ts": "^3.1.0",
"uuid": "^11.0.3",
"uuid": "^11.0.4",
"web-vitals": "^4.2.4"
},
"scripts": {
Expand Down Expand Up @@ -81,15 +81,15 @@
"@types/jest": "^29.5.14",
"@types/lodash": "^4.17.14",
"@types/mapbox__mapbox-gl-draw": "~1.4.6",
"@types/node": "^20.17.11",
"@types/node": "^20.17.12",
"@types/react": "^18.3.18",
"@types/react-color": "^3.0.13",
"@types/react-dom": "^18.3.5",
"@types/semver": "^7.5.8",
"@types/uuid": "^10.0.0",
"@typescript-eslint/eslint-plugin": "^8.19.0",
"@typescript-eslint/parser": "^8.19.0",
"@typescript-eslint/typescript-estree": "^8.19.0",
"@typescript-eslint/eslint-plugin": "^8.19.1",
"@typescript-eslint/parser": "^8.19.1",
"@typescript-eslint/typescript-estree": "^8.19.1",
"@vite-pwa/assets-generator": "^0.2.6",
"@vitejs/plugin-react-swc": "^3.7.2",
"@vitest/coverage-v8": "^2.1.8",
Expand All @@ -103,13 +103,13 @@
"jsdom": "^25.0.1",
"lint-staged": "^15.3.0",
"prettier": "^3.4.2",
"rollup-plugin-visualizer": "^5.13.1",
"rollup-plugin-visualizer": "^5.14.0",
"sass": "^1.83.1",
"semver": "^7.6.3",
"source-map-explorer": "^2.5.3",
"ts-jest": "^29.2.5",
"typescript": "^5.7.2",
"typescript-eslint": "^8.19.0",
"typescript-eslint": "^8.19.1",
"vite": "^6.0.7",
"vite-plugin-checker": "^0.8.0",
"vite-plugin-eslint": "^1.8.1",
Expand Down
Loading

0 comments on commit 698fd5c

Please sign in to comment.