m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-06-30 13:41:50 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,203 Commits 2 Branches 0 Tags 16 MiB
c1d3e9ec67
Commit Graph

462 Commits

Author SHA1 Message Date
Mike Cao
c1d3e9ec67 Upgraded Chart.js to v4. Updated charts. 2023-03-14 22:37:50 -07:00
Mike Cao
9a3e8921a7 Merge branch 'dev' of https://github.com/umami-software/umami into dev 2023-03-10 18:45:51 -08:00
Mike Cao
6ba00152c2 Updated filter tags. 2023-03-10 17:49:19 -08: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
0607e9f442 Upgraded next to 13. Fixed date filter for websites. 2023-03-08 20:23:32 -08:00
Mike Cao
696d9c978c Updated date range handling. Fixed share page. 2023-03-08 16:37:43 -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
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
3ac560dc0f Added checks for CLOUD_MODE. 2023-02-28 20:04:07 -08:00
Francis Cao
6c302a7325 collect pagetitle, update subdivision2 data type 2023-02-28 17:40:18 -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
Francis Cao
6bacfa5892 add city, subdivision1, subdivison2 2023-02-16 18:55:51 -08:00
Francis Cao
4351ef37f8 update to GeoLite2-City 2023-02-14 12:06:41 -08:00
Mike Cao
4a689bf294 Added website menu view. Fixed pages filter. 2023-02-10 23:21:50 -08:00
Mike Cao
c815e7cd51 More refactoring and clean-up. 2023-02-10 03:26:57 -08:00
Mike Cao
ad5e34a894 Fixed lint issues. 2023-02-07 16:29:25 -08:00
Mike Cao
0ce2d1fbfc Team delete functionality. 2023-02-02 11:59:38 -08:00
Mike Cao
02a1438cfe More refactoring. 2023-01-30 21:44:07 -08:00
sdvcrx
86aaa5519e
Add maxAge config to cache CORS preflight request 2023-01-19 18:06:18 +08:00
Brian Cao
1eb9e10d94 Re-write CH queries to use query params. 2023-01-12 00:02:12 -08:00
Brian Cao
b4bd988e4e WebsiteId query param. Fix Prisma filters. 2023-01-11 11:01:44 -08:00
Mike Cao
7450b76e6d Refactored settings components. 2023-01-09 23:59:26 -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
Mike Cao
c56f02c475 Refactored fetching to use react-query. 2022-12-28 15:43:22 -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
561cde6e7e
Add admin check. (#1716) 
* Add admin check.

* Fix teamId check.
 2022-12-27 15:18:58 -08:00
Mike Cao
c90bd941b5 Merge remote-tracking branch 'origin/dev' into dev 2022-12-27 00:00:42 -08:00
Mike Cao
aef7326f4c Added access_code column to teams. 2022-12-27 00:00:31 -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
1fcaa1c9fc Updated log messages. 2022-12-14 23:13:57 -08:00
Mike Cao
4c202741c2 Fixed share page. 2022-12-13 11:27:55 -08:00
Brian Cao
8732d056dd
Dev (#1702) 
* Initial Typescript models.

* Re-add realtime data

* get distinct sessions for session metrics

* Add queries for new schema.

* Fix Typo.

* Add some api/team endpoints.

* Fix destructure error.

* Fix getWebsites call.

* Ignore typescript build errors.

* Fix enum issue.

* add clickhouse route to deleteWebsite

* Fix Website auth.

* Updated lint-staged config.

* Add permission checks.

* Add user role api.

* Fix error when updating website.

* Fix isAdmin check.  Fix Schema.

* Initial conversion to react-basics.

* Remove user/team transfer from website update.

* delete website in relational query

* Fix login secure token creation.

* Add event type to event.

* Allow user to be added to team with role.

* Updated login form.

* Add Role to TeamUser.

* Add database migration.

* Refactored permissions check. Updated redis lib.

* Feat/um 114 roles and permissions (#1683)

* Auth checkpoint.

* Merge branch 'dev' into feat/um-114-roles-and-permissions

* Add 02 migration.

* Added lib/types.

* Updated schema.

* Updated roles and permissions logic.

* Implement react-basics styles. Fix queries.

* Update website details layout.

* Add 01 migration.

* Fix admin create.

* Update react-basics.

Co-authored-by: Francis Cao <franciscao@gmail.com>
Co-authored-by: Mike Cao <mike@mikecao.com>
Co-authored-by: Mike Cao <moocao@gmail.com>
 2022-12-12 19:45:38 -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
Brian Cao
77b739870e Add database migration. 2022-11-29 21:56:43 -08:00
Mike Cao
2259ee8d76 Initial conversion to react-basics. 2022-11-21 22:32:55 -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