Hariom Balhara
09c8f55682
Make i18n a non-batch request and non-cacheable ( #3188 )
2022-06-29 10:50:32 -06:00
zomars
d732a984c2
Merge branch 'main' of https://github.com/calcom/cal.com
2022-06-28 15:46:17 -06:00
Leo Giovanetti
df2c3c42bf
Recurring config missing from event ( #3182 )
2022-06-28 18:04:44 -03:00
zomars
7122a4a91d
Consolidates dayjs in a single package
2022-06-28 14:48:24 -06:00
zomars
fe50f04075
Only stale SSR requests
2022-06-28 11:37:01 -06:00
alannnc
9a3624bb9a
fix/request-reschedule-google-calendar-sync ( #3157 )
...
* Pass calendarId as parameter to deleteEvent()
* Updated deleteEvent param and default when sending calendarId
2022-06-27 08:52:42 -06:00
Agusti Fernandez Pardo
5ec4b7ad37
feat: adds new version endpoint in internal api ( #3155 )
...
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-25 05:37:29 +00:00
Joe Au-Yeung
02e5ec37e7
Broken Integration Alarm System ( #3135 )
...
* Create broken integration email
* Send video on broken video link
* Add translations
* Add Trans components
* Remove calendars file
* Type fixes
* Add translations
* Fix type errors
* Fix Spanish translation
Co-authored-by: Omar López <zomars@me.com>
* Remove iCal event
* Locale fixes
* Clean up trans tag
* Apply suggested translation
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
* Change email to en
* Fix type error
* Type fix
* Fix e2e
* Fix e2e
* Fix e2e
* Fix e2e
* Fix e2e
* Update webhookResponse-chromium.txt
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-06-24 23:16:20 -06:00
Omar López
2d28ca61a4
Feature/parallel booking availability ( #3087 )
2022-06-19 16:02:00 +01:00
Alex van Andel
159c026533
As Google Meet is always installed, this fixes the doubling ( #3093 )
...
* As Google Meet is always installed, this fixes the doubling
* Make entire Google link clickable, fix extraData
* Attempt at type fixing :)
* AdditionalInformation for the booking page?
* Update packages/emails/src/components/LocationInfo.tsx
Being explicit :)
* Exclude AdditionalInformation as it is irrelevant here
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
2022-06-17 18:34:41 +00:00
sean-brydon
d44c8f7912
Stops users who are not in getting the "Requires confirmation" email ( #3084 )
...
* Update Email
* Remove console.debug
* Remove redundant assignment
Co-authored-by: Omar López <zomars@me.com>
* Update apps/web/pages/api/book/confirm.ts
* Fix E2E test
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-17 09:02:29 +00:00
Syed Ali Shahbaz
6253216484
Webhook polishing ( #2987 )
2022-06-16 17:21:48 +01:00
Alex van Andel
e9f3248fc0
Feature/booking page refactor ( #3035 )
...
* Extracted UI related logic on the DatePicker, stripped out all logic
* wip
* fixed small regression due to merge
* Fix alignment of the chevrons
* Added isToday dot, added onMonthChange so we can fetch this month slots
* Added includedDates to inverse excludedDates
* removed trpcState
* Improvements to the state
* All params are now dynamic
* This builds the flat map so not all paths block on every new build
* Added requiresConfirmation
* Correctly take into account getFilteredTimes to make the calendar function
* Rewritten team availability, seems to work
* Circumvent i18n flicker by showing the loader instead
* 'You can remove this code. Its not being used now' - Hariom
* Nailed a persistent little bug, new Date() caused the current day to flicker on and off
* TS fixes
* Fix some eventType details in AvailableTimes
* '5 / 6 Seats Available' instead of '6 / Seats Available'
* More type fixes
* Removed unrelated merge artifact
* Use WEBAPP_URL instead of hardcoded
* Next round of TS fixes
* I believe this was mistyped
* Temporarily disabled rescheduling 'this is when you originally scheduled', so removed dep
* Sorting some dead code
* This page has a lot of red, not all related to this PR
* A PR to your PR (#3067 )
* Cleanup
* Cleanup
* Uses zod to parse params
* Type fixes
* Fixes ISR
* E2E fixes
* Disabled dynamic bookings until post v1.7
* More test fixes
* Fixed border position (transparent border) to prevent dot from jumping - and possibly fix spacing
* Disabled style nitpicks
* Delete useSlots.ts
Removed early design artifact
* Unlock DatePicker locale
* Adds mini spinner to DatePicker
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
2022-06-15 14:54:31 -06:00
sean-brydon
c03ff0a543
Fixes slack verification and timeout errors ( #2972 )
...
* Fixing slack create event
* Fixes verify working 90% of the time :S
* Verify V2
* Fixing verify - not needed on interaction payload
* Fixing verifcation + response
* Fix verifcation
* DM user error/success
* Remove random 200
* Timeout return
* Adding Zod schema verification
* Added validations, cleanup
* Type fixes
* Update event.ts
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-11 22:30:52 +01:00
Leo Giovanetti
514fca7a53
Recurring event improvements ( #2750 )
...
* Loading state and rejected bookings gone
* Listing fixes
* Tweaking upcoming vs recurring bookings tabs
* Tweaking new emails to avoid recurringEvent param
* Tweaks to support recurring events in common flows
* Missed one renderEmail
* Removing uneeded references
* Reverting manual plural fixes
* Refactoring recurring event strings
* Correcting merge issues
* Relying on newly introduced obj
* Fixing mobile
* Final tweaks
* Latest fixes
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-10 17:38:06 -03:00
alannnc
0df0b6a0f2
Fix/wipe vital app revision ( #2983 )
...
* Fixes for both apps regarding event update/delete
* Added wipe my cal test
* Added eslint ignore
* Fix test
* Merge both test into a single test
* remove duplicated line
* Using prisma from calcom pkg and removing optional chaining from current invocations
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-10 19:16:10 +00:00
Omar López
22d2bae46b
Availabilty consolitadion ( #3010 )
2022-06-10 12:38:46 -06:00
Omar López
b11398f551
Recurring event fixes ( #3030 )
...
* Incorporates recurringEvent into calEvent
* Recurrent event fixes
* Update event.ts
* type fixes
* Update zod-utils.ts
* Adding more recurringEvent to calEvent and other fixes
* Moving away from heavy 3rd party enum
* Fixing test
* Renaming as suggested and fixes
Co-authored-by: Leo Giovanetti <hello@leog.me>
2022-06-09 18:32:34 -06:00
Omar López
3a2224a4e4
Update bookingReminder.ts ( #3007 )
2022-06-08 09:37:06 +01:00
Hariom Balhara
18e0f13605
[Feature] App Store CLI - Make it super easy to add an app. ( #2917 )
...
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-07 11:43:32 +05:30
zomars
13f20dd7cf
additionInformation => additionalInformation
2022-06-06 13:49:10 -06:00
zomars
67b96d990c
Update invite.ts
2022-06-06 12:59:57 -06:00
Alex van Andel
ba04533de3
Linting fixes round #1 ( #2906 )
...
* Fixes round #1
* disabled any warning for intentional typing of AsyncReturnType
* Whacked MetaMask add / remove button
* types, not great, not terrible, better than any
* Fixed typo in CheckboxField and wrapped description in <label>
* Feedback
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-06 18:24:37 +00:00
Omar López
15d5333cf6
Refactor emails to use JSX as templating engine ( #2915 )
...
* Init Maizzle
* Initial template JSX conversion and testing
* WIP
* WIP
* WIP
* WIP
* WIP
* Migrated AttendeeRescheduledEmail
* WIP
* WIP
* DRY
* Cleanup
* Cleanup
* Cleanup
* Migrate feedback email
* Migrates ForgotPasswordEmail
* Migrates OrganizerCancelledEmail
* Migrated OrganizerLocationChangeEmail
* Formatting
* Migrated AttendeeRequestRescheduledEmail
* Migrates OrganizerPaymentRefundFailedEmail
* Migrates OrganizerRequestEmail
* Migrates OrganizerRequestReminderEmail
* Fixes type-check
* Moved email-manager to package
* Import fixes
* Removed duplicate email code from vital app
* Removed duplicate email code from wipemycal
* Build/type fixes
* Fixes web email imports
* Fixes build
* Embed build fixes
* Update AttendeeAwaitingPaymentEmail.tsx
* Update default-cookies.ts
* Revert "Embed build fixes"
This reverts commit 8d693e99ac
.
* Embed build fixes
# Conflicts:
# packages/embeds/embed-core/package.json
* dep and email date fixes
* Update attendee-scheduled-email.ts
* Update package.json
* Update [...nextauth].tsx
* Update email.ts
* Prevents /api/email on production builds
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-06 17:49:56 +00:00
Omar López
12d66cb9df
Booking confirm endpoint refactoring ( #2949 )
...
* Adds new default handler and responder
* Moved confirm endpoint
* Fixes availability for unconfirmed bookings
* Cleanup
* Update _patch.ts
* Prevent too much diffs
* Adds missing BookingStatus
* Migrates confirmed & rejected to status
* Adds requiresConfirmation icon to listing
* Adds booking status migration
* Adds migrations to remove confirmed/rejected
* Undo refactor
* Sets the organizer as "accepted" in gCal
* Update getBusyTimes.ts
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-06 10:54:47 -06:00
Joe Au-Yeung
983c970069
Add more variables to event names and a dynamic field ( #2898 )
...
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Alan <alannnc@gmail.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-06-06 08:48:13 -04:00
Syed Ali Shahbaz
b9428301b6
Hotfix: fixed callback URL for team invite email ( #2975 )
2022-06-06 14:07:53 +05:30
Vladimir Klimontovich
456a4ba581
Telemetry improvements ( #2935 )
...
* next-collect initial setup
* naming changes
* WIP
* WIP: added cookie name
* telemetry update
* fixes
* telemetry eventTypes fix
* tmp jitsu config for testing
* tmp jitsu key update (for tests)
* deploy commit
* cookieName fixes
* telemetry credentials update
* NextCollect updated to latest canary; added TELEMETRY_KEY to config
* TELEMETRY_KEY fix
removed browser_user_agent field from event
* removed _middleware.ts for test deploy
* _middleware.ts restored
* next-collect version bump
* yarn.lock fix
* Added license consent property, set default telemetry endpoint
* Switched to stable version of next-collect; restored LicenseProvider accidentally deleted during merge
* Switched to stable version of next-collect; restored LicenseProvider accidentally deleted during merge
* Updated to latest version of next-collect
* - Updated to latest version of next-collect
- Few improvements in event collection: isTeamBooking for all events, page_url for all events
- Do not send second page event on re-render of /team/[slug]
* Revert booking confirmed tracking
* Applied prettier + fix lint
Co-authored-by: Art Sk <kirsan007@gmail.com>
2022-06-02 10:19:01 -06:00
Leo Giovanetti
33a45a8af5
Installed Apps page revamp ( #2751 )
...
* First round of changes
* Some missing styling
* Last round of core changes
* Color tweaks
* Improving code readability
* Reverting unneeded changes
* Reverting yarn.lock
* Removing yarn.lock
* Empty state updated
* Fixing webhook test
* Cleaning up code
* Fixing test and simplifying code a bit
* Merging API Keys into developer section
* Unifying Empty Screen with monorepo version
* Cleaning up
* Installed apps logic consistency + cleaning up
* Type fixes
* Apply suggestions from code review
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: alannnc <alannnc@gmail.com>
* Improvements, still WIP
* Update apps/web/pages/apps/installed.tsx
Co-authored-by: Omar López <zomars@me.com>
* Apply suggestions from code review
Co-authored-by: Omar López <zomars@me.com>
* App active install status
* Apple Calendar setup, Daily.co preinstalled
* Final pass
* Minor tweaks
* Conflicts with migration ignored
* Fixing merge
* Fixing merge yet again
* Adopting main changes
* Removing unneeded data-testid
* Fixing reported bugs
* Simplifying webhook query
* Moving teams settings tab to second
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: alannnc <alannnc@gmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-06-01 14:24:41 -03:00
Omar López
3af6b3b6b3
Update event.ts
2022-05-30 14:43:15 -06:00
Joe Au-Yeung
0761e8664a
Add reschedule reason to DB and emails ( #2909 )
...
* Write reschedule reason to db
* Add reschedule reason to emails
* Add reschedule reason to request reschedule email
* Add reschedule reason to request reschedule email
* Add reschedule reason to request reschedule email
* Add reschedule reason to request reschedule email
* Write reschedule reason to db
* Add reschedule reason to emails
* No longer using rescheduleReason in favor of cancellationReason
* Update apps emails accordingly with reschedule reason
* Update reschedule.test.ts
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Alan <alannnc@gmail.com>
Co-authored-by: zomars <zomars@me.com>
2022-05-30 13:40:29 -06:00
Omar López
9df4867fca
License server ( #2379 )
...
* WIP License server
* WIP
* Moves locations to App Store and Core
* LocationType fixes
* Runs db migrations post-deploy
* WIP
* WIP
* Cleanup
* WIP
* WIP
* Decouples translations from NavTabs
* Adds admin submodule
* Adds admin submodule
* Sync dependencies
* WIP
* WIP
* Updates submodules
* Renames package
* Updates submodules
* Adds scripts for console
* Updates license checker URL
* Updates admin
* Adds staging/prod admin console links
* Update yarn.lock
* Update NavTabs.tsx
* WIP
* Update admin
* WIP
* Adds hint to InputField
* Update admin
* Adds turbo admin dependecies
* Update admin
* Prevents redirection on form submit
* Form warning fixes
* Update admin
* Form fixes
* Update yarn.lock
* Update admin
* Update admin
* Update admin
* Adds withLicenseRequired HOC
* Adds LicenseRequired to EE components
* Admin deploy fix?
* Updates submodules
* Use relative inside lib
* type fixes
* Fixes turbo race condition
* Relocates admin to console
* Relocates admin to console
* Update console
* Update api
* Update turbo.json
* Update ErrorBoundary.tsx
* Update defaultEvents.ts
* Update checkLicense.ts
* Update yarn.lock
* Skip on E2E
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-26 11:07:14 -06:00
Joe Au-Yeung
c8d6c0dbdd
Add seats to event types ( #2485 )
...
* Add seatsPerTimeSlot to event type schema
* Add seats per time slot to event type form
* Book event and render seats
* Pass booking uid for seats
* Disable requires confirmation if seats are enabled
* Fix type errors
* Update submodules
* Fix type errors
* Fix type errors
* Fix duplicate string
* Fix duplicate string
* Fix schema and migration file
* Fix render seats
* Fix bookinguid typos
* Remove console.log
* Fix type error
* Fix mobile formatting
* Update apps/web/lib/hooks/useSlots.ts
Co-authored-by: Omar López <zomars@me.com>
* Update apps/web/lib/hooks/useSlots.ts
Co-authored-by: Omar López <zomars@me.com>
* Added translation for seats available text
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: alannnc <alannnc@gmail.com>
2022-05-24 15:19:12 +02:00
zomars
3a1d8b8183
Merge production to main
2022-05-23 09:29:19 -06:00
Leo Giovanetti
38f23986ad
Hotfix: Fixing Security Issues ( #2848 )
...
* Fixing Privilege Escalation
* Fixing critical obj ref in availability
* Fixing reschedule security issue
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-05-23 11:29:29 +00:00
Carina Wollendorfer
4b6c701c48
save additional inputs as json + view details of booking ( #2796 )
...
* move custom inputs from description to own json object
* show custom inputs on success page
* fix type error
* add custom inputs to email and webhook
* add custom inputs to all emails
* add values for custom inputs when rescheduling
* add custom input everywhere description is shown
* fix bug with boolean value
* fix issues with null values
* disable custom inputs and add notes for organizer
* don't show custom input with empty string
* don't show custom inputs with empty string in calender event and email
* add link to booking details page
* redirect to success page to see booking details
* add functionality to cancel and reschedule booking
* fix bookings that require confirmation
* clean code
* fix infinite lopp in useEffect of success page
* show web conference details message when integration as location
* improve design of cancelling event
* clean code
* disable darkmode for organizer on booking details page
* fix dark mode for cancelling booking
* fix build error
* Fixes infinite loop
* Fixes infinite loop
* Fixes infinite loop
* Update all Yarn dependencies (2022-05-16) (#2769 )
* Update all Yarn dependencies (2022-05-16)
* Upgrade dependencies
* Removes deprecated packages
* Upgrades deps
* Updates submodules
* Update yarn.lock
* Linting
* Linting
* Update website
* Build fixes
* TODO: fix this
* Module resolving
* Type fixes
* Intercom fixes on SSG
* Fixes infinite loop
* Upgrades to React 18
* Type fixes
* Locks node version to 14
* Upgrades daily-js
* Readds missing types
* Upgrades playwright
* Noop when intercom is not installed
* Update website
* Removed yarn.lock in favor of monorepo
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
* Create ci.yml
* Update ci.yml
* Reintroduces typescript-eslint
Buckle up!
* Type fixes
* Update ci.yml
* Update api
* Update admin
* Reusable inferSSRProps
* Linting
* Linting
* Prisma fixes
* Update ci.yml
* Cache testing
* Update e2e.yml
* Update DatePicker.tsx
* Update e2e.yml
* Revert "Linting"
This reverts commit adf817766e
.
* Revert "Linting"
This reverts commit 1b59dacd64
.
* Linting
* Update e2e.yml
* Ci updates
* Add team Id to hash url (#2803 )
* Fix missing tabs - Embed (#2804 )
* Fix missing tabs
* Fix Eslint error
* Fix Eslint errors
* Add import statement (#2812 )
* Add import statement
* Update apps/docs/next.config.js
Co-authored-by: Omar López <zomars@me.com>
* Show success page if booking was deleted on calendar (#2808 )
* Add exception to 410
* Fix type error
* Add GoogelCalError type
* only show invite link for app.cal.dev (#2807 )
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
* fix: update eslint config to test .ts and .js separately (#2805 )
* fix: update eslint config
* fix: update ts ignore
* fix: update eslint config
* Update TeamAvailabilityScreen.tsx
* Type fixes
* Update useIntercom.ts
Co-authored-by: Omar López <zomars@me.com>
* fix: sync api to latest commit (#2810 )
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Embed React improvements (#2782 )
* Add off support. Add getApi export.
* Add publish command
* Add embed-snippet in prod deps
* Update README
* Update package.json
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Consolidates test-results
* Type fixes
* Abstracts minimal booking select
* Type fixes
* Update listBookings.ts
* Update common.json
* Update bookingReminder.ts
* Consolidates isOutOfBounds
* Update webhookResponse-chromium.txt
* Update TableActions.tsx
* Type fixes
* Update BookingPage.tsx
* Update webhookResponse-chromium.txt
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: iamkun <kunhello@outlook.com>
Co-authored-by: Agusti Fernandez Pardo <me@agusti.me>
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-18 15:05:49 -06:00
zomars
0153bc583a
Type fixes
2022-05-17 15:32:54 -06:00
depfu[bot]
db01f7be19
Update all Yarn dependencies (2022-05-16) ( #2769 )
...
* Update all Yarn dependencies (2022-05-16)
* Upgrade dependencies
* Removes deprecated packages
* Upgrades deps
* Updates submodules
* Update yarn.lock
* Linting
* Linting
* Update website
* Build fixes
* TODO: fix this
* Module resolving
* Type fixes
* Intercom fixes on SSG
* Fixes infinite loop
* Upgrades to React 18
* Type fixes
* Locks node version to 14
* Upgrades daily-js
* Readds missing types
* Upgrades playwright
* Noop when intercom is not installed
* Update website
* Removed yarn.lock in favor of monorepo
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
2022-05-17 19:31:49 +00:00
Joe Au-Yeung
ad126efee8
Add Google cal extneral calendar id to booking reference ( #2671 )
...
* Set google cal event id to use our uid
* Save calendar external id to bookingRef
* Pass external calendar ids to update and delete
* Create migration
* Fix type errors
* Fix prisma url
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
2022-05-16 14:20:09 -06:00
Agusti Fernandez Pardo
9c52e195ea
Fix adds redirect callback that support app.cal.com ( #2768 )
...
* Fix adds redirect callback that support app.cal.com
* Update apps/web/pages/api/auth/[...nextauth].tsx
Check origin of website and baseurl
Co-authored-by: Omar López <zomars@me.com>
* fix: lint issue extra space removed
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-16 17:44:44 +00:00
Hashen
e4c5df7a2e
remove redundant conditional expressions ( #2756 )
...
* remove redundant conditional expressions
* remove redundant conditional expression
Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
2022-05-16 11:26:32 -06:00
andreaestefania12
f2a6d00348
Fix/unpaid unconfirmed ( #2553 )
...
* Fix merge errors
* Errors prettier/prettier
* Update apps/web/pages/api/book/event.ts
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com>
* Update apps/web/pages/api/book/event.ts
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com>
* Update apps/web/pages/api/integrations.ts
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com>
* Fix merge errors
* Errors prettier/prettier
* Update apps/web/pages/api/book/confirm.ts
Co-authored-by: alannnc <alannnc@gmail.com>
* Modal window before delete stripe integration
* ESLint Report
* Test fixes
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com>
Co-authored-by: alannnc <alannnc@gmail.com>
Co-authored-by: zomars <zomars@me.com>
2022-05-16 10:27:36 -06:00
Agusti Fernandez Pardo
549e38fb78
fix: remove hardcoded redirect in signin url email verification ( #2764 )
...
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
2022-05-16 17:34:13 +02:00
Omar López
2bb6f33112
E2E fixtures ( #2747 )
2022-05-13 21:02:10 -06:00
Hariom Balhara
7a08403636
Fix reschedule not happening in calendar if two calendards are there ( #2733 )
...
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-05-12 09:33:15 +00:00
zomars
ecb3264b52
getBusyTimes consolidation
2022-05-11 19:49:21 -06:00
zomars
06702aa48a
E2E and paid bookings fixes
2022-05-11 14:36:38 -06:00
Hariom Balhara
50f1fe544e
Improve logs and Fix unwanted 500 to reduce noise in logs ( #2674 )
...
* Improve logs
* Fix unintentional 500
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-11 05:41:09 +00:00
Leo Giovanetti
1a79e0624c
Recurring Events ( #2562 )
...
* Init dev
* UI changes for recurring event + prisma
* Revisiting schema + changes WIP
* UI done, BE WIP
* Feature completion
* Unused query param removed
* Invalid comment removed
* Removed unused translation
* Update apps/web/public/static/locales/en/common.json
Thanks!
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* Success page changes
* More progress
* Email text tweaks + test + seed
* Tweaking emails + Cal Apps support WIP
* No app integration for now
Final email and pages tweaks to avoid recurring info showed
* Missing comment for clarity
* Yet again, comment
* Last minute fix
* Missing tooltip for upcoming bookings
* Fixing seed
* Fixing import
* Increasing timeout for e2e
* Fixing any
* Apply suggestions from code review
Co-authored-by: Omar López <zomars@me.com>
* Update apps/web/pages/d/[link]/book.tsx
Co-authored-by: Omar López <zomars@me.com>
* Code improvements
* More code improvements
* Reverting back number input arrows
* Update BookingPage.tsx
* Update BookingPage.tsx
* Adds fallback for sendOrganizerPaymentRefundFailedEmail
* Type overkill
* Type fixes
* Type fixes
* Nitpicks
* Update success.tsx
* Update success.tsx
* Update success.tsx
* Fixing types
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
2022-05-05 18:16:25 -03:00
alannnc
df7abdfc06
Fix/reschedule on dynamic events ( #2657 )
...
* Reschedule for dynamic events
* Fix lint
* Handling attendee calendar event cancellation
Co-authored-by: zomars <zomars@me.com>
2022-05-05 01:03:36 +00:00