m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-01-09 13:42:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,706 Commits 2 Branches 0 Tags 19 MiB
22d477b98b
Commit Graph

418 Commits

Author SHA1 Message Date
Mike Cao
594660f298 Reverted SSO process. 2023-04-06 20:35:55 -07:00
Mike Cao
6dd90ce9ca Refactored SSO process. 2023-04-04 23:29:54 -07:00
Mike Cao
8276a769e6 Remove www from domain. 2023-04-03 20:22:23 -07:00
Mike Cao
31f28125dc Revert font. 2023-04-02 23:12:43 -07:00
Mike Cao
ae772f048c Fix referrer lookup. 2023-04-02 22:41:24 -07:00
Mike Cao
b77657faa6 Updated error message. 2023-04-02 16:33:44 -07:00
Mike Cao
8b966a04b0 Fixed password update. 2023-04-02 14:23:21 -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
74192cd695 Refactored filter logic. 2023-04-01 15:44:30 -07:00
Mike Cao
9dd35b3766 Fixed metrics display. 2023-03-31 05:55:28 -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
Mike Cao
a026fc97fc Prevent blank urls. 2023-03-29 23:14:09 -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
cdacb640c6 Updated tracker and collect. 2023-03-26 04:15:08 -07:00
Mike Cao
43ef6884df Updated layout for settings pages. 2023-03-24 10:55:20 -07:00
Mike Cao
9260e5bc33 Updated settings. 2023-03-23 16:33:10 -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
Mike Cao
c2789d70bc Added SideNav component. 2023-03-23 11:46:49 -07:00
Mike Cao
9ddb8b5d25 Use useMessages hook everywhere. 2023-03-22 14:05:55 -07:00
Mike Cao
fc2a8f3d9f Updated navigation. 2023-03-21 21:28:36 -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
275e7d3df6 update send 2023-03-15 16:06:51 -07:00
Mike Cao
c1d3e9ec67 Upgraded Chart.js to v4. Updated charts. 2023-03-14 22:37:50 -07:00
Brian Cao
701bde53b7 Hook up teamMemberDelete and teamDelete. 2023-03-09 23:21:19 -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
696d9c978c Updated date range handling. Fixed share page. 2023-03-08 16:37:43 -08:00
Mike Cao
3fc5f5151b Touch up footer. 2023-03-03 21:26:39 -08:00
Mike Cao
19662abcd8
Merge pull request #1808 from umami-software/bug/um-191-fix-redis-auth-misc-bug 
Bug/um 191 fix redis auth misc bug
 2023-03-03 13:15:10 -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
