Commit Graph

56 Commits (531804779464e795d9e2f27662167d5c409226be)

Author SHA1 Message Date
Nico 3764a9d462
Bugfix/include zoom location (#715)
* Store video data in event location; fixed several types

* fixed malformed id

* Insert Zoom data when updating as well

* Add columns to store (video) meetings

* Store meeting data

* fixed type

* Use stored videoCallData

* Store location in field as well

* Use meta field for booking reference

* Introduced meta field in code

* Revert "Introduced meta field in code"

This reverts commit 535baccee3.

* Revert "Use meta field for booking reference"

This reverts commit 174c252f67.

* Linting fixes

Co-authored-by: nicolas <privat@nicolasjessen.de>
Co-authored-by: Peer_Rich <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-22 23:43:10 +01:00
Omar López d194878bb2
Suggestion: let prettier sort imports order (#673)
* Suggestion: let prettier sort imports order

# Conflicts:
#	yarn.lock

* AUTO SORT ALL THE IMPORTS

* Linting

* Fixes test
2021-09-22 13:52:38 -06:00
Omar López 3add84a279
Adds Stripe integration (#717)
* Adds Stripe integration

* Moves Stripe instrucctions to ee

* Adds NEXT_PUBLIC_APP_URL variable

* Adds fallback for NEXT_PUBLIC_APP_URL

* Throws error objects instead

* Improved error handling

* Removes deprecated method

* Bug fixing

* Payment refactoring

* PaymentPage fixes

* Fixes preview links

* More preview link fixes

* Fixes client links

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2021-09-22 19:36:13 +01:00
Peer Richelsen 3c089af58a
new EmptyScreen component, using it in /bookings (#708)
* new EmptyScreen component, using it in /bookings

* Linting fixes

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-21 11:36:29 +01:00
Conor Meagher 96fd7ecf41
chore: change calendso strings to cal.com (#707)
* chore: change calendso strings to cal.com

* rebase LICENSE

* rebase LICENSE

* strings that were missed

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-21 10:59:34 +01:00
Alex van Andel cf7f5ae53c
Replace all instances of calendso.com with cal.com and add a new logo for Cal.com emails (#662) 2021-09-15 21:35:55 +01:00
Alex van Andel 6ab741b927
Feature/round robin (#613)
* Heavy WIP

* More WIP

* Playing with backwards compat

* Moar wip

* wip

* Email changes for group feature

* Committing in redundant migrations for reference

* Combine all WIP migrations into a single feature migration

* Make backup of current version of radio area pending refactor

* Improved accessibility through keyboard

* Cleanup in seperate commit so I can cherrypick later

* Added RadioArea component

* wip

* Ignore .yarn file

* Kinda stable

* Getting closer...

* Hide header when there are only personal events

* Added uid to event create, updated EventTypeDescription

* Delete redundant migration

* Committing new team related migrations

* Optimising & implemented backwards compatibility

* Removed now redundant pages

* Undid prototyping to calendarClient I did not end up using

* Properly typed Select & fixed lint throughout

* How'd that get here, removed.

* TODO: investigate why userData is not compatible with passed type

* This likely matches the event type that is created for a user

* Few bugfixes

* Adding datepicker optimisations

* Fixed new event type spacing, initial profile should always be there

* Gave NEXT_PUBLIC_BASE_URL a try but I think it's not the right solution

* Updated EventTypeDescription to account for long titles, added logo to team page.

* Added logo to team query

* Added cancel Cypress test because an upcoming merge contains changes

* Fix for when the event type description is long

* Turned Theme into the useTheme hook, and made it fully compatible with teams pages

* Built AvatarGroup ui component + moved Avatar to ui

* Give the avatar some space fom the description

* Fixed timeZone selector

* Disabled tooltip +1-...

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-14 09:45:28 +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
Mihai C 1ab9d1797a
fix: organizer/attendee timezones in emails (#543) 2021-09-01 21:39:24 +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
nicolas 47ee0334db Use better Regex to strip down html 2021-07-25 23:22:34 +02:00
nicolas 2b38638d84 Added maybeUid to CalEventParser 2021-07-25 19:15:31 +02:00
nicolas 86e2add30f Resolved conflicts; included reference creation into EventManager; use EventManager everywhere 2021-07-24 22:24:00 +02:00
nicolas cf52df5662 Use entrypoint to make zoom location more beautiful 2021-07-20 20:40:41 +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
Bailey Pumfleet 5ccefac758 Redesign organizer confirmation email 2021-07-16 22:23:29 +01:00
Bailey Pumfleet f9da8eb12c Redesign invitee confirmation email 2021-07-16 21:57:44 +01:00
Peer Richelsen 61fd300bc8 re-added last two commits (<br> fix and dark mode for all booked today text 2021-07-13 15:11:01 +02:00
Peer Richelsen de14b2de33 wip 2021-07-13 14:38:54 +02:00
Peer Richelsen 949fcf8884 fixed amoount of line breaks (<br>) in new organizer email 2021-07-13 14:32:25 +02:00
nicolas 3c09837104 Resolved conflicts 2021-07-07 12:43:13 +02:00
nicolas 88db124f47 Fixed padding 2021-06-30 00:35:05 +02:00
nicolas 098b95ef55 Introduced CalEventParser to acquire rich descriptions for events in integrations 2021-06-29 23:43:18 +02:00
femyeda 726d211f27 attach hangouts location to invitee and organizer email notification 2021-06-29 07:16:20 -05:00
Bailey Pumfleet 8394b12a71
Merge pull request #307 from femyeda/feat/cal-69/password-reset
Feat/cal 69/password reset
2021-06-25 16:52:36 +01:00
Malte Delfs 2f20cf2968 made sendEmail async 2021-06-24 19:30:39 +02:00
femyeda ab1298e2ca Allow user to reset password 2021-06-24 11:01:41 -05:00
Peer Richelsen a1ddb873f0 minor change to reschedule info in email 2021-06-24 11:01:41 -05:00
Peer Richelsen 20cd3bc52e minor change to reschedule info in email 2021-06-23 23:45:07 +01:00
Alex van Andel 4c62c7c97f Included missing dayjs plugins 2021-06-21 19:30:00 +00:00
nicolas 9007bbed29 Added links to iCal again 2021-06-20 17:04:00 +02:00
nicolas ebc42f0c96 Merge branch 'main' into feature/zoom-integration
# Conflicts:
#	lib/calendarClient.ts
#	lib/emails/new-event.ts
#	pages/[user]/book.tsx
#	pages/api/availability/[user].ts
#	pages/api/book/[user].ts
#	pages/integrations/index.tsx
2021-06-20 16:37:51 +02:00
nicolas c662c97d14 Refactored EventOwner to EventOrganizer 2021-06-18 02:44:41 +02:00
nicolas 869ba9b97c Implemented reschedule mail and fixed bug that rescheduling weren't saved 2021-06-17 02:44:13 +02:00
nicolas 9b4cf088c0 Added line break 2021-06-17 00:57:59 +02:00
nicolas f56ced0ff1 Re-implemented event confirmation mails object based 2021-06-17 00:56:02 +02:00
nicolas 04e0b55b51 Introduced more classes for event mails 2021-06-17 00:26:51 +02:00
nicolas e37dd017c8 Introduced EventOwnerMail and VideoEventOwnerMail as class based implementations 2021-06-16 23:40:13 +02:00
nicolas 51a8bafaa7 Full zoom integration (except availability check) 2021-06-16 22:14:44 +02:00
Alex van Andel dbd1721405 Fixes #266: ICS event is off by one month 2021-06-14 19:00:37 +00:00
nicolas 8227e733e6 Append reschedule/cancel also to event description 2021-06-13 00:37:35 +02:00
Bailey Pumfleet 65c7960b76
Merge branch 'main' into feature/invite-external-users 2021-06-11 22:02:07 +01:00
Alex van Andel 96d4a9bd6d Set Reply-To header to allow replying to bookings 2021-06-10 18:04:59 +00:00
nicolas 3d4222c631 Merge branch 'main' into feature/cancel-reschedule-links 2021-06-10 08:33:39 +02:00
Alex van Andel 40eb9036f4 Implements inviting external users to teams 2021-06-09 21:43:37 +00:00
nicolas 72a07770e8 Implemented link generation in mails 2021-06-08 17:24:06 +02:00
Alex van Andel 7df41b519f Use NEXTAUTH_URL to define the BASE_URL, then use that in invite email 2021-06-07 16:57:59 +00:00
nicolas d05ae49e8d Made UID unique, implemented cancel API, Prepared mail footer, 2021-06-06 03:51:24 +02:00
Alex van Andel 7a31cb0f6a Implemented the API, split the teams page up into multiple components 2021-06-05 22:53:33 +00:00