public-offering
/
cal.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,772 Commits
797 Branches
196 Tags
353 MiB
Commit Graph

374 Commits (f50b4166f57a6e3ae1e49095d239654b946c337c)

Author SHA1 Message Date
Hariom Balhara 10d9886dcc
Update packages/features/form-builder/FormBuilder.tsx 
Co-authored-by: Omar López <zomars@me.com>
 2023-02-16 10:49:32 +05:30
zomars 64aa375a53 Type fix 2023-02-15 16:30:39 -07:00
zomars 3b2241abe0 Restoring reqBody to avoid uneeded conflicts with main 2023-02-15 13:44:02 -07:00
zomars 020aad147e Merge branch 'main' into feat/manage-all-booking-inputs 2023-02-15 13:39:09 -07:00
Hariom Balhara 0a07251780 Merge remote-tracking branch 'origin/feat/manage-all-booking-inputs' into feat/manage-all-booking-inputs 2023-02-15 23:58:56 +05:30
Hariom Balhara 197ee90eda Fix options not set when default value is used 2023-02-15 21:28:03 +05:30
Hariom Balhara f15febde09
Update packages/features/form-builder/FormBuilder.tsx 
Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
 2023-02-15 21:14:26 +05:30
sean-brydon ea34545d72
Handle booking flow for dynamic default events (#7094) 
* Handle booking flow for default events

* Cleanup

* Update packages/lib/defaultEvents.ts

* Fix naming conventions

* Fix prettier error

---------

Co-authored-by: zomars <zomars@me.com>
 2023-02-15 15:42:49 +00:00
Hariom Balhara 8e82cb556b Fix regression in edit due to name conflict check 2023-02-15 21:00:44 +05:30
Hariom Balhara 0df3e77ef1 Fix cancellation reason 2023-02-15 12:29:32 +05:30
Hariom Balhara 24f67841f6 Merge remote-tracking branch 'origin/feat/manage-all-booking-inputs' into feat/manage-all-booking-inputs 2023-02-15 10:32:42 +05:30
Hariom Balhara 11d2d91a19 Fixes from Loom comments and PR 2023-02-15 10:15:27 +05:30
zomars 3aaccf3a47 Merge branch 'main' into feat/manage-all-booking-inputs 2023-02-14 17:08:36 -07:00
sean-brydon 1c97e549eb
Implement URL validation on default videos links (#7087) 2023-02-14 13:19:45 +00:00
Hariom Balhara f278ea11fb Merge remote-tracking branch 'origin/main' into feat/manage-all-booking-inputs 2023-02-14 15:14:05 +05:30
Hariom Balhara 7f395b032d Misc fixes 2023-02-14 14:58:25 +05:30
sean-brydon 77600f8168
Feat/custom default video (#6971) 
* Add queries to fetch metadata and update default

* Add to zod schema

* Change default rules on settings page

* Update query

* Initall override on create event type

* Working default

* Change schema to save locationLink too

* Update default conferncing to include link

* Rename tsx to ts. Fix metadata keys

* WIP on refactoring appstore installed

* Add this to appstore installed apps too

* Display only on conferencing apps

* Add i18n strings

* Change order in dropdown menu so delete is bottom

* Refactor query to not expose all of metadata

* Fix mr type checker

* Possible e2e fix

* Refactor metadata to use ctx

* Refactor back to query cell

* Alias schema

* Adding comment for more info

* Remove constant for clarity

* Update nextjs-bundle-analysis.yml

---------

Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: zomars <zomars@me.com>
 2023-02-13 22:55:32 +00:00
Hariom Balhara 038544ea52 Fix Carinas feedback and implement 2 workflows thingy 2023-02-13 21:34:05 +05:30
Joe Shajan c2a8f799ff
fix: availability header margin bottom (#7037) 2023-02-13 15:06:27 +00:00
Hariom Balhara 0fb781d5fd Merge branch 'feat/manage-all-booking-inputs' of github.com:calcom/cal.com into feat/manage-all-booking-inputs 2023-02-13 19:16:32 +05:30
Hariom Balhara 02e42cab29 Merge remote-tracking branch 'origin/main' into feat/manage-all-booking-inputs 2023-02-13 19:16:26 +05:30
Hariom Balhara 6ec5696e50 More PR review fixes 2023-02-13 18:31:40 +05:30
Carina Wollendorfer 1cae2b6f3d
Fixing issues around workflows (#6991) 
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
 2023-02-13 12:39:06 +00:00
Richard Poelderl 9d9fa8e575
turn inline logo & shell headers into h3 (#7060) 2023-02-13 12:29:48 +00:00
alannnc c3e7981917
Fix/bookings unintended confirmations on rejection 6975 (#7047) 
* Fixed translation message and added paymentStatus to booking page

* Fix booking confirmation with payment

* Remove previous code unnecesary
 2023-02-13 12:26:28 +00:00
Hariom Balhara 5ce11051d1
Update packages/features/bookings/lib/getBookingFields.ts 
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
 2023-02-13 17:40:39 +05:30
Carina Wollendorfer 5fcfbb2d90
fix text color (#7056) 
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
 2023-02-13 11:10:52 +00:00
Hariom Balhara 6815206553 More fixes discovered during review 2023-02-13 14:50:46 +05:30
Hariom Balhara a800529d98 More fixes discovered during review 2023-02-13 14:34:06 +05:30
Hariom Balhara c232f7acfc More fixes discovered during review 2023-02-13 12:02:41 +05:30
Peer Richelsen 8a99c3d2a5
Update Tips.tsx 2023-02-12 22:34:07 +01:00
Peer Richelsen 4ec8241a86
Update README.md 2023-02-12 20:33:16 +01:00
Peer Richelsen e6313aafac
Update README.md 2023-02-12 20:31:32 +01:00
Peer Richelsen f87f030bb5
Update README.md 2023-02-12 20:31:20 +01:00
Hariom Balhara d16d00fe07 BugFixes after testing 2023-02-11 14:39:32 +05:30
Hariom Balhara 543b25f7df Feedback from zomars 2023-02-11 12:57:40 +05:30
Hariom Balhara f45be560cb Merge remote-tracking branch 'origin/feat/manage-all-booking-inputs' into feat/manage-all-booking-inputs 2023-02-11 12:43:55 +05:30
Hariom Balhara 68a8b4d4fa More self review comments addressed 2023-02-11 12:42:23 +05:30
zomars bdfafd591f Merge branch 'main' into feat/manage-all-booking-inputs 2023-02-10 17:42:03 -07:00
Joe Au-Yeung 2056ebe186
Only show seats badge if it is greater than 1 (#7041) 2023-02-10 16:38:20 +00:00
Hariom Balhara 8fcddb7555 Self review comments addressed 2023-02-10 20:56:21 +05:30
Hariom Balhara 153ecbd48e Lint fixes 2023-02-10 20:00:43 +05:30
Nafees Nazik 8197ba18d4
feat: add new Jitsu events (#6980) 
Co-authored-by: Peer Richelsen <peer@cal.com>
 2023-02-10 09:53:03 +00:00
Hariom Balhara 38b26aa082 Merge remote-tracking branch 'origin/main' into feat/manage-all-booking-inputs 2023-02-10 13:03:11 +05:30
Omar López 42dcd4a2a9
Revert "Use Calendar component view=day for drop-in replacement troubleshooter (#6869)" (#6985) 
This reverts commit f18e80cfcf.
 2023-02-09 12:01:43 -07:00
Hariom Balhara b12b860666 Fixes 2023-02-09 20:25:15 +05:30
Udit Takkar 15da690270
fix: use typedquery hook in duplicate dialog (#6730) 
* fix: use typedquery hook in duplicate dialog

Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>

* Update packages/features/eventtypes/components/DuplicateDialog.tsx

---------

Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
Co-authored-by: Peer Richelsen <peer@cal.com>
Co-authored-by: Omar López <zomars@me.com>
 2023-02-08 21:29:16 +00:00
Joe Au-Yeung 2462e8e597
Small UI fixes for seats & destination calendars (#6859) 
* Do not add former time for events on seats

* Default display destination calendar

* Add seats badge to event type item

* Add string

* Actively watch seats enabled option for requires confirmation

* Only show former time when there is a rescheduleUid
 2023-02-08 21:13:10 +00:00
alannnc 2f628a17df
feat/payment-service-6438-cal-767 (#6677) 
* WIP paymentService

* Changes for payment Service

* Fix for stripe payment flow

* Remove logs/comments

* Refactored refund for stripe app

* Move stripe handlePayment to own lib

* Move stripe delete payments to paymentService

* lint fix

* Change handleRefundError as generic function

* remove log

* remove logs

* remove logs

* Return stripe default export to lib/server

* Fixing types

* Fix types

* Upgrades typescript

* Update yarn lock

* Typings

* Hotfix: ping,riverside,whereby and around not showing up in list (#6712)

* Hotfix: ping,riverside,whereby and around not showing up in list (#6712) (#6713)

* Adds deployment settings to DB (#6706)

* WIP

* Adds DeploymentTheme

* Add missing migrations

* Adds client extensions for deployment

* Cleanup

* Revert "lint fix"

This reverts commit e1a2e4a357.

* Add validation

* Revert changes removed in force push

* Removing abstract class and just leaving interface implementation

* Fix types for handlePayments

* Fix payment test appStore import

* Fix stripe metadata in event type

* Move migration to separate PR

* Revert "Move migration to separate PR"

This reverts commit 48aa64e072.

* Update packages/prisma/migrations/20230125175109_remove_type_from_payment_and_add_app_relationship/migration.sql

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

---------

Co-authored-by: zomars <zomars@me.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
 2023-02-08 13:36:22 -07:00
Carina Wollendorfer b3d8d7e944
Fixes localisation of {EVENT_DATE} in workflows (#6907) 
* translate {EVENT_DATE} variable to correct language

* fix locale for cron schedule reminder emails/sms

* fix type error

* add missing locale to attendees

* fix type error

* code clean up

* revert last commit

* using Intl for date translations

---------

Co-authored-by: CarinaWolli <wollencarina@gmail.com>
 2023-02-08 17:06:25 +00:00