maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,941 Commits 866 Branches 211 Tags 815 MiB
Commit Graph

7941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan 2a2cb14f6c Handle children on event types, managed events, readonly and team count 2023-09-06 17:25:17 -07:00
Alan 9d1ebbebd1 merge with main 2023-09-06 12:53:00 -07:00
Peer Richelsen fce98ebb13
app store improvements, logos, dark mode, added screenshots, fixed author names (#11164) 2023-09-07 01:17:04 +05:30
alannnc b81b221bf5
fix: booking_paid webhook and added new payment metadata (#11093) 2023-09-06 12:40:27 -07:00
Hariom Balhara f9eb335d0b
test: Integration tests for handleNewBooking (#11044) 
Co-authored-by: Shivam Kalra <shivamkalra98@gmail.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
 2023-09-06 12:23:53 -07:00
Omar López d7d7bcd651
fix: set avatar cache control (#11163) 2023-09-06 12:22:13 -07:00
Crowdin Bot 4c861b9e67 New Crowdin translations by Github Action 2023-09-06 18:32:09 +00:00
Carina Wollendorfer 2fa704c39b
fix: add make invite link to setup page (#11177) 
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
 2023-09-06 14:29:13 -04:00
Crowdin Bot 9ccdf21d75 New Crowdin translations by Github Action 2023-09-06 15:25:19 +00:00
GitStart-Cal.com 9d6148da42
chore: add Wizard in storybook (CALCOM-10760) (#11166) 
Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
 2023-09-06 17:22:02 +02:00
Mehul bf437b7d6b
fix: event duration can be 0 (#11145) 
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
 2023-09-06 17:21:24 +02:00
Udit Takkar 3701fcd68b
fix: teams page error (#11171) 2023-09-06 11:38:21 +02:00
GitStart-Cal.com 2f90dc7cb6
fix: DataTable storybook file is not rendering (#10984) 
Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
 2023-09-06 09:18:06 +01:00
alannnc 829f90b82f
chore: remove unused queries on user event types (#11159) 
* remove unused queries on user event types

* Fix types
 2023-09-06 05:00:06 -03:00
Crowdin Bot 3539693729 New Crowdin translations by Github Action 2023-09-06 05:11:51 +00:00
Joe Au-Yeung 868ba4396d
fix: Installing Zoho CRM (#11161) 
* Fix installing Zoho CRM

* Clean up
 2023-09-06 05:08:59 +00:00
zomars d06e36a5cd Update yarn.lock 2023-09-05 14:46:14 -07:00
Crowdin Bot f61c9d9bbf New Crowdin translations by Github Action 2023-09-05 21:39:15 +00:00
Leo Giovanetti a2d521e001
fix: i18n issues reported by crowdin (#11160) 2023-09-05 18:36:17 -03:00
Omar López bf9c881d16
v3.2.8 2023-09-05 13:41:18 -07:00
alannnc 6dd0f9ce29
fix: selected organizer when creating event (#11157) 2023-09-05 13:38:59 -07:00
GitStart-Cal.com d34db7aef6
fix: Fix wrong footer Button in some languages (#10873) 
Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Shivam Kalra <shivamkalra98@gmail.com>
 2023-09-05 18:44:46 +00:00
Keith Williams b4b90f2d27
perf: Removed unused queries for user event types (#10568) 
* perf: Removed unused queries for user event types

* Added empty children array

* Refactor to clean up

* Fixing type issue

* Removed extra call to get raw event types

* Temporarily putting children back

* Removing include from children

* Added check for children

* Put children back for testing

---------

Co-authored-by: Alan <alannnc@gmail.com>
 2023-09-05 11:35:02 -07:00
Peer Richelsen 3f0380617a
chore: removed gravatar (#11153) 2023-09-05 19:56:02 +02:00
Udit Takkar 7143923ea4
fix: rescheduling in require confirmation (#11152) 
## What does this PR do?

Fixes https://github.com/calcom/cal.com/issues/11075

BEFORE:

Meeting has been rescheduled email and calendar event after submitting booking without confirming the meeting (require confirmation event type).

<img width="1086" alt="Screenshot 2023-09-05 at 7 45 44 PM" src="https://github.com/calcom/cal.com/assets/53316345/574c8d2f-3698-44ea-9466-aef162e09dd5">

AFTER:-

event scheduled email and calendar event created only after "awaiting approval" meeting has been confirmed.

<img width="1086" alt="Screenshot 2023-09-05 at 7 47 22 PM" src="https://github.com/calcom/cal.com/assets/53316345/af19ccea-d418-4a40-a9c6-88782522df53">


## Type of change

<!-- Please delete bullets that are not relevant. -->

- [x] Bug fix (non-breaking change which fixes an issue)

## How should this be tested?

1) Create a requires confirmation event type
2) open incognito tab or another browser and book a meeting (Attendee)
3) Confirm the booking (Organizer) and attendee would get meeting schedule email
4) Get the reschedule link from attendee's email and reschedule the booking

Both attendee and organiser shouldn't get booking email or calendar event  before organiser has accepted the meeting
 2023-09-05 10:52:47 -07:00
Alan 3cdd210ee4 fix mobile tabs event types 2023-09-05 10:40:13 -07:00
DexterStorey dfccf4604f
fix: better timezones and error handling in ai tools (#11085) 
* current time in user timezone, let ai handle 401

* update agent.ts

* simple onboarding for non cal.com users

* reverting this line - unecessary

* v1.0.1
 2023-09-05 13:56:26 +01:00
Vijay c12abd75a8
fix: #10973 back button not working as expected in embed (#11073) 
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
 2023-09-05 15:40:09 +05:30
Alan 5776d8b495 working mobile and desktop team event load 2023-09-04 22:40:46 -07:00
Crowdin Bot 2e12f09f05 New Crowdin translations by Github Action 2023-09-04 23:12:36 +00:00
alannnc 4258da1df5
remove double call on useSchedule() (#11141) 2023-09-04 23:10:19 +00:00
Hariom Balhara 41ef354c7b
fix: `FORM_SUBMITTED` webhook payload change and support for Team Webhooks with it (#10986) 2023-09-04 17:04:57 -04:00
alannnc 8891641953
hotfix: missing gCal calendarId (#11139) 
Co-authored-by: zomars <zomars@me.com>
 2023-09-04 20:25:39 +00:00
Alan 247df0c69e clean up 2023-09-04 13:14:36 -07:00
Udit Takkar 0150041496
fix: improve UX of team invite by copy link (#11009) 2023-09-04 12:43:37 -07:00
Carina Wollendorfer 13f9e97015
fix: variables for custom webhook payload (#11135) 
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
 2023-09-04 11:01:12 -07:00
Peer Richelsen 3c5901edb8
chore: cal.ai redirect (#11130) 2023-09-04 16:21:37 +00:00
Madhan Kumar d26bab5880
fix: Require an 'Email' placeholder in the 'Add guest' field. (#11123) 
* Adding_Email_PlaceHolder_Text

Signed-off-by: Madhan Kumar M <madhankumar26291@gmail.com>

* Adding_Email_PlaceHolder_Text

Signed-off-by: Madhan Kumar M <madhankumar26291@gmail.com>

* Adding_Email_PlaceHolder_Text

Signed-off-by: Madhan Kumar M <madhankumar26291@gmail.com>

* fixes

* fixes

---------

Signed-off-by: Madhan Kumar M <madhankumar26291@gmail.com>
Co-authored-by: Alan <alannnc@gmail.com>
 2023-09-04 09:13:12 -07:00
Udit Takkar 1c451a8d51
fix: installed badge (#11131) 2023-09-04 17:51:59 +02:00
Crowdin Bot 576261bf88 New Crowdin translations by Github Action 2023-09-04 15:50:49 +00:00
alannnc 7d944af7f6
fix: teams are listed on insights but then you cant find them on settings page 11087 cal 2401 (#11092) 
* fix listing of other teams

* add more invalidate trpc queries

* Remove unused code

* Removed unnecesary flags
 2023-09-04 08:47:53 -07:00
Crowdin Bot dfe7056c93 New Crowdin translations by Github Action 2023-09-04 14:55:48 +00:00
aar2dee2 b27f01449a
feat: make.com/integromat app (#8897) 
* start make app integration

* setup integration

* add relevant env vars

* update app metadata

* import setup route in app setups

* fix typo

* add app store imports

* fix module import error

* update make readme

* move scheduler to app-store utils

* move add subscription to node scheduler

* move delete subscription to scheduler

* subscribe unsubscribe in zapier using common nodeScheduler

* fix lint errors

* revert settings.json

* update icon

* add app screenshots

* fix app description

* fix type errors

* update app code

* Delete .gitkeep

* delete unused template files

* get app invite link from env vars

* chore: handle error, cleanup readme, address review comments

* fix: update link in readme

* revert yarn.lock

* fix type errors

* Update packages/prisma/seed-app-store.ts

* Update .env.appStore.example

* Update .env.appStore.example

* update app readme

* fix param name in deleteSubcription

* fix listBookings handler

* Update turbo.json

* use default installation handler to install app

* use logger for console logs

* Fix inviteLink reading

* fix app setup handler

* Fix type issue

* always show app invite link

* fix type error

* add make invite link

---------

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
 2023-09-04 14:52:34 +00:00
Peer Richelsen b48934b126
Merge branch 'main' into refactor-event-types-type-id-10419-cal-2264-cal-2296 2023-09-04 15:42:24 +02:00
Alan 932723abe6 WIP 2023-09-04 06:29:55 -07:00
Udit Takkar 6dd77d0494
fix: create event type (#11046) 2023-09-04 15:02:30 +02:00
VIneet Pradhan f73d38b632
fix: color tokens are not used in payment form (#10806) 
Co-authored-by: VIneet Pradhan <138296762+vineetpradhan-dev@users.noreply.github.com>
Co-authored-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
 2023-09-04 15:02:21 +02:00
Gaurav Suthar a7d8f0c84e
fix: add loading to delete event dialog (#11102) 
* add loading to delete event dialog

* chore: use mutation isLoading

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

---------

Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
Co-authored-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
 2023-09-04 14:59:50 +02:00
Heath Henley b0164990c0
Conformation --> Confirmation (#11058) 2023-09-04 14:56:46 +02:00
Ikko Eltociear Ashimine bad72ba7bf
chore: fix typo in embed-iframe.ts (#10858) 
currenty -> currently
 2023-09-04 17:48:42 +05:30