ambiser
/
umami
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,019 Commits
7 Branches
70 Tags
13 MiB
Commit Graph

281 Commits (c90194dad4e3be79ba02f02fd848b82cab76f763)

Author SHA1 Message Date
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 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 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 d8c440453c Added getWebsite method. 2022-10-06 14:18:27 -07:00
Mike Cao f3135ee867 Get account by uuid for cloud operations. 2022-10-04 20:16:09 -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
Brian Cao adb0a06006 add uuid to account 2022-09-30 22:27:47 -07:00
Mike Cao 5fb1f08df8 Split up account update logic. 2022-09-29 15:15:11 -07:00
Brian Cao b3d7d49448
Fix timezone bug (#1543) 2022-09-27 17:18:16 -07:00
Brian Cao 78c3453639
fix clickhouse calls (#1536) 2022-09-23 22:43:51 -07:00
Brian Cao 52e036964b Merge Session/Event/Pageview CH 2022-09-12 09:55:34 -07:00
Mike Cao 13cf286874 Fix www replace. 2022-09-05 15:35:36 -07:00
Mike Cao 9f6834925b
Merge pull request #1465 from aidanm1999/feature/2022-09/admin-website-assigning 
Admins can assign websites to non-admins
 2022-09-03 23:17:06 -07:00
Mike Cao efb52f5ff1 Fix crypto errors. 2022-08-29 08:31:16 -07:00
Mike Cao f4e0da481e Use next-basics package. 2022-08-28 20:20:54 -07:00
Brian Cao 54ade11a98 fix send message. look at redis on session create 2022-08-26 21:10:46 -07:00
Brian Cao 818f8721e9 redis checkpoint 2022-08-26 20:21:53 -07:00
Aidan Marshall b388961b8b Features: 
- Removes spellcheck for domain entry field
- Adds the ability to assign websites to other users if you are an admin
 2022-08-26 17:22:46 +02:00
Brian Cao 10cc6616c5 add redis placeholder 2022-08-25 23:12:47 -07:00
Brian Cao bb50753704 split db files 2022-08-25 22:04:32 -07:00
Brian Cao 46b4b98d40 update kafka messaging 2022-08-25 11:07:47 -07:00
Brian Cao 537ddde189 remove allow_agent 2022-08-22 23:21:44 -07:00
Francis Cao e522293130 fixed event_uuid logic 2022-08-22 12:24:57 -07:00
Brian Cao 41d4b4c402 allow agent 2022-08-18 23:25:45 -07:00
Francis Cao 295ce2487d Merge branch 'master' of https://github.com/umami-software/umami into francis/uc-24-kafka-test 2022-08-18 16:54:57 -07:00
Francis Cao 34e9ab811b add session_uuid to token 2022-08-09 23:32:02 -07:00
Mike Cao bc75b622b5 Updated test console. Refactored fetch for tracker. 2022-08-09 10:27:35 -07:00
Mike Cao 9b7e472410 Added CURRENT_VERSION constant. 2022-08-08 11:31:36 -07:00
Francis Cao fc3c39be3c Merge branch 'dev' of https://github.com/umami-software/umami into francis/uc-24-kafka-test 2022-08-08 08:36:21 -07:00
Mike Cao 89781d4847 Refactored query parameters. 2022-08-08 01:26:20 -07:00
Francis Cao 1a84608e2b add Clickhouse migration files. update saveEvent to include event_uuid 2022-08-04 20:15:21 -07:00
Mike Cao 1662b66fbb Cleaned up script. 2022-08-02 00:52:08 -07:00
Mike Cao 9969c9b6b1 Forgot the actual check. 2022-08-02 00:32:28 -07:00
Mike Cao a4a6888248 Moved telemetry code to script. 2022-08-02 00:24:17 -07:00
Mike Cao 3d7e9392f0 Merge remote-tracking branch 'origin/dev' into dev 2022-08-01 23:05:24 -07:00
Mike Cao 50e491af06 Added endpoint for fetching server-side variables. 2022-08-01 23:04:47 -07:00
Mike Cao df1c203c38
Merge pull request #1376 from umami-software/brian/um-24-event-data 
Brian/um 24 event data
 2022-08-01 23:50:08 -05:00
Brian Cao daf3978970 address PR comments. line up PSQL / MYSQL 2022-08-01 20:50:14 -07:00
Mike Cao 68d35c0fc4 Moved DISABLE_LOGIN check to getServerSideProps. 2022-08-01 18:42:07 -07:00
Brian Cao 8f934c7e6c checkpoint 2022-07-29 22:30:09 -07:00
Mike Cao ba1e28f082 Fix filter issue for metrics. Closes #1268 2022-07-22 23:56:29 -07:00
Brian Cao 304314fff0 Merge branch 'dev' into brian/um-16-clickhouse-support 2022-07-22 17:03:42 -07:00
Brian Cao 65910c7348 clickhouse inserts 2022-07-22 14:43:19 -07:00
Chris Walsh 92b009fa1e
Add UTM pageview metrics to API 2022-07-21 14:57:29 -07:00
Mike Cao 358c725828 Fix issue with unicode filtering. Closes #1258 2022-07-21 01:35:14 -07:00
Mike Cao be8291c856 Refactored referrer logic. Display stats for no referrers. 2022-07-21 01:11:10 -07:00
Mike Cao d95b53143e
Merge pull request #1304 from thueske/feature/screensize 
Feature: Add screensize to UI
 2022-07-18 00:37:07 -07:00
Tobias Hüske 8d358ccb9d Feature: Add screensize to UI 2022-07-16 07:29:55 +02:00
Brian Cao 9803d4b5ee Merge branch 'dev' into brian/um-22-query-folder-structure 2022-07-12 22:34:05 -07:00
Brian Cao 2950343f94 fix import 2022-07-12 19:50:47 -07:00
Brian Cao 8aec6d7406 move queries 2022-07-12 14:14:36 -07:00
mike 846afad0a4 Moved middleware. 2022-07-07 09:24:32 -07:00
rohandebsarkar ce6fd12f9f
Change `API_COLLECT_ENDPOINT` to `COLLECT_API_ENDPOINT` 2022-07-04 15:52:59 +05:30
rohandebsarkar ae48ff0e68
Adds support for `customCollectEndpoint` 2022-07-03 11:33:49 +05:30
Mike Cao 8175f13f96 Added IGNORE_HOSTNAME environment variable. Closes #1151. 2022-06-27 01:46:21 -07:00
Mike Cao 5a5a278d9e Removed DISABLE_LOGIN from middleware. 2022-06-22 02:28:23 -07:00
Mike Cao 0f37c17cb5 Added logging to test Vercel issue. 2022-06-22 02:08:13 -07:00
mike ccec996b34 Update disable login message. 2022-06-10 11:23:00 -07:00
Mike Cao 9dae76fbf3 Updated version check. 2022-06-03 07:06:44 -07:00
Mike Cao e735a1c50d Updated share token logic. Closes #1113. 2022-05-05 19:04:28 -07:00
Mike Cao 08dff1293e
Merge pull request #1127 from Zxilly/master 
fix: cover edge case of script name
 2022-04-27 08:33:52 -07:00
isNullOrEmpty() 699740dc34 fix: cover edge case of script name 2022-04-27 10:05:24 +00:00
Mike Cao f69dbaeaf6 Allow filtering of events with url. 2022-04-13 19:04:06 -07:00
Mike Cao df1ddf3e73 Updated filter processing logic. 2022-04-11 00:19:29 -07:00
Mike Cao fb2dc9f5ab Allow filtering on session fields. 2022-04-10 03:51:43 -07:00
Mike Cao edd1645bab Refactor multi-script name code. Update languages. 2022-04-09 22:11:15 -07:00
Mike Cao 0e82807170
Merge pull request #1036 from djyde/support-multiple-track-script-name 
support multiple track script name
 2022-04-09 20:13:13 -07:00
Mike Cao e7602b58f4
Merge pull request #1080 from HolgerHuo/fix-referrer-issue 
Fix referrer filter issue
 2022-04-08 21:43:54 -07:00
Mike Cao 13432ede22 Include version for preload. 2022-04-08 21:39:13 -07:00
Mike Cao 1b599a9d9c Preload image. 2022-04-08 15:37:36 -07:00
Holger Huo 0377773e21 fix: forgot to include referrer filter in sessionMetrics 2022-04-07 22:27:15 +08:00
Mike Cao 9696a5f8f2 Re-use the response from forceSSL. 2022-04-04 18:51:31 -07:00
Mike Cao 6eaf090bde Changed force SSL method to send headers. 2022-04-04 17:01:21 -07:00
Mike Cao bf5068d32a Added CORS to website API endpoints. 2022-04-04 00:33:20 -07:00
Mike Cao faf6438852 Allow user to change admin username. 2022-04-03 22:25:32 -07:00
Kevin Decherf 1269bea870 fixup! Update metric tables when filtering on referrer 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2022-03-24 23:20:19 +01:00
Kevin Decherf 35f9c7ef6c Update metric tables when filtering on referrer 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2022-03-20 22:14:54 +01:00
Kevin Decherf ecfc7ea68e Rename ref to prevent collision with react elements 
It seems that, at least in dev mode, 'ref' may incorrectly refer to
react elements.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2022-03-20 22:10:41 +01:00
Randy 2bd3ddf6ec support multiple track script name 2022-03-19 14:18:32 +08:00
Mike Cao 3717b0e888 Fix issue with force SSL redirects. 2022-03-15 08:49:42 -07:00
Mike Cao 5ca6f76daa Updated collect API response. 2022-03-10 20:39:11 -08:00
Mike Cao 17790aa5a8 Fix issue with sendBeacon request. 2022-03-10 19:01:33 -08:00
Mike Cao 20622116a8 New Dashboard component. 2022-03-03 19:45:49 -08:00
Mike Cao 34ad1d9c39 New mobile menu. 2022-02-28 18:39:37 -08:00
Mike Cao 9937caa569 Replaced redux with zustand. Fixed login issue, closes #980. 2022-02-22 22:47:59 -08:00
Mike Cao 7270d95240 Move environment variables to middleware. Closes #972. 2022-02-20 23:27:50 -08:00
Mike Cao 8e350a2056 Added option to disable login. Closes #948 2022-02-16 15:01:33 -08:00
Mike Cao 6a8de2aeec Added option to remove trailing slash from urls. 2022-01-25 21:23:40 -08:00
Mike Cao d8e831db50 Switch to authentication using bearer token. 2022-01-23 00:33:06 -08:00
Mike Cao 489d46f663 Fix PR. 2022-01-14 00:08:27 -08:00
Mike Cao 2e1db5ba55
Merge pull request #905 from p-chan/add-screen-fallback 
Fix runtime error when device is null
 2022-01-12 20:37:34 -08:00
P-Chan 56c0837e83 Refactor device message 2022-01-05 20:25:53 +09:00
Mike Cao c531072a4e
Merge pull request #873 from cywio/languages-table 
Add languages to website details page
 2021-12-19 23:05:17 -08:00