Skip to content

v1.6#2772

Merged
zomars merged 66 commits into
productionfrom
main
May 16, 2022
Merged

v1.6#2772
zomars merged 66 commits into
productionfrom
main

Conversation

@zomars
Copy link
Copy Markdown
Contributor

@zomars zomars commented May 16, 2022

zomars and others added 30 commits May 9, 2022 16:17
* fixed /booking skeleton

* nit
* 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>
* Add more embed events

* Add more embed events

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* Improve logs

* Fix unintentional 500

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* 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>
* Add more embed events

* Add more embed events

* Fix nextCursor calculation logic

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* 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>
Co-authored-by: Omar López <zomars@me.com>
* allows deletion of disabled event

* some visual fixes

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* 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>
@zomars zomars marked this pull request as ready for review May 16, 2022 18:36
@zomars zomars added this to the v.1.6 milestone May 16, 2022
@vercel vercel Bot temporarily deployed to Production – cal-dev May 16, 2022 18:41 Inactive
* Alert to describe exclusion of options

* Update apps/web/pages/event-types/[type].tsx

Co-authored-by: Omar López <zomars@me.com>

* Update apps/web/components/eventtype/RecurringEventController.tsx

Co-authored-by: Omar López <zomars@me.com>

* Formatting

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
@vercel vercel Bot temporarily deployed to Production – cal-dev May 16, 2022 18:53 Inactive
…mid night (#2766)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
@vercel vercel Bot temporarily deployed to Production – cal-dev May 16, 2022 19:06 Inactive
@vercel vercel Bot temporarily deployed to Production – cal-dev May 16, 2022 19:19 Inactive
* New Crowdin translations by Github Action

* Update vital.json

* Update vital.json

Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Omar López <zomars@me.com>
@vercel vercel Bot temporarily deployed to Production – cal-dev May 16, 2022 19:24 Inactive
* Set google cal event id to use our uid

* Save calendar external id to bookingRef

* Pass external calendar ids to update and delete

* Create migration

* Fix type errors

* Fix prisma url

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
@vercel vercel Bot temporarily deployed to Production – cal-dev May 16, 2022 20:22 Inactive
@zomars zomars requested review from a team, PeerRich and pumfleet May 16, 2022 20:24
@vercel vercel Bot temporarily deployed to Production – cal-dev May 16, 2022 21:56 Inactive
@vercel vercel Bot temporarily deployed to Production – cal-dev May 16, 2022 22:00 Inactive
@zomars zomars merged commit fc13a22 into production May 16, 2022
@vercel vercel Bot temporarily deployed to Preview – cal-dev May 17, 2022 11:03 Inactive
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.