Commit Graph

4902 Commits (2dddd4ce7790f11ea8a644e0b52c66811fafaa88)

Author SHA1 Message Date
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
Hariom Balhara f0a5b7734f
[Hotfix]Fixes 3 issues related to 404 links (#2977) 2022-06-06 09:41:11 +00:00
Hariom Balhara 03e787ad5a
Fixes 3 issues related to 404 links (#2979) 2022-06-06 11:40:56 +02:00
Syed Ali Shahbaz dd09854932
Hotfix: fixed callback URL for team invite email (#2978) 2022-06-06 14:59:46 +05:30
Syed Ali Shahbaz b9428301b6
Hotfix: fixed callback URL for team invite email (#2975) 2022-06-06 14:07:53 +05:30
zomars 2344a4da13 Update yarn.lock 2022-06-05 16:42:26 -06:00
zomars 4652878e6c tsc fixes 2022-06-05 16:35:39 -06:00
zomars 4efc2914af Embed build fixes 2022-06-05 13:55:58 -06:00
zomars 9866e12a84 Update default-cookies.ts 2022-06-05 13:54:13 -06:00
github-actions[bot] 8998e41104
New Crowdin translations by Github Action (#2964)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-06-05 09:00:08 +02:00
zomars 0a64715d84 Fallbacks to Cal Video when missing credentials for location 2022-06-04 11:32:43 -06:00
zomars 879619e075 Fallbacks to Cal Video when missing credentials for location 2022-06-04 11:23:56 -06:00
Hariom Balhara 16cab18163 Fix preview not working (#2962) 2022-06-04 07:31:13 -06:00
Agusti Fernandez Pardo 456ba9db04 fix: saml update/delete only owner team (#2948)
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-04 07:31:10 -06:00
Hariom Balhara 1c89afc7ad
Fix preview not working (#2962) 2022-06-04 07:17:02 -06:00
Agusti Fernandez Pardo 16836d0cfb
fix: saml update/delete only owner team (#2948)
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-03 23:13:50 +00:00
zomars 2c65e39482 Ignores vital for now 2022-06-03 14:18:43 -06:00
github-actions[bot] 65dc7c5b65
New Crowdin translations by Github Action (#2959)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-06-03 22:04:54 +02:00
github-actions[bot] eb02efb25a
New Crowdin translations by Github Action (#2834)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-06-03 22:01:49 +02:00
aar2dee2 864a873c57
Images in slider will have fixed height, variable width (#2916)
* Images in slider will have fixed height, variable width

* fix spacing

* remove extra whitespace

* fix whitespace lint errors

* fix whitespace lint error

* fix width for images in app store slider

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-06-03 22:01:00 +02:00
Peer Richelsen fcba3bec03
added email to ee helper (#2958) 2022-06-03 21:59:40 +02:00
zomars 4569a96e78 Update index.ts 2022-06-03 13:21:46 -06:00
zomars debbd980d9 Fixes preview deploys 2022-06-03 12:48:47 -06:00
zomars d5e40faeb5 Adds booking reportUsage for enterprise 2022-06-03 12:33:53 -06:00
zomars 10edc1f4ac Update next.config.js 2022-06-03 10:50:48 -06:00
Peer Richelsen 42c49a8263
renamed integratin to app and extracted into common.json (#2951) 2022-06-03 14:57:50 +00:00
Carina Wollendorfer 7b0d5811d6
Improve meeting url information in booking detail view (#2943)
* change meeting url text for booking detail view

* improve for wen conferencing details for different booking status

Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-03 11:28:33 +00:00
Leo Giovanetti 9d1e6f23db
Fixing spaces and wraps for event type legend (#2941)
* Fixing spaces and wraps

* Spacing wrapped items

* fix lint errors

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
2022-06-03 11:15:29 +00:00
Carina Wollendorfer b4f3680876
disable confirm button when recurring mutation is loading (#2950)
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
2022-06-03 12:52:10 +02:00
zomars 7536473c9d Allows telemetry opt-out 2022-06-02 14:06:13 -06:00
zomars fd8e4ef890 licenseCheck fixes 2022-06-02 13:49:12 -06:00
zomars c8a16ce43b Call prod console only on prod non staging deploys 2022-06-02 13:40:16 -06:00