3850 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Francis Cao	c1786069eb	Merge branch 'dev' into analytics	2024-02-19 12:34:33 -08:00
Mike Cao	1746d7d8fb	Merge remote-tracking branch 'origin/dev' into dev	2024-02-19 11:31:21 -08:00
Mike Cao	d709f4eb80	Fixed websites paging.	2024-02-19 11:31:11 -08:00
Francis Cao	5468ca5dd3	fix getActiveVisitors return type	2024-02-19 11:18:50 -08:00
Mike Cao	9671414edd	Updated types.	2024-02-19 10:05:51 -08:00
Mike Cao	117cb6168c	Added hostUrl prop.	2024-02-19 09:36:44 -08:00
Mike Cao	d5b4da63df	Updated page titles.	2024-02-17 15:12:14 -08:00
Mike Cao	b2a7aaaad0	Upgraded Prisma v5.9.1.	2024-02-17 10:52:53 -08:00
Mike Cao	a985245c79	Merge branch 'dev' into analytics	2024-02-17 10:48:36 -08:00
Mike Cao	709f46a391	Moved suspense boundary.	2024-02-17 10:41:34 -08:00
Mike Cao	fb72485f88	Merge remote-tracking branch 'origin/dev' into dev	2024-02-17 10:37:39 -08:00
Mike Cao	54abab0bda	Added suspense boundary.	2024-02-17 10:37:29 -08:00
Mike Cao	9cbdf9bce9	Merge branch 'dev' into analytics	2024-02-17 10:23:16 -08:00
Mike Cao	b1dae9c484	Merge branch 'dev' of https://github.com/umami-software/umami into dev	2024-02-17 10:22:48 -08:00
Mike Cao	007625ecf7	Split up sso page.	2024-02-17 10:21:46 -08:00
Mike Cao	df872a1989	Merge branch 'dev' into analytics	2024-02-17 10:18:55 -08:00
Mike Cao	cecdf49180	Merge branch 'dev' of https://github.com/umami-software/umami into dev	2024-02-17 10:18:40 -08:00
Mike Cao	04e62bfd7c	Merge branch 'dev' into analytics	2024-02-17 10:04:43 -08:00
Mike Cao	a9d46437f2	Merge branch 'dev' of https://github.com/umami-software/umami into dev	2024-02-17 10:03:54 -08:00
Mike Cao	b76f4aa42d	Merge branch 'analytics' into dev	2024-02-16 19:28:53 -08:00
Mike Cao	01fe95a891	Updated teams button props.	2024-02-16 19:26:46 -08:00
Mike Cao	b7083421e5	Added icon to teams button.	2024-02-16 19:02:31 -08:00
Mike Cao	44393472cf	Updated teams button.	2024-02-16 18:58:15 -08:00
Francis Cao	c6f656e142	Merge branch 'dev' of https://github.com/umami-software/umami into analytics	2024-02-16 13:09:42 -08:00
Francis Cao	8048bc7866	Fix viewonly for teams addwebsite button	2024-02-16 13:09:20 -08:00
Brian Cao	379849ee1d	Merge branch 'dev' into analytics	2024-02-16 12:03:21 -08:00
Brian Cao	f5e87083eb	Fix validation.	2024-02-16 12:02:18 -08:00
Mike Cao	a24e8b6396	Fixed "All time" and "Custom range" date selections.	2024-02-16 11:51:48 -08:00
Mike Cao	858864ef7f	Fixed dashboard display.	2024-02-16 11:33:01 -08:00
Mike Cao	4853437afa	Merge branch 'dev' into analytics	2024-02-16 10:49:32 -08:00
Mike Cao	d5de8b9d60	Merge branch 'analytics' into dev	2024-02-16 10:49:04 -08:00
Mike Cao	d1e9bb9472	Updated lang.	2024-02-16 10:46:14 -08:00
Mike Cao	f25cd93012	Prevent admin from resetting their own role.	2024-02-16 10:22:18 -08:00
Mike Cao	2e871af05b	Merge pull request #2508 from jermanuts/master ... Update ar-SA.json	2024-02-15 19:56:46 -08:00
Mike Cao	8e6c7eef86	Merge branch 'dev' into master	2024-02-15 19:56:33 -08:00
Mike Cao	d11d974dab	Merge pull request #2512 from pxlfrk/master ... add missing OCI docker labels	2024-02-15 19:54:50 -08:00
Mike Cao	b50bf535de	Merge pull request #2514 from Maxime-J/dev-fixes ... Dev fixes	2024-02-15 19:13:40 -08:00
Mike Cao	1e6e468644	Merge pull request #2513 from Maxime-J/metrics-search ... Fix metrics search when a value is null.	2024-02-15 19:13:18 -08:00
Mike Cao	5217d3009d	Merge remote-tracking branch 'origin/dev' into dev	2024-02-15 14:45:48 -08:00
Mike Cao	7ab580c709	Added hooks for website stats and pageviews.	2024-02-15 14:45:07 -08:00
Mike Cao	45d77ac70a	Merge pull request #2502 from Maxime-J/os-names ... Render correct OS names globally.	2024-02-15 12:56:06 -08:00
Francis Cao	71f904ce57	fix usemodified for team websites	2024-02-15 10:46:54 -08:00
Maxime-J	d1cbbf37c0	Fix metrics search when a value is null.	2024-02-15 14:25:33 +00:00
Maxime-J	5fc3d81c39	Fix MySQL migration 4.	2024-02-15 10:59:11 +00:00
Maxime-J	b81f5112bc	Add basePath for telemetry.	2024-02-15 10:59:00 +00:00
Mike Cao	f50067e44f	Fixed website refresh after save.	2024-02-14 23:21:35 -08:00
Mike Cao	37e28bbf74	Merge branch 'dev' into os-names	2024-02-14 22:15:08 -08:00
Mike Cao	f01073c46a	Update redirects for teams.	2024-02-14 22:13:13 -08:00
Mike Cao	1955166bdf	Bump query limit to 500.	2024-02-14 15:13:53 -08:00
Mike Cao	bbf85cb110	Merge branch 'dev' of https://github.com/umami-software/umami into dev	2024-02-14 13:16:37 -08:00