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 7
4975 commits 10 branches 106 tags 48 MiB
Commit graph

4975 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mike Cao
94b4b66a3d Merge branch 'dev' into jajaja 
# Conflicts:
#	package.json
#	pnpm-lock.yaml
 2025-05-09 21:56:07 -07:00
Mike Cao
b93bcecd7b Fixed data migration script. 2025-05-09 21:47:44 -07:00
Mike Cao
75d4614a9d Ignore generated folder used by Prisma. 2025-05-09 20:11:06 -07:00
Mike Cao
97381f300a Fixed wrong Prisma version in Docker. 2025-05-09 17:16:24 -07:00
Mike Cao
3f1ecf4c1b Fixed identify. Closes #3409 2025-05-09 16:54:49 -07:00
Mike Cao
d3977eef7d
Merge pull request #3406 from tsykin/master 
fix: Incorrect Channel Metrics caused by missing ReferrerQuery data
 2025-05-09 17:27:51 -05:00
Mike Cao
3e01c7732b
Merge pull request #3405 from Maxime-J/fix-docker-manifest 
Fix customized docker image issue
 2025-05-09 16:46:08 -05:00
Maxime-J
ed8cac4a3b Consider base path in set-routes-manifest 2025-05-09 14:48:45 +02:00
tsykin
c23f08fd23 changed sql query for channels metrics due to missing referrer_query data 2025-05-09 14:37:27 +02:00
Francis Cao
edbe52611e fix session activity order 2025-05-08 10:31:25 -07:00
Francis Cao
d2a3ed732a fix realtime activity ordering 2025-05-08 10:04:21 -07:00
Francis Cao
98eb26fd9e fixed getAttribution table alias typo 2025-05-08 09:15:27 -07:00
Francis Cao
3b24ea3175 remove split code 2025-05-08 09:06:27 -07:00
Francis Cao
cd532fd53d fix minute x-axis date labels 2025-05-08 09:05:44 -07:00
Mike Cao
1552a3f2f1 Merge branch 'dev' 2025-05-08 00:13:59 -07:00
Mike Cao
4d54f50739 PR fixes. 2025-05-08 00:12:44 -07:00
Mike Cao
f5a8be5add Fixed README. 2025-05-07 23:30:09 -07:00
Mike Cao
f7593718dc
Merge pull request #3392 from umami-software/dev 
v2.18.0
 2025-05-07 19:10:40 -05:00
Mike Cao
64505bb417 Added before-send attribute to tracker. 2025-05-07 16:16:38 -07:00
Mike Cao
1a794a8520 Updated language build. 2025-05-07 13:40:21 -07:00
Mike Cao
3004c37ccf Updated settings components. 2025-05-07 12:33:53 -07:00
Mike Cao
a15c7cd596 Updated tables. Added MenuButton. 2025-05-07 04:10:27 -07:00
Mike Cao
519395c033
Merge pull request #3386 from gjelbrim/fix/display-kosovo-correctly 
Fix: Display Kosovo Correctly
 2025-05-07 00:08:34 -05:00
Mike Cao
3e9a7ee9ad
Merge pull request #3381 from YektaDev/script-simplification 
Script Simplification
 2025-05-05 19:19:26 -05:00
Mike Cao
9101f8a478
Merge branch 'dev' into script-simplification 2025-05-05 18:59:11 -05:00
Mike Cao
92b283486e Updated menus, chart tooltips, styles. 2025-05-05 01:36:16 -07:00
Ali Khaleqi Yekta
9b9cf32ee7
Script simplification: Final minor cleanups 2025-05-04 12:24:23 +03:30
Ali Khaleqi Yekta
5369144b64
Script simplification: Less nesting 2025-05-04 12:18:49 +03:30
Ali Khaleqi Yekta
b26fc15fa0
Script simplification: Greatly clarify element tracking logic 2025-05-04 12:17:08 +03:30
Ali Khaleqi Yekta
671dcfceb5
Script simplification: Use Element.closest + less nesting 2025-05-04 12:13:15 +03:30
Ali Khaleqi Yekta
e12e5b0d2e
Script simplification: In-place headers + re-order 2025-05-04 12:12:23 +03:30
Gjelbrim Haskaj
5974a3672d
Merge branch 'dev' into fix/display-kosovo-correctly 2025-05-04 02:26:05 +02:00
Gjelbrim Haskaj
f4781169cc
Update public/intl/country/sv-SE.json 
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
 2025-05-04 02:25:50 +02:00
Gjelbrim Haskaj
946a71fd87
Update public/intl/country/nb-NO.json 
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
 2025-05-04 02:25:43 +02:00
Gjelbrim Haskaj
03ba2819cb
Update public/intl/country/de-DE.json 
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
 2025-05-04 02:25:33 +02:00
Gjelbrim Haskaj
6595978522
Update country JSONs file to include Kosovo (XK) 2025-05-04 01:35:37 +02:00
Gjelbrim Haskaj
a6f4270303
Updated Kosovo ID in datamaps.world.json from "-99" to "XKX" 2025-05-04 01:34:55 +02:00
Mike Cao
0a16ab38e4 Reworked settings screens. 2025-05-03 00:31:37 -07:00
Mike Cao
c1d301ffdc Fixed realtime page. 2025-05-02 15:20:20 -07:00
Mike Cao
65ebd736b9 Merged compare logic. Removed compare page. 2025-05-02 12:32:23 -07:00
Ali Khaleqi Yekta
1f36726f73
Minor enhancements and clarifications 2025-05-01 18:34:18 +03:30
Ali Khaleqi Yekta
130c024c3e
Simplify title: No need to observe 2025-05-01 17:33:46 +03:30
Mike Cao
f69f793b87 Fixed script. 2025-05-01 04:39:52 -07:00
Mike Cao
6594c31a70 Use esbuild to build prisma client. 2025-05-01 04:38:43 -07:00
Mike Cao
63e0873b5d Use generated prisma client. 2025-05-01 04:24:56 -07:00
Mike Cao
c0ccffeab4 Merge branch 'dev' into jajaja 
# Conflicts:
#	pnpm-lock.yaml
#	postcss.config.js
#	src/app/(main)/websites/[websiteId]/sessions/SessionsDataTable.tsx
#	src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx
 2025-05-01 03:31:51 -07:00
Mike Cao
63a0460ab7 Updated packages. Next 15.3.1. Prisma 6.7.0. 2025-05-01 00:35:10 -07:00
Mike Cao
211e1826da Fixed import again. 2025-04-30 21:36:31 -07:00
Mike Cao
8ccaeb96b6 Fixed import. 2025-04-30 21:31:00 -07:00
Mike Cao
a97752545d Merge remote-tracking branch 'origin/dev' into dev 2025-04-30 21:28:11 -07:00