Commit Graph

2683 Commits (dfc6373bb4494b99c4a071c4ea217611caa93cef)

Author SHA1 Message Date
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
Leo Giovanetti 8cd420173c
Tweaks requested by Ciarán (#3009)
* Tweaks requested

* Missing recurring event details in mobile view

* Removing bg-white
2022-06-09 20:49:09 +00:00
github-actions[bot] d276763b11
New Crowdin translations by Github Action (#3032)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-06-09 13:51:55 +02:00
Peer Richelsen 0f0513b8b7
added no-scrollbar utility (#3031)
* added no-scrollbar utility

* added responsive variants

* undo prettier on global.css
2022-06-09 04:46:03 -06:00
Hariom Balhara a9e519f643
Improvement: Add React to Embed Snippet Generator (#3018)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-09 10:35:18 +05:30
github-actions[bot] 8f86e0b164
New Crowdin translations by Github Action (#3023)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-06-08 21:11:28 +02:00
zomars ac3a4bcaab Adds failsafe for calendar credentials without externaId set 2022-06-08 12:23:48 -06:00
zomars 205c774ca3 Prevent flatMap type errors in @calcom/core 2022-06-08 12:04:42 -06:00
Carina Wollendorfer abe5d53fc1
Disable dark mode on the success page only for the organizer (#3001)
* disable darkmode only for organizer

* disable dark mode when user comes from user dashboard

* move Theme to shell

* fix build errors

* sort dates for recurring bookings

* new parameter if user comes from booking an event

Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-08 16:02:09 +02:00
Peer Richelsen 289cdefc27
overflow scroll to mobile settings (#3014)
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
2022-06-08 13:49:55 +00:00
github-actions[bot] 1d96933f5f
New Crowdin translations by Github Action (#3016)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-06-08 15:42:56 +02:00
github-actions[bot] 2e1cadb5da
New Crowdin translations by Github Action (#3015) 2022-06-08 09:44:08 +01:00
Jatin Ranka 30e35fe068
Fix: updated env file path for db setup (#2937) 2022-06-08 09:43:01 +01:00
GitStart 7151c65f1a
[CAL-1277]: When clicking a deleted type event while it's "deleting", it sends you to 500 error (#2968) 2022-06-08 09:42:00 +01:00
Omar López 3a2224a4e4
Update bookingReminder.ts (#3007) 2022-06-08 09:37:06 +01:00
Leo Giovanetti 33a4bb797d
Fixes plural issue with locales (#3011)
* Fixes

* Covering rest of locales

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-08 09:32:52 +02:00
Carina Wollendorfer b8cd4c32ac
add all missing information to mobile view (#3013)
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
2022-06-08 07:11:34 +00:00
Hariom Balhara bb4875443a
Add app-store:watch a dependency of web:dev (#3005)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-07 16:57:27 +00:00
Peer Richelsen d1cd83acea
renaming "opt-in" to "requires confirmation #2 attempt (#2999)
* second try

* nit

* nit
2022-06-07 18:22:37 +02:00
Alex van Andel 5a84adcd8a
Fixes 0 issue by boolean cast (#3004) 2022-06-07 10:10:30 -06:00
Joe Au-Yeung 55d6f1ee35
Change order that the page is prefilled (#3003) 2022-06-07 09:46:07 -06:00
zomars e863b71dfa Email language fixes 2022-06-07 08:49:39 -06:00
Joe Au-Yeung 0f5550680a
Add username and email to feedback email (#3002)
* Add username and email to feedback email

* Fix type error
2022-06-07 08:39:47 -06:00
Alex van Andel e77ddc3d2e
Trailing unlocking node <17 (#2711)
* Trailing unlocking node <17

* Updated apps/web package.json

* Updated .nvmrc -> v16 :)

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-07 11:53:11 +01:00
Peer Richelsen c3b7b32af5
fixed flex of event-types (#2994) 2022-06-07 10:14:27 +01:00
Syed Ali Shahbaz f4f953cca1
fix (#2992) 2022-06-07 08:41:25 +00:00
Hariom Balhara e2ef7216a8
Add licenses to embeds (#2984)
* Add license to embed

* add repo links as well

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-06-07 08:25:55 +00: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 51b86b1d97 Update telemetry.ts 2022-06-06 15:33:38 -06:00
zomars 875e279def v1.6.3 2022-06-06 14:23:10 -06:00
zomars 88db424a16 Update _getStaticProps.tsx 2022-06-06 13:52:57 -06:00
zomars a8aeac22ee Update App.tsx 2022-06-06 13:50:34 -06:00
zomars 13f20dd7cf additionInformation => additionalInformation 2022-06-06 13:49:10 -06:00
Omar López 41c5ad45fd
Apply suggestions from code review
Co-authored-by: alannnc <alannnc@gmail.com>
2022-06-06 13:42:59 -06:00
zomars 7fec9d64fa Email cleanup 2022-06-06 13:39:54 -06:00
Omar López c95b8d0048
Delete _getStaticProps.tsx 2022-06-06 13:30:44 -06:00
Omar López f65edba982
Update vital.json 2022-06-06 13:27:49 -06:00
Omar López 94c3bc7f19
Update vital.json 2022-06-06 13:25:13 -06:00
Omar López bfd27f0d94
Update vital.json 2022-06-06 13:23:49 -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
zomars 547b40913f Merge branch 'production'
# Conflicts:
#	.env.example
#	.github/workflows/e2e-embed.yml
#	apps/web/components/EmptyScreen.tsx
#	apps/web/components/SettingsShell.tsx
#	apps/web/components/Shell.tsx
#	apps/web/components/booking/BookingListItem.tsx
#	apps/web/components/booking/pages/AvailabilityPage.tsx
#	apps/web/ee/components/LicenseRequired.tsx
#	apps/web/ee/components/apiKeys/ApiKeyListContainer.tsx
#	apps/web/ee/components/support/HelpMenuItem.tsx
#	apps/web/lib/emails/templates/attendee-request-reschedule-email.ts
#	apps/web/lib/emails/templates/attendee-rescheduled-email.ts
#	apps/web/lib/emails/templates/attendee-scheduled-email.ts
#	apps/web/lib/emails/templates/organizer-request-reschedule-email.ts
#	apps/web/lib/emails/templates/organizer-rescheduled-email.ts
#	apps/web/lib/emails/templates/organizer-scheduled-email.ts
#	apps/web/pages/_app.tsx
#	apps/web/pages/apps/installed.tsx
#	apps/web/pages/event-types/[type].tsx
#	apps/web/public/static/locales/en/common.json
#	apps/web/server/routers/viewer/bookings.tsx
#	packages/app-store/vital/lib/templates/attendee-request-reschedule-email.ts
#	packages/app-store/vital/lib/templates/base-template.ts
#	packages/app-store/vital/lib/templates/organizer-request-reschedule-email.ts
#	packages/app-store/wipemycalother/lib/templates/attendee-request-reschedule-email.ts
#	packages/app-store/wipemycalother/lib/templates/base-template.ts
#	packages/app-store/wipemycalother/lib/templates/organizer-request-reschedule-email.ts
#	packages/ee/server/checkLicense.ts
#	packages/emails/email-manager.ts
#	packages/embeds/embed-core/package.json
#	packages/embeds/embed-snippet/package.json
#	packages/embeds/vite.config.js
#	packages/lib/constants.ts
#	packages/types/environment.d.ts
#	yarn.lock
2022-06-06 11:58:32 -06: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
Joe Au-Yeung ad101e0a31
Address feedback of feedback feature (#2981) 2022-06-06 13:40:02 -04: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
github-actions[bot] 3b321e5d3c
New Crowdin translations by Github Action (#2980)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-06-06 17:33:13 +02:00
Carina Wollendorfer d0ac4d41ed
fix language issue on booking page (#2973) 2022-06-06 14:30:41 +01: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
github-actions[bot] 3189f8b77a
New Crowdin translations by Github Action (#2966)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-06-06 12:07:20 +02:00
Hariom Balhara 079016052d
Add embed preview tests (#2969)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-06 12:06:27 +02:00