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

feat: Billing Service #14756

Merged
merged 22 commits into from Apr 30, 2024
Merged

feat: Billing Service #14756

merged 22 commits into from Apr 30, 2024

Commits on Apr 25, 2024

  1. chore: Billing Service

    @exception
    exception committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    bd742e2 View commit details
    Browse the repository at this point in the history

  2. chore: others

    @exception
    exception committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    ea44e0b View commit details
    Browse the repository at this point in the history

  3. chore: don't type

    @exception
    exception committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    ad487c7 View commit details
    Browse the repository at this point in the history

  4. chore: typo

    @exception
    exception committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    cbdb86a View commit details
    Browse the repository at this point in the history

  5. chore: use proper wh secret

    @exception
    exception committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    b63aea8 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. chore: updates

    @exception
    exception committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    78769b9 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into chore/platform-billing 

    # Conflicts:
#	apps/api/v2/src/ee/bookings/bookings.module.ts
#	apps/api/v2/src/modules/oauth-clients/oauth-client.module.ts
#	apps/api/v2/swagger/documentation.json
#	apps/web/components/settings/organizations/platform/oauth-clients/OAuthClientForm.tsx
#	packages/prisma/schema.prisma
#	yarn.lock
    @exception
    exception committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    48db4f2 View commit details
    Browse the repository at this point in the history

  3. chore: lockfile

    @exception
    exception committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    48d4cf8 View commit details
    Browse the repository at this point in the history

  4. chore: docs and comment out

    @exception
    exception committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    e68ff2f View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. chore: updates and include plan

    @exception
    exception committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    e3822be View commit details
    Browse the repository at this point in the history

  2. chore: config

    @exception
    exception committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    96c7b14 View commit details
    Browse the repository at this point in the history

  3. chore: bring back alias

    @exception
    exception committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    6908369 View commit details
    Browse the repository at this point in the history

  4. chore: update lockfile

    @exception
    exception committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    663dea8 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into chore/platform-billing

    @exception
    exception committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    e58a316 View commit details
    Browse the repository at this point in the history

  6. chore: refactor

    @exception
    exception committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    5ba3255 View commit details
    Browse the repository at this point in the history

  7. chore: default none plan in db

    @exception
    exception committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    1f8f215 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. chore: read from env vars

    @exception
    exception committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    984db6f View commit details
    Browse the repository at this point in the history

  2. chore: feedback

    @exception
    exception committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    4f4f0b3 View commit details
    Browse the repository at this point in the history

  3. chore: remove json config

    @exception
    exception committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    c004642 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into chore/platform-billing

    @exception
    exception committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    7d9dbca View commit details
    Browse the repository at this point in the history

  5. chore: proper type

    @exception
    exception committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    330d82e View commit details
    Browse the repository at this point in the history

  6. Merge branch 'chore/platform-billing' of github.com:calcom/cal.com in… 

    …to chore/platform-billing
    @exception
    exception committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    edfe409 View commit details
    Browse the repository at this point in the history