m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-11-22 18:00:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats 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": [ "message.share-url": [
{ {
"type": 0, "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": [ "message.team-already-member": [

2
src/components/messages.ts
View File

@ -227,7 +227,7 @@ export const messages = defineMessages({
}, },
shareUrl: { shareUrl: {
id: 'message.share-url', 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: { trackingCode: {
id: 'message.tracking-code', 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": "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.reset-website-warning": "All statistics for this website will be deleted, but your settings will remain intact.",
"message.saved": "Saved.", "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-already-member": "You are already a member of the team.",
"message.team-not-found": "Team not found.", "message.team-not-found": "Team not found.",
"message.team-websites-info": "Websites can be viewed by anyone on the team.", "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 ( from (
select select
website_event.session_id, website_event.session_id,
${getDateQuery('website_event.created_at', 'day')}, ${getDateQuery('website_event.created_at', 'hour')},
count(*) as "c", count(*) as "c",
min(website_event.created_at) as "min_time", min(website_event.created_at) as "min_time",
max(website_event.created_at) as "max_time" max(website_event.created_at) as "max_time"
@ -70,7 +70,7 @@ async function clickhouseQuery(
from ( from (
select select
session_id, session_id,
${getDateQuery('created_at', 'day')} time_series, ${getDateQuery('created_at', 'hour')} time_series,
count(*) c, count(*) c,
min(created_at) min_time, min(created_at) min_time,
max(created_at) max_time max(created_at) max_time