03e787ad5a
Fixes 3 issues related to 404 links ( #2979 )
2022-06-06 11:40:56 +02:00
dd09854932
Hotfix: fixed callback URL for team invite email ( #2978 )
2022-06-06 14:59:46 +05:30
b9428301b6
Hotfix: fixed callback URL for team invite email ( #2975 )
2022-06-06 14:07:53 +05:30
2344a4da13
Update yarn.lock
2022-06-05 16:42:26 -06:00
4652878e6c
tsc fixes
2022-06-05 16:35:39 -06:00
4efc2914af
Embed build fixes
2022-06-05 13:55:58 -06:00
9866e12a84
Update default-cookies.ts
2022-06-05 13:54:13 -06:00
8998e41104
New Crowdin translations by Github Action ( #2964 )
...
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-06-05 09:00:08 +02:00
0a64715d84
Fallbacks to Cal Video when missing credentials for location
2022-06-04 11:32:43 -06:00
879619e075
Fallbacks to Cal Video when missing credentials for location
2022-06-04 11:23:56 -06:00
16cab18163
Fix preview not working ( #2962 )
2022-06-04 07:31:13 -06:00
456ba9db04
fix: saml update/delete only owner team ( #2948 )
...
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-04 07:31:10 -06:00
1c89afc7ad
Fix preview not working ( #2962 )
2022-06-04 07:17:02 -06:00
16836d0cfb
fix: saml update/delete only owner team ( #2948 )
...
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-03 23:13:50 +00:00
2c65e39482
Ignores vital for now
2022-06-03 14:18:43 -06:00
65dc7c5b65
New Crowdin translations by Github Action ( #2959 )
...
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-06-03 22:04:54 +02:00
eb02efb25a
New Crowdin translations by Github Action ( #2834 )
...
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-06-03 22:01:49 +02:00
864a873c57
Images in slider will have fixed height, variable width ( #2916 )
...
* Images in slider will have fixed height, variable width
* fix spacing
* remove extra whitespace
* fix whitespace lint errors
* fix whitespace lint error
* fix width for images in app store slider
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-06-03 22:01:00 +02:00
fcba3bec03
added email to ee helper ( #2958 )
2022-06-03 21:59:40 +02:00
4569a96e78
Update index.ts
2022-06-03 13:21:46 -06:00
debbd980d9
Fixes preview deploys
2022-06-03 12:48:47 -06:00
d5e40faeb5
Adds booking reportUsage for enterprise
2022-06-03 12:33:53 -06:00
10edc1f4ac
Update next.config.js
2022-06-03 10:50:48 -06:00
42c49a8263
renamed integratin to app and extracted into common.json ( #2951 )
2022-06-03 14:57:50 +00:00
7b0d5811d6
Improve meeting url information in booking detail view ( #2943 )
...
* change meeting url text for booking detail view
* improve for wen conferencing details for different booking status
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-03 11:28:33 +00:00
9d1e6f23db
Fixing spaces and wraps for event type legend ( #2941 )
...
* Fixing spaces and wraps
* Spacing wrapped items
* fix lint errors
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
2022-06-03 11:15:29 +00:00
b4f3680876
disable confirm button when recurring mutation is loading ( #2950 )
...
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
2022-06-03 12:52:10 +02:00
7536473c9d
Allows telemetry opt-out
2022-06-02 14:06:13 -06:00
fd8e4ef890
licenseCheck fixes
2022-06-02 13:49:12 -06:00
c8a16ce43b
Call prod console only on prod non staging deploys
2022-06-02 13:40:16 -06:00
887bd66a33
All prod builds should call prod console
2022-06-02 13:34:32 -06:00
eeb9ff662e
Adds cors to checkLicense
2022-06-02 13:20:48 -06:00
262df1a1b2
Updates console
2022-06-02 13:20:35 -06:00
3919d87486
Adds license to telemetry
2022-06-02 11:53:02 -06:00
6f203d14e3
Submodule updates
2022-06-02 10:20:29 -06:00
456a4ba581
Telemetry improvements ( #2935 )
...
* next-collect initial setup
* naming changes
* WIP
* WIP: added cookie name
* telemetry update
* fixes
* telemetry eventTypes fix
* tmp jitsu config for testing
* tmp jitsu key update (for tests)
* deploy commit
* cookieName fixes
* telemetry credentials update
* NextCollect updated to latest canary; added TELEMETRY_KEY to config
* TELEMETRY_KEY fix
removed browser_user_agent field from event
* removed _middleware.ts for test deploy
* _middleware.ts restored
* next-collect version bump
* yarn.lock fix
* Added license consent property, set default telemetry endpoint
* Switched to stable version of next-collect; restored LicenseProvider accidentally deleted during merge
* Switched to stable version of next-collect; restored LicenseProvider accidentally deleted during merge
* Updated to latest version of next-collect
* - Updated to latest version of next-collect
- Few improvements in event collection: isTeamBooking for all events, page_url for all events
- Do not send second page event on re-render of /team/[slug]
* Revert booking confirmed tracking
* Applied prettier + fix lint
Co-authored-by: Art Sk <kirsan007@gmail.com>
2022-06-02 10:19:01 -06:00
60d6c7be51
fix: owners can't be edited by admins ( #2942 )
...
* fix: owners can't be edited by admins
* fix: removec omment
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-02 09:39:23 -06:00
0f273c5efc
Update package.json
2022-06-01 15:46:48 -06:00
33a45a8af5
Installed Apps page revamp ( #2751 )
...
* First round of changes
* Some missing styling
* Last round of core changes
* Color tweaks
* Improving code readability
* Reverting unneeded changes
* Reverting yarn.lock
* Removing yarn.lock
* Empty state updated
* Fixing webhook test
* Cleaning up code
* Fixing test and simplifying code a bit
* Merging API Keys into developer section
* Unifying Empty Screen with monorepo version
* Cleaning up
* Installed apps logic consistency + cleaning up
* Type fixes
* Apply suggestions from code review
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: alannnc <alannnc@gmail.com>
* Improvements, still WIP
* Update apps/web/pages/apps/installed.tsx
Co-authored-by: Omar López <zomars@me.com>
* Apply suggestions from code review
Co-authored-by: Omar López <zomars@me.com>
* App active install status
* Apple Calendar setup, Daily.co preinstalled
* Final pass
* Minor tweaks
* Conflicts with migration ignored
* Fixing merge
* Fixing merge yet again
* Adopting main changes
* Removing unneeded data-testid
* Fixing reported bugs
* Simplifying webhook query
* Moving teams settings tab to second
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: alannnc <alannnc@gmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-06-01 14:24:41 -03:00
6179b0cc56
Fixing Spacing + text color ( #2938 )
...
* Fixing Spacing + text color
* Fix overflow
* Fixing mobile text color
2022-06-01 14:58:46 +02:00
9ded50b5fc
Fix/infinite booking list ( #2931 )
...
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-01 09:33:14 +05:30
7c34be272f
Invalid Payment URL gives 500 ( #2857 )
...
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
2022-05-31 14:40:12 +01:00
6145c7ad90
Bug - Admin Shell Duplicated ( #2933 )
...
* Fix additional shell in admin
* Update headings
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-05-31 14:36:20 +01:00
5225fc4317
A few booking page UI fixes ( #2932 )
2022-05-31 13:20:51 +02:00
514cff7b3c
Fix: Embed Tests - Handle superfast switching to next month bug ( #2929 )
...
* Wait for more time for next month dates to fully render
* Add comments
* Wait for rendering of current month as well
* Fix retries
* Fix speed issue with non embed tests asw ell
2022-05-31 09:32:41 +00:00
eb6e092a21
Improve dx command ( #2918 )
2022-05-30 17:47:58 -06:00
7d2c0ab405
Improve dx command ( #2918 )
2022-05-30 23:11:22 +01:00
01631e808f
v1.6.2 ( #2926 )
...
* Turbo fixes
* Make apps single pages public
* fixed /booking skeleton (#2722 )
* fixed /booking skeleton
* nit
* Type fixes
* Test fixes
* Update playwright.config.ts
* More test fixes
* Update dynamic-booking-pages.test.ts
* 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>
* Add more embed events (#2719 )
* Add more embed events
* Add more embed events
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* adds availability select loader (#2718 )
* 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>
* 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>
* added giphy description (#2730 )
* fixes #2732 (#2732 )
* 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>
* 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>
* Fix preview.html not built and thus served during depooy (#2727 )
Co-authored-by: Omar López <zomars@me.com>
* 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>
* Multiple E2E improvements
* Parallelizes some tests
* Update booking-pages.test.ts
* E2E and paid bookings fixes
* 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>
* TODO marks blocking test to be fixed
* Update testUtils.ts
* Update testUtils.ts
* getBusyTimes consolidation
* Fixes delete-me test
* E2E fixing attemps
* 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>
* 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>
* Increases timeout temporarily
* Merge pull request #2745 from calcom/apps/multiple-categories
Allow apps to belong to multiple categories
* Build fixes
* 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>
* Improving Email DRYness (#2486 )
* Email DRY
* WIP
* Improve email DRYness
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* E2E fixtures (#2747 )
* Sign in button should be changed or disabled after click #2654 (#2749 )
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
* Fixing ESLint warnings (#2723 )
* Fixing warnings
* Reverting and disabling ESLint in some cases
* Reverting Next Images
* Reverting file, bad merge
* Targeting ESLint to line
* Additional warnings
* New warning squished
* More tweaks and major fixes
* Uneeded conf
Co-authored-by: Omar López <zomars@me.com>
* Fix/avoid multiple schedule deletions (#2602 )
* Prevents users from deleting the same schedule multiple times due to delay before the schedule disappears. It also applies the same fix to team disband.
Schedule deletion:
Team disband:
Fixes issue [#2569 ](https://github.com/calcom/cal.com/issues/2569 )
Bug fix (non-breaking change which fixes an issue)
**apps/web/components/LightLoader.tsx** → this file was created in order to make a light color loading spinner available. It's necessary when we need to display a loading spinner above dark backgrounds.
**apps/web/components/availability/ScheduleListItem.tsx** → this component was created in order to give a schedule list item its own state.
* Removing a "setTimeout" that was only used for testing purposes
* Adding a code review suggestion to my modifications
* Changing loading style
* Cleanup
* Avoids using unnecessary state
* Revert "Adding a code review suggestion to my modifications"
This reverts commit b5e40062d7#2757 )
* Added check on create eventtype to see is user has slug that already exists, added error check on onError
* revert yarn.lock back
* Catches prisma known error instead of making an additional query
Co-authored-by: zomars <zomars@me.com>
* Fix white border (#2761 )
* fix: remove hardcoded redirect in signin url email verification (#2764 )
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
* Bad UX when user wants to set the default Event Type Title #2245 (#2760 )
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
* Skip sending emails in E2E
* Users Phone Number Option (#2669 )
* Users Phone Number Option
* Implemented improvments
* Add validation to form
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
* Fix/unpaid unconfirmed (#2553 )
* Fix merge errors
* Errors prettier/prettier
* Update apps/web/pages/api/book/event.ts
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com>
* Update apps/web/pages/api/book/event.ts
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com>
* Update apps/web/pages/api/integrations.ts
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com>
* Fix merge errors
* Errors prettier/prettier
* Update apps/web/pages/api/book/confirm.ts
Co-authored-by: alannnc <alannnc@gmail.com>
* Modal window before delete stripe integration
* ESLint Report
* Test fixes
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com>
Co-authored-by: alannnc <alannnc@gmail.com>
Co-authored-by: zomars <zomars@me.com>
* Mutually exclusive options (#2755 )
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Readd steps to create a new user #2665 (#2759 )
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
* remove redundant conditional expressions (#2756 )
* remove redundant conditional expressions
* remove redundant conditional expression
Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
* Fix adds redirect callback that support app.cal.com (#2768 )
* Fix adds redirect callback that support app.cal.com
* Update apps/web/pages/api/auth/[...nextauth].tsx
Check origin of website and baseurl
Co-authored-by: Omar López <zomars@me.com>
* fix: lint issue extra space removed
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* respect local set timezone and update url on mismatch (#2506 )
* ensure `timeZone()` will make its way to the URL
fixes https://github.com/calcom/cal.com/issues/2482
* keep `timeZone()` and the offset from URL in sync
Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Squashed commit of the following:
commit 27540b09ce#2764 )
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
commit ae15a7d7392a5a89fe502ce1e78053#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>
commit 2d6d1cb444#2716 )
commit ef68f4f4f8#2713 )
commit 18c28cc3fdd40e8caff93161cc4d45ed808c3be4099a477ded808c3be6#2672 from calcom/main
v1.5.4
* Typo
* Typo
* Update apps/web/pages/apps/categories/[category].tsx
* Apply suggestions from code review
* Alert to describe exclusion of options (#2770 )
* 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>
* fix: split time correctly if the local working hours are just across mid night (#2766 )
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Update crowdin.yml
* New Crowdin translations by Github Action (#2773 )
* 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>
* Add Google cal extneral calendar id to booking reference (#2671 )
* 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>
* v1.6
* v1.6
* 2FA submit disabled (#2790 )
* fixing the hyperlink for open startup (#2777 )
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Add login event (#2784 )
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
* Fixes infinite loop
* Fixes infinite loop
* Fixes infinite loop
* Update all Yarn dependencies (2022-05-16) (#2769 )
* Update all Yarn dependencies (2022-05-16)
* Upgrade dependencies
* Removes deprecated packages
* Upgrades deps
* Updates submodules
* Update yarn.lock
* Linting
* Linting
* Update website
* Build fixes
* TODO: fix this
* Module resolving
* Type fixes
* Intercom fixes on SSG
* Fixes infinite loop
* Upgrades to React 18
* Type fixes
* Locks node version to 14
* Upgrades daily-js
* Readds missing types
* Upgrades playwright
* Noop when intercom is not installed
* Update website
* Removed yarn.lock in favor of monorepo
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
* Create ci.yml
* Update ci.yml
* Reintroduces typescript-eslint
Buckle up!
* Type fixes
* Update ci.yml
* Update api
* Update admin
* Reusable inferSSRProps
* Linting
* Linting
* Prisma fixes
* Update ci.yml
* Cache testing
* Update e2e.yml
* Update DatePicker.tsx
* Update e2e.yml
* Revert "Linting"
This reverts commit adf817766e1b59dacd64#2803 )
* Fix missing tabs - Embed (#2804 )
* Fix missing tabs
* Fix Eslint error
* Fix Eslint errors
* Add import statement (#2812 )
* Add import statement
* Update apps/docs/next.config.js
Co-authored-by: Omar López <zomars@me.com>
* Show success page if booking was deleted on calendar (#2808 )
* Add exception to 410
* Fix type error
* Add GoogelCalError type
* only show invite link for app.cal.dev (#2807 )
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
* fix: update eslint config to test .ts and .js separately (#2805 )
* fix: update eslint config
* fix: update ts ignore
* fix: update eslint config
* Update TeamAvailabilityScreen.tsx
* Type fixes
* Update useIntercom.ts
Co-authored-by: Omar López <zomars@me.com>
* fix: sync api to latest commit (#2810 )
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Embed React improvements (#2782 )
* Add off support. Add getApi export.
* Add publish command
* Add embed-snippet in prod deps
* Update README
* Update package.json
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Consolidates test-results
* Add vscode tasks.json (#2801 )
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* save additional inputs as json + view details of booking (#2796 )
* move custom inputs from description to own json object
* show custom inputs on success page
* fix type error
* add custom inputs to email and webhook
* add custom inputs to all emails
* add values for custom inputs when rescheduling
* add custom input everywhere description is shown
* fix bug with boolean value
* fix issues with null values
* disable custom inputs and add notes for organizer
* don't show custom input with empty string
* don't show custom inputs with empty string in calender event and email
* add link to booking details page
* redirect to success page to see booking details
* add functionality to cancel and reschedule booking
* fix bookings that require confirmation
* clean code
* fix infinite lopp in useEffect of success page
* show web conference details message when integration as location
* improve design of cancelling event
* clean code
* disable darkmode for organizer on booking details page
* fix dark mode for cancelling booking
* fix build error
* Fixes infinite loop
* Fixes infinite loop
* Fixes infinite loop
* Update all Yarn dependencies (2022-05-16) (#2769 )
* Update all Yarn dependencies (2022-05-16)
* Upgrade dependencies
* Removes deprecated packages
* Upgrades deps
* Updates submodules
* Update yarn.lock
* Linting
* Linting
* Update website
* Build fixes
* TODO: fix this
* Module resolving
* Type fixes
* Intercom fixes on SSG
* Fixes infinite loop
* Upgrades to React 18
* Type fixes
* Locks node version to 14
* Upgrades daily-js
* Readds missing types
* Upgrades playwright
* Noop when intercom is not installed
* Update website
* Removed yarn.lock in favor of monorepo
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
* Create ci.yml
* Update ci.yml
* Reintroduces typescript-eslint
Buckle up!
* Type fixes
* Update ci.yml
* Update api
* Update admin
* Reusable inferSSRProps
* Linting
* Linting
* Prisma fixes
* Update ci.yml
* Cache testing
* Update e2e.yml
* Update DatePicker.tsx
* Update e2e.yml
* Revert "Linting"
This reverts commit adf817766e1b59dacd64#2803 )
* Fix missing tabs - Embed (#2804 )
* Fix missing tabs
* Fix Eslint error
* Fix Eslint errors
* Add import statement (#2812 )
* Add import statement
* Update apps/docs/next.config.js
Co-authored-by: Omar López <zomars@me.com>
* Show success page if booking was deleted on calendar (#2808 )
* Add exception to 410
* Fix type error
* Add GoogelCalError type
* only show invite link for app.cal.dev (#2807 )
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
* fix: update eslint config to test .ts and .js separately (#2805 )
* fix: update eslint config
* fix: update ts ignore
* fix: update eslint config
* Update TeamAvailabilityScreen.tsx
* Type fixes
* Update useIntercom.ts
Co-authored-by: Omar López <zomars@me.com>
* fix: sync api to latest commit (#2810 )
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Embed React improvements (#2782 )
* Add off support. Add getApi export.
* Add publish command
* Add embed-snippet in prod deps
* Update README
* Update package.json
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Consolidates test-results
* Type fixes
* Abstracts minimal booking select
* Type fixes
* Update listBookings.ts
* Update common.json
* Update bookingReminder.ts
* Consolidates isOutOfBounds
* Update webhookResponse-chromium.txt
* Update TableActions.tsx
* Type fixes
* Update BookingPage.tsx
* Update webhookResponse-chromium.txt
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: iamkun <kunhello@outlook.com>
Co-authored-by: Agusti Fernandez Pardo <me@agusti.me>
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Update check-types.yml
* adding organizer as attendee to google calendar events (#2779 )
* Fix auto-select and close of dropdown (#2819 )
* fixes dynamic color and typefix for tfunction after react upgrade (#2821 )
* New Crowdin translations by Github Action (#2791 )
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
* Relocates admin to console
# Conflicts:
# apps/admin
* Relocates admin to console
* Fix login submit (#2849 )
* fix: long string overflowing calendar div (#2842 )
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
* Adding labels (#2783 )
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Wrong username is identified if query params are present and user doesn't exist (#2838 )
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
* Meet/Zoom Email Clarification (#2828 )
* Add clarificaiton to email
* Update apps/web/lib/emails/templates/organizer-scheduled-email.ts
* Add to attendee scheduled email
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Request the inclusion Assuncion Time Zone (#2840 )
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
* Fix UI of dialog (#2788 )
* removed large mandatory height and scroll
* added z index using css
* cleanup
* fixed TS errors
* extract dialog out of dropdown
* Adds custom loading text to confirmation dialog
* rename update
* utilizing mutation loading state
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Hotfix: Fixing Security Issues (#2848 )
* Fixing Privilege Escalation
* Fixing critical obj ref in availability
* Fixing reschedule security issue
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* Merge production to main
* Update vital.json
* Update vital.json
* Fix login page CTA disabled state (#2832 )
* fix(ui/login): better disabled state for login CTA
The fix involves tracking the form submission with a dedicated state `submitInProgress` with React.
`formState` from `react-hook-form` does not take time taken for the network call into account. For example,
if the api takes 5 seconds to complete, we would expect the `formState.isSubmitting` to be true for `5`
seconds. But, surprisingly this is not the case and `formState` from `react-hook-form` resolves
immediately after it makes a successful connection to the endpoint.
A dedicated state (with `useState`) is introduced that is enabled when the user clicks on the login CTA, and disabled when the api call is resolved, either successfully or with an error.
* Update login.tsx
* Update login.tsx
* Fixes isSubmitting state
Co-authored-by: zomars <zomars@me.com>
* Playwright binaries shouldn't be on deps
* Playwright binaries shouldn't be on deps
* Fix infinite renders on event-type edit page (#2820 )
* Updates submodules
* Makes sure to hash post-install cache
* Add seats to event types (#2485 )
* Add seatsPerTimeSlot to event type schema
* Add seats per time slot to event type form
* Book event and render seats
* Pass booking uid for seats
* Disable requires confirmation if seats are enabled
* Fix type errors
* Update submodules
* Fix type errors
* Fix type errors
* Fix duplicate string
* Fix duplicate string
* Fix schema and migration file
* Fix render seats
* Fix bookinguid typos
* Remove console.log
* Fix type error
* Fix mobile formatting
* Update apps/web/lib/hooks/useSlots.ts
Co-authored-by: Omar López <zomars@me.com>
* Update apps/web/lib/hooks/useSlots.ts
Co-authored-by: Omar López <zomars@me.com>
* Added translation for seats available text
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: alannnc <alannnc@gmail.com>
* Redesign help menu item (#2710 )
* Seperate help menu item and contact menu item
* Add menu items
* Install react-popover
* Render contact only if support keys are present
* Adjust contact support links
* Add translations
* Add embed changes
* Adjust menu if helped is pressed
* Add items to help menu
* Change button color on selection
* Create endpoint
* Create feedback table
* Create migration file
* Write feedback to db
* Remove logs
* Add response message
* Send feedback email
* Disable submit if no rating and after submit
* Add translations
* Fix padding
* Clean up
* Clean up
* Add user feedback email to .env example
* Lint fixes and styles
* Changed onClick function to a named function and fix style
* Fix ids order
* Removed commented code and changed textarea id and name
* Fix id orders
* Change to AND operator
Co-authored-by: Omar López <zomars@me.com>
* Add user relation to feedback
Co-authored-by: Omar López <zomars@me.com>
* Add migration files
* Change rating to strings
* Change rating to strings
* Fix type errors
* WIP success & error messages
* Change success and error to boolans
* Style messages
* Add await
Co-authored-by: Omar López <zomars@me.com>
* Remove duplicate string
* Refactor import statement
Co-authored-by: Omar López <zomars@me.com>
* Change opacity of emojis
* added support@cal.com email for feedback
* Add success toast
* Update .env.example
Co-authored-by: Omar López <zomars@me.com>
* Add tCRP route
* tCRP send email
* tCRP send email
Co-authored-by: Alan <alannnc@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* fixed labels for seats, removes shadow from event-type inputs (#2862 )
* fixed labels for seats
* minor fixes, removed shadow from all event-type inputs
* Render input field on pro accounts (#2859 )
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
* Submodule sync
* sec-001 fixes (#2866 ) (#2867 )
* sec-001 fixes (#2866 )
* sec-001 fixes
* Typo
* Fixes paid bookings
# Conflicts:
# apps/web/ee/components/stripe/Payment.tsx
* Hotfix: Fixing Security Issues (#2848 ) (#2850 )
* sec-001 fixes (#2866 )
* sec-001 fixes
* Typo
* Fixes paid bookings
* fixes issues with date of recurring events on booking detail page (#2872 )
* fixes date not showing for confirmed recurring event
* only show all events on upcoming bookings
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
* Resolve if can't find event on google cal (#2860 )
* Resolve if can't find event on google cal
* Change order of console.error
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* Disable Impersonation Option (#2880 )
* Disable Impersonation
* Update Description Copy
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* Fix deleted event when on different cal (404) (#2882 )
* Fix/email shows false (#2879 )
* Webhook sec fixes (#2883 )
* Webhook sec fixes
* Revert changes
* Feat/Display location information publicly (#2752 )
* Updating checkbox field to reflect new designs
* Include Infobadge option checkbox
* Checkbox Field + i18n
* Default checked - true
* Sync with router
* Extracting Types
* Update filtering logic
* Add UI to booking page
* Default address/link
* Update hashedlink page
* Tidy up
* Video icon
* Add nullish check
* Update to use RHF controller
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Fix 500 errors if data is invalid (#2886 )
* Check in middleware to ensure authorization for all endpoints (#2885 )
Co-authored-by: Alex van Andel <me@alexvanandel.com>
* Fix bug to check opt in bookings (#2889 )
* Fix bug to check opt in bookings
* Implemented value, onChange instead of form access
Co-authored-by: Alex van Andel <me@alexvanandel.com>
* remove unused imports (#2892 )
* Cascades impersonations on user delete (#2891 )
Co-authored-by: Alex van Andel <me@alexvanandel.com>
* Ensures json fields on each call (#2893 )
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Redundant conditional expression (#2894 )
* remove redundant conditional expressions
* remove redundant conditional expressions
* License server (#2379 )
* WIP License server
* WIP
* Moves locations to App Store and Core
* LocationType fixes
* Runs db migrations post-deploy
* WIP
* WIP
* Cleanup
* WIP
* WIP
* Decouples translations from NavTabs
* Adds admin submodule
* Adds admin submodule
* Sync dependencies
* WIP
* WIP
* Updates submodules
* Renames package
* Updates submodules
* Adds scripts for console
* Updates license checker URL
* Updates admin
* Adds staging/prod admin console links
* Update yarn.lock
* Update NavTabs.tsx
* WIP
* Update admin
* WIP
* Adds hint to InputField
* Update admin
* Adds turbo admin dependecies
* Update admin
* Prevents redirection on form submit
* Form warning fixes
* Update admin
* Form fixes
* Update yarn.lock
* Update admin
* Update admin
* Update admin
* Adds withLicenseRequired HOC
* Adds LicenseRequired to EE components
* Admin deploy fix?
* Updates submodules
* Use relative inside lib
* type fixes
* Fixes turbo race condition
* Relocates admin to console
* Relocates admin to console
* Update console
* Update api
* Update turbo.json
* Update ErrorBoundary.tsx
* Update defaultEvents.ts
* Update checkLicense.ts
* Update yarn.lock
* Skip on E2E
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Update turbo.json
* Reverts license check on payment
Since it's a public page
* Submodule sync
* fix: overflowing text on teams page - using tailwind line-clamp (#2843 )
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
* Fix @calcom/embed-react installation with TS project (#2870 )
* Fix failing builds (#2908 )
* Update turbo.json
* Change location of booking (#2658 )
* add functionality to change location in booking and send out mail
* add i18n
* change location with dropdown like in event-types
* small fixes and code clean up
* clean code
* improve format of current Location string
* clean code
* clear selection when dialog closed
* added mutation and changed props (first working verison)
* clean code
* clean code
* clean code
* clean code
* fix typo
* change maxHeight of select
* use useWatch for selectedLocation
* pass default values with props
* set current location directly in useState
* clear selected values when updating location
* fix trpc query for credentialst
* change icons for editing booking
* improve naming of variables
* remove unnecessary orderBy
* use locationOptionsToString method
* fix current location naming for Cal Video
* add phone input
* save phone number as location of booking
* remove input field for phone number for event-types
* fix redirection issue
* show previous selected location in event-type
* remove attendee number from selection for booking
* make first letter of location lowercase
* remove input field for attendee phone number
* clear Errors when changing location type
* set location details to optional
* clean code
* fixing issue that dropdown doesn't close when dialog opens
* clean code
* make overflow visibile in dialog
* fix existing bug with address not showing in event-type settings
* fix issue with losing focus after validation
* close rejection dialog
* small spelling fixes
* fix issue with LocationChangeEmail
* fix failing E2E test
* fix failing E2E test
* fix E2E test
* bug fix for saving user phone, and other minor changes
* merge main
* improve text
* fix UI of booking list
* Delete admin
* remove selection after update and submit
* add translation for error message
* add default values for checkbox
* add "your phone number" to locations on booking page
* remove duplicate attributes from viewer.bookings
Co-authored-by: Omar López <zomars@me.com>
* check if user is authorized to make changes to booking
* remove location string
* clan code for displayLocaitonPublicly checkbox
* fetch locationOptions on server side
* remove trpc query for credentials
* fix phone number input
* fix labels of host and attendee phone number for booking page
* Migrates edit location to tRPC
* Link elemnt should only be used in `a` tags
* Adds missin router
* Migrates locationOptions to tRPC query
* Type fixes
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Alan <alannnc@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* added checkly and twitch badges
* Update README.md
* areas of expertise test
* Update CONTRIBUTING.md
* Update README.md (#2912 )
* Update CONTRIBUTING.md
* Update CONTRIBUTING.md
* Update CONTRIBUTING.md
* Update CONTRIBUTING.md
* Update CONTRIBUTING.md
* Update CONTRIBUTING.md
* remove unsed imports (#2895 )
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Fix event-type preview links on Vercel Previews (#2919 )
* Fix website url
* Fix avatar paths everywhere
* Fix linting errors
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Cleanup & removed usages of sparingly used Text/ files (#2904 )
* Update CONTRIBUTING.md
* Update CONTRIBUTING.md
* Fixed typo in CheckboxField and wrapped description in <label> (#2924 )
* Fixed typo in CheckboxField and wrapped description in <label>
* Make functionality identical to before
* Fixed use of infomationIconText
* Fix lint error (needs refactor, out of scope)
* Payment amount input leading 0 (#2836 )
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
* Allow less than 6 bookings and add proper min validation of 2+ (#2921 )
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* fix(app-store): Giphy Ux fixes (#2746 )
* fix(app-store): Giphy Ux fixes
* Add search placeholder
* Min height image on event type page
* Use regex in zod validation and fix design issues for figma row 1
* Add paddings as per discussion with Ciarán
* Fix getGiphyApiKey nomenclature
* Update apps/web/public/static/locales/en/common.json
* Update regex to be more readable and allow enter to search
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
* Add embed tests in CI (#2887 )
* Add embed tests in CI
* Update e2e-embed.yml
* Run quick tests only
* Ignore certain folders
* Add embed-react tests as well
* Fix commands
* Dont run unit tests
* Update playwright.config.ts
* Update playwright.config.ts
* Update playwright.config.ts
* Create correct artifcats
* Create correct artifcats
* Fi ignore path
* Update package.json
* Add back embed-react typecheck
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* remove subtitle (#2925 )
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Fix booking detail page for cancelled events (#2905 )
* fix booking detail page for cancelled events
* Fix typo
* fix bug when now attendees exist in booking
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Alan <alannnc@gmail.com>
* v1.6.2
* Add reschedule reason to DB and emails (#2909 )
* Write reschedule reason to db
* Add reschedule reason to emails
* Add reschedule reason to request reschedule email
* Add reschedule reason to request reschedule email
* Add reschedule reason to request reschedule email
* Add reschedule reason to request reschedule email
* Write reschedule reason to db
* Add reschedule reason to emails
* No longer using rescheduleReason in favor of cancellationReason
* Update apps emails accordingly with reschedule reason
* Update reschedule.test.ts
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Alan <alannnc@gmail.com>
Co-authored-by: zomars <zomars@me.com>
* Update website
* Update HelpMenuItem.tsx
* Update event.ts
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: Leo Giovanetti <hello@leog.me>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: GitStart <1501599+gitstart@users.noreply.github.com>
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Arthur Cruz <42497300+arthur1041@users.noreply.github.com>
Co-authored-by: Mitchell Moore <47459168+Mitchell-Moore@users.noreply.github.com>
Co-authored-by: Agusti Fernandez Pardo <me@agusti.me>
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Co-authored-by: andreaestefania12 <19562383+andreaestefania12@users.noreply.github.com>
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com>
Co-authored-by: alannnc <alannnc@gmail.com>
Co-authored-by: Hashen <37979557+Hashen110@users.noreply.github.com>
Co-authored-by: buschco <colin@busch.dev>
Co-authored-by: iamkun <kunhello@outlook.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Ankit Gordhandas <agordhandas@gmail.com>
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: Ken Miller <kemiller@users.noreply.github.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
Co-authored-by: Arun Kumar <palerdot@users.noreply.github.com>
Co-authored-by: Shrey Gupta <connectwithshrey@gmail.com>
2022-05-30 15:36:15 -06:00
3af6b3b6b3
Update event.ts
2022-05-30 14:43:15 -06:00
bba9b755bc
Update HelpMenuItem.tsx
2022-05-30 13:43:21 -06:00
Hariom Balhara
