Commit graph

184 commits

Author SHA1 Message Date
Alex van Andel
aff45e3451
Fixed #598 - handleLegacyConfirmationMail (#601)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-08 11:21:19 +00:00
Syed Ali Shahbaz
fa35af7bd8
Cal 262 refactor edit teams according to the design reference (#516)
* refactored settings/team landing page

* changed team edit flow, WIP

* merge conflict fix for teams.tsx

* minor fixes to edit team, WIP

* invite-member and disband team APIs attached inside edit-team page

* added remove-member API in edit-team page, minor fixes

* minor code fix, WIP

* WIP

* add logo, bio, branding to team schema

* bio, logo, branding, slug patch API and minor code fix-- WIP

* fn to Disband team directly from the dropdown menu in settings/teams page, removed debug remnants --WIP

* Pull latest data after an action in settings/teams-edit page

* added slug conflict check at Patch time

* code clean-up

* initial change request fixes --WIP

* prop type fix and add warn button color theme --WIP

* added warn Button to Dialog

* remaining change request fixes

* added noop from react-query

* updated invited team-list design

* prettier fix for api/teams/profile

* removed noop import and added custom noop

* minor Button fix

* requested changes addressed
2021-09-06 14:22:22 +01:00
Alex van Andel
d9aff72220
Prepares the email system for Calendso Teams (#586)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-06 09:06:33 +00:00
Alex Johansson
2f1ede9bcd
use getSession() from @lib/auth everywhere (#563) 2021-09-03 21:51:21 +01:00
Femi Odugbesan
2d23a8b7db
Onboarding Flow (#503)
* wip

* wip

* db: schedule schema

* fix adding time goes into new day

fix adding new time not keeping updating ranges

fix updating ranges not maintaining changed values

* remove photo upload

* remove unused code

* remove more unused code

* undo time lib

* didnt actually change this

* dont show onboardi
ng flow for users created before sept 1 2021

* use more consistent max-widths

* align all inputs in scheduler component

* allow overriding of default styles

* match figma designs

implement goto previous step

* add more types, match figma

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-02 13:13:19 +01:00
Mihai C
fc50821282
feat: add react-query and navigate to edit after event-type creation (#528)
* feat: add react-query and navigate to edit after event-type creation

* fix: add types/toasts and add react-query mutations on event-types

Co-authored-by: Mihai Colceriu <colceriumi@gmail.com>
2021-08-27 15:11:24 +03:00
Alex Johansson
a44bc63304
fix linting issue introduced in 9844cf9 (#529) 2021-08-26 13:42:40 +02:00
Bailey Pumfleet
9844cf92a8 Temporarily disable checking video busy times 2021-08-24 22:44:29 +01:00
Alex van Andel
bc97237858
Remove image from session, add /api/me, update Avatar component (#493)
* Remove image from session, add /api/me, update Avatar component

* Fixed Avatar on Desktop

* Added emailMd5 to session + load md5 from props on /settings/profile

* Explicitly select which fields to expose in /api/me

* Abstracted Gravatar, defaults avatar for /api/me, removed session dep from UserDropdown

* Delete md5.js :)

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-08-22 14:16:42 +01:00
Mihai C
3894ee12d1
feat: CustomEventType placeholder and API fixes (#446)
* feat: add optional placeholder for text/multi-line text custom inputs on event types

* fix: delete associations of event type first

* fix: remove unneeded check

* fix: minor tweak

Co-authored-by: mihaic195 <mihai@sortlist.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-08-22 14:06:26 +01:00
Alex Johansson
6d158e0c50
fix google auth callback (#500)
* maybe fix?

* fix

* Update pages/api/integrations/googlecalendar/callback.ts

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

Co-authored-by: Alex van Andel <me@alexvanandel.com>
2021-08-19 15:37:18 +01:00
Alex Johansson
f63aa5d550
add linting in CI + fix lint errors (#473)
* run `yarn lint --fix`

* Revert "Revert "add linting to ci""

This reverts commit 0bbbbee4be.

* Fixed some errors

* remove unused code - not sure why this was here?

* assert env var

* more type fixes

* fix typings og gcal callback - needs testing

* rename `md5.ts` to `md5.js`

it is js.

* fix types

* fix types

* fix lint errors

* fix last lint error

Co-authored-by: Alex van Andel <me@alexvanandel.com>
2021-08-19 14:27:01 +02:00
Alex Johansson
aed9757409
fix bad auth commit (#487) 2021-08-18 12:15:22 +00:00
Alex Johansson
a0a0ec86f0
add type-safe getSession() (#486)
* fix types for auth
* implement safer to use `getSession`
2021-08-18 11:52:25 +00:00
Alex van Andel
3a00ab0d0e Switched exclusivity, initial bugfix was incorrect 2021-08-16 22:51:52 +00:00
femyeda
49e7cbf803 fix issue where user could not connect to caldav
Uses base caldav adapter to ensure connectivity

rethrows all errors on CalDavCalendarAdapter
2021-08-16 09:34:49 -05:00
Bailey Pumfleet
ceacf02383
Merge pull request #449 from kanji-keraliya/office-365-integration-domain
Fixed: Office 365 integration redirection URL issue
2021-08-16 10:23:45 +01:00
Bailey Pumfleet
3d725a9573
Merge pull request #412 from emrysal/bugfix/eventType-merge-artifacts
Removed selectedEventType + fixed missing booking.eventTypeId
2021-08-16 10:22:38 +01:00
Peer_Rich
83bef7d95e
Merge pull request #448 from femyeda/team-pages
Team pages
2021-08-15 18:44:42 +02:00
femyeda
19ef588fa5 fix issue where client side vali
dation not happening

show error message from server
2021-08-15 09:22:05 -05:00
Femi Odugbesan
65366b7c5b
cal-101-caldav-integration (#419)
* add generic calendar icon for caldav

* module for symmetric encrypt/decrypt

* caldav integration

* use Radix dialog

* Move caldav components to /caldav

* remove duplicate cancel button, unused function

* ensure app can connect to caldav server before adding

* fix calendar clients can possibly return null

* fix: add caldav dialog does not close when submitted

* safely attempt all caldav operations

* clarify variable name, fix typo

* use common helper for stripping html

* remove usage of request lib until "completed"

* add types and usage comments to crypto lib

* add encryption key to example env file
2021-08-14 20:53:59 -05:00
Alex van Andel
03cfd4ba8b Detect conflicts when the time is the same as startTime 2021-08-14 15:01:05 +00:00
Alex van Andel
92d3f08f70 Merge branch 'main' into bugfix/eventType-merge-artifacts 2021-08-14 14:56:34 +00:00
Kanji Keraliya
4c48410e2d Fixed: Office 365 integration redirection url issue 2021-08-14 11:55:43 +05:30
femyeda
216a7c0c48 prevent duplicate team names 2021-08-13 14:50:11 -05:00
Bailey Pumfleet
da98a1ff1d
Merge pull request #413 from emrysal/bugfix/fix-zoom-calendar-conflict 2021-08-13 09:08:04 +01:00
nicolas
5a5e61739b Removed faulty check 2021-08-08 21:41:02 +02:00
nicolas
560bd19472 Merge branch 'main' into bugfix/unify-email-sending 2021-08-08 21:21:33 +02:00
Alex van Andel
8bc209f6d0 Attempts to fix conflict with zoom 2021-08-04 21:04:23 +00:00
Alex van Andel
72b62cd49a Removed selectedEventType + fixed missing booking.eventTypeId 2021-08-04 20:03:20 +00:00
Peer_Rich
6977b74f35
Merge pull request #411 from alishaz-polymath/main
Added 'Add Guest' button at the confirm booking step
2021-08-04 20:17:30 +02:00
Syed Ali Shahbaz
00069fa9a7 Added -Add guest- button at confirm booking step, and minor code improvement 2021-08-04 16:09:43 +05:30
Alex van Andel
78de56b7f5 Missing dayjs().isBetween plugin + format Z explicitly 2021-08-03 10:14:20 +00:00
nicolas
bd28636af5 Merge branch 'main' into bugfix/unify-email-sending 2021-07-28 22:01:58 +02:00
nicolas
65fd733751 Use optional udi 2021-07-25 17:08:11 +02:00
nicolas
4fb8e8285e Added location to event 2021-07-25 16:29:06 +02:00
nicolas
df161d5498 Added location to bookings table 2021-07-25 14:37:22 +02:00
nicolas
a97862d4b8 Process event location in EventManager 2021-07-25 14:19:49 +02:00
nicolas
86e2add30f Resolved conflicts; included reference creation into EventManager; use EventManager everywhere 2021-07-24 22:24:00 +02:00
Alex van Andel
9234f74bec Added accompanying frontend 2021-07-23 20:19:23 +00:00
Bailey Pumfleet
02dd0eb8e2
Merge pull request #371 from Malte-D/feature/opt-in-booking
Feature/opt in booking
2021-07-22 11:30:48 +01:00
nicolas
e0abbbb2f1 Fixed linting errors 2021-07-20 20:18:26 +02:00
nicolas
7aff32fb50 Only send single mail when booking zoom 2021-07-20 20:07:59 +02:00
Alex van Andel
7098e75841 Fixes 404 issue with slug when trailing whitespaces exist 2021-07-20 13:27:36 +00:00
Malte Delfs
0c975cdcbc fixed codacy issues 2021-07-18 21:22:39 +02:00
Malte Delfs
f5516ed427 added reminder emails for opt-in bookings 2021-07-18 21:12:35 +02:00
Malte Delfs
a2bf242c9e opt in booking 2021-07-18 20:28:54 +02:00
nicolas
81e1287693 Fixed cancellation 2021-07-18 16:03:59 +02:00
nicolas
b4ed8ae87e Merge branch 'main' into bugfix/unify-email-sending 2021-07-18 15:12:18 +02:00
nicolas
b146b80778 Fixed signature 2021-07-15 23:34:55 +02:00