Commit Graph

2116 Commits (17763aca61b672af8e60bb0f58a72752f7601e88)

Author SHA1 Message Date
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
Agusti Fernandez f8f3456b92
Adds iframe to developer.cal.com (swagger-ui) into docs/public-api.mdx (#2518)
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
2022-04-15 23:56:32 +00:00
Agusti Fernandez 3b637eefaa
adds redirect for /api to developer.cal.com (#2517)
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
2022-04-15 14:19:52 -06:00
zomars 9381c3b89e Sync dependencies 2022-04-15 13:24:01 -06:00
Agusti Fernandez 46e1d28881
improve styling on mobile for swagger docs (#2516)
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-04-15 12:52:51 -06:00
zomars 0d5d6bc4e6 Adds admin submodule 2022-04-15 12:43:49 -06:00
zomars 037f2fcc0b Adds admin submodule 2022-04-15 12:16:42 -06:00
Agusti Fernandez f23cc8b99f
Adds env example and changes route (#2515) 2022-04-15 19:11:35 +01:00
Hariom Balhara 6843347dd7
Embed: Bump Versions and update Readmes and descriptions (#2507) 2022-04-15 18:55:36 +01:00
Yassin Eldeeb 063d40aa0a
fix(readme): specify nodejs version in prereq section (#2514) 2022-04-15 11:38:45 -06:00
Agusti Fernandez bee5c83eed
change hardcoed to use /api in route (#2513) 2022-04-15 18:30:47 +01:00
Hariom Balhara 8132b04a27
Fix Duplicat elocations (#2512) 2022-04-15 11:29:45 -06:00
sean-brydon dabf5367bc
DailyVideo default (#2505)
Co-authored-by: Omar López <zomars@me.com>
2022-04-15 17:07:37 +02:00
Agusti Fernandez 33287d6944
update docs to cal.dev (#2509) 2022-04-15 14:43:43 +01:00
Agusti Fernandez f229bb6513
feat: adds swagger-ui new app in monorepo (#2375) 2022-04-15 13:56:22 +01:00
Agusti Fernandez c16aabd9e8
sync api and website (#2504) 2022-04-15 13:06:38 +02:00
alannnc c06d8164bc
feature/app wipe my cal (#2496) 2022-04-15 10:09:40 +00:00
sean-brydon 080f2bb845
Updating App-Infomation + pics (#2489) 2022-04-15 10:35:50 +01:00
Peer Richelsen 25e4e28c2a
small app store fixes (#2501)
* added new other illustration, fixed dialog styling

* revert color change
2022-04-15 08:54:09 +00:00
alannnc 5b90ace8cf
feature/app wipe my cal (#2487)
* WIP bookings page ui changes, created api endpoint

* Ui changes mobile/desktop

* Added translations

* Fix lib import and common names

* WIP reschedule

* WIP

* Save wip

* [WIP] builder and class for CalendarEvent, email for attende

* update rescheduled emails, booking view and availability page view

* Working version reschedule

* Fix for req.user as array

* Added missing translation and refactor dialog to self component

* Test for reschedule

* update on types

* Update lib no required

* Update type on createBooking

* fix types

* remove preview stripe sub

* remove unused file

* remove unused import

* Fix reschedule test

* Refactor and cleaning up code

* Email reschedule title fixes

* Adding calendar delete and recreate placeholder of cancelled

* Add translation

* Removed logs, notes, fixed types

* Fixes process.env types

* Use strict compare

* Fixes type inference

* Type fixing is my middle name

* Update apps/web/components/booking/BookingListItem.tsx

* Update apps/web/components/dialog/RescheduleDialog.tsx

* Update packages/core/builders/CalendarEvent/director.ts

* Update apps/web/pages/success.tsx

* Updates rescheduling labels

* Update packages/core/builders/CalendarEvent/builder.ts

* Type fixes

* Update packages/core/builders/CalendarEvent/builder.ts

* Only validating input blocked once

* E2E fixes

* Stripe tests fixes

* Wipe my cal init commit

* Fixes circular dependencies

* Added conditional display for wipe my cal button

* Added placeholder image for app category

* Fix type string for conditional validation

Co-authored-by: Peer Richelsen <peer@cal.com>
Co-authored-by: zomars <zomars@me.com>
2022-04-14 20:24:27 -06:00