Commit Graph

1873 Commits

Author SHA1 Message Date
Bailey Pumfleet 30e65c4e0e
Merge branch 'main' into fix/allow-self-event-editing 2022-03-15 15:52:05 +00:00
Bailey Pumfleet fae714bceb
Add a fallback if name is null (#2157) 2022-03-15 15:42:59 +00:00
Joe Au-Yeung 47c2fc3d89
Add contributing to app store doc - V2 (#2118)
* Add contributing to app store docs

* Edit file structure diagram and fix build

* Add doc to meta

* Wrap example variabels in code block

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-03-15 15:17:56 +00:00
Agusti Fernandez 53b202790e
Feature: pre-fill name and email if user loggedIn in booking page (#2131)
* feat: pre-fill name and email if user loggedIn in booking page

* feat: add name to next-auth autoMergeIdentiteies response

* fix: Update booking page so if you're in your own booking, it doesn't prefill

Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-03-15 14:39:20 +00:00
Syed Ali Shahbaz 9b1031d009
Added 3 digit hex compatibility for Custom Brand colors (#2152)
* Added 3 digit hex compatibility

* fix for compatibility
2022-03-15 10:45:08 +00:00
Omar López b25e6c25aa
Adds missing required main file for EE (#2146)
* Adds missing required main file

* Lint fixes
2022-03-14 20:39:37 +01:00
milospuac 4083ebd591
Update webhooks.mdx (#2144)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-03-14 13:24:34 +00:00
Bailey Pumfleet f2e0f00f93 Fix error.svg URL 2022-03-14 11:59:05 +00:00
Bailey Pumfleet fd6b2c57cb
Revert "Bugfix/login failure due email capitalisation (#1884)" (#2143)
This reverts commit 3d685eb4ae.
2022-03-14 11:53:13 +00:00
Jonathan Ng 3d685eb4ae
Bugfix/login failure due email capitalisation (#1884)
* convert the email to lowercase

this code will prevent the email check from failing if the user email contain capitalisation.

* Updated Readme to contain warning.

* Revert "Updated Readme to contain warning."

This reverts commit c406587c73.

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-03-14 11:45:22 +00:00
Syed Ali Shahbaz c9fb82a7e6
added event trigger to discord payload (#2109)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-03-14 11:27:28 +00:00
Peer Richelsen eaf19d1d23
Update .kodiak.toml (#2142) 2022-03-14 11:21:16 +00:00
github-actions[bot] 7e6e6b6d6b
New Crowdin translations by Github Action (#2140)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-03-14 11:08:29 +00:00
Alex van Andel 3a5522cf0e
Renames 'version' to full package.json import (#2132) 2022-03-14 10:20:40 +00:00
Hariom Balhara 6377377c4d
Fix Broken user dropdown (#2138)
* Fix Broken user dropdown

* Add unnecessary removal

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-03-14 10:15:00 +00:00
github-actions[bot] 62be5b561e
New Crowdin translations by Github Action (#2126)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-03-14 10:12:20 +00:00
Leo Giovanetti 424482646f
Removing headlessui used in menus (#2127) 2022-03-13 22:09:39 +00:00
sean-brydon f0b1767b3c
Link/In person location (#2104) 2022-03-13 15:56:56 +00:00
github-actions[bot] 3e3e802b28
New Crowdin translations by Github Action (#2124)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-03-13 12:14:33 +00:00
github-actions[bot] da9f49341f
New Crowdin translations by Github Action (#2123)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-03-13 10:11:40 +00:00
github-actions[bot] 1ab9728fa0
New Crowdin translations by Github Action (#2121)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-03-13 09:58:11 +00:00
Peer Richelsen 5b4cebac16
added day, version, plan and self host (sh) or hosted (h) into left sidebar footer (#2111) 2022-03-13 00:07:21 +00:00
Syed Ali Shahbaz 788e2acaff
Fix for buffer not considering custom interval slots and event duration for slots when using custom intervals (#2079)
* modified buffer checks

* added custom interval consideration in getSlots fn

* further getslot call fixes

* added check for end of day availability slots

* removed debug remnants

* moved slot filtering into a function

* improved readability of code

* improved readability

* extracted getFilteredTimes outside useSlot

* added a buffer test

* added another buffer test

* edge case fix for eod availability and test fix

* removed unnecessary comments

* verbose comment

* fixed eod logic and updated expected test value

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-03-12 06:52:27 +00:00
Hariom Balhara 8d7a7c8b1f Debug failing test -Revert 2022-03-12 09:27:17 +05:30
Hariom Balhara 33be1a89ec Merge branch 'main' into fix/allow-self-event-editing 2022-03-12 09:21:25 +05:30
Hariom Balhara 77f3c0cb50 Debug failing test 2022-03-12 09:04:09 +05:30
github-actions[bot] ada3317ba5
New Crowdin translations by Github Action (#2099)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-03-12 00:18:58 +00:00
Joe Au-Yeung bb73e30b17
Revert "Add contributing to app store docs (#2113)" (#2115)
This reverts commit 006645b279.
2022-03-12 00:15:36 +00:00
Joe Au-Yeung 006645b279
Add contributing to app store docs (#2113)
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-03-11 15:01:25 +00:00
Hariom Balhara 04293a25ca
Merge branch 'main' into fix/allow-self-event-editing 2022-03-11 20:03:52 +05:30
Syed Ali Shahbaz ec06f645bd
added null eventtypeid fix (#2108) 2022-03-11 09:00:25 +00:00
Hariom Balhara 9464e4cbe5
Merge branch 'main' into fix/allow-self-event-editing 2022-03-11 13:01:59 +05:30
sean-brydon 21bc4f9386
Radix UI Switch (#2075)
* Radix UI Switch

Making all switches consistent - using Raxix UI design instead of headless

* Moving Switch Component to Monorepo

* Update apps/web/components/booking/TimeOptions.tsx

* Fix stripe data import

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Alan <alannnc@gmail.com>
2022-03-11 00:26:42 +00:00
Omar López 45f8d2d230
Type fixes (#2107)
* Update viewer.tsx

* Type fix
2022-03-10 22:29:34 +00:00
Omar López d98731d50a
Update viewer.tsx (#2106) 2022-03-10 15:13:26 -07:00
Joe Au-Yeung ec97971e7d
Fixed API call route (#2105) 2022-03-10 16:15:45 -05:00
Peer Richelsen 0b83133155
added emptyscreen for away mode profile (#2093)
* added emptyscreen for away mode profile

* eplaced shadow with border

* added snooze emoji

* Remove modified yarn.lock file from PR

* space between smiley and text

Co-authored-by: Peer Richelsen <peer@Peers-MacBook-Pro-2.local>
Co-authored-by: Peer Richelsen <peer@hey.com>
2022-03-10 19:21:27 +00:00
Hariom Balhara a229dea41c Remove unnecessary autogenerated queries 2022-03-10 09:19:59 +05:30
Hariom Balhara f10f3c05ae Merge remote-tracking branch 'origin/main' into fix/allow-self-event-editing 2022-03-10 09:18:39 +05:30
Omar López 5625cf226b
Stripe to monorepo (#2063)
* downgrade func

* fix security hole lol

* fix query conditions

* - set to trial not free
- auto create stripe customer if missing
- fix production check

* Extracts downgrade logic to script, fixes ts-node conflicts with prisma

* Adds trialEndsAt field to users

* Updates trial/downgrade logic

* Typo

* Legibility fixes

* Update team-billing.ts

* Legibility improvements

* Updates illegal logic

* WIP

* WIP migrating stripe to package

* Update website

* Import fixes

* Import fixes

* Fixes to downgrade script

* Check for premium usernames before downgrading

* Fixed formatting

* Delete deploy-env.sh

* Locks dayjs to 1.10.6

* Type fixes

* Seems like we're stuck with dayjs 1.10.4

* Script fixes

* Adds first name to dump

* Loop fix

Co-authored-by: Jamie <ijamespine@me.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-03-09 15:56:05 -07:00
Peer Richelsen adbae64619
fixed tablet view of event-types (#2098)
Co-authored-by: Peer Richelsen <peer@hey.com>
2022-03-09 22:17:46 +00:00
github-actions[bot] ecf352ce00
New Crowdin translations by Github Action (#2095)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-03-09 20:46:56 +00:00
Omar López e53648d218
Linting (#2083)
* Runs yarn format

* Update website

* Web lint is failing

* Formatting

* Adds cache for dependency install

* Adds linting reports for GH

* Fixes artifact upload

* Caching tests

* Merge reports on GH actions

* Linting

* Fix prettier plugin conflicts

* Dep fixes

* Moves tailwind to monorepo package (#2091)

* New Crowdin translations by Github Action (#2077)

Co-authored-by: Crowdin Bot <support+bot@crowdin.com>

* fix redirection to 404 page on login (#2086)

Co-authored-by: Peer Richelsen <peeroke@gmail.com>

* fix: update contributing (#2084)

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>

* Formatting

* Update website

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Louis <48682663+louis-27@users.noreply.github.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-03-09 17:52:48 +00:00
github-actions[bot] 9da761b21c
New Crowdin translations by Github Action (#2094)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-03-09 17:06:46 +00:00
Louis 202db9315f
fix: update contributing (#2084)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-03-09 14:47:29 +00:00
Hariom Balhara 89f86e2c84
fix redirection to 404 page on login (#2086)
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-03-09 14:47:02 +00:00
github-actions[bot] 0f27385c17
New Crowdin translations by Github Action (#2077)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-03-08 23:34:22 +00:00
Omar López 622d0fd0bc
Moves tailwind to monorepo package (#2091) 2022-03-08 15:51:53 -07:00
Omar López 5908e5b14b
E2E fixes (#2092) 2022-03-08 15:40:31 -07:00
Agusti Fernandez 4908b6fd01
hotfix: organizer needs to confirm booking, not attendee (#2090)
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
2022-03-08 10:08:35 -07:00