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
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
2022-06-06 17:49:56 +00:00
ad101e0a31
Address feedback of feedback feature ( #2981 )
2022-06-06 13:40:02 -04:00
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
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
d0ac4d41ed
fix language issue on booking page ( #2973 )
2022-06-06 14:30:41 +01:00
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
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
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
f0a5b7734f
[Hotfix]Fixes 3 issues related to 404 links ( #2977 )
2022-06-06 09:41:11 +00:00
03e787ad5a
Fixes 3 issues related to 404 links ( #2979 )
2022-06-06 11:40:56 +02:00
dd09854932
Hotfix: fixed callback URL for team invite email ( #2978 )
2022-06-06 14:59:46 +05:30
b9428301b6
Hotfix: fixed callback URL for team invite email ( #2975 )
2022-06-06 14:07:53 +05:30
2344a4da13
Update yarn.lock
2022-06-05 16:42:26 -06:00
4652878e6c
tsc fixes
2022-06-05 16:35:39 -06:00
4efc2914af
Embed build fixes
2022-06-05 13:55:58 -06:00
9866e12a84
Update default-cookies.ts
2022-06-05 13:54:13 -06:00
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
0a64715d84
Fallbacks to Cal Video when missing credentials for location
2022-06-04 11:32:43 -06:00
879619e075
Fallbacks to Cal Video when missing credentials for location
2022-06-04 11:23:56 -06:00
16cab18163
Fix preview not working ( #2962 )
2022-06-04 07:31:13 -06:00
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
1c89afc7ad
Fix preview not working ( #2962 )
2022-06-04 07:17:02 -06:00
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
2c65e39482
Ignores vital for now
2022-06-03 14:18:43 -06:00
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
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
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
fcba3bec03
added email to ee helper ( #2958 )
2022-06-03 21:59:40 +02:00
4569a96e78
Update index.ts
2022-06-03 13:21:46 -06:00
debbd980d9
Fixes preview deploys
2022-06-03 12:48:47 -06:00
d5e40faeb5
Adds booking reportUsage for enterprise
2022-06-03 12:33:53 -06:00
10edc1f4ac
Update next.config.js
2022-06-03 10:50:48 -06:00
42c49a8263
renamed integratin to app and extracted into common.json ( #2951 )
2022-06-03 14:57:50 +00:00
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
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
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
7536473c9d
Allows telemetry opt-out
2022-06-02 14:06:13 -06:00
fd8e4ef890
licenseCheck fixes
2022-06-02 13:49:12 -06:00
c8a16ce43b
Call prod console only on prod non staging deploys
2022-06-02 13:40:16 -06:00
887bd66a33
All prod builds should call prod console
2022-06-02 13:34:32 -06:00
eeb9ff662e
Adds cors to checkLicense
2022-06-02 13:20:48 -06:00
262df1a1b2
Updates console
2022-06-02 13:20:35 -06:00
3919d87486
Adds license to telemetry
2022-06-02 11:53:02 -06:00
6f203d14e3
Submodule updates
2022-06-02 10:20:29 -06:00
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
60d6c7be51
fix: owners can't be edited by admins ( #2942 )
...
* fix: owners can't be edited by admins
* fix: removec omment
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-02 09:39:23 -06:00
0f273c5efc
Update package.json
2022-06-01 15:46:48 -06:00
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
6179b0cc56
Fixing Spacing + text color ( #2938 )
...
* Fixing Spacing + text color
* Fix overflow
* Fixing mobile text color
2022-06-01 14:58:46 +02:00
zomars