Commit Graph

1718 Commits (944a3c02ce50a660a4048f1ea51b5ee993204841)

Author SHA1 Message Date
Syed Ali Shahbaz 0675ff8762
updated event object to hold rejection reason (#1777)
* updated event object to hold rejection reason

* lint fix

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-02-10 09:45:27 +00:00
Syed Ali Shahbaz c4862c4b92
adds validation to event type availability (#1778)
* adds validation to event type availability

* lint fix

* general improvement

* prettier fix

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-10 09:37:00 +00:00
Syed Ali Shahbaz 97fdfc5d6b
fixes gravatar fallback for team collective events (#1759) 2022-02-09 18:56:02 -07:00
Peer Richelsen 712dceb8cb
verified badge margin (#1775)
* wip

* wip
2022-02-10 00:23:14 +00:00
Peer Richelsen 803e5c7f2d
fixes event-type location input length (#1772)
* fixed textsm classname bug

* fixed event type location length
2022-02-09 23:10:43 +00:00
github-actions[bot] 889edb8b44
New Crowdin translations by Github Action (#1765)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-02-09 19:22:02 +00:00
Demian Caldelas 898efbb280
Add vscode prisma extension to recommended list (#1760)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-09 18:53:07 +00:00
Nathaniel 7f5a2363f9
fixed calendso busy query timezone issue (#1360)
* fixed calendso busy query timezone issue

* rename tz to timezone for consistency

* added back missing code

Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-09 18:34:47 +00:00
Syed Ali Shahbaz a41dd30467
Add reason for rejection (optional) (#1719)
* init --WIP

* added rejection option modal

* migration added

* lint fix

* rejection reason in email added

* moved getRejectedReason function

* lint fix

* --wip

* Prevent undefineds and nulls on email messages

* Cleanup

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
2022-02-09 18:25:58 +00:00
Nathaniel b2fb60af31
fixed multiple caldav integration bugs (#1764) 2022-02-09 10:16:44 -07:00
Peer Richelsen 51d553559f
tailwind prettier (#1646)
* tailwind prettier

* Minor fixes

* Sorts components and pages

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
2022-02-09 00:05:13 +00:00
Arthur Denner 1e9234ea67
fix: remove template string to fix interpolation (#1736)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-02-08 22:44:49 +00:00
Philipp Dormann 20d2955e68
Add Jitsi Meet Integration (#1674)
* basic integration structure

* jitsi logo

* add jitsi meet description to event settings page

* add JitsiVideoApiAdapter

ref #1445

* add LocationType.Jitsi to BookingPage

ref #1445

* add LocationType.Jitsi to event-types

ref #1445

* add meet.jit.si/cal/uuid support to BookingPage

ref #1445

* add basic "cal_provide_jitsi_meeting_url" translation strings

ref #1445

* generate meeting id

ref #1445

* implement direct jitsi link in /success page

ref #1445

* cleanup location link duplicate

ref #1445

* full JitsiVideoApiAdapter implementation

ref #1445

* check integration availability in /pages/event-types/[type]

ref #1445

* add video conferencing link as calendar event location

ref #1445

* PR feedback

* Update components/booking/pages/BookingPage.tsx

don't know - wouldn't do this myself for future proofing but fine...

Co-authored-by: Omar López <zomars@me.com>

* Update components/booking/pages/BookingPage.tsx

🤷‍♂️

Co-authored-by: Omar López <zomars@me.com>

* cleanup: props.type === "jitsi_video"

ref #1445

Co-authored-by: zomars <zomars@me.com>
2022-02-08 15:12:28 -07:00
Arthur Denner 38b41f0adb
fix: handle prefers-color-scheme correctly (#1740)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-08 19:19:33 +00:00
Demian Caldelas 84f897e330
Remove cypress.json to fully remove cypress (#1751) 2022-02-08 18:35:45 +00:00
wilson gumba 1976aa761c
added playwright html reporter (#1715)
* added playwright html reporter

* upload artifacts

* add junit reporter

* upload artifacts

* revert

* upload report as artifact

* upload only report in ci

* remove playwright cache

* revert caching

* upload reporter as artifact

* remove all cache

* revert changes

* Update .github/workflows/e2e.yml

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-08 16:30:21 +00:00
Syed Ali Shahbaz 522875da74
Brand color without correct hex value compatibility (#1737)
* enabled fallback support and og-brand-color fix

* --added react-colorful package

* added colorpicker component and added it to settings/profile

* lint fix

* typo fix in server/viewer

* clean-up

* improved colorpicker component

* added swatch component and integrated with brand color picker

* improved ux for color picker swatch

* added colorname integration

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-08 09:13:42 -07:00
Syed Ali Shahbaz 447def5849
Timeslot selectable times fix for not UTC timezones in Availability (#1721)
* --wip

* fix for event type availability tz mismatch

* cleanup

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-08 09:01:18 -07:00
Omar López 00a79bdaba
Ignores e2e test for translation PRs (#1748) 2022-02-08 15:42:05 +00:00
github-actions[bot] 890daffad0
New Crowdin translations by Github Action (#1745)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-02-08 15:20:40 +00:00
Peer Richelsen 476399abe8
fixed type for stripe (#1746) 2022-02-08 15:18:10 +00:00
Bailey Pumfleet ce3947ac4c
Fetch only CalDAV calendars via TSDav (#1727)
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-02-08 14:56:49 +00:00
github-actions[bot] 2ec0673e3d
New Crowdin translations by Github Action (#1743)
* New Crowdin translations by Github Action

* Update common.json

Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-02-08 14:43:18 +00:00
Peer Richelsen 7f8883866a
added signup message for 404 (#1734)
* added signup message for 404

* wip

* wip

* Update common.json
2022-02-08 13:38:13 +00:00
Jamie Pine 5567721431
Team Billing (#1552)
* added base logic for team billing

- moved Stripe customer related logic to customer.ts
- implemented unstable logic for team owner upgrading, downgrading and adding/removing seats

* logic improvements

* - improved Alert style
- hide free team members on public team page
- upgraded textarea to ui component TextArea in SAML setup
- added Alert on team settings for hidden members
- hide CreateEventTypeButton if not admin
- fixed missing locale strings in team settings

* remove random import

* - show hidden status on team list
- refactor team pill

* - improved logic (mostly functional)
- added Alerts for members & owners
- added local strings
- created upgrade modal
- added info notice on invite member modal
- fixed router redirect after leaving team

* - improved logic in team-billing
- error display on upgrade modal
- added better launch.json for VSCode debugger
- fixed bug with missing inviteeUserId

* code cleanup

* nit pick fixes i should sleep now

* fixed leave team bug
- quantity would not decrease upon leave or removal

* added stripe billing callback handler

* - better launch.json
- teams empty component

* - fixed error not removing after successful pro upgrade
- fixed silent fail on team create name conflict
- fixed input border radius on member invite modal

* updated local strings

* improved logic for edge cases, such as:
- team owned by member sponsored by another team can smoothly upgrade to pro if kicked from sponsored team
- logic to calculate if owner is specifically missing pro subscription (ownerIsMissingSeat)
- corrected calculation of members missing seats, shouldn't care for proPaidForByTeamId as that only matters for removing member and preserving pro if they pay for it themselves
- added react query devtools
- added missing locale string

* - allow type override for LinkIconButton
- consolidate filter logic for getMembersMissingSeats

* - only activate team billing for hosted cal
- fix prod price keys

* fix requiresUpgrade when not hosted by cal

* added HOSTED_CAL_FEATURES

* fixed failing build

- fixed broken import path
- added support for premium price plan. (will consider premium as a valid seat)
- remove rouge console log

* fix customer id type error

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-07 23:35:26 +00:00
Arthur Denner c201bfab2d
fix: add missing items to app.json (#1732)
* fix: add Postgres addon to app.json

* feat: add BASE_URL env variable to app.json

* fix: add JWT_SECRET env variable to app.json

* fix: add postdeploy script to app.json

* fix: add CALENDSO_ENCRYPTION_KEY env variable to app.json
2022-02-07 22:01:51 +00:00
github-actions[bot] 4a13448595
New Crowdin translations by Github Action (#1723)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-02-07 19:55:24 +00:00
Peer Richelsen fb38c062ae
added verified badge to profile (#1710)
* added verified badge to profile

* added verified to schema

* made verified optional

* generated missing migration

* add if exists

Co-authored-by: Jamie <ijamespine@me.com>
2022-02-07 17:16:20 +00:00
Peer Richelsen 19d1744138
smaller layout improvements to event-types edit (#1724)
* made event-type full width clickable

* fixed event locaiton dialog buttons on mobile

* some smaller changes on event-types
2022-02-07 16:26:08 +00:00
Miguel Nieto A d14c7ed5c6
Update project-folder in README (#1726) 2022-02-07 16:19:44 +00:00
Peer Richelsen 5c98eee647
made event-type full width clickable (#1722) 2022-02-07 12:33:15 +00:00
github-actions[bot] 42b1f090b0
New Crowdin translations by Github Action (#1713)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-02-06 19:34:18 +00:00
Peer Richelsen df00df5124
increased zindex of bottom nav (#1712) 2022-02-06 18:37:30 +00:00
github-actions[bot] 34a75090c4
New Crowdin translations by Github Action (#1704)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-02-04 23:37:11 +00:00
Jamie Pine d0a6d6a6e6
Better 2FA Interface (#1707)
* - added TwoFactor component
- added react-digit-input package
- added SAMLLogin component
- upgraded auth/logic to react-hook-form
- fixed EmailField to match other ___Field components to include Label
- cleaned up login logic

* upgraded error component

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-02-04 20:30:36 +00:00
Ken Miller ae5d5e1261
Tandem Video (#1671)
* Tandem Video

* Updating some copy

* adding some instructions for getting client id + secret

* PR Feedback

* removing spurious tsconfig file
2022-02-04 18:30:52 +00:00
Peer Richelsen dedf001237
Update README.md 2022-02-04 13:18:20 +00:00
github-actions[bot] 3bddb58fc2
New Crowdin translations by Github Action (#1698)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-02-04 00:01:40 +00:00
Alex van Andel cd208d29ab
Re-implemented smartContractAddress guards (#1703) 2022-02-03 23:23:20 +00:00
Alex van Andel c0081b971b
Works on local, fingers crossed (#1701) 2022-02-03 22:31:22 +00:00
Peer Richelsen 6ea2c47942
removed redirects for web3, needs dialog in booking page (#1700)
* removed redirects, better: ask for verification in follow up pr for event-type pages

* fuck ts honestly

* ignoring type issues lol
2022-02-03 20:08:25 +00:00
Bailey Pumfleet b202c7b595 Reduce minimum time to 1 minute 2022-02-03 17:04:44 +00:00
Peer Richelsen 656d319cd9
removed web3 from .env.example 2022-02-03 14:29:44 +00:00
Syed Ali Shahbaz 675340cb73
availability: end time should not be lower than start time (#1673)
* added start-end time check

* fixed init value for selected

* added zod validation

* cleanup

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-03 13:23:29 +00:00
Syed Ali Shahbaz c709f9ed1b
fixed attendee language per attendee (#1694)
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-02-03 12:29:41 +00:00
github-actions[bot] 72d029d9f6
New Crowdin translations by Github Action (#1696)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-02-03 12:25:11 +00:00
Rohan Gupta 64db8d1cd4
Add Huddle01 integration (#1675)
* Add Huddle01 integration

* updated huddle01 locale strings

Co-authored-by: deepso <deeps.o7o8.y@gmail.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-02-03 11:59:02 +00:00
Peer Richelsen acf8b83b1a
added cz to dropdown (#1688)
* added cz to dropdown

* Update next-i18next.config.js
2022-02-02 18:53:16 +00:00
github-actions[bot] 6fb67bff20
New Crowdin translations by Github Action (#1690)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-02-02 18:51:26 +00:00
Deepak Prabhakara 7b65942de2
Feature/sso signup (#1555)
* updated saml-jackson

* if logged in redirect to getting-started page with username in the query param

* fixed issue with mixed up Google login, profile.id is undefined and this is causing the first record to be retrieved instead of the AND query failing

* updated updated saml-jackson

* document PGSSLMODE for Heroku

* tweaks to PGSSLMODE doc

* for self-hosted instance just allow user to signin with any identity (as long as email matches)

* fixed submitting flag

* added username to onboarding flow (if requested during signup)

* added telemetry for google login, saml login, saml config

* check if firstName and lastName are defined

* convert mutation to an async op

* added e2e test to ensure username query param gets picked up during onboarding

* fixed minor typo and added note about configuring Google integration as an Internal app when self-hosting

* cleaned up unnecessary ssr in sso signup routes

* renamed function

* Revert "cleaned up unnecessary ssr in sso signup routes"

This reverts commit 3607ffef79.

* moved client side code to useEffect hook

* - format
- fixed Save button in SAML config component

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-02 18:33:27 +00:00