lly/umami
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
4,930 Commits 1 Branch 0 Tags
c0ccffeab43bfd1f62cf2893e2aa3da1ec532475
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mike Cao e89cf9e930 Removed generated prisma. 2025-04-30 21:28:02 -07:00
Mike Cao 665a60dbc2 Updated session details. 2025-04-30 20:18:36 -07:00
Mike Cao 039dcd96e6 Theme change. Render custom date ranges. 2025-04-30 19:54:24 -07:00
Mike Cao 4e37e10b6d Switched to type: module. 2025-04-29 14:36:52 -07:00
Mike Cao 615a6d444f Updated script requires. 2025-04-29 14:16:20 -07:00
Mike Cao ec7d5bdfe2 Fixed build. 2025-04-29 14:04:55 -07:00
Mike Cao 13755417b1 Fixed build. 2025-04-29 13:53:14 -07:00
Mike Cao 848f8d3ecf Fixed build. Updated packages. 2025-04-29 13:42:36 -07:00
Mike Cao b3e1aef4ef Added workspace file. 2025-04-29 10:41:12 -07:00
Mike Cao 510503045b Prisma stuff. 2025-04-29 10:39:48 -07:00
Mike Cao 73b45a9f5e Replaced __dirname usage. 2025-04-29 09:53:11 -07:00
Mike Cao b5efbbbb2e Missing package. 2025-04-28 23:41:42 -07:00
Mike Cao 6a29f2ef6f Prisma generation. 2025-04-28 23:37:45 -07:00
Mike Cao c969603001 Converted global to globalThis. 2025-04-28 23:05:18 -07:00
Mike Cao 886b7e9e56 Revert check-db. 2025-04-28 21:27:26 -07:00
Mike Cao 21367e166e Updated check-db. 2025-04-28 21:21:04 -07:00
Mike Cao 6f551d5e0d Removed prisma config. 2025-04-28 21:04:25 -07:00
Mike Cao fc6aa80176 Updated prisma config. 2025-04-28 20:59:06 -07:00
Mike Cao d667fd5fbe Removed workspace file. 2025-04-28 20:45:09 -07:00
Mike Cao 335f775d66 Updated packages. 2025-04-28 20:42:22 -07:00
Mike Cao be1b2fc272 Merge dev. 2025-04-28 20:09:58 -07:00
Mike Cao 5aaff55a70 Use custom path for generated Prisma client. 2025-04-28 16:51:24 -07:00
Mike Cao 5cbf5a567c Upgrade Prisma v6.6.0. 2025-04-26 21:25:55 -07:00
Mike Cao be3972bfb6 Removed yarn references. 2025-04-26 11:11:22 -07:00
Mike Cao d44be466d8 Changed session id generation. 2025-04-25 21:48:59 -07:00
Mike Cao d4b786380b Events filtering. Closes #3356 2025-04-25 18:06:41 -07:00
Mike Cao b8a582c8da Fixed events search. Closes #3329 2025-04-25 14:18:23 -07:00
Mike Cao 84f7032f8e Merge remote-tracking branch 'origin/dev' into dev 2025-04-25 13:59:50 -07:00
Mike Cao 02f0df3a2e Allow custom favicon URL. Closes #3365 2025-04-25 13:59:23 -07:00
Mike Cao ffa8d8dd88 Merge remote-tracking branch 'origin/dev' into dev 2025-04-25 03:20:00 -07:00
Mike Cao e8a933f80e Updated id logic. 2025-04-25 03:19:37 -07:00
Mike Cao 340cdce1dc Dockerfile tweaks. 2025-04-24 19:23:10 -07:00
Mike Cao 48f5465334 Removed version endpoint. 2025-04-23 16:40:14 -07:00
Mike Cao 5be38adf7a Switched to pnpm from yarn. 2025-04-23 16:38:52 -07:00
Mike Cao 466316fb31 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2025-04-22 23:20:24 -07:00
Mike Cao c0ff7a31a4 Updated lang. 2025-04-22 23:09:17 -07:00
Mike Cao 48b6dfe72f Fixed realtime activity sort. Closes #3330 2025-04-22 23:01:37 -07:00
Mike Cao afad255e5b t Merge branch 'dev' of https://github.com/umami-software/umami into dev 2025-04-22 22:20:26 -07:00
Mike Cao b6ba1d4ca8 Fixed auth verify method. Closes #3339 2025-04-21 22:25:40 -07:00
Mike Cao 8d3aad8454 Fixed formatRegion method. Closes #3344 2025-04-21 22:07:38 -07:00
Mike Cao 337a5b6e33 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2025-04-21 21:42:48 -07:00
Mike Cao 52e1440089 Custom date range select. 2025-04-19 10:09:59 -07:00
Mike Cao afb8fd3894 Updated Next. 2025-04-16 21:29:47 -07:00
Mike Cao e79f4717e7 Updated filter params logic. Added inline compare dates. 2025-04-15 15:32:25 -07:00
Mike Cao b192d90aaf Added missing files. 2025-04-14 14:49:33 -07:00
Mike Cao 2c4c99f069 Updated report icon. Removed failing test. 2025-04-14 14:43:16 -07:00
Mike Cao bfdd3f9525 New filter bar and filter edit form. 2025-04-09 21:15:12 -07:00
Mike Cao 47e89afcb4 Updated packages. 2025-04-06 15:42:45 -07:00
Mike Cao 7d2c361725 Fixed field parameters. 2025-03-27 15:33:24 -07:00
Mike Cao 0f6cdf8b80 Updated reports components. 2025-03-26 21:54:23 -07:00
Mike Cao f5bc3dc6c2 Panels redesign. 2025-03-25 14:47:51 -07:00
Mike Cao 7886c3f393 Renamed query hooks. Fixed conversion bugs. 2025-03-22 03:48:18 -07:00
Mike Cao adca3c36d0 Moved collapse button. 2025-03-22 01:31:51 -07:00
Mike Cao 5d2c1e27c2 Added Panel component. New color scheme. 2025-03-20 23:12:56 -07:00
Mike Cao a7dad20d8a Merge branch 'dev' into jajaja 
# Conflicts:
#	package.json
#	pnpm-lock.yaml
 2025-03-20 01:00:33 -07:00
