3699 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mike Cao	2a8437cac9	Added jest testing.	2024-03-01 13:25:32 -08:00
Mike Cao	2363b03d1c	Merge remote-tracking branch 'origin/dev' into dev	2024-02-29 21:18:47 -08:00
Mike Cao	6df266bbfd	Added search to filter dropdown. Updated eslint packages.	2024-02-29 21:18:34 -08:00
Mike Cao	343cf7a364	Merge branch 'master' into dev	2024-02-29 20:28:00 -08:00
Mike Cao	75d2e3af41	Removed docker labels.	2024-02-29 20:21:51 -08:00
Mike Cao	0bae517677	Updated var reference.	2024-02-29 20:19:56 -08:00
Mike Cao	a6acd5e099	Added Docker labels to manual build.	2024-02-29 20:01:38 -08:00
Francis Cao	e5c19482ab	Merge branch 'dev' of https://github.com/umami-software/umami into dev	2024-02-29 17:40:58 -08:00
Francis Cao	7ded5fc6c9	add prelim website tests	2024-02-29 17:40:49 -08:00
Mike Cao	9f90412b25	Merge master.	2024-02-29 17:35:54 -08:00
Mike Cao	7e742730ae	Bump version.	2024-02-29 14:14:29 -08:00
Mike Cao	2795d0ecea	Merge pull request #2548 from umami-software/analytics ... v2.10.1	2024-02-29 14:10:46 -08:00
Francis Cao	14c0c5060a	working compose file for cypress	2024-02-28 16:29:35 -08:00
Mike Cao	98989a6010	Merge remote-tracking branch 'origin/analytics' into analytics	2024-02-28 16:09:10 -08:00
Mike Cao	87b947d174	Fixed date buttons for today/yesterday selection.	2024-02-28 16:08:50 -08:00
Brian Cao	719699762c	add orderBy	2024-02-28 15:01:58 -08:00
Francis Cao	44d8606d1a	add cypress docker compose file	2024-02-28 15:01:13 -08:00
Brian Cao	59f4d9aff8	Merge branch 'dev' of https://github.com/umami-software/umami into dev	2024-02-28 12:40:27 -08:00
Brian Cao	ec11bd7cfe	add orderBy	2024-02-28 12:40:23 -08:00
Brian Cao	300a0f63e7	add orderby to query.	2024-02-28 10:26:15 -08:00
Francis Cao	e68d1b3233	remove cloud mode for transfer website	2024-02-28 10:25:57 -08:00
Francis Cao	6ac147f484	remove cloud mode for transfer website	2024-02-28 10:22:32 -08:00
Brian Cao	3d6cdddd38	Merge branch 'dev' of https://github.com/umami-software/umami into dev	2024-02-28 10:19:27 -08:00
Brian Cao	ae82e531b1	add orderby to query.	2024-02-28 10:19:22 -08:00
Mike Cao	923a6b3914	Merge remote-tracking branch 'origin/dev' into dev	2024-02-27 22:41:20 -08:00
Mike Cao	0f298c4197	Bump dev version.	2024-02-27 22:41:03 -08:00
Francis Cao	5b9f0707b8	install cypress and add initial test	2024-02-27 21:41:34 -08:00
Mike Cao	3e45c9d055	Removed label causing build issue.	2024-02-27 20:35:39 -08:00
Mike Cao	915a4ee9b0	Merge pull request #2534 from umami-software/dev ... v2.10.0	2024-02-27 15:59:02 -08:00
Mike Cao	23a45a3109	Updated validations for send payload.	2024-02-27 15:09:57 -08:00
Mike Cao	41eed2c056	Fix CSS.	2024-02-26 01:14:38 -08:00
Mike Cao	8f7f6b3479	Merge branch 'dev' into analytics	2024-02-26 00:57:21 -08:00
Mike Cao	968fda33e3	Updated event data view.	2024-02-26 00:53:56 -08:00
Mike Cao	7723576212	Updated handling of date values for event data.	2024-02-25 23:14:45 -08:00
Mike Cao	0c910f2abd	Merge remote-tracking branch 'origin/dev' into dev	2024-02-23 20:41:36 -08:00
Mike Cao	c5c4aaeb44	Updated lang files.	2024-02-23 20:40:44 -08:00
Mike Cao	f81f0839c6	Updated Funnel report component.	2024-02-23 20:31:35 -08:00
Francis Cao	8dd4e96226	Merge branch 'dev' into analytics	2024-02-22 22:48:09 -08:00
Francis Cao	09869bbe5a	fix date validation for getDataType	2024-02-22 22:31:43 -08:00
Francis Cao	490bb11771	fix create website / teams permissions	2024-02-22 22:21:11 -08:00
Francis Cao	8fbd6871f7	Fix report create for view only, fix createdby on save and add column in team websites table	2024-02-22 15:31:32 -08:00
Brian Cao	fd1b9ff7b4	add permission to create report.	2024-02-22 13:47:28 -08:00
Mike Cao	542c97455a	Merge branch 'analytics' of https://github.com/umami-software/umami into analytics	2024-02-19 18:31:34 -08:00
Mike Cao	1d93a8773d	Merge branch 'dev' into analytics	2024-02-19 18:31:22 -08:00
Mike Cao	2832ff9622	Always fetch website directly.	2024-02-19 18:30:44 -08:00
Mike Cao	fcba703f82	Merge remote-tracking branch 'origin/dev' into dev	2024-02-19 15:47:00 -08:00
Mike Cao	7639d6b36e	Fixed share url.	2024-02-19 15:46:43 -08:00
Francis Cao	4c63db599f	Merge branch 'dev' of https://github.com/umami-software/umami into analytics	2024-02-19 13:40:18 -08:00
Francis Cao	7fce92dffd	fix active visitor bug	2024-02-19 13:39:57 -08:00
Francis Cao	c1786069eb	Merge branch 'dev' into analytics	2024-02-19 12:34:33 -08:00