Mike Cao
c49e2c6974
Fixed Vercel geolocation.
2023-04-25 14:52:29 -07:00
Mike Cao
3f1ed750f0
Added error boundary. Fixed #1976 .
2023-04-25 14:41:54 -07:00
Mike Cao
92ab391ef8
Use Vercel headers for location.
2023-04-24 19:29:31 -07:00
Mike Cao
c5bffb97cc
Improved error handling for useSession middleware.
2023-04-22 14:17:57 -07:00
Mike Cao
987e3aabbd
Fix tracking code form.
2023-04-21 17:21:44 -07:00
Mike Cao
3b6c6846b1
Fixed lang references.
2023-04-19 18:42:29 -07:00
Mike Cao
afde1377dc
Merge branch 'dev' into master
2023-04-19 17:06:46 -07:00
Mike Cao
dfae0c150d
Merge branch 'dev'
...
# Conflicts:
# components/common/Calendar.js
# components/common/EventDataButton.js
# components/forms/EventDataForm.js
# components/layout/Header.js
# db/mysql/migrations/02_add_event_data/migration.sql
# lang/be-BY.json
# lang/de-CH.json
# lang/es-MX.json
# lang/fa-IR.json
# lang/km-KH.json
# lang/lt-LT.json
# lang/th-TH.json
# lib/auth.js
# lib/detect.ts
# lib/lang.js
# lib/middleware.js
# lib/prisma.js
# package.json
# pages/_app.js
# pages/api/accounts/[id]/password.js
# pages/api/collect.js
# pages/api/realtime/init.js
# pages/api/websites/[id]/index.js
# pages/api/websites/[id]/reset.ts
# pages/api/websites/index.js
# public/intl/messages/fa-IR.json
# public/intl/messages/lt-LT.json
# public/intl/messages/pt-BR.json
# public/intl/messages/th-TH.json
# queries/analytics/event/getEventData.js
# queries/analytics/event/getEventMetrics.js
# queries/analytics/pageview/getPageviewMetrics.js
# queries/analytics/pageview/getPageviewParams.js
# queries/analytics/pageview/getPageviewStats.js
# queries/analytics/session/getSessionMetrics.js
# queries/analytics/stats/getActiveVisitors.js
# queries/analytics/stats/getWebsiteStats.js
# sql/schema.mysql.sql
# styles/index.css
# yarn.lock
2023-04-17 11:08:17 -07:00
Mike Cao
d406564af3
Manually merge PR #1879 .
2023-04-17 10:31:50 -07:00
Francis Cao
43499eb4fd
fix region / city filters
2023-04-17 00:10:51 -07:00
Mike Cao
e286994397
Merge branch 'dev' of https://github.com/umami-software/umami into dev
...
# Conflicts:
# public/iso-3166-2.json
2023-04-13 22:30:22 -07:00
Mike Cao
f2edd0d604
Added regions and cities support.
2023-04-13 22:28:29 -07:00
Brian Cao
0335fd3529
Remove webisite.teamId related code. Clean up queries.
2023-04-13 20:57:22 -07:00
Brian Cao
ef324fdf73
Fix update user.
2023-04-13 12:08:53 -07:00
Kai Steinke
0926a4c310
feat: add missing locales and sort alphabetically
2023-04-11 10:53:43 +02:00
Francis Cao
f5f6dc052e
fix column name date bug
2023-04-10 09:44:25 -07:00
Brian Cao
9eff565e7a
Fix teamWebsite / teamUser.
2023-04-09 16:04:28 -07:00
Mike Cao
0dc6529cf1
Added new languages to lib/lang.
2023-04-08 15:51:49 -07:00
Mike Cao
b2bebaea3e
Added km-KH, updated be-BY.
2023-04-08 13:58:58 -07:00
Mike Cao
e850fbd0bd
Merge changes from master.
2023-04-08 13:55:52 -07:00
Brian Cao
7b07de7a98
Api work for remove user.
2023-04-07 22:45:46 -07:00
Mike Cao
6dd90ce9ca
Refactored SSO process.
2023-04-04 23:29:54 -07:00
Brian Cao
dee58f8a55
Fix date function.
2023-04-04 00:24:03 -07:00
Brian Cao
76296bc2ee
Fix realtime.
2023-04-03 23:22:20 -07:00
Mike Cao
ba71f5cafc
Fix location lookup.
2023-04-02 22:36:52 -07:00
Mike Cao
7464bd2521
Fixed types.
2023-04-02 17:28:25 -07:00
Mike Cao
9001361e4c
Fix session lookup.
2023-04-02 17:23:12 -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
728e4cff5b
Updated queries to use cache.
2023-04-01 17:38:35 -07:00
Mike Cao
74192cd695
Refactored filter logic.
2023-04-01 15:44:30 -07:00
Brian Cao
d2687b6580
Fix metrics.
2023-03-31 14:53:48 -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
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
05933ff1d2
Use new geo folder.
2023-03-28 19:24:36 -07:00
Mike Cao
23d02e5aac
Try reverting to country database.
2023-03-28 19:10:11 -07:00
Francis Cao
14e4a090bb
update schema and queries to implement reset_at
2023-03-27 11:25:16 -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
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
f569f6ac91
fix null ip lookup error
2023-03-15 16:39:55 -07:00
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
Mike Cao
7a3443cd06
Merge pull request #1775 from EffakT/country_fallback
...
Adding registered_country fallback to getCountry
2023-03-09 15:55:38 -08:00
Mike Cao
49402924aa
Merge pull request #1792 from d19dotca/patch-1
...
Stylized macOS + sorted Desktop & Mobile OS names
2023-03-09 15:16:05 -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
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