Mike Cao a3fb27a0db Fixed error messages. 2025-03-19 23:52:44 -07:00
Mike Cao f5c4e1b46e Layout changes. 2025-03-19 19:50:45 -07:00
Mike Cao efd4f4ca00 Small fixes. 2025-03-15 20:34:42 -07:00
Mike Cao 5536e0b7e7 Scrollable content area. 2025-03-13 19:49:04 -07:00
Mike Cao a9ba2504d7 Use FloatingTooltip from zen. 2025-03-13 17:52:45 -07:00
Mike Cao e7163c4e7e Updated channel logic. 2025-03-13 13:38:08 -07:00
Mike Cao 556cc1b205 Updated channel logic. 2025-03-13 13:36:54 -07:00
Mike Cao b5078e3fcc Package updates. 2025-03-13 10:34:14 -07:00
Mike Cao b331da193f Merge branch 'dev' into jajaja 2025-03-08 07:25:40 -08:00
Mike Cao abde966647 Fixed wrong country lookup. 2025-03-07 21:41:02 -08:00
Mike Cao 97c687ff05 Fixed group referrers count. Closes #3257 2025-03-07 20:29:31 -08:00
Mike Cao 833de1a1af Added decoding to URL elements. 2025-03-07 18:42:15 -08:00
Mike Cao 1b21f264b0 Added more paid ad params. Closes #3270 2025-03-07 13:37:19 -08:00
Mike Cao b4be6cb221 More conversions. 2025-03-07 12:21:20 -08:00
Mike Cao 5999bf6256 Zen components conversion. 2025-03-07 03:11:58 -08:00
Mike Cao aac1a12e51 Fixed exports. 2025-03-03 19:25:39 -08:00
Mike Cao 5682b4d217 Build svg into components. 2025-03-03 18:37:49 -08:00
Mike Cao fdc73268b7 Merge branch 'dev' into jajaja 2025-03-01 17:31:30 -08:00
Mike Cao cb7eef200c Added check for do not track to tracker. 2025-03-01 17:18:46 -08:00
Mike Cao 925c756215 Updated salt methods. 2025-03-01 16:29:35 -08:00
Mike Cao 65f18d12ab Added timestamp property to payload. 2025-03-01 14:40:37 -08:00
Mike Cao 9a87442870 Added SKIP_DB_MIGRATION var. 2025-02-28 21:04:53 -08:00
Mike Cao 05db1a8ba2 Removed css rule. Fixes #3272 2025-02-28 17:37:56 -08:00
Mike Cao a8835f385e Refactored batch route. 2025-02-28 16:58:57 -08:00
Mike Cao 5c988ab5ff Merge branch 'dev' into jajaja 2025-02-21 20:04:04 -08:00
Mike Cao b5c6194f36 Converted user and website settings. 2025-02-21 16:55:05 -08:00
Mike Cao 4c24e54fdd Consistent error responses. Updated login page. 2025-02-20 09:57:59 -08:00
Mike Cao 88f2ac20bc Updated packages. 2025-02-19 23:39:47 -08:00
Mike Cao edb7022c55 Merge branch 'dev' into jajaja 
# Conflicts:
#	package.json
#	src/components/hooks/useTimezone.ts
#	yarn.lock
 2025-02-19 22:55:40 -08:00
Mike Cao 7bb89b28be Removed getMessage from errors. 2025-02-19 19:11:11 -08:00
Mike Cao 1c5ef97f84 Updated icons. 2025-02-18 20:46:03 -08:00
Mike Cao b53606d497 Added side nav. 2025-02-16 01:11:45 -08:00
Mike Cao a8a1ccce18 Added AnimatedDiv component. 2025-02-14 17:16:09 -08:00
Mike Cao 96138a39a2 Fixed validation for journey report. 2025-02-14 16:47:52 -08:00
Mike Cao 2978bf3c6f Updated packages. 2025-02-14 16:41:48 -08:00
Mike Cao e015ce8779 Fixed team member lookup. 2025-02-14 12:47:17 -08:00
Mike Cao b3f7694852 Updated types. 2025-02-14 12:42:33 -08:00
Mike Cao d2f829a9b2 Merge branch 'dev' into jajaja 2025-02-14 11:45:34 -08:00
Mike Cao c2acb27e7e Merge branch 'dev' of https://github.com/umami-software/umami into dev 2025-02-14 11:40:43 -08:00
Mike Cao 36b53775bd Fixed team user fetch. 2025-02-14 03:09:18 -08:00