391 Commits

Author	SHA1	Message	Date
Mike Cao	cb4c8accea	Fixed admin checks.	2022-12-13 08:41:13 -08:00
Mike Cao	4cc22fcc95	Fix event data check.	2022-12-12 20:46:43 -08:00
Mike Cao	0a6ecfe3d2	Implement react-basics styles. Fix queries.	2022-12-08 23:43:43 -08:00
Mike Cao	b57ecf33e6	Updated roles and permissions logic.	2022-12-06 18:36:41 -08:00
Mike Cao	4781a0cc8c	Added lib/types.	2022-12-02 14:15:24 -08:00
Brian Cao	06bebadbb9	Feat/um 114 roles and permissions (#1683) ... * Auth checkpoint. * Merge branch 'dev' into feat/um-114-roles-and-permissions	2022-12-01 20:53:37 -08:00
Mike Cao	a4e80ca3e5	Refactored permissions check. Updated redis lib.	2022-12-01 10:58:50 -08:00
Mike Cao	fe01574b16	Updated login form.	2022-11-28 11:14:24 -08:00
Brian Cao	502facd426	Allow user to be added to team with role.	2022-11-22 22:17:49 -08:00
Brian Cao	d85b2be5f8	Add event type to event.	2022-11-22 15:06:52 -08:00
Brian Cao	c90194dad4	Merge remote-tracking branch 'origin/dev' into dev	2022-11-21 23:23:20 -08:00
Brian Cao	9172098fa7	Fix login secure token creation.	2022-11-21 23:23:16 -08:00
Mike Cao	f98a97ef83	Merge branch 'dev' of https://github.com/umami-software/umami into dev	2022-11-21 22:33:13 -08:00
Brian Cao	3efd2a5b10	Remove user/team transfer from website update.	2022-11-21 22:32:59 -08:00
Mike Cao	2259ee8d76	Initial conversion to react-basics.	2022-11-21 22:32:55 -08:00
Brian Cao	d60ad1c782	Fix isAdmin check. Fix Schema.	2022-11-21 16:44:42 -08:00
Brian Cao	371425ab60	Fix error when updating website.	2022-11-21 11:39:59 -08:00
Brian Cao	8fc6e99aa8	Add user role api.	2022-11-20 22:24:31 -08:00
Brian Cao	78225691df	Add permission checks.	2022-11-20 00:48:13 -08:00
Brian Cao	e28ee6597a	Fix Website auth.	2022-11-18 18:49:58 -08:00
Mike Cao	2b10802e07	Fix getWebsites call.	2022-11-18 09:47:06 -08:00
Brian Cao	25279271ce	Add some api/team endpoints.	2022-11-18 00:27:42 -08:00
Brian Cao	f5eb974d8d	Fix Typo.	2022-11-17 22:46:05 -08:00
Brian Cao	5aa8187e42	Add queries for new schema.	2022-11-17 22:27:33 -08:00
Brian Cao	0aaba8cbd1	Initial Typescript models.	2022-11-15 13:21:14 -08:00
Mike Cao	4f098a34c1	Hide user button for cloud.	2022-11-09 22:12:40 -08:00
Brian Cao	84375a582e	Fix isAdmin check.	2022-11-09 12:03:24 -08:00
Brian Cao	df84a16b95	Add external uuid to user create.	2022-11-09 10:59:03 -08:00
Mike Cao	76cad96a24	Updated auth to check for uuid.	2022-11-09 10:15:21 -08:00
Mike Cao	8a74138e17	Fixed website create.	2022-11-09 07:40:17 -08:00
Mike Cao	67732b9b5a	Refactor authentication and token handling.	2022-11-08 22:58:52 -08:00
Brian Cao	e9c8d16d5b	pass in correct arguments to save pageview/event	2022-11-08 16:45:23 -08:00
Mike Cao	208fcb8418	Added redis check to verify.	2022-11-08 12:28:45 -08:00
Brian Cao	13fd3ccd16	api and lib fixes (#1643)	2022-11-08 11:55:02 -08:00
Mike Cao	f118bc95c1	Refactored redis usage. Added lib/cache.	2022-11-07 22:35:51 -08:00
Mike Cao	3485b6268b	Added rev_id column. Updated redis calls.	2022-11-07 16:22:49 -08:00
Mike Cao	1075325ec5	Update website fetch and update.	2022-11-02 15:45:47 -07:00
Mike Cao	05245ca316	Use shallow routing for website details.	2022-11-02 08:57:52 -07:00
Brian Cao	075d77abac	change const	2022-11-01 09:56:43 -07:00
Brian Cao	689b732829	Merge branch 'dev' into feat/um-23-v2-schema-init	2022-10-31 23:48:12 -07:00
Brian Cao	17041efaae	use uuid	2022-10-31 23:42:37 -07:00
Mike Cao	5d73a9c4b4	Merge remote-tracking branch 'origin/app' into dev	2022-10-31 20:21:19 -07:00
Brian Cao	3a617b7bfa	fix account delete bug	2022-10-31 18:50:05 -07:00
Mike Cao	c58e037a7e	Updated useConfig. Added SSO page.	2022-10-31 11:02:37 -07:00
Brian Cao	572df48667	assign backup	2022-10-31 10:38:37 -07:00
Brian Cao	d32d5e75e9	change owner by id	2022-10-29 15:50:29 -07:00
Mike Cao	246e4e5f4f	Fix disable checks.	2022-10-28 10:34:50 -07:00
Mike Cao	98835bbc78	Define uiDisabled at build time.	2022-10-27 17:02:54 -07:00
Mike Cao	fc9584eb44	Refactor env check.	2022-10-27 16:42:57 -07:00
Brian Cao	08ec801fdc	remove GSS from 404	2022-10-27 14:48:21 -07:00
Brian Cao	99c975c329	add DISABLE_UI, DISABLE_ADMIN	2022-10-27 12:14:34 -07:00
Mike Cao	d05fd2bd3d	Refactor redis calls.	2022-10-25 20:17:13 -07:00
Mike Cao	8b64ef1a4e	Fixed issue with accessing user dashboards. Closes #1590	2022-10-25 15:48:49 -07:00
Mike Cao	ac070d3ce9	Fixed change password issue. API refactoring. Closes #1592.	2022-10-25 10:45:56 -07:00
Mike Cao	2290be7ca4	Fixed share page issue.	2022-10-24 19:48:10 -07:00
Mike Cao	59fdaf580f	Fixed share page.	2022-10-24 16:28:20 -07:00
Brian Cao	ba31f48f1a	Feat/um 49 query builder api (#1573) ... * add uuid to event. add indexes * eventdata api * add event data * remove test data * update list	2022-10-21 21:33:23 -07:00
Mike Cao	6147c3502a	Merge pull request #1567 from umami-software/feat/um-69-nice ... add cloud_mode	2022-10-12 17:33:54 -07:00
Brian Cao	9e8748e2f3	checkpoint	2022-10-12 16:29:44 -07:00
Mike Cao	e429abc08e	Added error conditions for website updates.	2022-10-12 15:52:31 -07:00
Brian Cao	db1ae3f2c7	add cloud_mode	2022-10-12 15:35:33 -07:00
Mike Cao	5a4fc96ebc	Refactor API authentication.	2022-10-12 13:11:44 -07:00
Mike Cao	c33729e185	Merge branch 'dev' of https://github.com/umami-software/umami into dev	2022-10-11 23:48:05 -07:00
Brian Cao	07d003e858	fix collect	2022-10-11 23:09:06 -07:00
Mike Cao	8627782137	Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # components/settings/WebsiteSettings.js # pages/api/websites/[id]/index.js	2022-10-11 21:51:47 -07:00
Mike Cao	5e2d23f18f	Refactor auth logic.	2022-10-11 21:48:33 -07:00
Brian Cao	c147742d7a	use uuid	2022-10-11 19:37:38 -07:00
Mike Cao	edd1751b81	Merge changes	2022-10-10 21:38:02 -07:00
Brian Cao	78338205a3	Feat/um 62 prisma property names (#1562) ... * checkpoint * fix pg schema * fix mysql schema * change property names	2022-10-10 13:42:18 -07:00
Mike Cao	2428314f58	Updated save method for websites.	2022-10-07 17:13:03 -07:00
Mike Cao	d8c440453c	Added getWebsite method.	2022-10-06 14:18:27 -07:00
Mike Cao	f3135ee867	Get account by uuid for cloud operations.	2022-10-04 20:16:09 -07:00
Mike Cao	d784b2a8db	Merge branch 'dev' of https://github.com/umami-software/umami into dev ... # Conflicts: # pages/api/account/index.js	2022-10-03 17:17:53 -07:00
Brian Cao	adb0a06006	add uuid to account	2022-09-30 22:27:47 -07:00
Mike Cao	5fb1f08df8	Split up account update logic.	2022-09-29 15:15:11 -07:00
Brian Cao	b3d7d49448	Fix timezone bug (#1543)	2022-09-27 17:18:16 -07:00
Brian Cao	78c3453639	fix clickhouse calls (#1536)	2022-09-23 22:43:51 -07:00
Brian Cao	52e036964b	Merge Session/Event/Pageview CH	2022-09-12 09:55:34 -07:00
Mike Cao	13cf286874	Fix www replace.	2022-09-05 15:35:36 -07:00
Mike Cao	9f6834925b	Merge pull request #1465 from aidanm1999/feature/2022-09/admin-website-assigning ... Admins can assign websites to non-admins	2022-09-03 23:17:06 -07:00
Mike Cao	efb52f5ff1	Fix crypto errors.	2022-08-29 08:31:16 -07:00
Mike Cao	f4e0da481e	Use next-basics package.	2022-08-28 20:20:54 -07:00
Brian Cao	54ade11a98	fix send message. look at redis on session create	2022-08-26 21:10:46 -07:00
Brian Cao	818f8721e9	redis checkpoint	2022-08-26 20:21:53 -07:00
Aidan Marshall	b388961b8b	Features: ... - Removes spellcheck for domain entry field - Adds the ability to assign websites to other users if you are an admin	2022-08-26 17:22:46 +02:00
Brian Cao	10cc6616c5	add redis placeholder	2022-08-25 23:12:47 -07:00
Brian Cao	bb50753704	split db files	2022-08-25 22:04:32 -07:00
Brian Cao	46b4b98d40	update kafka messaging	2022-08-25 11:07:47 -07:00
Brian Cao	537ddde189	remove allow_agent	2022-08-22 23:21:44 -07:00
Francis Cao	e522293130	fixed event_uuid logic	2022-08-22 12:24:57 -07:00
Brian Cao	41d4b4c402	allow agent	2022-08-18 23:25:45 -07:00
Francis Cao	295ce2487d	Merge branch 'master' of https://github.com/umami-software/umami into francis/uc-24-kafka-test	2022-08-18 16:54:57 -07:00
Francis Cao	34e9ab811b	add session_uuid to token	2022-08-09 23:32:02 -07:00
Mike Cao	bc75b622b5	Updated test console. Refactored fetch for tracker.	2022-08-09 10:27:35 -07:00
Mike Cao	9b7e472410	Added CURRENT_VERSION constant.	2022-08-08 11:31:36 -07:00
Francis Cao	fc3c39be3c	Merge branch 'dev' of https://github.com/umami-software/umami into francis/uc-24-kafka-test	2022-08-08 08:36:21 -07:00
Mike Cao	89781d4847	Refactored query parameters.	2022-08-08 01:26:20 -07:00
Francis Cao	1a84608e2b	add Clickhouse migration files. update saveEvent to include event_uuid	2022-08-04 20:15:21 -07:00
Mike Cao	1662b66fbb	Cleaned up script.	2022-08-02 00:52:08 -07:00
Mike Cao	9969c9b6b1	Forgot the actual check.	2022-08-02 00:32:28 -07:00
Mike Cao	a4a6888248	Moved telemetry code to script.	2022-08-02 00:24:17 -07:00
Mike Cao	3d7e9392f0	Merge remote-tracking branch 'origin/dev' into dev	2022-08-01 23:05:24 -07:00
Mike Cao	50e491af06	Added endpoint for fetching server-side variables.	2022-08-01 23:04:47 -07:00
Mike Cao	df1c203c38	Merge pull request #1376 from umami-software/brian/um-24-event-data ... Brian/um 24 event data	2022-08-01 23:50:08 -05:00
Brian Cao	daf3978970	address PR comments. line up PSQL / MYSQL	2022-08-01 20:50:14 -07:00
Mike Cao	68d35c0fc4	Moved DISABLE_LOGIN check to getServerSideProps.	2022-08-01 18:42:07 -07:00
Brian Cao	8f934c7e6c	checkpoint	2022-07-29 22:30:09 -07:00
Mike Cao	ba1e28f082	Fix filter issue for metrics. Closes #1268	2022-07-22 23:56:29 -07:00
Brian Cao	304314fff0	Merge branch 'dev' into brian/um-16-clickhouse-support	2022-07-22 17:03:42 -07:00
Brian Cao	65910c7348	clickhouse inserts	2022-07-22 14:43:19 -07:00
Chris Walsh	92b009fa1e	Add UTM pageview metrics to API	2022-07-21 14:57:29 -07:00
Mike Cao	358c725828	Fix issue with unicode filtering. Closes #1258	2022-07-21 01:35:14 -07:00
Mike Cao	be8291c856	Refactored referrer logic. Display stats for no referrers.	2022-07-21 01:11:10 -07:00
Mike Cao	d95b53143e	Merge pull request #1304 from thueske/feature/screensize ... Feature: Add screensize to UI	2022-07-18 00:37:07 -07:00
Tobias Hüske	8d358ccb9d	Feature: Add screensize to UI	2022-07-16 07:29:55 +02:00
Brian Cao	9803d4b5ee	Merge branch 'dev' into brian/um-22-query-folder-structure	2022-07-12 22:34:05 -07:00
Brian Cao	2950343f94	fix import	2022-07-12 19:50:47 -07:00
Brian Cao	8aec6d7406	move queries	2022-07-12 14:14:36 -07:00
mike	846afad0a4	Moved middleware.	2022-07-07 09:24:32 -07:00
rohandebsarkar	ce6fd12f9f	Change API_COLLECT_ENDPOINT to COLLECT_API_ENDPOINT	2022-07-04 15:52:59 +05:30
rohandebsarkar	ae48ff0e68	Adds support for customCollectEndpoint	2022-07-03 11:33:49 +05:30
Mike Cao	8175f13f96	Added IGNORE_HOSTNAME environment variable. Closes #1151.	2022-06-27 01:46:21 -07:00
Mike Cao	5a5a278d9e	Removed DISABLE_LOGIN from middleware.	2022-06-22 02:28:23 -07:00
Mike Cao	0f37c17cb5	Added logging to test Vercel issue.	2022-06-22 02:08:13 -07:00
mike	ccec996b34	Update disable login message.	2022-06-10 11:23:00 -07:00
Mike Cao	9dae76fbf3	Updated version check.	2022-06-03 07:06:44 -07:00
Mike Cao	e735a1c50d	Updated share token logic. Closes #1113.	2022-05-05 19:04:28 -07:00
Mike Cao	08dff1293e	Merge pull request #1127 from Zxilly/master ... fix: cover edge case of script name	2022-04-27 08:33:52 -07:00
isNullOrEmpty()	699740dc34	fix: cover edge case of script name	2022-04-27 10:05:24 +00:00
Mike Cao	f69dbaeaf6	Allow filtering of events with url.	2022-04-13 19:04:06 -07:00
Mike Cao	df1ddf3e73	Updated filter processing logic.	2022-04-11 00:19:29 -07:00
Mike Cao	fb2dc9f5ab	Allow filtering on session fields.	2022-04-10 03:51:43 -07:00
Mike Cao	edd1645bab	Refactor multi-script name code. Update languages.	2022-04-09 22:11:15 -07:00
Mike Cao	0e82807170	Merge pull request #1036 from djyde/support-multiple-track-script-name ... support multiple track script name	2022-04-09 20:13:13 -07:00
Mike Cao	e7602b58f4	Merge pull request #1080 from HolgerHuo/fix-referrer-issue ... Fix referrer filter issue	2022-04-08 21:43:54 -07:00
Mike Cao	13432ede22	Include version for preload.	2022-04-08 21:39:13 -07:00
Mike Cao	1b599a9d9c	Preload image.	2022-04-08 15:37:36 -07:00
Holger Huo	0377773e21	fix: forgot to include referrer filter in sessionMetrics	2022-04-07 22:27:15 +08:00
Mike Cao	9696a5f8f2	Re-use the response from forceSSL.	2022-04-04 18:51:31 -07:00
Mike Cao	6eaf090bde	Changed force SSL method to send headers.	2022-04-04 17:01:21 -07:00
Mike Cao	bf5068d32a	Added CORS to website API endpoints.	2022-04-04 00:33:20 -07:00
Mike Cao	faf6438852	Allow user to change admin username.	2022-04-03 22:25:32 -07:00
Kevin Decherf	1269bea870	fixup! Update metric tables when filtering on referrer ... Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2022-03-24 23:20:19 +01:00
Kevin Decherf	35f9c7ef6c	Update metric tables when filtering on referrer ... Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2022-03-20 22:14:54 +01:00
Kevin Decherf	ecfc7ea68e	Rename ref to prevent collision with react elements ... It seems that, at least in dev mode, 'ref' may incorrectly refer to react elements. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2022-03-20 22:10:41 +01:00
Randy	2bd3ddf6ec	support multiple track script name	2022-03-19 14:18:32 +08:00
Mike Cao	3717b0e888	Fix issue with force SSL redirects.	2022-03-15 08:49:42 -07:00
Mike Cao	5ca6f76daa	Updated collect API response.	2022-03-10 20:39:11 -08:00
Mike Cao	17790aa5a8	Fix issue with sendBeacon request.	2022-03-10 19:01:33 -08:00
Mike Cao	20622116a8	New Dashboard component.	2022-03-03 19:45:49 -08:00