Commit Graph

2135 Commits (6504a29247b5f112ef701e53c11bada07f857116)

Author SHA1 Message Date
kodiakhq[bot] 6504a29247
Merge branch 'main' into enterprise-license 2022-04-21 13:28:26 +00:00
milospuac fead885aa4
Create slack.mdx (#2565)
Documentation for our Slack commands
2022-04-21 14:26:29 +01:00
kodiakhq[bot] 3363d7b841
Merge branch 'main' into enterprise-license 2022-04-21 09:35:21 +00:00
sean-brydon e680bb1548
Adding Scope for bot permissions (#2530)
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-04-21 10:32:56 +01:00
kodiakhq[bot] db7e31a84c
Merge branch 'main' into enterprise-license 2022-04-20 21:39:33 +00:00
alannnc 6e82d38249
Fix for appstore and wipemycal render (#2556)
* Fix for appstores and wipe-my-cal

* Fix email subject for reschedule

* Fix email subject for reschedule

* Fix api add wipemycal return

* Now we ask on a endpoint if app its installed

* Fix types

Co-authored-by: Omar López <zomars@me.com>
2022-04-20 23:37:25 +02:00
zomars 56998b9287 Updates admin 2022-04-20 14:34:11 -06:00
kodiakhq[bot] a3d9227818
Merge branch 'main' into enterprise-license 2022-04-20 20:22:24 +00:00
zomars 9f63299a1a Fixes hubspot metadata 2022-04-20 14:20:02 -06:00
zomars b2be2f68f5 Updates license checker URL 2022-04-20 14:14:46 -06:00
zomars a9a7d83c45 Adds scripts for console 2022-04-20 13:46:07 -06:00
zomars b7ed262701 Updates submodules 2022-04-20 13:22:19 -06:00
kodiakhq[bot] d8ac3a2e4d
Merge branch 'main' into enterprise-license 2022-04-20 18:39:11 +00:00
zomars 702f31c935 Prepares prettier for local modules 2022-04-20 12:37:03 -06:00
zomars 7838307071 Merge branch 'main' into enterprise-license 2022-04-20 12:01:51 -06:00
zomars 08db282a07 Extracts EmptyScreen 2022-04-20 12:00:49 -06:00
zomars 080a394bb3 Renames package
# Conflicts:
#	package.json
2022-04-20 11:52:07 -06:00
zomars 8fb429e073 Renames package
# Conflicts:
#	package.json
2022-04-20 11:51:26 -06:00
zomars afbfb982fd Renames package 2022-04-20 11:50:54 -06:00
kodiakhq[bot] 17763aca61
Merge branch 'main' into enterprise-license 2022-04-20 00:36:38 +00:00
Afzal Sayed 00a3ff89e4
Uniquely index event-type with teamId and slug (#2452) 2022-04-19 18:35:12 -06:00
zomars 096fccc3e2 Merge branch 'main' into enterprise-license 2022-04-19 17:12:36 -06:00
zomars 48522390ea Merge branch 'main' into enterprise-license
# Conflicts:
#	apps/web/ee/components/team/availability/TeamAvailabilityModal.tsx
#	apps/web/pages/settings/security.tsx
#	yarn.lock
2022-04-19 17:12:11 -06:00
Omar López 8f3b854559
Admin console (#2555)
* Adds admin submodule

* Adds admin submodule
2022-04-19 16:58:46 -06:00
Omar López 05edb144b2
Adds admin submodule (#2554) 2022-04-19 16:55:41 -06:00
zomars 0c94ecdc92 Updates submodules 2022-04-19 16:52:06 -06:00
zomars 4b83fef672 WIP 2022-04-19 15:42:17 -06:00
zomars 3c5686171c Merge branch 'main' into enterprise-license
# Conflicts:
#	apps/web/ee/components/team/availability/TeamAvailabilityModal.tsx
#	apps/web/pages/settings/profile.tsx
2022-04-19 11:34:15 -06:00
zomars d0918cd9be WIP 2022-04-19 11:31:14 -06:00
Yassin Eldeeb 8c173c840b
fix(web): overflow with auto scroll instead of scroll (#2535)
* fix(readme): update setup steps

* fix(readme): update required node version in prerequisites section

* fix(web): overflow-auto instead of overflow-scroll

* Revert "fix(readme): update setup steps"

This reverts commit 2938d510c8.

* Revert "fix(readme): update required node version in prerequisites section"

This reverts commit 848e1a1535.

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-04-19 16:50:19 +01:00
Bailey Pumfleet b540f44d6c
Create CODE_OF_CONDUCT.md 2022-04-19 14:27:44 +01:00
Agusti Fernandez 7493093a1a
fix: dangling zero in api keys list (#2548) 2022-04-19 12:32:17 +01:00
Agusti Fernandez cf68541520
update swagger (#2547) 2022-04-19 10:50:40 +02:00
Peer Richelsen b4ee4413cc
Update eventTypes.tsx (#2545) 2022-04-18 22:40:56 +02:00
Peer Richelsen f214830d0f
Update README.mdx (#2544) 2022-04-18 22:08:49 +02:00
Peer Richelsen c92070a5a2
Update package.json 2022-04-18 19:53:49 +02:00
Hariom Balhara 102ca5403d
Fix "Edit Booking" Icon (#2536) 2022-04-18 11:25:56 +01:00
Hariom Balhara 7fd57b88dc
Fix mobile reschedule actions (#2534) 2022-04-17 17:37:16 +02:00
Hariom Balhara 5f57694148
Fix Mobile UI for Booking Availability Page. Make it consistent with booking page (#2533) 2022-04-17 13:25:11 +02:00
Peer Richelsen 73c97e85d4
overflow scroll for categories (#2502) 2022-04-16 20:37:19 +00:00
Syed Ali Shahbaz ccde0c20ab
fixed avatargroup in mobile screens (#2498)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-04-16 22:23:15 +02:00
sean-brydon d2d3c67144
Display most recent (#2529) 2022-04-16 13:51:44 +02:00
Agusti Fernandez 6d5af81f68
adds authorize to swagger docs to pass apiKey (#2524) 2022-04-16 08:22:22 +01:00
Hariom Balhara 2e9d4125ed
Fix Embed Documentation (#2525) 2022-04-16 06:17:47 +00:00
Omar López 56c32beebc
Update README.md 2022-04-15 21:02:35 -06:00
Agusti Fernandez faa67e0bb6
Feature: Adds api keys to cal.com webapp (#2277)
* feat: add ApiKey model for new Api auth, owned by a user

* fix: remove metadata:Json and add note:String instead in new apiKey model

* fix: rename apiKey to apiKeys in moder User relation in schema.prisma

* feat: add hashedKey to apiKey and lastUsedAt datetime to keep track of usage of keys and makiung them securely stored in db

* fix 30 day -> 30 days in expiresAt

* feat: api keys frontend in security page

* adds hashedKey to api key model, add frontend api keys in security page

* Make frontend work to create api keys with or without expiry, note, defaults to 1 month expiry

* remove migration for now, add env.example to swagger, sync api

* feat: hashed api keys

* fix: minor refactor and cleanup in apiKeys generator

* add api key success modal

* sync apps/api

* feat: We have API Keys in Security =)

* remove swagger env from pr

* apps api sync

* remove comments in password section

* feat: migration for api keys schema

* sync api w main

* delete apps/api

* add back apps/api

* make min date and disabled optional props in datepicker

* feat fix type check errors

* fix : types

* fix: rmeove renaming of verificationrequest token indexes in migration

* fix: remove extra div

* Fixes for feedback in PR

* fix button />

* fix: rename weird naming of translation for you_will_only_view_it_once

* fix: remove ternary and use && to avoid null for false

* fix sync apps/api with main not old commit

* fix empty className

* fix: remove unused imports

* fix remove commented jsx fragment close

* fix rename editing

* improve translations

* feat: adds beta tag in security tab under api keys

* fix: use api keys everywhere

* fix: cleanup code in api keys

* fix: use watch and controller for neverexpires/datepicker

* Fixes: improve api key never expires

* add back change password h2 title section in security page

* fix update env API_KEY_ prefix default to cal_

* fix: improve eidt api keys modal

* fix: update edit mutation in viewer.apiKeys

* Update apps/web/ee/components/apiKeys/ApiKeyListItem.tsx

Co-authored-by: Alex van Andel <me@alexvanandel.com>

* fix: item: any to pass build

Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
2022-04-15 20:58:34 -06:00
Leo Giovanetti ffebe8e901
HubSpot App (#2380)
* Initial changes

* OAuth done and credentials stored

* Added "other" integrations

* Switching to hubspot api client

* Event creation for all attendees

* Update and delete done

* Doc update

* Fixing types

* App label is not mandatory

* Fixing bad merge: App label deleted

* Fixing bad automerge

* Removing  c.log

Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-04-15 23:23:38 -03:00
Omar López 2cafe2d98e
Update README.md 2022-04-15 20:12:24 -06:00
Agusti Fernandez d03038d976
Fix: styling (#2523)
* remove vercel favicon and logo, remove empty space on top due to Head

* adds a negative margin-top to compensate for svg-assets

Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-04-16 01:58:07 +00:00
Agusti Fernandez 7e392da78a
remove vercel favicon and logo, remove empty space on top due to Head (#2522)
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
2022-04-16 03:35:49 +02:00