Commit Graph

515 Commits

Author SHA1 Message Date
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
7bbed0e12b Changed HASH_SALT to APP_SECRET. 2022-12-27 21:38:23 -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
Mike Cao
fe01574b16 Updated login form. 2022-11-28 11:14:24 -08:00
Mike Cao
2259ee8d76 Initial conversion to react-basics. 2022-11-21 22:32:55 -08:00
Mike Cao
c3a4d6c725 Added settings button. 2022-11-10 04:47:02 -08:00
Mike Cao
4f098a34c1 Hide user button for cloud. 2022-11-09 22:12:40 -08:00
Brian Cao
7bf12cc552 Assign user to userStore 2022-11-09 13:54:09 -08:00
Brian Cao
84375a582e Fix isAdmin check. 2022-11-09 12:03:24 -08:00
Mike Cao
f118bc95c1 Refactored redis usage. Added lib/cache. 2022-11-07 22:35:51 -08:00
Mike Cao
05245ca316 Use shallow routing for website details. 2022-11-02 08:57:52 -07:00
Brian Cao
17041efaae use uuid 2022-10-31 23:42:37 -07:00
Mike Cao
246e4e5f4f Fix disable checks. 2022-10-28 10:34:50 -07:00
Mike Cao
fc9584eb44 Refactor env check. 2022-10-27 16:42:57 -07:00
Brian Cao
99c975c329 add DISABLE_UI, DISABLE_ADMIN 2022-10-27 12:14:34 -07:00
Brian Cao
a49638b4c7 Merge branch 'feat/um-86-fix-website-update' into dev 2022-10-26 11:38:41 -07:00
Brian Cao
1d6f158509 fix id/uuid 2022-10-26 11:36:58 -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
2ad5cd9335 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	lib/auth.js
2022-10-25 10:46:32 -07:00
Mike Cao
ac070d3ce9 Fixed change password issue. API refactoring. Closes #1592. 2022-10-25 10:45:56 -07:00
Brian Cao
ebf439c598
fix auth, add pg extension (#1596) 2022-10-25 10:27:43 -07:00
Mike Cao
994cf950c8 Fixed issue with realtime page rendering. 2022-10-25 09:24:20 -07:00
Brian Cao
a320d65652 default column/filters 2022-10-21 22:19:51 -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
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
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
bce4476d12 fix reset/delete 2022-10-11 19:43:02 -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
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
5fb1f08df8 Split up account update logic. 2022-09-29 15:15:11 -07:00
Mike Cao
add7c5ebe9
Merge pull request #1531 from userdehghani/pr-blank-target
open update links in new tab
2022-09-24 18:36:18 -07:00
Mohammad Amin Dehghani
e92cb29025 open update links in new tab 2022-09-21 17:49:18 +04:30
AriaieBOY
d8eb22932b
Update RealtimeLog.js 2022-09-19 19:28:52 +04:30
Mike Cao
52bbc3692d Fix issue with generating URLs. 2022-09-05 12:04:30 -07:00