Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

generic <UpgradeScreen> component #6594

Merged
merged 22 commits into from Jan 23, 2023
Merged

generic <UpgradeScreen> component #6594

merged 22 commits into from Jan 23, 2023
+379 −204

Commits on Jan 19, 2023

  1. first attempt of <UpgradeScreen>

    @PeerRich
    PeerRich committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    e45bf93 View commit details
    Browse the repository at this point in the history

  2. changes to icons

    @PeerRich
    PeerRich committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    930a148 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2023

  1. reverted changes back to initial state, needs fix: teams not showing

    @PeerRich
    PeerRich committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    d0130ec View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into upgradeScreen2

    @sean-brydon
    sean-brydon committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    b05623b View commit details
    Browse the repository at this point in the history

  3. WIP

    @sean-brydon
    sean-brydon committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    a54bfea View commit details
    Browse the repository at this point in the history

  4. Fix weird reactnode error

    @sean-brydon
    sean-brydon committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    69ee010 View commit details
    Browse the repository at this point in the history

  5. Fix loading text

    @sean-brydon
    sean-brydon committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    aa4348f View commit details
    Browse the repository at this point in the history

  6. added upgradeTip to routing forms

    @PeerRich
    PeerRich committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    0ceb0f4 View commit details
    Browse the repository at this point in the history

  7. icon colors

    @PeerRich
    PeerRich committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    816be70 View commit details
    Browse the repository at this point in the history

  8. create and use hook to check if user has team plan

    CarinaWolli committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    249cd3d View commit details
    Browse the repository at this point in the history

  9. use useTeamPlan for upgradeTeamsBadge

    CarinaWolli committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    5e78029 View commit details
    Browse the repository at this point in the history

  10. replace huge svg with compressed jpeg

    @PeerRich
    PeerRich committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    c917f44 View commit details
    Browse the repository at this point in the history

  11. responsive fixes

    @PeerRich
    PeerRich committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    166f2e0 View commit details
    Browse the repository at this point in the history

  12. Update packages/ui/components/badge/UpgradeTeamsBadge.tsx 

    Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
    @CarinaWolli @sean-brydon
    CarinaWolli and sean-brydon committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    77cd1dc View commit details
    Browse the repository at this point in the history

  13. Merge branch 'upgradeScreen2' of https://github.com/calcom/cal.com in… 

    …to upgradeScreen2
    @PeerRich
    PeerRich committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    fdcc932 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2023

  1. Merge branch 'main' into upgradeScreen2

    @emrysal
    emrysal committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    b0c74ca View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into upgradeScreen2

    @emrysal
    emrysal committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    af547d6 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2023

  1. Merge remote-tracking branch 'origin/main' into upgradeScreen2

    @hariombalhara
    hariombalhara committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    adcf3c6 View commit details
    Browse the repository at this point in the history

  2. Give team plan features to E2E tests

    @hariombalhara
    hariombalhara committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    ab163ef View commit details
    Browse the repository at this point in the history

  3. Allow option to make a user part of team int ests

    @hariombalhara
    hariombalhara committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    077fe40 View commit details
    Browse the repository at this point in the history

  4. Remove flash of paywall for team user

    @hariombalhara
    hariombalhara committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    340d166 View commit details
    Browse the repository at this point in the history

  5. Add team user for typeform tests as well

    @hariombalhara
    hariombalhara committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    27b213b View commit details
    Browse the repository at this point in the history