Commit Graph

124 Commits (93f4afe26bd4607cc59915181ef3b93156192c25)

Author SHA1 Message Date
kodiakhq[bot] ddc17562c4
Merge branch 'main' into feat/api-keys 2022-04-16 02:25:45 +00: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
kodiakhq[bot] bb17079ceb
Merge branch 'main' into feat/api-keys 2022-04-15 17:57:49 +00:00
Hariom Balhara 6843347dd7
Embed: Bump Versions and update Readmes and descriptions (#2507) 2022-04-15 18:55:36 +01:00
kodiakhq[bot] c99a99ba2a
Merge branch 'main' into feat/api-keys 2022-04-15 17:31:57 +00:00
Hariom Balhara 8132b04a27
Fix Duplicat elocations (#2512) 2022-04-15 11:29:45 -06:00
kodiakhq[bot] eca0d607b9
Merge branch 'main' into feat/api-keys 2022-04-15 10:11:37 +00:00
alannnc c06d8164bc
feature/app wipe my cal (#2496) 2022-04-15 10:09:40 +00:00
kodiakhq[bot] 41cdeb3eee
Merge branch 'main' into feat/api-keys 2022-04-15 09:38:01 +00:00
sean-brydon 080f2bb845
Updating App-Infomation + pics (#2489) 2022-04-15 10:35:50 +01:00
kodiakhq[bot] f2ffbf8126
Merge branch 'main' into feat/api-keys 2022-04-15 08:56:15 +00: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
kodiakhq[bot] afd51ae707
Merge branch 'main' into feat/api-keys 2022-04-15 02:26: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
kodiakhq[bot] d8ac2ffa76
Merge branch 'main' into feat/api-keys 2022-04-15 02:06:38 +00:00
Omar López ba73960a02
App store metadata refactor (#2495)
* Delete api

* Fixes circular dependencies

* Revert "Delete api"

This reverts commit 174177a833.

* Delete _metadata.ts

* Update metadata.ts
2022-04-14 20:04:21 -06:00
kodiakhq[bot] d158c18b9d
Merge branch 'main' into feat/api-keys 2022-04-14 22:30:51 +00:00
buschco 94f64f9730
fix handling for recurring events (#2455) 2022-04-14 23:29:16 +01:00
zomars 115f5f5eef Merge fixes 2022-04-14 16:12:35 -06:00
alannnc 3c6ac395cc
Feature/reschedule bookings (#2351)
* 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

Co-authored-by: Peer Richelsen <peer@cal.com>
Co-authored-by: zomars <zomars@me.com>
2022-04-14 15:25:24 -06:00
kodiakhq[bot] 6570b5eb62
Merge branch 'main' into feat/api-keys 2022-04-14 14:52:11 +00:00
Bailey Pumfleet d91f667d0c Update greyscale palette 2022-04-14 15:50:00 +01:00
kodiakhq[bot] f06cde5d8c
Merge branch 'main' into feat/api-keys 2022-04-14 04:02:31 +00:00
Hariom Balhara 9ed666a475
Add app-store tests (#2465)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-04-14 09:30:38 +05:30
kodiakhq[bot] bd9861e216
Merge branch 'main' into feat/api-keys 2022-04-14 02:49:29 +00:00
Hariom Balhara 39935306fc
Embed behind authentication page, Floating Button Popup and other changes (#2468)
Co-authored-by: Omar López <zomars@me.com>
2022-04-14 08:17:34 +05:30
Agusti Fernandez Pardo e098bd3b77 fix: rmeove renaming of verificationrequest token indexes in migration 2022-04-13 15:15:12 +02:00
Agusti Fernandez Pardo cdf3954abc ff 2022-04-13 02:58:48 +02:00
Agusti Fernandez Pardo e8067ae73d feat: migration for api keys schema 2022-04-13 02:24:54 +02:00
Hariom Balhara 75c2ccff96
RoundRobin Booking Error in a particular case (#2471)
* users can be array of user when roundrobin team booking is there with availablity of multiple people

* Return empty array

* Add comments

* checktype fix

* removed extra condition

Co-authored-by: Syed Ali Shahbaz <alishahbaz7@gmail.com>
2022-04-12 10:10:18 -07:00
sean-brydon 61c60fc319
Add response events (#2456)
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-04-10 17:19:45 +00:00
sean-brydon 399f4978f8
Adding Username (#2424) 2022-04-09 15:40:02 +01:00
Hariom Balhara df4a41127f
Embed: Documentation TS errors Fix, IFrame Communication Tests, Updated documentation (#2432) 2022-04-08 16:59:08 +00:00
Syed Ali Shahbaz eceba51020
Dynamic group booking follow-up (#2430) 2022-04-08 17:50:10 +01:00
Agusti Fernandez Pardo 9ce5212a6b fix: minor refactor and cleanup in apiKeys generator 2022-04-08 17:38:01 +02:00
Hariom Balhara c63d81719b
Embed Improvements (#2365)
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-04-08 05:33:24 +00:00
Agusti Fernandez Pardo 358368194a remove migration for now, add env.example to swagger, sync api 2022-04-08 01:39:08 +02:00
Agusti Fernandez Pardo 88fa805825 Make frontend work to create api keys with or without expiry, note, defaults to 1 month expiry 2022-04-08 01:36:47 +02:00
Agusti Fernandez Pardo d0af8bc57c adds hashedKey to api key model, add frontend api keys in security page 2022-04-07 21:57:41 +02:00
sean-brydon 96f6294542
Show eventDescription on email (#2371)
* Show eventDescription on email

* Fixing Inheritance

* Fixing Duplicate getLocation

* Type fixes

Co-authored-by: zomars <zomars@me.com>
2022-04-07 18:22:11 +00:00
sean-brydon fefc314d35
Fixing api points not returning (#2419)
Co-authored-by: Omar López <zomars@me.com>
2022-04-07 16:26:33 +00:00
Syed Ali Shahbaz e6587efd27
Hotfix for merge loss in PR2416 (#2418) 2022-04-07 15:34:11 +01:00
Syed Ali Shahbaz a551919152
Dynamic group link for more than 2 user fixed (#2416) 2022-04-07 14:41:26 +01:00
Hariom Balhara 173e7846e8
Fix team booking (#2417) 2022-04-07 13:51:16 +01:00
Syed Ali Shahbaz 63635fc110
Dynamic group booking fix to accept "+" in URL and updated Head SEO for dynamic booking (#2414) 2022-04-07 11:28:52 +01:00
Agusti Fernandez Pardo c2cd32995d feat: api keys frontend in security page 2022-04-07 03:29:07 +02:00
Omar López 652b15c9e7
Adds huddle01 screenshots (#2406)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-04-06 13:21:08 -07:00
Omar López f9bd93197e
DB deploy fixes (#2408)
* DB deploy fixes

* Update turbo.json

* Turbo fixes
2022-04-06 12:52:48 -07:00
Omar López 0e93af912e
Don't display uninstalled apps (#2405)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-04-06 10:51:31 -07:00
Syed Ali Shahbaz d1ffd1edae
dynamic group links (#2239)
* --init

* added default event types

* updated lib path

* updated group link design

* fixed collective description

* added default minimum booking notice

* Accept multi user query for a default event type

* check types

* check types --WIP

* check types still --WIP

* --WIP

* --WIP

* fixed single user type not working

* check fix

* --import path fix

* functional collective eventtype page

* fixed check type

* minor fixes and --WIP

* typefix

* custominput in defaultevent fix

* added booking page compatibility for dynamic group links

* added /book compatibility for dynamic group links

* checktype fix --WIP

* checktype fix

* Success page compatibility added

* added migrations

* added dynamic group booking slug to booking creation

* reschedule and database fix

* daily integration

* daily integration --locationtype fetch

* fixed reschedule

* added index to key parameter in eventtype list

* fix + added after last group slug

* added user setting option for dynamic booking

* changed defaultEvents location based on recent changes

* updated default event name in updated import

* disallow booking when one in group disallows it

* fixed setting checkbox association

* cleanup

* udded better error handling for disabled dynamic group bookings

* cleanup

* added tooltip to allow dynamic setting and enable by default

* Update yarn.lock

* Fix: Embed Fixes, UI configuration PRO Only, Tests (#2341)

* #2325 Followup (#2369)

* Adds initial MDX implementation for App Store pages

* Adds endpoint to serve app store static files

* Replaces zoom icon with dynamic-served one

* Fixes zoom icon

* Makes Slider reusable

* Adds gray-matter for MDX

* Adds zoom screenshots

* Update yarn.lock

* Slider improvements

* WIP

* Update TrendingAppsSlider.tsx

* WIP

* Adds MS teams screenshots

* Adds stripe screenshots

* Cleanup

* Update index.ts

* WIP

* Cleanup

* Cleanup

* Adds jitsi screenshot

* Adds Google meet screenshots

* Adds office 365 calendar screenshots

* Adds google calendar screenshots

* Follow #2325

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* requested changes

* further requested changes

* more changes

* type fix

* fixed prisma/client import path

* added e2e test

* test-fix

* E2E fixes

* Fixes circular dependency

* Fixed paid bookings seeder

* Added missing imports

* requested changes

* added username slugs as part of event description

* updated event description

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-04-06 10:20:30 -07:00