Skip to content

Commit

Permalink
Merge pull request #3109 from umami-software/analytics
Browse files Browse the repository at this point in the history
v2.15.0
  • Loading branch information
mikecao authored Dec 13, 2024
2 parents dda53ab + 690ab59 commit 35068d3
Show file tree
Hide file tree
Showing 69 changed files with 1,280 additions and 951 deletions.
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ services:
depends_on:
db:
condition: service_healthy
init: true
restart: always
healthcheck:
test: ["CMD-SHELL", "curl http://localhost:3000/api/heartbeat"]
Expand Down
18 changes: 10 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "umami",
"version": "2.14.0",
"version": "2.15.0",
"description": "A simple, fast, privacy-focused alternative to Google Analytics.",
"author": "Umami Software, Inc. <hello@umami.is>",
"license": "MIT",
Expand Down Expand Up @@ -63,18 +63,21 @@
"cacheDirectories": [
".next/cache"
],
"resolutions": {
"jackspeak": "2.1.1"
},
"dependencies": {
"@clickhouse/client": "^1.4.1",
"@date-fns/utc": "^1.2.0",
"@dicebear/collection": "^9.2.1",
"@dicebear/core": "^9.2.1",
"@fontsource/inter": "^4.5.15",
"@prisma/client": "5.17",
"@prisma/client": "5.22.0",
"@prisma/extension-read-replicas": "^0.3.0",
"@react-spring/web": "^9.7.3",
"@tanstack/react-query": "^5.28.6",
"@umami/prisma-client": "^0.14.0",
"@umami/redis-client": "^0.21.0",
"@umami/redis-client": "^0.24.0",
"chalk": "^4.1.1",
"chart.js": "^4.4.2",
"chartjs-adapter-date-fns": "^3.0.0",
Expand All @@ -99,16 +102,15 @@
"kafkajs": "^2.1.0",
"maxmind": "^4.3.6",
"md5": "^2.3.0",
"moment-timezone": "^0.5.35",
"next": "14.2.10",
"next": "15.0.4",
"next-basics": "^0.39.0",
"node-fetch": "^3.2.8",
"npm-run-all": "^4.1.5",
"prisma": "5.17",
"react": "^18.2.0",
"prisma": "5.22.0",
"react": "^19.0.0",
"react-basics": "^0.125.0",
"react-beautiful-dnd": "^13.1.0",
"react-dom": "^18.2.0",
"react-dom": "^19.0.0",
"react-error-boundary": "^4.0.4",
"react-intl": "^6.5.5",
"react-simple-maps": "^2.3.0",
Expand Down
2 changes: 1 addition & 1 deletion public/intl/messages/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -1450,7 +1450,7 @@
"label.visits": [
{
"type": 0,
"value": "訪問者数"
"value": "訪問数"
}
],
"label.website": [
Expand Down
Loading

0 comments on commit 35068d3

Please sign in to comment.