Francis Cao
448d2b2241 fix redis auth issue 2023-03-03 12:30:12 -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
4cb5a14de9 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-02-28 20:04:17 -08:00
Mike Cao
3ac560dc0f Added checks for CLOUD_MODE. 2023-02-28 20:04:07 -08:00
Brian Cao
84430e38eb
Check deletedAt. (#1796) 2023-02-27 16:01:34 -08:00
Mike Cao
5657a64c77 Pass domain to realtime components. 2023-02-24 02:41:02 -08:00
Francis Cao
55a586fe27 add subdivision1/2, cities to query logic 2023-02-20 09:04:20 -08:00
Mike Cao
802c262cd9 Fixed realtime chart display. 2023-02-17 21:42:42 -08:00
Mike Cao
93b77672f3 More updates to realtime. 2023-02-15 02:27:18 -08:00
Mike Cao
28921a7cd5 Updates to realtime. Fixed refresh button. 2023-02-14 17:23:20 -08:00
Francis Cao
eea01b21cf Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-171-cloud-mode-env-variable 2023-02-14 10:59:36 -08:00
Francis Cao
9f8ea060b6 implement cloud mode logic 2023-02-09 10:13:50 -08:00
Mike Cao
ad5e34a894 Fixed lint issues. 2023-02-07 16:29:25 -08:00
Mike Cao
94726239aa Added /me/websites. 2023-02-07 16:28:55 -08:00
Mike Cao
835289a1f8 Fixed team websites query. 2023-02-02 03:30:09 -08:00
Mike Cao
656df4f846 Update teams features. 2023-02-01 18:39:54 -08:00
Mike Cao
89f2fd601e Fix user logic. 2023-01-30 23:03:08 -08:00
Mike Cao
02a1438cfe More refactoring. 2023-01-30 21:44:07 -08:00
Mike Cao
7725b5c129 Refactored intl messages. 2023-01-25 07:42:46 -08:00
Mike Cao
91af593ff5 Updated settings components. 2023-01-20 17:12:53 -08:00
Mike Cao
1d9c3133f0 Refactored layout. Added NavBar component. 2023-01-18 15:05:39 -08:00
Mike Cao
53ec66e820 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	components/pages/login/LoginForm.js
 2023-01-11 14:48:17 -08:00
Mike Cao
4f15c4f146 Updated login and layout pages. 2023-01-11 14:47:38 -08:00
Brian Cao
b4bd988e4e WebsiteId query param. Fix Prisma filters. 2023-01-11 11:01:44 -08:00
Mike Cao
9d967fb0fe Updated settings components and date filter. 2023-01-11 08:33:43 -08:00
Mike Cao
4b5b4db108 Updated settings components and date filter. 2023-01-10 17:18:59 -08:00
Mike Cao
7450b76e6d Refactored settings components. 2023-01-09 23:59:26 -08:00
Mike Cao
d827b79c72 Updated forms usage. 2023-01-05 22:56:36 -08:00
Brian Cao
fcb1767eb1
Feat/um 145 re add events (#1733) 
* Re-add events. Fix event_type queries.

* Re-add eventData

* revert CSS.
 2023-01-05 19:39:29 -08:00
Mike Cao
796c65fa29 Updated login check method. 2023-01-04 21:20:24 -08:00
Mike Cao
170b30b391 CSS fix. 2023-01-03 12:31:55 -08:00
Mike Cao
f3879c92e1 Merge branch 'dev' of https://github.com/umami-software/umami into dev 
# Conflicts:
#	lib/middleware.ts
#	pages/api/users/[id]/index.ts
#	pages/api/users/index.ts
#	pages/api/websites/[id]/active.ts
#	pages/api/websites/[id]/eventdata.ts
#	pages/api/websites/[id]/events.ts
#	pages/api/websites/[id]/index.ts
#	pages/api/websites/[id]/metrics.ts
#	pages/api/websites/[id]/pageviews.ts
#	pages/api/websites/[id]/reset.ts
#	pages/api/websites/[id]/stats.ts
#	yarn.lock
 2022-12-31 13:54:44 -08:00
Brian Cao
eb2f07c105 Event Data maximum size. 2022-12-29 14:51:51 -08:00
Mike Cao
c56f02c475 Refactored fetching to use react-query. 2022-12-28 15:43:22 -08:00
Mike Cao
cad0b73e42 Refactored useApi usage. 2022-12-27 20:20:44 -08:00
Brian Cao
561cde6e7e
Add admin check. (#1716) 
* Add admin check.

* Fix teamId check.
 2022-12-27 15:18:58 -08:00
Brian Cao
ef9d915592 Fix event var names. 2022-12-26 23:21:54 -08:00
Mike Cao
dff105c747 Updated prisma and redis clients. 2022-12-26 21:51:16 -08:00
Brian Cao
a91386434d Remove snake_case. 2022-12-26 17:36:48 -08:00
Brian Cao
e1f99a7d01
Rewrite admin. (#1713) 
* Rewrite admin.

* Clean up password forms.

* Fix naming issues.

* CSS Naming.
 2022-12-26 16:57:59 -08:00
Mike Cao
4c202741c2 Fixed share page. 2022-12-13 11:27:55 -08:00
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