Commit Graph

109 Commits

Author SHA1 Message Date
Mike Cao
0ce2d1fbfc Team delete functionality. 2023-02-02 11:59:38 -08:00
Mike Cao
835289a1f8 Fixed team websites query. 2023-02-02 03:30:09 -08:00
Mike Cao
22aeaf7166 Added owner column to teams table. 2023-02-02 02:54:43 -08:00
Mike Cao
656df4f846 Update teams features. 2023-02-01 18:39:54 -08:00
Mike Cao
02a1438cfe More refactoring. 2023-01-30 21:44:07 -08:00
Mike Cao
5f15ad0807 More refactoring, cleaned up icons, nav buttons, add messages. 2023-01-27 21:53:13 -08:00
Mike Cao
7725b5c129 Refactored intl messages. 2023-01-25 07:42:46 -08:00
Mike Cao
cdd54df8f6 Refactored user components. 2023-01-23 15:32:35 -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
f654e6728c Fix links. 2023-01-11 10:49:04 -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
70ef857dc7 Fix links. 2023-01-10 00:13:32 -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
db6a6d6055 Merge branch 'dev' of https://github.com/umami-software/umami into dev
# Conflicts:
#	components/forms/UserPasswordForm.js
#	components/pages/Dashboard.js
2022-12-28 15:49:28 -08:00
Mike Cao
c56f02c475 Refactored fetching to use react-query. 2022-12-28 15:43:22 -08:00
Brian Cao
b243f0a319 Fix Icon. 2022-12-28 12:56:22 -08:00
Brian Cao
74d2cd8d03
Feat/um 140 password modal (#1718)
* Change password to modal.

* Close on save.
2022-12-28 12:37:09 -08:00
Mike Cao
cad0b73e42 Refactored useApi usage. 2022-12-27 20:20:44 -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
e8e90a5451 Update website details layout. 2022-12-10 14:26:52 -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
Brian Cao
84375a582e Fix isAdmin check. 2022-11-09 12:03:24 -08:00
Brian Cao
17041efaae use uuid 2022-10-31 23:42:37 -07:00
Brian Cao
7f3db334f5
fix sort on dashboard (#1600) 2022-10-25 16:48:39 -07:00
Mike Cao
8b64ef1a4e Fixed issue with accessing user dashboards. Closes #1590 2022-10-25 15:48:49 -07:00
Mike Cao
994cf950c8 Fixed issue with realtime page rendering. 2022-10-25 09:24: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
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
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
Mike Cao
ee3c9debb2
Merge branch 'dev' into patch-1 2022-09-03 23:15:03 -07:00
Dhravya Shah
aaf0effcbb
Fixed TypeError: Cannot read properties of undefined (reading 'website_id') 2022-09-01 19:48:21 +05:30
Mike Cao
fb39ce8822 Fixed dashboard ordering issue. Closes #1414 2022-08-29 20:57:34 -07:00
Mike Cao
f4e0da481e Use next-basics package. 2022-08-28 20:20:54 -07:00
Mike Cao
bc75b622b5 Updated test console. Refactored fetch for tracker. 2022-08-09 10:27:35 -07:00
Mike Cao
89781d4847 Refactored query parameters. 2022-08-08 01:26:20 -07:00
Mike Cao
7ae457669b Fix event table. 2022-08-05 13:07:20 -07:00
Mike Cao
62b032ab19 Refactored dashboard sort logic. 2022-08-04 21:37:18 -07:00