Commit Graph

5519 Commits (52202948a951e435d6f805b75a4154f5e3a43d15)

Author SHA1 Message Date
Bill Gale b11d81fdd2
fix: user bio width when booking a team member (#1264) 2021-12-07 10:02:36 +00:00
Bill Gale 6792e17c80
fix: move pull request template (#1263)
* fix: move pull request template

* fix: rename template
2021-12-07 10:01:45 +00:00
Mihai C dd446abeec
fix: calendar event fixes (#1260)
* fix: calendar event fixes

* update after code review
2021-12-06 19:34:31 +00:00
Rory Hughes c109ab1e30
Ensure credential objects come oldest first (#1258)
Given the credentials are loaded based on userId, sort is not consistent.
Without this, events are booked on whichever calendar credential is loaded first. 
813eaa83b7/lib/events/EventManager.ts (L240-L244)

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-12-06 13:25:22 +00:00
Rory Hughes dc13c95644
Favour the user's default calendar notification settings without overriding (#1259)
If people want emails for every event on their calendar, they can set that up.
2021-12-06 13:24:32 +00:00
Joel Lu c85f0650fe
Fix time view not in full length (#1256)
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2021-12-06 11:37:15 +00:00
Alex van Andel 7e6628e3ac
Fixes missing locations (#1257) 2021-12-06 11:22:35 +00:00
Peer Richelsen e8af9110a7
fixed border color of daily video (#1255) 2021-12-06 09:49:56 +00:00
TomBoss ec9c8bb35d
correction of typo (#1251) 2021-12-03 16:50:39 +00:00
Alex van Andel 22aa083883
Adds eventTypeId as a parameter (#1217) 2021-12-03 16:18:31 +00:00
Alex van Andel 8c1b69cc0f
Feature/field prefills (#1249)
* Needs more testing, but looks functional

* Add metadata feature to booking create payload

* Forward URL parameters given in link

* Moved stringifying of custom inputs to backend
2021-12-03 10:15:20 +00:00
Peer Richelsen 8d1d3fcc7a
fixed subtitle for event-types (#1247) 2021-12-02 22:32:38 +00:00
Mike Casey dd48749f42
Update README instructions new user record (#1103)
This commit clarifies the minimum required fields that must be set for the new user record in Prisma Studio to avoid the createContext error  when first starting the application on a local development environment

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2021-12-02 22:15:05 +00:00
Peer Richelsen bd51316c68
removed imgur from emails, added missing / to footer logo (#1245) 2021-12-02 22:05:58 +00:00
Omar López 2430784142
Followup for #1242 (#1243) 2021-12-02 21:41:09 +00:00
Peer Richelsen 2b51cd9c8d
tablet navigation: removed code redundancy & fixed alignment (#1241)
* minor design changes to tablet navigation

* added white icon logo

* reduced code redundancy in tablet view & fixed alignment
2021-12-02 20:52:38 +00:00
Alex Johansson de3c4aa75a
fix zoom leading to `integrations:zoom` location (#1242) 2021-12-02 17:18:17 +00:00
Peer Richelsen 813eaa83b7
minor design changes to tablet navigation (#1240) 2021-12-02 09:52:59 +00:00
Syed Ali Shahbaz ec2d0a89ba
Bugfix/event types buggy view on tablet (#1238) 2021-12-01 14:56:25 +00:00
Mihai C 80a2b6c068
chore: clean up and fix images (#1224)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-12-01 10:32:08 +00:00
Omar López 7faa9508c4
Removed unused webhook (#1227) 2021-11-30 23:50:49 +00:00
Flemming 5773d064c2
Prevent user form entering negative numbers into event duration (#1231)
* Add Docker Compose as requirement to run the quick start

* Add basic frontend validation/needs for event duration

* Only add min prop to the duration field

* Don't allow negative value for the event buffer time

* Increase min duration of a event type

Co-authored-by: Alex van Andel <me@alexvanandel.com>
2021-11-30 19:18:28 +00:00
depfu[bot] 0a7233d452
Update all Yarn dependencies (2021-11-26) (#1223)
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
2021-11-29 20:53:02 +00:00
Syed Ali Shahbaz 529f3027cd
replaced btn-primary, btn-secondary, btn-white with respective Button equivalents (#1218)
* replaced btn primary, secondary, white with Button

* removed unused Link var

* replaced <button> in settings/security

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: Peer Richelsen <peeroke@richelsen.net>
2021-11-29 06:37:31 +00:00
Peer Richelsen 20cbab1c15
fixed edit icon for event-type details (#1230) 2021-11-28 08:54:45 +00:00
Flemming 98d3cb1915
Add Docker Compose as requirement to run the quick start (#1225) 2021-11-26 18:36:01 +00:00
Mihai C 8322e5c8d1
Emails Revamp (#1201)
* refactor: emails (WIP)

* wip

* wip

* refactor: calendarClient

* chore: remove comment

* feat: new templates

* feat: more templates (wip)

* feat: email templates wip

* feat: email templates wip

* feat: prepare for testing

* For testing stripe integration

* Uses imported BASE_URL

* Fixes types

* use BASE_URL

Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2021-11-26 11:03:43 +00:00
Adrien La 36767afbf5
Add full FR language translation from EN (#1202)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-11-25 16:04:13 +00:00
Alex van Andel 396355e350
Call setSelectedTimeZone as we don't want to refactor Scheduler (#1213)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-11-25 16:03:37 +00:00
depfu[bot] da2c825dad
Update all Yarn dependencies (2021-11-24) (#1212)
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
2021-11-25 13:51:15 +01:00
depfu[bot] dab146a313
Update all Yarn dependencies (2021-11-15) (#1176)
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
2021-11-24 23:33:25 +00:00
Alex van Andel 712266664e
Fixes #1205 - Able to schedule for past times in current date (#1211) 2021-11-24 22:53:41 +00:00
Omar López f8781e4d5f
Create pull_request_template.md (#1204) 2021-11-24 18:40:25 +00:00
Syed Ali Shahbaz d8b3c42c28
Improvement/cal 639 turn edit location dialog into radix uu (#1055)
* replaced disclosure with collapsible

* added radix radio-group

* removed radix-UI radio group

* more fix

* --WIP

* --WIP

* react-hook-formify --WIP

* radix ui radio replaces headless ui radio

* further fixes --WIP

* --WIP

* form handling and availability wrapping

* minuteField fix

* availability fix

* fixed react-select menu overflow in dialog

* --WIP

* added default value for custom inputs

* fixed locations

* fixed daterangepicker

* fixed team eventType

* basic cleanup --wip

* fixed locations removal bug

* removed old locations state remnants

* some cleanup --wip

* rebase conflict resolution

* removed debug rem and fixed radio text size

* further requested changes

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: Omar López <zomars@me.com>
2021-11-24 10:07:49 -07:00
Nathaniel 24e36ad46a
upgrade tsdav to v1.1.5 (#993)
* upgrade tsdav to v1.1.1

* upgrade to v1.1.5

* updated lockfile

* updated tsdav

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@richelsen.net>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-11-24 11:52:57 +00:00
Alex Johansson 644b0f1b0e
re-enable batching (#1199)
This reverts commit 58f55f84e2. /  #1197
2021-11-24 11:45:09 +00:00
Alex Johansson deb97fdab0
get rid of circular references in `viewer.eventTypes` (#1198) 2021-11-24 10:42:55 +00:00
Alex Johansson 58f55f84e2
temporarily disable batching (#1197) 2021-11-24 09:53:03 +00:00
Alex van Andel 5b3dd02747
Webhook tweaks + Support added for "Custom payload templates" / x-www-form-urlencoded / json (#1193)
* Changed styling of webhook test & updated <Form> component

* Implements custom webhook formats

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-11-22 11:37:07 +00:00
Syed Ali Shahbaz ecc960f0a3
fixed mobile UI (#1195) 2021-11-22 11:07:17 +00:00
Mihai C dfb1b5602d
hotfix: location on approval email (#1186)
* hotfix: location on confirmation email

* fix: build checks
2021-11-18 11:13:38 +00:00
Alex van Andel d6dd13a9d8
Updated team to also use getWorkingHours (#1188) 2021-11-18 10:20:48 +00:00
Alex van Andel e0d1b6b5ea
Working availability Schedule for every timezone (few things TODO) (#1187) 2021-11-18 03:29:36 +00:00
Alex van Andel ffdf0b9217
Fixes user availability to be contextual to the user timezone (#1166)
* WIP, WIP, WIP, WIP

* Adds missing types

* Type fixes for useSlots

* Type fixes

* Fixes periodType 500 error when updating

* Adds missing dayjs plugin and type fixes

* An attempt was made to fix tests

* Save work in progress

* Added UTC overflow to days

* Update lib/availability.ts

Co-authored-by: Alex Johansson <alexander@n1s.se>

* No more magic numbers

* Fixed slots.test & added getWorkingHours.test

* Tests pass, simpler logic, profit?

* Timezone shifting!

* Forgot to unskip tests

* Updated the user page

* Added American seed user, some fixes

* tmp fix so to continue testing availability

* Removed timeZone parameter, fix defaultValue auto-scroll

Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Alex Johansson <alexander@n1s.se>
2021-11-18 01:03:19 +00:00
Alex Johansson f3c95fa3de
fix i18n flicker on auth pages (#1183)
* fix flicker on `/auth/login`

* fix flicker on logout

* fix flicker on error

* fix i18n flicker on signup
2021-11-16 18:12:08 +01:00
Lola 669b7798db
Enable Recording in Daily Video Calls (#1141)
* ⬆️ Bump tailwindcss from 2.2.14 to 2.2.15

Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss) from 2.2.14 to 2.2.15.
- [Release notes](https://github.com/tailwindlabs/tailwindcss/releases)
- [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v2.2.14...v2.2.15)

---
updated-dependencies:
- dependency-name: tailwindcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* updating cal will provide a zoom meeting url

* updating cal will provide a zoom meeting url

* modifying how daily emails send

* modifying how daily emails send

* daily table

* migration updates

* rebasing updates

* updating Daily references to a new table

* merge updates, adding Daily references to book/events.ts

* updated video email templates to remove Daily specific references

* updating the events.ts and refactoring in the event manager

* removing the package-lock

* updating some of the internal Daily notes

* removing handle errors raw from the Daily video client

* prettier formatting fixes

* Added the Daily location to calendar events and updated Cal video references to Daily.co video

* updating references to create in event manager to check for Daily video

* adding a daily interface in the event manager

* adding daily to the location labels

* resolving yarn merge conflicts

* removing prettier auto and refactoring integrations: daily in the event manager

* removing changes to estlintrc.json

* updating message when daily video call meeting has not started

* updated modal time buffer

* changed video calls to Cal colors

* removing change to undoing change to lodash/merge on the event manager

* removing change on the event-types to match the main repo

* updating the border color in daily video calls

* updating cal will provide a zoom meeting url

* updating cal will provide a zoom meeting url

* modifying how daily emails send

* modifying how daily emails send

* daily table

* migration updates

* rebasing updates

* updating Daily references to a new table

* merge updates, adding Daily references to book/events.ts

* updated video email templates to remove Daily specific references

* updating the events.ts and refactoring in the event manager

* removing the package-lock

* updating some of the internal Daily notes

* removing handle errors raw from the Daily video client

* prettier formatting fixes

* Added the Daily location to calendar events and updated Cal video references to Daily.co video

* updating references to create in event manager to check for Daily video

* adding a daily interface in the event manager

* adding daily to the location labels

* resolving yarn merge conflicts

* removing prettier auto and refactoring integrations: daily in the event manager

* removing changes to estlintrc.json

* updated modal time buffer

* updates to enable recording

* removed the console log line for debugging int he DailyVideoAdapter

* removed the env copy created here

* updating readme and chaging Daily Scale Plan variable to true

* merge changes

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Lola-Ojabowale <lola.ojabowale@gmail.com>
2021-11-16 14:12:10 +00:00
Syed Ali Shahbaz 4e01b13133
Feature/cal 677 brand color in settingsprofile (#1158)
* added CSS variable --brand-color

* added CustomBranding component

* prisma update for brand color

* added brandcolor to user context in viewer.me

* conflict resolution

* added brandColor input and mutation

* custom brand color to availability

* brandColor added to BookingPage

* fixed availability, booking for team and added customBranding to success

* brandColor added to cancel/uid

* requested changes

* lint fix

* further changes

* lint fix
2021-11-16 14:21:46 +05:30
Omar López 11e7779a58
Allows nameless users to Signout and update profile (#1181) 2021-11-15 18:08:04 -07:00
Alex Johansson 7de35dc4e5
set `engines` version to `>=14` (#1178)
* add `16.x` to `engines`

node.16 is LTS now

* Update package.json

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2021-11-16 00:20:12 +00:00
Alex Johansson 0a34512e3b
availability timezone fix (#1180) 2021-11-15 20:32:10 +00:00