watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2025-12-06 01:18:00 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Mike Cao 2024-01-14 21:17:23 -08:00
commit 70a9ba4efb
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/intl/messages/en-US.json
View file

@ -1382,7 +1382,7 @@
"message.share-url": [
{
"type": 0,
"value": "Your website stats are publically available at the following URL:"
"value": "Your website stats are publicly available at the following URL:"
}
],
"message.team-already-member": [

2
src/components/messages.ts
View file

@ -227,7 +227,7 @@ export const messages = defineMessages({
},
shareUrl: {
id: 'message.share-url',
defaultMessage: 'Your website stats are publically available at the following URL:',
defaultMessage: 'Your website stats are publicly available at the following URL:',
},
trackingCode: {
id: 'message.tracking-code',

2
src/lang/en-US.json
View file

@ -207,7 +207,7 @@
"message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
"message.reset-website-warning": "All statistics for this website will be deleted, but your settings will remain intact.",
"message.saved": "Saved.",
"message.share-url": "Your website stats are publically available at the following URL:",
"message.share-url": "Your website stats are publicly available at the following URL:",
"message.team-already-member": "You are already a member of the team.",
"message.team-not-found": "Team not found.",
"message.team-websites-info": "Websites can be viewed by anyone on the team.",

4
src/queries/analytics/getWebsiteStats.ts
View file

@ -31,7 +31,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
from (
select
website_event.session_id,
${getDateQuery('website_event.created_at', 'day')},
${getDateQuery('website_event.created_at', 'hour')},
count(*) as "c",
min(website_event.created_at) as "min_time",
max(website_event.created_at) as "max_time"
@ -70,7 +70,7 @@ async function clickhouseQuery(
from (
select
session_id,
${getDateQuery('created_at', 'day')} time_series,
${getDateQuery('created_at', 'hour')} time_series,
count(*) c,
min(created_at) min_time,
max(created_at) max_time