Merge branch 'main' into feat/organizations

apps/web/public/static/locales/ca/common.json

@@ -0,0 +1,24 @@
+{
+  "awaiting_payment_subject": "Esperant el pagament: {{title}} el {{date}}",
+  "help": "Ajuda",
+  "price": "Preu",
+  "paid": "Pagat",
+  "refunded": "Reembossat",
+  "payment": "Pagament",
+  "missing_card_fields": "Falten camps de la targeta",
+  "pay_now": "Paga ara",
+  "codebase_has_to_stay_opensource": "El codi font ha de seguir com codi obert, tant si s'ha modificat com si no",
+  "cannot_repackage_codebase": "No pots tornar a empaquetar ni vendre el codi font",
+  "acquire_license": "Adquireix una llicència comercial per eliminar aquests termes mitjançant un correu electrònic",
+  "terms_summary": "Resum dels termes",
+  "open_env": "Obre .env i accepta la nostra llicència",
+  "env_changed": "He canviat el meu .env",
+  "accept_license": "Accepta la llicència",
+  "still_waiting_for_approval": "Un esdeveniment encara està pendent d'aprovació",
+  "event_is_still_waiting": "La sol·licitud d'esdeveniment encara està pendent: {{attendeeName}} - {{date}} - {{eventType}}",
+  "no_more_results": "No hi ha més resultats",
+  "no_results": "No hi ha resultats",
+  "load_more_results": "Carrega més resultats",
+  "integration_meeting_id": "{{integrationName}} Identificador de la reunió: {{meetingId}}",
+  "confirmed_event_type_subject": "Confirmat: {{eventType}} amb {{name}} el {{date}}"
+}

apps/web/public/static/locales/sr/common.json

@@ -11,7 +11,16 @@
   "calcom_explained_new_user": "Završite podešavanje vašeg {{appName}} naloga! Na par koraka ste od rešavanja svih problema sa rasporedom.",
   "have_any_questions": "Imate pitanja? Tu smo da pomognemo.",
   "reset_password_subject": "{{appName}}: Upustva za resetovanje lozinke",
+  "verify_email_subject": "{{appName}}: Potvrdi svoj nalog",
+  "check_your_email": "Proveri imejl",
+  "verify_email_page_body": "Poslali smo imejl na {{email}}. Važno je da potvrdite svoju imejl adresu da biste obezbedili najbolju isporuku imejla i kalendara od aplikacije {{appName}}.",
+  "verify_email_banner_body": "Potvrdite svoju imejl adresu da biste obezbedili najbolju isporuku imejla i kalendara od aplikacije {{appName}}.",
   "verify_email_banner_button": "Pošaljite imejl",
+  "verify_email_email_header": "Potvrdite svoju imejl adresu",
+  "verify_email_email_button": "Potvrdi imejl",
+  "verify_email_email_body": "Potvrdite svoju imejl adresu klikom na dugme ispod.",
+  "verify_email_email_link_text": "U slučaju da ne volite da klikćete na dugmad, evo linka:",
+  "email_sent": "Imejl je uspešno poslat",
   "event_declined_subject": "Odbijeno: {{title}} datuma {{date}}",
   "event_cancelled_subject": "Otkazano: {{title}} datuma {{date}}",
   "event_request_declined": "Vaš zahtev za događaj je odbijen",

packages/features/ee/teams/components/MemberInvitationModal.tsx

@@ -131,7 +131,7 @@ export default function MemberInvitationModal(props: MemberInvitationModalProps)
         </div>
 
         <Form form={newMemberFormMethods} handleSubmit={(values) => props.onSubmit(values)}>
-          <div className="space-y-6">
+          <div className="my-6 space-y-6">
             {/* Indivdual Invite */}
             {modalImportMode === "INDIVIDUAL" && (
               <Controller
@@ -240,9 +240,7 @@ export default function MemberInvitationModal(props: MemberInvitationModalProps)
                 />
               )}
             />
-          </div>
-          <DialogFooter showDivider>
-            <div className="mr-auto flex">
+            <div className="flex">
               <Button
                 type="button"
                 color="minimal"
@@ -271,6 +269,8 @@ export default function MemberInvitationModal(props: MemberInvitationModalProps)
                 </Button>
               )}
             </div>
+          </div>
+          <DialogFooter showDivider>
             <Button
               type="button"
               color="minimal"

packages/features/eventtypes/components/CreateEventTypeDialog.tsx

@@ -293,7 +293,7 @@ export default function CreateEventTypeDialog({
               </div>
             )}
           </div>
-          <div className="mt-8 flex justify-end gap-x-2">
+          <div className="mt-10 flex justify-end gap-x-2">
             <DialogClose />
             <Button type="submit" loading={createMutation.isLoading}>
               {t("continue")}

packages/features/form-builder/FormBuilder.tsx

@@ -425,7 +425,7 @@ export const FormBuilder = function FormBuilder({
           })
         }>
         <DialogContent className="max-h-none p-0" data-testid="edit-field-dialog">
-          <div className="h-auto max-h-[85vh] overflow-auto px-8 pt-8 pb-7">
+          <div className="h-auto max-h-[85vh] overflow-auto px-8 pt-8 pb-10">
             <DialogHeader
               title={t("add_a_booking_question")}
               subtitle={t("form_builder_field_add_subtitle")}
@@ -545,7 +545,7 @@ export const FormBuilder = function FormBuilder({
               />
             </Form>
           </div>
-          <DialogFooter className="relative rounded px-8 pb-6" showDivider>
+          <DialogFooter className="relative rounded px-8 pb-4" showDivider>
             <DialogClose color="secondary">{t("cancel")}</DialogClose>
             <Button data-testid="field-add-save" type="submit" form="form-builder">
               {isFieldEditMode ? t("save") : t("add")}

packages/features/shell/Shell.tsx

@@ -342,11 +342,11 @@ function UserDropdown({ small }: { small?: boolean }) {
             </span>
             {!small && (
               <span className="flex flex-grow items-center truncate">
-                <span className="flex-grow truncate text-sm">
-                  <span className="text-emphasis mb-1 block truncate pb-1 font-medium leading-none">
+                <span className="flex-grow truncate text-sm leading-none">
+                  <span className="text-emphasis mb-1 block truncate font-medium">
                     {user.name || "Nameless User"}
                   </span>
-                  <span className="text-default truncate pb-1 font-normal leading-none">
+                  <span className="text-default truncate pb-1 font-normal">
                     {user.username
                       ? process.env.NEXT_PUBLIC_WEBSITE_URL === "https://cal.com"
                         ? `cal.com/${user.username}`

packages/ui/components/dialog/Dialog.tsx

@@ -138,7 +138,7 @@ export function DialogFooter(props: { children: ReactNode; className?: string; s
   return (
     <div className={classNames("bg-default", props.className)}>
       {props.showDivider && <hr className="border-subtle absolute right-0 w-full" />}
-      <div className={classNames("bg-default mt-6 flex justify-end space-x-2 rtl:space-x-reverse")}>
+      <div className={classNames("-mb-4 flex justify-end space-x-2 pt-4 rtl:space-x-reverse")}>
         {props.children}
       </div>
     </div>