BradNut/umami
1
0
Fork 0
mirror of https://github.com/BradNut/umami synced 2025-09-08 17:40:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
2971 commits 7 branches 44 tags 17 MiB
Commit graph

609 commits

Author SHA1 Message Date
榆木
35cf149876
Check the hostname value for legality to eliminate dirty data 
Check the hostname value for legality to eliminate dirty data
 2023-07-13 12:27:38 +08:00
Brian Cao
a9617cb704 Remove bigint. 2023-07-11 18:52:52 -07:00
Brian Cao
4d41527f94 Use bigint. 2023-07-11 18:47:52 -07:00
Mike Cao
11009175f2 Merge remote-tracking branch 'origin/dev' into dev 2023-07-11 01:16:38 -07:00
Mike Cao
55701c9e8c Event data updates. 2023-07-11 01:16:17 -07:00
Brian Cao
c7e79a0563 Merge remote-tracking branch 'origin/dev' into dev 2023-07-10 15:30:37 -07:00
Brian Cao
1bdaf4aca2 Always record string. 2023-07-10 15:30:34 -07:00
Mike Cao
29a2ca0c26
Merge pull request #2096 from IMS-Network/fix-1966-issue-IDN 
fix DOMAIN_REGEX for .ישראל IDN's to work :)
 2023-07-10 08:50:23 -07:00
