m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-11-15 17:55:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,574 Commits 2 Branches 0 Tags 16 MiB
c5bffb97cc
Commit Graph

516 Commits

Author SHA1 Message Date
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
slawiko
02272d3909 Adds locale mapping 2023-02-22 12:25:13 +01:00
Dustin Dauncey
b8f72660d9
Stylized macOS + sorted Desktop & Mobile OS names 
Since iOS was stylized, I thought it was consistent if we also stylized macOS (it's not Mac OS anymore, it's (macOS)[https://en.wikipedia.org/wiki/MacOS]). 

Also took a quick moment to sort the values for Desktop and Mobile OS names in order to more easily locate at a glance the item being looked for.
 2023-02-20 21:21:05 -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
effakt
6b3eb7617d Adding registered_country fallback to getCountry 2023-02-04 08:46:32 +13: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
Mike Cao
765833b357 Merge branch 'app' of https://github.com/umami-software/umami into app 2023-01-25 13:15:02 -08:00
Mike Cao
54eb8a19d4
Merge pull request #1760 from mbos2/croatian-translation-fix 
Croatian translations update
 2023-01-25 13:14:53 -08:00
Mike Cao
a430eae12b Merged #1752. 2023-01-25 08:47:13 -08:00
Matej Bošnjak
1b6653c35c croatian translations fix 2023-01-23 18:54:35 +01:00
sdvcrx
86aaa5519e
Add maxAge config to cache CORS preflight request 2023-01-19 18:06:18 +08:00
Brian Cao
cd400bcef2 Fix regex. 2023-01-18 16:36:28 -08:00
Brian Cao
922c3acab3
Fix share URL permissions. (#1745) 
* Fix share URL permissions.

* Add sql param logic.

* Add permissions to edit website.

* Update permissions.

* Move parameters to param injection.

* Sanitize eventdata.

* Remove caret.

* Fix avg.
 2023-01-18 15:09:49 -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
stoXmod
d199065d3a Improve sinhala font and added to language select menu 2023-01-10 12:38:57 +05:30
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
Brian Cao
ce02958bc2 Fix enum issue. 2022-11-18 11:22:03 -08:00
Brian Cao
b0c7980a20 Merge branch 'dev' into feat/um-23-new-schema 2022-11-16 18:34:03 -08:00
Mike Cao
8722b794d9 Fixed share token check. 2022-11-16 11:44:36 -08:00
Brian Cao
0aaba8cbd1 Initial Typescript models. 2022-11-15 13:21:14 -08:00
Mike Cao
2555ee09d1 Added Croatian language. 2022-11-12 21:03:47 -08:00
Mike Cao
091716e037 Updated middleware check. 2022-11-12 11:33:14 -08:00
Mike Cao
1c64800157 Updated token payload. 2022-11-11 09:42:54 -08:00
Brian Cao
84375a582e Fix isAdmin check. 2022-11-09 12:03:24 -08:00
Mike Cao
d2100c33b7 Update auth logic. 2022-11-09 10:16:50 -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
3b705e6cb4 Fetch user inside useAuth. 2022-11-09 06:40:36 -08:00
Mike Cao
67732b9b5a Refactor authentication and token handling. 2022-11-08 22:58:52 -08:00
Mike Cao
1a8c7c42f4 Updated Clickhouse session logic. 2022-11-08 17:11:08 -08:00
Brian Cao
c2df477374 skip session check if using clickhouse 2022-11-08 15:50:34 -08:00
Brian Cao
648a5341e5 fix useAuth 2022-11-08 12:51:04 -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
Maxime-J
268c036632 custom fr-FR date format 2022-11-07 18:38:43 +00:00
Mike Cao
1075325ec5 Update website fetch and update. 2022-11-02 15:45:47 -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
c58e037a7e Updated useConfig. Added SSO page. 2022-10-31 11:02:37 -07:00
Mike Cao
aceb904398
v1.39.2 (#1599) 
* Fixed issue with realtime page rendering.

* fix auth, add pg extension (#1596)

* Fixed change password issue. API refactoring. Closes #1592.

* Fixed account lookup.

* Fixed issue with accessing user dashboards. Closes #1590

* fix sort on dashboard (#1600)

Co-authored-by: Brian Cao <brian@umami.is>
 2022-10-25 16:50:12 -07:00
Mike Cao
46a18f2918 Fixed account lookup. 2022-10-25 11:01:28 -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
Brian Cao
500a2b9663 fix column names 2022-10-21 22:30:52 -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
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
b0bed5e73a Merge branch 'dev' into feat/um-66-update-clickhouse-schema-uuid 2022-10-11 10:31:15 -07:00
Mike Cao
edd1751b81 Merge changes 2022-10-10 21:38:02 -07:00
Brian Cao
4073d57e64 roll back id adds 2022-10-10 17:01:48 -07:00
Brian Cao
ec6454aead Merge branch 'dev' into feat/um-66-update-clickhouse-schema-uuid 2022-10-10 16:20:07 -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
Francis Cao
96add409b6 update api to new CH columns 2022-10-08 16:12:33 -07:00
Mike Cao
73e7f647c0
Merge pull request #1551 from sergiomensing/fix-color-dots-in-realtime-logs 
Fix unique dot colors in the realtime logs
 2022-10-07 16:34:51 -07:00
Brian Cao
dcf16e1411 fix redis init 2022-10-06 16:41:37 -07:00
Mike Cao
e442617421 Add connect methods to libraries. 2022-10-06 15:00:16 -07:00
Mike Cao
d8c440453c Added getWebsite method. 2022-10-06 14:18:27 -07:00
Brian Cao
0387cf0da0 remove CH import 2022-10-06 12:49:49 -07:00
Sergio Mensing
e8a30e7251 use slice instead of substring for desired result 2022-10-05 14:44:49 +02:00