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

8652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zomars e118af0839 Merge branch 'main' into zomars/cal-2724-implement-csrf-protection-for-public-trpc-endpoints 2023-11-22 12:37:15 -07:00
zomars 15650afdfd fix: Locks Stripe version 2023-11-22 12:36:14 -07:00
JA a094c3e124 feat(webhooks): pass webhook secret to `testTrigger` (#12187) 2023-11-22 12:36:14 -07:00
Greg Pabian b575df9376 chore: migrate the event-types page to the app directory (#12390) 
Co-authored-by: Omar López <zomars@me.com>
 2023-11-22 12:36:14 -07:00
zomars ad78d99320 syncpack fix-mismatches 2023-11-22 12:36:14 -07:00
Udit Takkar 280a530859 fix: default organizer bug in managed event type (#11921) 2023-11-22 12:36:14 -07:00
Joe Au-Yeung 87316c79c9 test: Integration Test GCal Primary Calendar (#12011) 
Co-authored-by: Alex van Andel <me@alexvanandel.com>
 2023-11-22 12:36:14 -07:00
Joe Au-Yeung 48dd4048f9 chore: Clean Up Delete Credential Selected Calendar Error Message (#12353) 2023-11-22 12:36:14 -07:00
Matt Nicolls e49ff393d6 fix: include eventTypeId in BOOKING_CANCELLED event (#12445) 2023-11-22 12:36:14 -07:00
sebzz ae152db45e docs: add google credentials in example env (#11695) 
* docs:add google credentials in example env

* docs: add a space after #

* chore: update .env.example

---------

Co-authored-by: Udit Takkar <udit222001@gmail.com>
 2023-11-22 12:36:13 -07:00
Morgan c8c7a02d14 fix: alby payment isPaid always false on create (#12463) 2023-11-22 12:36:13 -07:00
Amit Sharma 4a9cd4007a chore: Add team invite tests (#12425) 
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
 2023-11-22 12:36:13 -07:00
Adugna Tadesse 3be6ed49e9 outlook second account fix (#12013) 
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
 2023-11-22 12:36:13 -07:00
Udit Takkar 0f165cae16 chore: reset form on submission (#12465) 2023-11-22 12:36:13 -07:00
Peer Richelsen 259166aa5f chore: ignore "platform" in pr-assign-team workflow (#12487) 2023-11-22 12:36:13 -07:00
Peer Richelsen 74d027b60e chore: fixed cal.ai thumbnail (#12486) 2023-11-22 12:36:13 -07:00
Peer Richelsen 4317d4df0a chore: fix cal.ai price (#12485) 2023-11-22 12:36:13 -07:00
Somay Chauhan 6cb1bfe89f fix: opening team invite link in email throws error on signup page (#12397) 
Co-authored-by: Keith Williams <keithwillcode@gmail.com>
 2023-11-22 12:36:13 -07:00
Syed Ali Shahbaz ae56d78886 fix: Admin Logic for event-type API endpoint (#12482) 
* Fix Admin logic

* chore: fix prettier

---------

Co-authored-by: Udit Takkar <udit222001@gmail.com>
 2023-11-22 12:36:13 -07:00
Hariom Balhara c5c1a1f01c test: Add more orgs tests (#12241) 2023-11-22 12:36:13 -07:00
Morgan 8235e1bebe fix: better errors for googlecalendar integration (#12403) 2023-11-22 12:36:13 -07:00
Ujjwal Goyal 86cafd979b fix: Date overrides UI bug depending on screen size (#12423) 
* Update DateOverrideInputDialog.tsx

fix: Date overrides UI bug depending on screen size (calcom#12406)

* chore: remove comment

---------

Co-authored-by: madhurgoyal19 <35370133+madhurgoyal19@users.noreply.github.com>
Co-authored-by: Udit Takkar <udit222001@gmail.com>
 2023-11-22 12:36:13 -07:00
Crowdin Bot f8235610c7 New Crowdin translations by Github Action 2023-11-22 12:36:13 -07:00
Morgan a779ad801f fix: alby payment could not be created (#12460) 
* fix: alby payment could not be created

* fixup! fix: alby payment could not be created

* fixup! fixup! fix: alby payment could not be created
 2023-11-22 12:36:13 -07:00
Crowdin Bot 79c5f72e8c New Crowdin translations by Github Action 2023-11-22 12:36:13 -07:00
Peer Richelsen f63a59fa23 chore: paid support wip (#12419) 
* paid support wip

* nit

* added upgrade box to intercom

* nit
 2023-11-22 12:36:13 -07:00
Manpreet Singh 53164d5c0a fix: slug value in webhook payload (#12290) 
Co-authored-by: Udit Takkar <udit222001@gmail.com>
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
 2023-11-22 12:36:13 -07:00
Lars Artmann c25ef3162f fix: [embed-react] types fix for compatible with TypeScript's "moduleResolution": "bundler" (#12327) 
Co-authored-by: Peer Richelsen <peer@cal.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
 2023-11-22 12:36:13 -07:00
Somay Chauhan 7006f0bf25 fix: don't send notes to booker if "Hide notes in calendar" is on (#12333) 2023-11-22 12:36:13 -07:00
Alex van Andel 80fb612898 fix: Better error reporting & some fixes to deleteUser API (#12439) 2023-11-22 12:36:13 -07:00
sean-brydon 0c3321a35e fix: identifer (#12426) 
Co-authored-by: Udit Takkar <udit222001@gmail.com>
 2023-11-22 12:36:13 -07:00
Alex van Andel 27d969f995 feat: Base implementation of v2 of avatars (#12369) 
* feat: Base implementation of v2 of avatars

* Make avatarUrl and logoUrl entirely optional

* Made necessary backwards compat changes

* fix: type errors

* Fix: OG image

* fix types

* Consistency with other behaviour, ux tweak

---------

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
 2023-11-22 12:36:13 -07:00
Hariom Balhara 09cc4d8227 fix: Members count when `team` slug is same as `org` slug (#12124) 2023-11-22 12:36:13 -07:00
sean-brydon 250022a030 feat: troubleshooter with weekly view (V2) (#12280) 
* Inital UI + layout setup

* use booker approach of grid

* event-select - sidebar + store work

* adds get schedule by event-type-slug

* Calendar toggle

* Load schedule from event slug

* Add busy events to calendar

* useschedule

* Store more event info than just slug

* Add date override to calendar

* Changes sizes on smaller screens

* add event title as a tooltip

* Ensure header navigation works

* Stop navigator throwing errors on inital render

* Correct br

* Event duration fixes

* Add getMoreInfo if user is authed with current request.username

* Add calendar color map wip

* Add WIP comments for coloured outlines

* Revert more info changes

* Calculate date override correctly

* Add description option

* Fix inital schedule data not being populated

* Nudge overlap over to make it clearer

* Fix disabled state

* WIP on math logic

* Event list overlapping events logic

* NIT about width

* i18n + manage calendars link

* Delete old troubleshooter

* Update packages/features/calendars/weeklyview/components/event/EventList.tsx

* Remove t-slots

* Fix i18n & install calendar action

* sm:imrovments

* NITS

* Fix types

* fix: back button

* Month prop null as we control from query param

* Add head SEO

* Fix headseo import

* Fix date override tests
 2023-11-22 12:36:13 -07:00
Crowdin Bot ce51fb5824 New Crowdin translations by Github Action 2023-11-22 12:36:12 -07:00
Hariom Balhara 6960aeefb0 fix: add node-mocks-http to web (#12435) 2023-11-22 12:36:12 -07:00
zomars 2171a320f5 fix: Locks Stripe version 2023-11-22 12:19:30 -07:00
JA 7ee035c3a3
feat(webhooks): pass webhook secret to `testTrigger` (#12187) 2023-11-22 14:17:50 -05:00
Greg Pabian 1de05ebf3d
chore: migrate the event-types page to the app directory (#12390) 
Co-authored-by: Omar López <zomars@me.com>
 2023-11-22 19:17:33 +00:00
zomars 53d7e2ec3f syncpack fix-mismatches 2023-11-22 12:08:30 -07:00
Udit Takkar f65c7e413f
fix: default organizer bug in managed event type (#11921) 2023-11-22 12:43:25 -05:00
Joe Au-Yeung b762f60214
test: Integration Test GCal Primary Calendar (#12011) 
Co-authored-by: Alex van Andel <me@alexvanandel.com>
 2023-11-22 11:15:47 -03:00
Joe Au-Yeung 2498785c49
chore: Clean Up Delete Credential Selected Calendar Error Message (#12353) 2023-11-22 10:22:03 -03:00
Matt Nicolls 9a6683e01d
fix: include eventTypeId in BOOKING_CANCELLED event (#12445) 2023-11-22 12:04:51 +00:00
sebzz 2853288f49
docs: add google credentials in example env (#11695) 
* docs:add google credentials in example env

* docs: add a space after #

* chore: update .env.example

---------

Co-authored-by: Udit Takkar <udit222001@gmail.com>
 2023-11-22 11:49:27 +00:00
Morgan d04226ab9a
fix: alby payment isPaid always false on create (#12463) 2023-11-22 11:39:00 +00:00
Amit Sharma cb7ddc455a
chore: Add team invite tests (#12425) 
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
 2023-11-22 11:26:43 +00:00
Adugna Tadesse 73aa1e8a22
outlook second account fix (#12013) 
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
 2023-11-22 11:01:29 +00:00
Udit Takkar a3b5263b76
chore: reset form on submission (#12465) 2023-11-22 10:42:19 +00:00
Peer Richelsen af2c6c0844
chore: ignore "platform" in pr-assign-team workflow (#12487) 2023-11-22 10:25:56 +00:00