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

2126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan 2dcd2d4d83 Added translations and more validations 2022-04-15 06:00:38 -06:00
Alan 1f22f85ad9 Merge branch 'main' of ssh://github.com/calcom/cal.com into feature/app-wipe-my-cal 2022-04-15 05:44:57 -06:00
Agusti Fernandez c16aabd9e8
sync api and website (#2504) 2022-04-15 13:06:38 +02:00
alannnc c06d8164bc
feature/app wipe my cal (#2496) 2022-04-15 10:09:40 +00:00
Alan 96da9f6635 Fix where selections on cancelling 2022-04-15 03:59:34 -06:00
Bailey Pumfleet 6a7f07ed33
Merge branch 'main' into feature/app-wipe-my-cal 2022-04-15 10:36:15 +01:00
sean-brydon 080f2bb845
Updating App-Infomation + pics (#2489) 2022-04-15 10:35:50 +01:00
Bailey Pumfleet ce226529fa
Merge branch 'main' into feature/app-wipe-my-cal 2022-04-15 10:34:56 +01:00
Peer Richelsen 25e4e28c2a
small app store fixes (#2501) 
* added new other illustration, fixed dialog styling

* revert color change
 2022-04-15 08:54:09 +00:00
Alan c989c94532 remove console logs 2022-04-14 20:44:04 -06:00
Alan fb89cba803 merge with main 2022-04-14 20:41:51 -06:00
Alan e1ea04df5b merge with main 2022-04-14 20:41:05 -06:00
Alan 7ed0ccd013 remove log 2022-04-14 20:36:41 -06:00
alannnc 5b90ace8cf
feature/app wipe my cal (#2487) 
* WIP bookings page ui changes, created api endpoint

* Ui changes mobile/desktop

* Added translations

* Fix lib import and common names

* WIP reschedule

* WIP

* Save wip

* [WIP] builder and class for CalendarEvent, email for attende

* update rescheduled emails, booking view and availability page view

* Working version reschedule

* Fix for req.user as array

* Added missing translation and refactor dialog to self component

* Test for reschedule

* update on types

* Update lib no required

* Update type on createBooking

* fix types

* remove preview stripe sub

* remove unused file

* remove unused import

* Fix reschedule test

* Refactor and cleaning up code

* Email reschedule title fixes

* Adding calendar delete and recreate placeholder of cancelled

* Add translation

* Removed logs, notes, fixed types

* Fixes process.env types

* Use strict compare

* Fixes type inference

* Type fixing is my middle name

* Update apps/web/components/booking/BookingListItem.tsx

* Update apps/web/components/dialog/RescheduleDialog.tsx

* Update packages/core/builders/CalendarEvent/director.ts

* Update apps/web/pages/success.tsx

* Updates rescheduling labels

* Update packages/core/builders/CalendarEvent/builder.ts

* Type fixes

* Update packages/core/builders/CalendarEvent/builder.ts

* Only validating input blocked once

* E2E fixes

* Stripe tests fixes

* Wipe my cal init commit

* Fixes circular dependencies

* Added conditional display for wipe my cal button

* Added placeholder image for app category

* Fix type string for conditional validation

Co-authored-by: Peer Richelsen <peer@cal.com>
Co-authored-by: zomars <zomars@me.com>
 2022-04-14 20:24:27 -06:00
Alan 6a9cee125d Fix type string for conditional validation 2022-04-14 20:13:40 -06:00
Alan cc38f29fee Added placeholder image for app category 2022-04-14 20:10:19 -06:00
Alan a0b28716f5 Added conditional display for wipe my cal button 2022-04-14 20:07:58 -06:00
zomars a125fa3376 Merge branch 'main' into feature/app-wipe-my-cal 2022-04-14 20:04:56 -06:00
Omar López ba73960a02
App store metadata refactor (#2495) 
* Delete api

* Fixes circular dependencies

* Revert "Delete api"

This reverts commit 174177a833.

* Delete _metadata.ts

* Update metadata.ts
 2022-04-14 20:04:21 -06:00
zomars 15ec20bf78 Fixes circular dependencies 2022-04-14 19:41:10 -06:00
zomars 7e054c1243 Merge branch 'main' into feature/app-wipe-my-cal 2022-04-14 18:57:23 -06:00
Alan 4d679d44fa Wipe my cal init commit 2022-04-14 17:15:38 -06:00
buschco 94f64f9730
fix handling for recurring events (#2455) 2022-04-14 23:29:16 +01:00
zomars 5b31cc23f0 Merge branch 'main' into feature/app-wipe-my-cal 2022-04-14 16:28:34 -06:00
Omar López 21d183e661
Fixes postinstall scripts (#2492) 
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
 2022-04-14 15:59:00 -06:00
Afzal Sayed 699d910ab4
Perf: Optimize event-types page (#2436) 
* Perf: Optimize event-types page

* Memoize layout in Shell

* setQueryState without awaiting mutate for optimistic update

* Update Shell.tsx

* Fix types

* Update auth-index.test.ts

Co-authored-by: zomars <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
 2022-04-14 21:49:51 +00:00
alannnc 3c6ac395cc
Feature/reschedule bookings (#2351) 
* WIP bookings page ui changes, created api endpoint

* Ui changes mobile/desktop

* Added translations

* Fix lib import and common names

* WIP reschedule

* WIP

* Save wip

* [WIP] builder and class for CalendarEvent, email for attende

* update rescheduled emails, booking view and availability page view

* Working version reschedule

* Fix for req.user as array

* Added missing translation and refactor dialog to self component

* Test for reschedule

* update on types

* Update lib no required

* Update type on createBooking

* fix types

* remove preview stripe sub

* remove unused file

* remove unused import

* Fix reschedule test

* Refactor and cleaning up code

* Email reschedule title fixes

* Adding calendar delete and recreate placeholder of cancelled

* Add translation

* Removed logs, notes, fixed types

* Fixes process.env types

* Use strict compare

* Fixes type inference

* Type fixing is my middle name

* Update apps/web/components/booking/BookingListItem.tsx

* Update apps/web/components/dialog/RescheduleDialog.tsx

* Update packages/core/builders/CalendarEvent/director.ts

* Update apps/web/pages/success.tsx

* Updates rescheduling labels

* Update packages/core/builders/CalendarEvent/builder.ts

* Type fixes

* Update packages/core/builders/CalendarEvent/builder.ts

* Only validating input blocked once

* E2E fixes

* Stripe tests fixes

Co-authored-by: Peer Richelsen <peer@cal.com>
Co-authored-by: zomars <zomars@me.com>
 2022-04-14 15:25:24 -06:00
Alan 4fe25ef05c Merge branch 'feature/reschedule-bookings' of ssh://github.com/calcom/cal.com into feature/app-wipe-my-cal 2022-04-14 15:13:21 -06:00
zomars 2899d4551c Stripe tests fixes 2022-04-14 15:10:42 -06:00
zomars e657aa36b8 E2E fixes 2022-04-14 14:44:14 -06:00
Omar López ce4f5d345f
Merge branch 'main' into feature/reschedule-bookings 2022-04-14 14:20:24 -06:00
Omar López 6bb4b2e938
Fixes auth E2E tests (#2490) 2022-04-14 20:17:59 +00:00
Alan 4005bb0939 Merge branch 'feature/reschedule-bookings' of ssh://github.com/calcom/cal.com into feature/app-wipe-my-cal 2022-04-14 14:07:23 -06:00
Alan 6317da8936 Only validating input blocked once 2022-04-14 14:06:51 -06:00
Alan 68e6295304 Merge with main 2022-04-14 13:43:55 -06:00
Omar López ddcfd6afa6
Update packages/core/builders/CalendarEvent/builder.ts 2022-04-14 12:30:21 -06:00
zomars 572aa2c98f Merge branch 'main' into feature/reschedule-bookings 2022-04-14 12:27:52 -06:00
zomars cbd84cbe64 Type fixes 2022-04-14 12:26:25 -06:00
Omar López 4b7e3b3b16
Update packages/core/builders/CalendarEvent/builder.ts 2022-04-14 12:24:20 -06:00
zomars ff7b30e813 Updates rescheduling labels 2022-04-14 12:22:32 -06:00
Omar López d63191ae4c
Update apps/web/pages/success.tsx 2022-04-14 11:55:36 -06:00
Omar López de9ee071db
Update packages/core/builders/CalendarEvent/director.ts 2022-04-14 11:55:27 -06:00
Omar López 0076bb7d78
Update apps/web/components/dialog/RescheduleDialog.tsx 2022-04-14 11:55:12 -06:00
Omar López 0bd4189e4f
Update apps/web/components/booking/BookingListItem.tsx 2022-04-14 11:54:57 -06:00
Hariom Balhara d1b063d59d
User should be able to rebook a cancelled timeslot (#2483) 
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
 2022-04-14 16:01:38 +01:00
Clark Weckmann cfbf419f57
Updated git link and Prisma command. (#2363) 
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
 2022-04-14 15:58:58 +01:00
Alex van Andel 5fdc5078cc
Styling tweaks to inputs and Select (+ TimezoneSelect) (#2453) 
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
 2022-04-14 15:58:23 +01:00
Bailey Pumfleet d91f667d0c Update greyscale palette 2022-04-14 15:50:00 +01:00
Hariom Balhara 9ed666a475
Add app-store tests (#2465) 
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
 2022-04-14 09:30:38 +05:30
Hariom Balhara 39935306fc
Embed behind authentication page, Floating Button Popup and other changes (#2468) 
Co-authored-by: Omar López <zomars@me.com>
 2022-04-14 08:17:34 +05:30