Commit Graph
13785 Commits
Author SHA1 Message Date
zomars ef523bda51 Update website 2022-05-30 13:41:57 -06:00
0761e8664a Add reschedule reason to DB and emails (#2909)
* Write reschedule reason to db

* Add reschedule reason to emails

* Add reschedule reason to request reschedule email

* Add reschedule reason to request reschedule email

* Add reschedule reason to request reschedule email

* Add reschedule reason to request reschedule email

* Write reschedule reason to db

* Add reschedule reason to emails

* No longer using rescheduleReason in favor of cancellationReason

* Update apps emails accordingly with reschedule reason

* Update reschedule.test.ts

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Alan <alannnc@gmail.com>
Co-authored-by: zomars <zomars@me.com>
2022-05-30 13:40:29 -06:00
zomars 6b0cffa79a v1.6.2 v.1.6.2 v1.6.2 2022-05-30 12:53:07 -06:00
zomars 843daad481 Merge branch 'production'
# Conflicts:
#	.vscode/tasks.json
#	apps/console
#	apps/web/components/NavTabs.tsx
#	apps/web/components/SettingsShell.tsx
#	apps/web/components/booking/BookingListItem.tsx
#	apps/web/components/ui/TableActions.tsx
#	apps/web/components/ui/form/CheckboxField.tsx
#	apps/web/lib/emails/templates/attendee-scheduled-email.ts
#	apps/web/lib/emails/templates/organizer-scheduled-email.ts
#	apps/web/lib/types/booking.ts
#	apps/web/package.json
#	apps/web/pages/event-types/[type].tsx
#	apps/web/pages/getting-started.tsx
#	apps/web/pages/success.tsx
#	apps/web/public/static/locales/en/common.json
#	packages/config/package.json
#	packages/embeds/embed-core/package.json
#	packages/embeds/embed-react/package.json
#	packages/embeds/embed-react/src/index.ts
#	packages/embeds/embed-snippet/package.json
#	packages/embeds/embed-snippet/src/index.ts
#	packages/lib/isPrismaObj.ts
#	packages/lib/package.json
#	packages/ui/Dialog.tsx
#	yarn.lock
2022-05-30 12:50:31 -06:00
375517486c Fix booking detail page for cancelled events (#2905)
* fix booking detail page for cancelled events

* Fix typo

* fix bug when now attendees exist in booking

Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Alan <alannnc@gmail.com>
2022-05-30 20:17:50 +02:00
bc74014040 remove subtitle (#2925)
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-30 17:26:58 +00:00
Hariom Balharaandkodiakhq[bot] 3035412cdc Add embed tests in CI (#2887)
* Add embed tests in CI

* Update e2e-embed.yml

* Run quick tests only

* Ignore certain folders

* Add embed-react tests as well

* Fix commands

* Dont run unit tests

* Update playwright.config.ts

* Update playwright.config.ts

* Update playwright.config.ts

* Create correct artifcats

* Create correct artifcats

* Fi ignore path

* Update package.json

* Add back embed-react typecheck

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-30 22:41:05 +05:30
f7cec8d71f fix(app-store): Giphy Ux fixes (#2746)
* fix(app-store): Giphy Ux fixes

* Add search placeholder

* Min height image on event type page

* Use regex in zod validation and fix design issues for figma row 1

* Add paddings as per discussion with Ciarán

* Fix getGiphyApiKey nomenclature

* Update apps/web/public/static/locales/en/common.json

* Update regex to be more readable and allow enter to search

Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
2022-05-30 10:23:23 -06:00
Hariom Balharaandkodiakhq[bot] b22c562719 Allow less than 6 bookings and add proper min validation of 2+ (#2921)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-30 09:46:05 -06:00
e493b16466 Payment amount input leading 0 (#2836)
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
2022-05-30 09:28:32 -06:00
Alex van Andel d1f117f17a Fixed typo in CheckboxField and wrapped description in <label> (#2924)
* Fixed typo in CheckboxField and wrapped description in <label>

* Make functionality identical to before

* Fixed use of infomationIconText

* Fix lint error (needs refactor, out of scope)
2022-05-30 14:51:18 +00:00
Peer Richelsen af5bc9d530 Update CONTRIBUTING.md 2022-05-30 12:44:28 +02:00
Peer Richelsen d94267cdc1 Update CONTRIBUTING.md 2022-05-30 12:37:57 +02:00
Alex van Andel a15fe78ddb Cleanup & removed usages of sparingly used Text/ files (#2904) 2022-05-30 11:36:23 +02:00
Hariom Balharaandkodiakhq[bot] e270be1b87 Fix event-type preview links on Vercel Previews (#2919)
* Fix website url

* Fix avatar paths everywhere

* Fix linting errors

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-30 07:57:48 +00:00
Hashenandkodiakhq[bot] 8fe969d3b8 remove unsed imports (#2895)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-30 05:19:22 +00:00
Omar López 9fced41cd0 Update CONTRIBUTING.md 2022-05-28 16:56:03 -06:00
Omar López b3e9a38231 Update CONTRIBUTING.md 2022-05-28 16:54:01 -06:00
Omar López c144c365de Update CONTRIBUTING.md 2022-05-28 16:46:24 -06:00
Omar López 00e728e968 Update CONTRIBUTING.md 2022-05-28 12:50:52 -06:00
Omar López be92cc3563 Update CONTRIBUTING.md 2022-05-28 11:37:58 -06:00
Omar López 99c6b92bfe Update CONTRIBUTING.md 2022-05-28 10:35:07 -06:00
Hashen ce0fb6c09e Update README.md (#2912) 2022-05-28 18:20:28 +02:00
Peer Richelsen dfd6bc1523 Update CONTRIBUTING.md 2022-05-28 18:10:56 +02:00
Peer Richelsen a542930b87 areas of expertise test 2022-05-28 18:07:10 +02:00
Peer Richelsen 46752bd0d8 Update README.md 2022-05-28 11:26:38 +02:00
Peer Richelsen 0458203281 added checkly and twitch badges 2022-05-28 11:26:11 +02:00
Agusti Fernandez Pardo 849c4aa240 Merge pull request #102 from calcom/fix/event-type-validations
Fix/event type validations
2022-05-28 01:52:06 +02:00
Agusti Fernandez Pardo 9c3f85834f fix: remove console logs 2022-05-28 01:51:25 +02:00
Agusti Fernandez Pardo eea7c11488 fix event type valdiations 2022-05-28 01:50:28 +02:00
7b01bae829 Change location of booking (#2658)
* add functionality to change location in booking and send out mail

* add i18n

* change location with dropdown like in event-types

* small fixes and code clean up

* clean code

* improve format of current Location string

* clean code

* clear selection when dialog closed

* added mutation and changed props (first working verison)

* clean code

* clean code

* clean code

* clean code

* fix typo

* change maxHeight of select

* use useWatch for selectedLocation

* pass default values with props

* set current location directly in useState

* clear selected values when updating location

* fix trpc query for credentialst

* change icons for editing booking

* improve naming of variables

* remove unnecessary orderBy

* use locationOptionsToString method

* fix current location naming for Cal Video

* add phone input

* save phone number as location of booking

* remove input field for phone number for event-types

* fix redirection issue

* show previous selected location in event-type

* remove attendee number from selection for booking

* make first letter of location lowercase

* remove input field for attendee phone number

* clear Errors when changing location type

* set location details to optional

* clean code

* fixing issue that dropdown doesn't close when dialog opens

* clean code

* make overflow visibile in dialog

* fix existing bug with address not showing in event-type settings

* fix issue with losing focus after validation

* close rejection dialog

* small spelling fixes

* fix issue with LocationChangeEmail

* fix failing E2E test

* fix failing E2E test

* fix E2E test

* bug fix for saving user phone, and other minor changes

* merge main

* improve text

* fix UI of booking list

* Delete admin

* remove selection after update and submit

* add translation for error message

* add default values for checkbox

* add "your phone number" to locations on booking page

* remove duplicate attributes from viewer.bookings

Co-authored-by: Omar López <zomars@me.com>

* check if user is authorized to make changes to booking

* remove location string

* clan code for displayLocaitonPublicly checkbox

* fetch locationOptions on server side

* remove trpc query for credentials

* fix phone number input

* fix labels of host and attendee phone number for booking page

* Migrates edit location to tRPC

* Link elemnt should only be used in `a` tags

* Adds missin router

* Migrates locationOptions to tRPC query

* Type fixes

Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Alan <alannnc@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-27 23:27:41 +00:00
Agusti Fernandez Pardo 2cd548bdb2 fix: or z nul 2022-05-27 22:04:08 +02:00
Agusti Fernandez Pardo b9a2e0f4c6 fix: event types validations recurring event and locations nullable: 2022-05-27 21:58:38 +02:00
Agusti Fernandez Pardo 0b66e964fe fix: some logggingeventtypeid 2022-05-27 21:51:40 +02:00
zomars b869e70a7f Update turbo.json 2022-05-27 13:49:13 -06:00
Agusti Fernandez Pardo eee5fd0090 Merge pull request #101 from calcom/fix-event-types-id
fix: event types id endpoints
2022-05-27 21:45:17 +02:00
Agusti Fernandez Pardo be4ca8835e fix: event types id endpoints 2022-05-27 21:44:45 +02:00
Agusti Fernandez Pardo 81d2917a3d Merge pull request #100 from calcom/production
Production
2022-05-27 21:20:01 +02:00
Agusti Fernandez Pardo 458f37f5e9 Merge branch 'main' into production 2022-05-27 21:19:43 +02:00
Agusti Fernandez Pardo 8627b28a8e fix: conflicts 2022-05-27 21:18:47 +02:00
Agusti Fernandez Pardo b52832f333 fix 2022-05-27 21:01:15 +02:00
Agusti Fernandez Pardo f40e799769 fix event types 2022-05-27 21:01:15 +02:00
Agusti Fernandez Pardo 5b65bd1b66 fix 2022-05-27 21:01:15 +02:00
Agusti Fernandez Pardo 824d01f358 fix: move log of userId 2022-05-27 21:01:15 +02:00
Agusti Fernandez Pardo a91dd428c0 fix 2022-05-27 21:01:01 +02:00
Agusti Fernandez Pardo 9f50972570 fix event-types 2022-05-27 20:49:50 +02:00
Agusti Fernandez Pardo d09fa56f63 fix 2022-05-27 20:47:02 +02:00
Agusti Fernandez Pardo 46e0b8f4f5 fix: moves event-types to find user including it's event-types 2022-05-27 20:46:53 +02:00
Syed Ali Shahbaz 49ef2c341d prettier fix again 2022-05-27 20:46:22 +02:00
Syed Ali Shahbaz de557fccce prettier fix 2022-05-27 20:46:22 +02:00