Commit Graph

2362 Commits (c910b41043f94a2fdc7ccedb456c0ddcd886e765)

Author SHA1 Message Date
Omar López 68e275ab07
Improving Email DRYness (#2486)
* Email DRY

* WIP

* Improve email DRYness

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-13 12:34:54 +00:00
Joe Au-Yeung 498759890f
Populate msteams key in db (#2743)
* Populate msteams key in db

* Fix calendar credentials to teams

* Clarify account dialog

Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-05-13 14:20:50 +02:00
zomars bf1f9b6a32 Build fixes 2022-05-12 13:54:46 -06:00
Joe Au-Yeung b69c1e46d1
Merge pull request #2745 from calcom/apps/multiple-categories
Allow apps to belong to multiple categories
2022-05-12 11:47:11 -06:00
zomars dcd2862e72 Increases timeout temporarily 2022-05-12 08:16:27 -06:00
Hariom Balhara 7a08403636
Fix reschedule not happening in calendar if two calendards are there (#2733)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-05-12 09:33:15 +00:00
Carina Wollendorfer 574f9cb5d4
Adjusting Zapier endpoints for publishing integration (#2728)
* add /me endpoint for zapier API testing

* remove cacellationReason from listBookings response

Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
2022-05-12 10:21:46 +01:00
zomars 613e42ce70 E2E fixing attemps 2022-05-11 21:07:22 -06:00
zomars 43f479299a Fixes delete-me test 2022-05-11 20:21:16 -06:00
zomars ecb3264b52 getBusyTimes consolidation 2022-05-11 19:49:21 -06:00
zomars e89520d7d6 Update testUtils.ts 2022-05-11 16:55:30 -06:00
zomars 892bb90d9d Update testUtils.ts 2022-05-11 16:39:45 -06:00
zomars a2ea08ba5f TODO marks blocking test to be fixed 2022-05-11 16:29:44 -06:00
Alex van Andel 50632dd9dd
Add 'free' and 'workingElsewhere' as a non-blocking event (#2652)
* Add 'free' and 'workingElsewhere' to non-blocking event - this will allow bookings at these times

* Update CalendarService.ts

Co-authored-by: zomars <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-11 20:47:42 +00:00
zomars 06702aa48a E2E and paid bookings fixes 2022-05-11 14:36:38 -06:00
zomars f2988870d5 Update booking-pages.test.ts 2022-05-11 12:03:22 -06:00
zomars f0ea8d30ca Parallelizes some tests 2022-05-11 11:19:22 -06:00
zomars c3909ccc70 Multiple E2E improvements 2022-05-11 10:46:52 -06:00
Hariom Balhara ae15a7d739 Fix time issue 2022-05-11 09:53:16 -06:00
Syed Ali Shahbaz 01e88b3807
Allow deletion of a disabled event (#2737)
* allows deletion of disabled event

* some visual fixes

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-11 14:14:08 +00:00
Hariom Balhara effb9d56d9
Fix preview.html not built and thus served during depooy (#2727)
Co-authored-by: Omar López <zomars@me.com>
2022-05-11 14:01:49 +00:00
Leo Giovanetti 2a5a89fe50 Missing fix for success page 2022-05-11 07:50:30 -06:00
Leo Giovanetti 2ce1e78053 Hotfix: Success page for recurring event (#2725)
* Merge pull request #2672 from calcom/main

v1.5.4

* Turbo fixes

* Make apps single pages public

* Fix preview.html not built and thus served during depooy (#2713)

* Hotfix: Success page layout broken due to duplicate "When" (#2716)

* Update BookingPage.tsx

* Reverting unchaged lines

* Fixing recurrenceRule for ICS files

Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
2022-05-11 07:50:30 -06:00
Leo Giovanetti 3bbbc80511
Hotfix: Success page for recurring event (#2725)
* Merge pull request #2672 from calcom/main

v1.5.4

* Turbo fixes

* Make apps single pages public

* Fix preview.html not built and thus served during depooy (#2713)

* Hotfix: Success page layout broken due to duplicate "When" (#2716)

* Update BookingPage.tsx

* Reverting unchaged lines

* Fixing recurrenceRule for ICS files

Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
2022-05-11 10:12:59 -03:00
Hariom Balhara 19128fb08e
Hotfix : Fix Infinite loading of Bookings (#2729)
* Add more embed events

* Add more embed events

* Fix nextCursor calculation logic

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-05-11 10:35:43 +00:00
Peer Richelsen 0945bbe5cf
fixes #2732 (#2732) 2022-05-11 12:04:04 +02:00
Peer Richelsen ced6975fc8
added giphy description (#2730) 2022-05-11 11:46:27 +02:00
Joe Au-Yeung fb436996c0
Change date format for RecurringBookings (#2707)
* Change date format for RecurringBookings

* Missing bookingId query param

Co-authored-by: Leo Giovanetti <hello@leog.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-11 07:59:49 +00:00
Hariom Balhara 50f1fe544e
Improve logs and Fix unwanted 500 to reduce noise in logs (#2674)
* Improve logs

* Fix unintentional 500

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-11 05:41:09 +00:00
Syed Ali Shahbaz 746643bf8e
adds availability select loader (#2718) 2022-05-11 05:26:06 +00:00
Hariom Balhara 65a69ef1e4
Add more embed events (#2719)
* Add more embed events

* Add more embed events

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-05-11 05:14:08 +00:00
Carina Wollendorfer 6483182ef6
add invite link to Zapier setup page (#2696)
* add invite link and toaster to zapier setup page

* create env variable for invite link and save in database

* fetch invite link form getStaticProps

* add getStaticPath method

* clean code

* Moves app setup and index page

* Moves Loader to ui

* Trying new way to handle dynamic app store pages

* Cleanup

* Update tailwind.config.js

* zapier invite link fixes

* Tests fixes

Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
2022-05-11 04:58:10 +00:00
zomars 784a91709c Update dynamic-booking-pages.test.ts 2022-05-10 22:46:22 -06:00
zomars 82a52e065f More test fixes 2022-05-10 22:28:48 -06:00
zomars a1f6738cf1 Update playwright.config.ts 2022-05-10 21:51:24 -06:00
zomars a231945842 Test fixes 2022-05-10 21:37:09 -06:00
zomars a507d5963c Type fixes 2022-05-10 21:35:44 -06:00
Peer Richelsen 92806d5257
fixed /booking skeleton (#2722)
* fixed /booking skeleton

* nit
2022-05-10 16:59:23 +02:00
Hariom Balhara 2d6d1cb444
Hotfix: Success page layout broken due to duplicate "When" (#2716) 2022-05-10 14:49:46 +05:30
Hariom Balhara ef68f4f4f8
Fix preview.html not built and thus served during depooy (#2713) 2022-05-10 10:54:20 +05:30
zomars 9440df4445 Make apps single pages public 2022-05-09 16:17:23 -06:00
zomars 4e0efb76cd Turbo fixes 2022-05-09 16:17:23 -06:00
zomars 18c28cc3fd Make apps single pages public 2022-05-09 16:17:07 -06:00
zomars d40e8caff9 Turbo fixes 2022-05-09 16:08:03 -06:00
zomars 3161cc4d45 Merge branch 'main' into production 2022-05-09 14:58:33 -06:00
Omar López ed808c3be6
Merge pull request #2672 from calcom/main
v1.5.4
2022-05-09 14:56:23 -06:00
zomars 4099a477d1 v1.5.4 2022-05-09 14:33:32 -06:00
zomars 6542da7e30 Formatting 2022-05-09 14:33:13 -06:00
Hariom Balhara 8336611f54
Missing translation (#2697)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-09 22:24:01 +02:00
zomars 819c6c96e8 Build fixes 2022-05-09 14:05:57 -06:00