Commit Graph

8 Commits (80954aa86647db4bbf3c41d033f071f6fb6a5589)

Author SHA1 Message Date
Omar López ed808c3be6
Merge pull request #2672 from calcom/main
v1.5.4
2022-05-09 14:56:23 -06:00
Hariom Balhara 75c2ccff96
RoundRobin Booking Error in a particular case (#2471)
* users can be array of user when roundrobin team booking is there with availablity of multiple people

* Return empty array

* Add comments

* checktype fix

* removed extra condition

Co-authored-by: Syed Ali Shahbaz <alishahbaz7@gmail.com>
2022-04-12 10:10:18 -07:00
Syed Ali Shahbaz eceba51020
Dynamic group booking follow-up (#2430) 2022-04-08 17:50:10 +01:00
Syed Ali Shahbaz e6587efd27
Hotfix for merge loss in PR2416 (#2418) 2022-04-07 15:34:11 +01:00
Syed Ali Shahbaz a551919152
Dynamic group link for more than 2 user fixed (#2416) 2022-04-07 14:41:26 +01:00
Hariom Balhara 173e7846e8
Fix team booking (#2417) 2022-04-07 13:51:16 +01:00
Syed Ali Shahbaz 63635fc110
Dynamic group booking fix to accept "+" in URL and updated Head SEO for dynamic booking (#2414) 2022-04-07 11:28:52 +01:00
Syed Ali Shahbaz d1ffd1edae
dynamic group links (#2239)
* --init

* added default event types

* updated lib path

* updated group link design

* fixed collective description

* added default minimum booking notice

* Accept multi user query for a default event type

* check types

* check types --WIP

* check types still --WIP

* --WIP

* --WIP

* fixed single user type not working

* check fix

* --import path fix

* functional collective eventtype page

* fixed check type

* minor fixes and --WIP

* typefix

* custominput in defaultevent fix

* added booking page compatibility for dynamic group links

* added /book compatibility for dynamic group links

* checktype fix --WIP

* checktype fix

* Success page compatibility added

* added migrations

* added dynamic group booking slug to booking creation

* reschedule and database fix

* daily integration

* daily integration --locationtype fetch

* fixed reschedule

* added index to key parameter in eventtype list

* fix + added after last group slug

* added user setting option for dynamic booking

* changed defaultEvents location based on recent changes

* updated default event name in updated import

* disallow booking when one in group disallows it

* fixed setting checkbox association

* cleanup

* udded better error handling for disabled dynamic group bookings

* cleanup

* added tooltip to allow dynamic setting and enable by default

* Update yarn.lock

* Fix: Embed Fixes, UI configuration PRO Only, Tests (#2341)

* #2325 Followup (#2369)

* Adds initial MDX implementation for App Store pages

* Adds endpoint to serve app store static files

* Replaces zoom icon with dynamic-served one

* Fixes zoom icon

* Makes Slider reusable

* Adds gray-matter for MDX

* Adds zoom screenshots

* Update yarn.lock

* Slider improvements

* WIP

* Update TrendingAppsSlider.tsx

* WIP

* Adds MS teams screenshots

* Adds stripe screenshots

* Cleanup

* Update index.ts

* WIP

* Cleanup

* Cleanup

* Adds jitsi screenshot

* Adds Google meet screenshots

* Adds office 365 calendar screenshots

* Adds google calendar screenshots

* Follow #2325

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* requested changes

* further requested changes

* more changes

* type fix

* fixed prisma/client import path

* added e2e test

* test-fix

* E2E fixes

* Fixes circular dependency

* Fixed paid bookings seeder

* Added missing imports

* requested changes

* added username slugs as part of event description

* updated event description

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-04-06 10:20:30 -07:00