Mike Cao
6b69f69c08 Added icons for browsers, OS and devices. 2023-07-09 21:30:37 -07:00
Brian Cao
9ec2701228 Add view-only user. 2023-07-06 23:02:16 -07:00
Brian Cao
0a3ee2277a Fix numeric to number. 2023-07-06 21:02:56 -07:00
Mike Cao
2f4d669836 More updates to event data report. 2023-07-04 22:51:23 -07:00
thefourCraft
ebe1fe169f
Merge branch 'dev' into fix-1966-issue-IDN 2023-07-02 21:28:53 +03:00
thefourCraft
d472af277f
fix DOMAIN_REGEX for .ישראל IDN's to work :) 2023-07-02 21:14:24 +03:00
Mike Cao
9d7862cbd6 Event data report UI. 2023-07-01 22:02:49 -07:00
Brian Cao
414854b064 Fix funnel report. 2023-06-20 10:22:12 -07:00
Mike Cao
ab0838e272 Fixed issue with hover tooltips. 2023-06-15 20:15:31 -07:00
Francis Cao
a00972748f remove >= website created at logic 2023-06-14 22:32:06 -07:00
Mike Cao
22d477b98b Updates to reports. 2023-06-02 23:10:59 -07:00
Brian Cao
a3639d59a3 Add increment to usage. 2023-06-01 11:54:24 -07:00
Brian Cao
b484286523
Feat/um 305 unique session ch (#2065) 
* Add session_data / session redis to CH.

* Add mysql migration.
 2023-05-31 21:46:49 -07:00
Mike Cao
e9b0d3f796 Updated date range handling. 2023-05-28 22:28:11 -07:00
Mike Cao
bfb52eb678 Added report context. Removed report store. 2023-05-28 21:37:34 -07:00
Brian Cao
9d936fe8e5 add ownerId to non-cache. 2023-05-25 20:07:58 -07:00
Brian Cao
4c06487b11 Merge remote-tracking branch 'origin/dev' into dev 2023-05-25 16:46:39 -07:00
Brian Cao
06e6cbec9a Add share_id validation. 2023-05-25 16:46:37 -07:00
Mike Cao
3ccdd95f49 Moved render functions into lib/charts. 2023-05-25 10:26:00 -07:00
Brian Cao
40f53e8856 Merge branch 'feat/um-285-report-schema' into dev 2023-05-18 13:21:35 -07:00
Brian Cao
4df7d6a2a1 Add userReport api 2023-05-18 13:13:18 -07:00
Brian Cao
748ad84a52 Merge branch 'dev' into feat/um-285-report-schema 2023-05-16 14:12:39 -07:00
Brian Cao
2ce62c1023 Add usage. 2023-05-15 20:41:12 -07:00
Brian Cao
1130bca195 Funnel form. 2023-05-11 16:42:58 -07:00
Brian Cao
dd2db308ee Merge branch 'dev' into feat/um-285-report-schema 2023-05-08 23:47:25 -07:00
Brian Cao
d01aa5cd52 Add funnel queries 2023-05-08 23:46:58 -07:00
Mike Cao
e92d958b24 Updated redis client. Soft deletes reset username. 2023-05-05 21:16:13 -07:00
Brian Cao
65ebb26a70 Fix boolean event data. 2023-04-30 22:55:54 -07:00
Mike Cao
f450fc35fb Fixed city showing undefined. 2023-04-25 16:56:31 -07:00
Mike Cao
4c544361fd Fixed vercel again. 2023-04-25 16:51:42 -07:00
Mike Cao
4ea3eec98c Fixed vercel region issues. 2023-04-25 16:29:47 -07:00
Mike Cao
5864aee043 Fixed vercel issues. 2023-04-25 15:58:52 -07:00
Mike Cao
c49e2c6974 Fixed Vercel geolocation. 2023-04-25 14:52:29 -07:00
Mike Cao
3f1ed750f0 Added error boundary. Fixed #1976. 2023-04-25 14:41:54 -07:00
Mike Cao
92ab391ef8 Use Vercel headers for location. 2023-04-24 19:29:31 -07:00
Mike Cao
c5bffb97cc Improved error handling for useSession middleware. 2023-04-22 14:17:57 -07:00
Mike Cao
987e3aabbd Fix tracking code form. 2023-04-21 17:21:44 -07:00
Mike Cao
3b6c6846b1 Fixed lang references. 2023-04-19 18:42:29 -07:00
Mike Cao
afde1377dc
Merge branch 'dev' into master 2023-04-19 17:06:46 -07:00
Mike Cao
dfae0c150d Merge branch 'dev' 
# Conflicts:
#	components/common/Calendar.js
#	components/common/EventDataButton.js
#	components/forms/EventDataForm.js
#	components/layout/Header.js
#	db/mysql/migrations/02_add_event_data/migration.sql
#	lang/be-BY.json
#	lang/de-CH.json
#	lang/es-MX.json
#	lang/fa-IR.json
#	lang/km-KH.json
#	lang/lt-LT.json
#	lang/th-TH.json
#	lib/auth.js
#	lib/detect.ts
#	lib/lang.js
#	lib/middleware.js
#	lib/prisma.js
#	package.json
#	pages/_app.js
#	pages/api/accounts/[id]/password.js
#	pages/api/collect.js
#	pages/api/realtime/init.js
#	pages/api/websites/[id]/index.js
#	pages/api/websites/[id]/reset.ts
#	pages/api/websites/index.js
#	public/intl/messages/fa-IR.json
#	public/intl/messages/lt-LT.json
#	public/intl/messages/pt-BR.json
#	public/intl/messages/th-TH.json
#	queries/analytics/event/getEventData.js
#	queries/analytics/event/getEventMetrics.js
#	queries/analytics/pageview/getPageviewMetrics.js
#	queries/analytics/pageview/getPageviewParams.js
#	queries/analytics/pageview/getPageviewStats.js
#	queries/analytics/session/getSessionMetrics.js
#	queries/analytics/stats/getActiveVisitors.js
#	queries/analytics/stats/getWebsiteStats.js
#	sql/schema.mysql.sql
#	styles/index.css
#	yarn.lock
 2023-04-17 11:08:17 -07:00
Mike Cao
d406564af3 Manually merge PR #1879. 2023-04-17 10:31:50 -07:00
Francis Cao
43499eb4fd fix region / city filters 2023-04-17 00:10:51 -07:00
Mike Cao
e286994397 Merge branch 'dev' of https://github.com/umami-software/umami into dev 
# Conflicts:
#	public/iso-3166-2.json
 2023-04-13 22:30:22 -07:00
Mike Cao
f2edd0d604 Added regions and cities support. 2023-04-13 22:28:29 -07:00
Brian Cao
0335fd3529 Remove webisite.teamId related code. Clean up queries. 2023-04-13 20:57:22 -07:00
Brian Cao
ef324fdf73 Fix update user. 2023-04-13 12:08:53 -07:00
Kai Steinke
0926a4c310
feat: add missing locales and sort alphabetically 2023-04-11 10:53:43 +02:00
Francis Cao
f5f6dc052e fix column name date bug 2023-04-10 09:44:25 -07:00
Brian Cao
9eff565e7a Fix teamWebsite / teamUser. 2023-04-09 16:04:28 -07:00
Mike Cao
0dc6529cf1 Added new languages to lib/lang. 2023-04-08 15:51:49 -07:00
Mike Cao
b2bebaea3e Added km-KH, updated be-BY. 2023-04-08 13:58:58 -07:00
Mike Cao
e850fbd0bd Merge changes from master. 2023-04-08 13:55:52 -07:00
Brian Cao
7b07de7a98 Api work for remove user. 2023-04-07 22:45:46 -07:00
Mike Cao
6dd90ce9ca Refactored SSO process. 2023-04-04 23:29:54 -07:00
Brian Cao
dee58f8a55 Fix date function. 2023-04-04 00:24:03 -07:00
Brian Cao
76296bc2ee Fix realtime. 2023-04-03 23:22:20 -07:00
Mike Cao
ba71f5cafc Fix location lookup. 2023-04-02 22:36:52 -07:00
Mike Cao
7464bd2521 Fixed types. 2023-04-02 17:28:25 -07:00
Mike Cao
9001361e4c Fix session lookup. 2023-04-02 17:23:12 -07:00
Mike Cao
2713e3316a Fixed font. 2023-04-02 10:00:28 -07:00
Mike Cao
8397102bac Switch to next/font. 2023-04-01 20:03:38 -07:00
Mike Cao
728e4cff5b Updated queries to use cache. 2023-04-01 17:38:35 -07:00
Mike Cao
74192cd695 Refactored filter logic. 2023-04-01 15:44:30 -07:00
Brian Cao
d2687b6580 Fix metrics. 2023-03-31 14:53:48 -07:00
Brian Cao
2172dddd1c Convert send to TS. 2023-03-30 11:18:57 -07:00
Mike Cao
64b040c865 Fixed query parameter filter. 2023-03-30 09:44:04 -07:00
Brian Cao
6d5aeb3bd1 Fix joining team dupe. Add loading to team member remove. Fix messages. 2023-03-29 16:02:14 -07:00
Mike Cao
05933ff1d2 Use new geo folder. 2023-03-28 19:24:36 -07:00
Mike Cao
23d02e5aac Try reverting to country database. 2023-03-28 19:10:11 -07:00
Francis Cao
14e4a090bb update schema and queries to implement reset_at 2023-03-27 11:25:16 -07:00
Brian Cao
9979672de5
Feat/um 202 event data new (#1841) 
* Add event_data base.

* Add url_path.

* Add eventData back.

* Finish event_data relational.

* resolve comments.
 2023-03-23 14:01:15 -07:00
Francis Cao
b0c5899569 update prisma / ch filters logic 2023-03-20 11:26:45 -07:00
Francis Cao
790e71cc14 Merge branch 'dev' of https://github.com/umami-software/umami into bug/um-200-fix-referrer-filters 2023-03-15 16:40:13 -07:00
Francis Cao
f569f6ac91 fix null ip lookup error 2023-03-15 16:39:55 -07:00
Mike Cao
c1d3e9ec67 Upgraded Chart.js to v4. Updated charts. 2023-03-14 22:37:50 -07:00
Mike Cao
9a3e8921a7 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-03-10 18:45:51 -08:00
Mike Cao
6ba00152c2 Updated filter tags. 2023-03-10 17:49:19 -08:00
Brian Cao
701bde53b7 Hook up teamMemberDelete and teamDelete. 2023-03-09 23:21:19 -08:00
Mike Cao
7a3443cd06
Merge pull request #1775 from EffakT/country_fallback 
Adding registered_country fallback to getCountry
 2023-03-09 15:55:38 -08:00
Mike Cao
49402924aa
Merge pull request #1792 from d19dotca/patch-1 
Stylized macOS + sorted Desktop & Mobile OS names
 2023-03-09 15:16:05 -08:00
Brian Cao
8a9532f213
Feat/um 197 hook up teams (#1825) 
* Link up teams UI.

* Fix auth order.

* PR touchups.
 2023-03-09 12:42:12 -08:00
Mike Cao
0607e9f442 Upgraded next to 13. Fixed date filter for websites. 2023-03-08 20:23:32 -08:00
Mike Cao
696d9c978c Updated date range handling. Fixed share page. 2023-03-08 16:37:43 -08:00
Mike Cao
0119f7bcde Merge remote-tracking branch 'origin/dev' into dev 2023-03-03 12:39:16 -08:00
Mike Cao
bb99b3eba5 Fixed sticky header scrolling. Updated settings button. 2023-03-03 12:37:26 -08:00
Brian Cao
8684781624 Clean up teams on user delete. 2023-03-02 22:48:30 -08:00
Brian Cao
82f0bc3d2b
remove event_data. (#1804) 2023-03-01 16:42:47 -08:00
Francis Cao
a777b2916f Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-171-cloud-mode-env-variable 2023-03-01 11:40:34 -08:00
Francis Cao
93650a2f66 add pagetitle to queries 2023-03-01 10:53:57 -08:00
Mike Cao
3ac560dc0f Added checks for CLOUD_MODE. 2023-02-28 20:04:07 -08:00
Francis Cao
6c302a7325 collect pagetitle, update subdivision2 data type 2023-02-28 17:40:18 -08:00
slawiko
02272d3909 Adds locale mapping 2023-02-22 12:25:13 +01:00