Commit Graph

1424 Commits

Author SHA1 Message Date
kodiakhq[bot] 9022e6b556
Merge branch 'main' into katt/cal-620-edge-fns 2021-12-07 15:32:48 +00:00
Mihai C d76ef4a007
fix: calendar event description (#1266) 2021-12-07 15:32:07 +00:00
kodiakhq[bot] 33cca1c574
Merge branch 'main' into katt/cal-620-edge-fns 2021-12-07 15:05:19 +00:00
Joel Lu c43e6783a7
Fix: duplicate team name no prompt (#1267)
* Fix: duplicate team name no prompt

* Fix syntax error for error message
2021-12-07 15:04:34 +00:00
kodiakhq[bot] 13c6df1c02
Merge branch 'main' into katt/cal-620-edge-fns 2021-12-07 10:09:14 +00:00
Bill Gale 91f2c380c5
fix: event description for teams on mobile (#1261)
* fix: event description for teams on mobile

* fix: replace sm:truncate with overflow-ellipsis overflow-hidden

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2021-12-07 10:08:25 +00:00
kodiakhq[bot] 527cdb60e3
Merge branch 'main' into katt/cal-620-edge-fns 2021-12-07 10:03:44 +00:00
Bill Gale b11d81fdd2
fix: user bio width when booking a team member (#1264) 2021-12-07 10:02:36 +00:00
kodiakhq[bot] f4d8abf365
Merge branch 'main' into katt/cal-620-edge-fns 2021-12-07 10:02:26 +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
kodiakhq[bot] d3f138cefa
Merge branch 'main' into katt/cal-620-edge-fns 2021-12-06 19:35:11 +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
kodiakhq[bot] b39922f2b9
Merge branch 'main' into katt/cal-620-edge-fns 2021-12-06 13:25:37 +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
kodiakhq[bot] 72ea0ad769
Merge branch 'main' into katt/cal-620-edge-fns 2021-12-06 13:25:15 +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
kodiakhq[bot] 5f2aa280f8
Merge branch 'main' into katt/cal-620-edge-fns 2021-12-06 11:37:57 +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
kodiakhq[bot] ea5de84f5f
Merge branch 'main' into katt/cal-620-edge-fns 2021-12-06 11:23:18 +00:00
Alex van Andel 7e6628e3ac
Fixes missing locations (#1257) 2021-12-06 11:22:35 +00:00
kodiakhq[bot] c250ae9e0e
Merge branch 'main' into katt/cal-620-edge-fns 2021-12-06 09:50:36 +00:00
Peer Richelsen e8af9110a7
fixed border color of daily video (#1255) 2021-12-06 09:49:56 +00:00
kodiakhq[bot] c8027c4cab
Merge branch 'main' into katt/cal-620-edge-fns 2021-12-03 16:51:18 +00:00
TomBoss ec9c8bb35d
correction of typo (#1251) 2021-12-03 16:50:39 +00:00
kodiakhq[bot] 6f0a8f5d0f
Merge branch 'main' into katt/cal-620-edge-fns 2021-12-03 16:19:19 +00:00
Alex van Andel 22aa083883
Adds eventTypeId as a parameter (#1217) 2021-12-03 16:18:31 +00:00
Alex van Andel 6b2a4d00e1 Merge branch 'main' into katt/cal-620-edge-fns 2021-12-03 12:49:20 +01: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