Compare commits

...

6 commits

Author SHA1 Message Date
Francis Cao
220c2af344 fix revenue type
Some checks are pending
Create docker images (cloud) / Build, push, and deploy (push) Waiting to run
Node.js CI / build (postgresql, 18.18, 10) (push) Waiting to run
2025-12-05 09:18:53 -08:00
Mike Cao
7c804b10ea
Merge pull request #3834 from umami-software/dependabot/npm_and_yarn/jws-3.2.3
Some checks are pending
Node.js CI / build (postgresql, 18.18, 10) (push) Waiting to run
Bump jws from 3.2.2 to 3.2.3
2025-12-04 17:50:55 -08:00
dependabot[bot]
aaa8b5b6c9
Bump jws from 3.2.2 to 3.2.3
Bumps [jws](https://github.com/brianloveswords/node-jws) from 3.2.2 to 3.2.3.
- [Release notes](https://github.com/brianloveswords/node-jws/releases)
- [Changelog](https://github.com/auth0/node-jws/blob/master/CHANGELOG.md)
- [Commits](https://github.com/brianloveswords/node-jws/compare/v3.2.2...v3.2.3)

---
updated-dependencies:
- dependency-name: jws
  dependency-version: 3.2.3
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-12-04 17:37:01 +00:00
Mike Cao
81e27fc18c
Fix formatting for Docker compose instructions
Some checks failed
Node.js CI / build (postgresql, 18.18, 10) (push) Has been cancelled
2025-12-04 00:37:13 -08:00
Mike Cao
2b771ff2b4
Merge pull request #3832 from umami-software/dev
v3.0.2
2025-12-03 23:54:31 -08:00
Mike Cao
7e42b5b35e
Merge pull request #3827 from umami-software/dependabot/npm_and_yarn/next-15.5.7
Some checks are pending
Node.js CI / build (postgresql, 18.18, 10) (push) Waiting to run
Bump next from 15.5.3 to 15.5.7
2025-12-03 21:27:43 -08:00
3 changed files with 2 additions and 4 deletions

View file

@ -80,7 +80,7 @@ Docker image:
docker pull docker.umami.is/umami-software/umami:latest
```
Docker compose to run Umami with a Postgres database, run:
Docker compose (Runs Umami with a PostgreSQL database):
```bash
docker compose up -d

2
pnpm-lock.yaml generated
View file

@ -331,8 +331,6 @@ importers:
specifier: ^5.9.3
version: 5.9.3
dist: {}
packages:
'@ampproject/remapping@2.3.0':

View file

@ -205,7 +205,7 @@ async function clickhouseQuery(
${cohortQuery}
where website_revenue.website_id = {websiteId:UUID}
and website_revenue.created_at between {startDate:DateTime64} and {endDate:DateTime64}
aand upper(website_revenue.currency) = {currency:String}
and upper(website_revenue.currency) = {currency:String}
${filterQuery}
`,
queryParams,