Skip to content

Commit

Permalink
Merge branch 'calcom:main' into dockerfile-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@chasebolt
chasebolt authored May 16, 2022
2 parents 08a3cae + b392320 commit 11fdd9a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion calcom
Submodule calcom updated 50 files
+5 −2 apps/web/components/App.tsx
+11 −1 apps/web/components/CustomBranding.tsx
+4 −1 apps/web/components/ImageUploader.tsx
+2 −0 apps/web/components/Logo.tsx
+9 −7 apps/web/components/Shell.tsx
+4 −1 apps/web/components/apps/AppCard.tsx
+1 −1 apps/web/components/availability/Schedule.tsx
+75 −0 apps/web/components/availability/ScheduleListItem.tsx
+1 −1 apps/web/components/booking/pages/AvailabilityPage.tsx
+3 −3 apps/web/components/booking/pages/BookingPage.tsx
+10 −5 apps/web/components/dialog/ConfirmationDialogContent.tsx
+5 −0 apps/web/components/eventtype/CreateEventType.tsx
+4 −1 apps/web/components/integrations/IntegrationListItem.tsx
+4 −1 apps/web/components/security/EnableTwoFactorModal.tsx
+4 −2 apps/web/components/team/TeamList.tsx
+9 −5 apps/web/components/team/TeamListItem.tsx
+1 −0 apps/web/components/team/TeamSettingsRightSidebar.tsx
+1 −0 apps/web/components/team/screens/Team.tsx
+3 −1 apps/web/components/ui/AuthContainer.tsx
+1 −0 apps/web/components/ui/Avatar.tsx
+1 −0 apps/web/components/ui/AvatarSSR.tsx
+16 −10 apps/web/components/ui/PoweredByCal.tsx
+3 −2 apps/web/components/ui/WeekdaySelect.tsx
+3 −2 apps/web/components/ui/form/CheckedSelect.tsx
+1 −1 apps/web/ee/components/stripe/PaymentPage.tsx
+13 −4 apps/web/ee/components/web3/CryptoSection.tsx
+36 −26 apps/web/lib/hooks/useSlots.ts
+1 −1 apps/web/pages/404.tsx
+6 −1 apps/web/pages/500.tsx
+1 −1 apps/web/pages/auth/error.tsx
+11 −8 apps/web/pages/auth/forgot-password/[id].tsx
+1 −1 apps/web/pages/auth/login.tsx
+2 −2 apps/web/pages/auth/logout.tsx
+1 −1 apps/web/pages/auth/sso/[provider].tsx
+8 −54 apps/web/pages/availability/index.tsx
+1 −1 apps/web/pages/availability/troubleshoot.tsx
+1 −0 apps/web/pages/event-types/[type].tsx
+19 −16 apps/web/pages/getting-started.tsx
+5 −2 apps/web/pages/success.tsx
+21 −12 apps/web/pages/video/[uid].tsx
+9 −0 apps/web/public/cal-logo-word-dark.svg
+1 −0 apps/web/public/static/locales/en/common.json
+1 −0 apps/web/public/static/locales/pt-BR/common.json
+1 −0 apps/web/public/static/locales/pt/common.json
+12 −4 apps/web/server/routers/viewer/eventTypes.tsx
+2 −2 packages/app-store/googlevideo/_metadata.ts
+ − packages/app-store/googlevideo/static/logo.webp
+1 −1 packages/app-store/metamask/_metadata.ts
+2 −2 packages/app-store/wipemycalother/_metadata.ts
+1 −1 packages/ui/Button.tsx

0 comments on commit 11fdd9a

Please sign in to comment.