Commit graph

  • eb2f07c105 Event Data maximum size. Brian Cao 2022-12-29 14:51:51 -08:00
  • db6a6d6055 Merge branch 'dev' of https://github.com/umami-software/umami into dev Mike Cao 2022-12-28 15:49:28 -08:00
  • c56f02c475 Refactored fetching to use react-query. Mike Cao 2022-12-28 15:43:22 -08:00
  • b243f0a319 Fix Icon. Brian Cao 2022-12-28 12:56:22 -08:00
  • 74d2cd8d03
    Feat/um 140 password modal (#1718) Brian Cao 2022-12-28 12:37:09 -08:00
  • 1457c3ac4e Close on save. Brian Cao 2022-12-28 12:36:41 -08:00
  • ce56899704 Change password to modal. Brian Cao 2022-12-28 12:34:45 -08:00
  • abf80cab8e Merge branch 'dev' into feat/um-140-password-modal Brian Cao 2022-12-28 10:07:31 -08:00
  • 24fb8cfac4
    Merge branch 'umami-software:master' into master Didier Krux 2022-12-28 16:13:33 +01:00
  • 7bbed0e12b Changed HASH_SALT to APP_SECRET. Mike Cao 2022-12-27 21:38:23 -08:00
  • cad0b73e42 Refactored useApi usage. Mike Cao 2022-12-27 20:20:44 -08:00
  • 1472e205a3 Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-138-remove-prisma-foreign-key Francis Cao 2022-12-27 16:52:04 -08:00
  • 8ee7172ea0 drop foreign keys, add missing indexes Francis Cao 2022-12-27 16:26:25 -08:00
  • 561cde6e7e
    Add admin check. (#1716) Brian Cao 2022-12-27 15:18:58 -08:00
  • 2d99615d30 Fix teamId check. Brian Cao 2022-12-27 15:18:34 -08:00
  • 39ea100f2a Add admin check. Brian Cao 2022-12-27 13:13:59 -08:00
  • c90bd941b5 Merge remote-tracking branch 'origin/dev' into dev Mike Cao 2022-12-27 00:00:42 -08:00
  • aef7326f4c Added access_code column to teams. Mike Cao 2022-12-27 00:00:31 -08:00
  • ef9d915592 Fix event var names. Brian Cao 2022-12-26 23:21:54 -08:00
  • dff105c747 Updated prisma and redis clients. Mike Cao 2022-12-26 21:51:16 -08:00
  • c05d116875 Merge remote-tracking branch 'origin/dev' into dev Mike Cao 2022-12-26 20:51:08 -08:00
  • ad15466028 Updated packages. Mike Cao 2022-12-26 20:50:55 -08:00
  • 677566b5f3
    Merge pull request #1714 from umami-software/feat/um-136-camel-case Mike Cao 2022-12-26 20:49:38 -08:00
  • a91386434d Remove snake_case. Brian Cao 2022-12-26 17:36:48 -08:00
  • e1f99a7d01
    Rewrite admin. (#1713) Brian Cao 2022-12-26 16:57:59 -08:00
  • 4ef52e0136 CSS Naming. Brian Cao 2022-12-26 12:48:20 -08:00
  • b9fcab0597 Fix naming issues. Brian Cao 2022-12-26 12:47:03 -08:00
  • 4451fc5982 Clean up password forms. Brian Cao 2022-12-26 12:34:23 -08:00
  • 6cf6a97b4d Rewrite admin. Brian Cao 2022-12-25 22:00:20 -08:00
  • f4db04c3c6 Update to react-basics v0.40. mike 2022-12-20 23:01:47 -08:00
  • 1d36a8a46b Update to react-basics v0.39. mike 2022-12-20 16:38:00 -08:00
  • 07df9f9afa Use local version of umami in docker-compose Nils Rugsveen 2022-12-20 13:16:08 +01:00
  • 133074d2f3 Use node instead of node-alpine for build step Nils Rugsveen 2022-12-20 13:15:48 +01:00
  • e7df3f6be9 Fix 'Error loading shared library libssl.so.1.1' error Elvis 2022-12-17 11:49:24 +01:00
  • 1fcaa1c9fc Updated log messages. Mike Cao 2022-12-14 23:13:57 -08:00
  • 4c202741c2 Fixed share page. Mike Cao 2022-12-13 11:27:55 -08:00
  • cb4c8accea Fixed admin checks. Mike Cao 2022-12-13 08:41:13 -08:00
  • da49543b91 Merge branch 'dev' into analytics Mike Cao 2022-12-12 20:51:12 -08:00
  • 4cc22fcc95 Fix event data check. Mike Cao 2022-12-12 20:46:43 -08:00
  • 8732d056dd
    Dev (#1702) Brian Cao 2022-12-12 19:45:38 -08:00
  • e4fe22233c Update react-basics. Brian Cao 2022-12-12 16:46:46 -08:00
  • 4501951336 Fix admin create. Brian Cao 2022-12-12 12:31:56 -08:00
  • 8097428a4b Add 01 migration. Brian Cao 2022-12-12 12:04:31 -08:00
  • e8e90a5451 Update website details layout. Mike Cao 2022-12-10 14:26:52 -08:00
  • 0a6ecfe3d2 Implement react-basics styles. Fix queries. Mike Cao 2022-12-08 23:43:43 -08:00
  • fc44c62f9f Add compose.yaml in .dockerignore S HYS 2022-12-07 14:34:05 +09:00
  • 8a9a3ba30a Conform Compose file to Compose Specification S HYS 2022-12-07 13:54:59 +09:00
  • b57ecf33e6 Updated roles and permissions logic. Mike Cao 2022-12-06 18:36:41 -08:00
  • 4eb3140e43 Updated schema. Mike Cao 2022-12-05 13:03:02 -08:00
  • 849c0f9bc8 Merge remote-tracking branch 'origin/dev' into dev Mike Cao 2022-12-02 14:15:45 -08:00
  • 4781a0cc8c Added lib/types. Mike Cao 2022-12-02 14:15:24 -08:00
  • b40630f9d4 Merge remote-tracking branch 'origin/dev' into dev Brian Cao 2022-12-01 22:06:39 -08:00
  • 4ef48a8f4b Add 02 migration. Brian Cao 2022-12-01 22:06:36 -08:00
  • 06bebadbb9
    Feat/um 114 roles and permissions (#1683) Brian Cao 2022-12-01 20:53:37 -08:00
  • b4417d78d2 Merge branch 'dev' into feat/um-114-roles-and-permissions Brian Cao 2022-12-01 20:53:23 -08:00
  • ab9f403448 Merge branch 'dev' into feat/um-114-roles-and-permissions Brian Cao 2022-12-01 20:30:46 -08:00
  • a4e80ca3e5 Refactored permissions check. Updated redis lib. Mike Cao 2022-12-01 10:58:50 -08:00
  • 1dd4ada767 Replace more umami branding Ole Martin Knurvik 2022-12-01 14:34:09 +01:00
  • a8f8d4088d Change header icon Nils Rugsveen 2022-05-20 11:52:09 +02:00
  • 80f285be3e Change header title Nils Rugsveen 2022-05-20 11:49:52 +02:00
  • 449ce24cf5 Fix M1 Dockerfile build Nils Rugsveen 2022-05-20 11:40:33 +02:00
  • 3085bdd713 Auth checkpoint. Brian Cao 2022-11-30 18:40:44 -08:00
  • c8218a3e89
    Merge c2e3ff7e5a into 9ee6fb994c altude 2022-11-30 14:35:25 -08:00
  • c2e3ff7e5a Disable tracking if file is local Levi R 2022-11-30 14:30:43 -08:00
  • 0bcfc6654d Merge branch 'dev' into feat/um-114-roles-and-permissions Brian Cao 2022-11-30 10:01:08 -08:00
  • 1a7369e1f6 Merge branch 'feat/um-114-roles-and-permissions' into dev Brian Cao 2022-11-30 09:35:23 -08:00
  • 77b739870e Add database migration. Brian Cao 2022-11-29 21:56:43 -08:00
  • 0a9089a463 Merge remote-tracking branch 'origin/dev' into dev Brian Cao 2022-11-28 13:08:49 -08:00
  • d5437c895e Add Role to TeamUser. Brian Cao 2022-11-28 13:08:48 -08:00
  • fe01574b16 Updated login form. Mike Cao 2022-11-28 11:14:24 -08:00
  • 5869439769 feat: uffizzi integration Aramayis 2022-10-18 20:55:25 +04:00
  • 2fc61a6da3 format yml files Iván Salazar 2022-11-23 20:16:05 -06:00
  • d916ebef5c add arm support Iván Salazar 2022-11-23 16:37:25 -06:00
  • 502facd426 Allow user to be added to team with role. Brian Cao 2022-11-22 22:17:49 -08:00
  • d85b2be5f8 Add event type to event. Brian Cao 2022-11-22 15:06:52 -08:00
  • c90194dad4 Merge remote-tracking branch 'origin/dev' into dev Brian Cao 2022-11-21 23:23:20 -08:00
  • 9172098fa7 Fix login secure token creation. Brian Cao 2022-11-21 23:23:16 -08:00
  • 9e6dae2e55 Merge branch 'dev' of https://github.com/umami-software/umami into dev Francis Cao 2022-11-21 22:51:28 -08:00
  • 5da7a208a8 delete website in relational query Francis Cao 2022-11-21 22:51:23 -08:00
  • f98a97ef83 Merge branch 'dev' of https://github.com/umami-software/umami into dev Mike Cao 2022-11-21 22:33:13 -08:00
  • 3efd2a5b10 Remove user/team transfer from website update. Brian Cao 2022-11-21 22:32:59 -08:00
  • 2259ee8d76 Initial conversion to react-basics. Mike Cao 2022-11-21 22:32:55 -08:00
  • d60ad1c782 Fix isAdmin check. Fix Schema. Brian Cao 2022-11-21 16:44:42 -08:00
  • 371425ab60 Fix error when updating website. Brian Cao 2022-11-21 11:39:59 -08:00
  • c0a18e13fa Merge branch 'dev' of https://github.com/umami-software/umami into dev Mike Cao 2022-11-21 10:08:14 -08:00
  • 82d1f1ba2c Merge branch 'feat/um-23-new-schema' into dev Brian Cao 2022-11-20 22:24:51 -08:00
  • 6719f5b37c Merge branch 'dev' into feat/um-23-new-schema Brian Cao 2022-11-20 22:24:48 -08:00
  • 8fc6e99aa8 Add user role api. Brian Cao 2022-11-20 22:24:31 -08:00
  • 1e5174c211 Merge branch 'dev' of https://github.com/umami-software/umami into dev Mike Cao 2022-11-20 21:09:40 -08:00
  • 8bc3b288db
    Merge pull request #1668 from umami-software/feat/um-23-new-schema Mike Cao 2022-11-20 21:09:32 -08:00
  • df50d9cefc Merge branch 'dev' of https://github.com/umami-software/umami into dev Mike Cao 2022-11-20 21:04:53 -08:00
  • 78225691df Add permission checks. Brian Cao 2022-11-20 00:48:13 -08:00
  • 817880b511 Updated lint-staged config. Mike Cao 2022-11-19 18:28:46 -08:00
  • 51e2331315 Merge branch 'dev' into feat/um-23-new-schema Brian Cao 2022-11-18 18:50:19 -08:00
  • 2e01226b46 Merge branch 'feat/um-23-new-schema' into dev Brian Cao 2022-11-18 18:50:11 -08:00
  • e28ee6597a Fix Website auth. Brian Cao 2022-11-18 18:49:58 -08:00
  • 3eb1d783de Merge branch 'dev' of https://github.com/umami-software/umami into dev Francis Cao 2022-11-18 12:08:23 -08:00
  • eaa208652d add clickhouse route to deleteWebsite Francis Cao 2022-11-18 12:08:13 -08:00
  • 1af93a17a3 Merge branch 'dev' into feat/um-23-new-schema Brian Cao 2022-11-18 11:22:22 -08:00
  • 90fbe9abee Merge branch 'feat/um-23-new-schema' into dev Brian Cao 2022-11-18 11:22:10 -08:00