Commit Graph

468 Commits (68e275ab070462219c2f7896291934d3825e0f9d)

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
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
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
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
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
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
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
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 a231945842 Test fixes 2022-05-10 21:37:09 -06:00
Peer Richelsen 92806d5257
fixed /booking skeleton (#2722)
* fixed /booking skeleton

* nit
2022-05-10 16:59:23 +02:00
zomars 9440df4445 Make apps single pages public 2022-05-09 16:17: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
zomars e9ff358ac2 Update BookingPage.tsx 2022-05-09 13:59:45 -06:00
zomars f79fd36c03 Merge branch 'production' 2022-05-09 13:58:18 -06:00
Alex van Andel edd99cdeb2
Replaces member avatars with links to avatar.png endpoint (#2708)
* Replaces member avatars with links to avatar.png endpoint

* Replaced additional occurences

* Use WEBSITE_URL from @calcom/lib/constants instead

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-09 18:25:12 +00:00
Hariom Balhara 9825754b32
Hotfix: blank page for booking embed in Incognito Chrome (#2700)
* Merge remote-tracking branch 'origin/main' into feat/success-url

* Fix localstorage access

* Fix Comments

* make custom eleemnt explicitly 100% in width to go full width in a flex type parent

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-09 18:12:47 +00:00
Omar López 6a18b40c97
Update package.json
Fixes v14 builds
2022-05-09 12:00:49 -06:00
Hariom Balhara d00f0bae1d
All non recurring bookings were clubbed into one distinct booking (#2706) 2022-05-09 16:04:42 +00:00
sean-brydon fb042a36b6
Fix Mobile UI for /settings/security (#2703)
* Fix Mobile UI

* Remove truncate

* Move buttons

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-05-09 13:43:27 +02:00
Peer Richelsen 6c27b04f83
fixed team dark mode (#2702) 2022-05-09 11:25:36 +00:00
Syed Ali Shahbaz 9322b4ab4c
Flow, UX and other improvements for hash my url feature (#2644)
* added toast feedback

* updated flow

* locale

* updated locale data

* removed unused booking call for reschedule flow

* fixed hashedURL test

* test adjustment

* further test changes

* added check in test to click check only if unchecked

* Added private link quick copy button

* fixed spacing

* fix lint

* consistency

* moved create hash function out of component render

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-09 16:41:07 +05:30
sean-brydon 351622c4a2
Add Invalid Email Error (#2637)
* Add error message UI

* Add border color

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
2022-05-09 08:24:39 +00:00
Hariom Balhara 44736ac461
Fix turbo caching (#2695)
* Fix turbo cachin

* Improve tests stability
2022-05-07 08:54:30 +00:00
zomars 4922a13b68 Form warning fixes 2022-05-06 15:44:57 -06:00
zomars a05860515e Form fixes 2022-05-06 15:44:51 -06:00
zomars 7399d6421e Form warning fixes 2022-05-06 15:30:46 -06:00
iamkun 269dea70a1
fix: Booking page display time based on selected timezone (#2691)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-06 19:28:09 +00:00
alannnc 8c9096b55b
Vital App - Auto reschedule based on health data (#2500)
* Add vital integration

* Tidy up client_user_id creation

* Rename vital app to vitalother to follow name rules

* Added env var

* App vital reschedule

* Fix on app structure and api calls

* Implemented user identification from webhook

* WIP fix api call and read me

* Save vital settings via api

* Now saving userVitalSettings and trigger reschedule on selected param

* Added translations

* Fix type for vitalSettings

* Using api to get env vars required for url, fix display of vital settings

* Fix hours placeholder, translation not working

* Renames vital app

* Update seed-app-store.ts

* Update package.json

* Update yarn.lock

* Refactored env variables

* Update README.md

* Migrates to api_keys

* Extracts AppConfiguration

* vitalClient fixes

* Update index.ts

* Update metadata.ts

* Update index.ts

* Update metadata.ts

* Added namespace vital for translations

Co-authored-by: Maitham <maithamdib@gmail.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-06 17:21:30 +00:00
Hariom Balhara 67cc3a6409
Embed Code Generator: Fix Preview HTML and Embed Lib path for production (#2688)
* Improve logging

* Improve logging

* Keep embed origin conigurable

* Make embed URL and embed origin conigurable through env

* Gitignore public embed

* Add fingerprint to preview as well

* Fix path

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-06 15:56:26 +00:00
Carina Wollendorfer 83ec6d69eb
fix query to list API keys (#2690)
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-06 14:48:27 +00:00