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

chore: booking verification token and booking rejection logic from email #16324

Merged
merged 23 commits into from
Sep 21, 2024
Merged

chore: booking verification token and booking rejection logic from email #16324

merged 23 commits into from
Sep 21, 2024

Commits on Aug 22, 2024

  1. booking otp

    @anikdhabal
    anikdhabal committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    bca840b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into booking_otp

    @anikdhabal
    anikdhabal authored Aug 22, 2024
    Configuration menu
    Copy the full SHA
    53e46b5 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. Merge branch 'main' into booking_otp

    @zomars
    zomars authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    beb1ff0 View commit details
    Browse the repository at this point in the history

  2. Discard changes to packages/prisma/migrations/20240822140839_booking_… 

    …secret/migration.sql
    @zomars
    zomars authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    66b7019 View commit details
    Browse the repository at this point in the history

  3. refactor and update

    @anikdhabal
    anikdhabal committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    5b556b7 View commit details
    Browse the repository at this point in the history

  4. add 404 page

    @anikdhabal
    anikdhabal committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    288fcd3 View commit details
    Browse the repository at this point in the history

  5. update

    @anikdhabal
    anikdhabal committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    3f137c5 View commit details
    Browse the repository at this point in the history

  6. Discard changes to apps/web/pages/booking/[uid]/404.tsx

    @zomars
    zomars authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    b1407d1 View commit details
    Browse the repository at this point in the history

  7. Discard changes to apps/web/public/static/locales/en/common.json

    @zomars
    zomars authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    e17b40e View commit details
    Browse the repository at this point in the history

  8. Uses otp and email form

    @zomars
    zomars committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    cd3490d View commit details
    Browse the repository at this point in the history

  9. Discard changes to apps/web/pages/api/email.ts

    @zomars
    zomars authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    4c6dd22 View commit details
    Browse the repository at this point in the history

  10. Discard changes to packages/prisma/migrations/20240823032309_add_book… 

    …ing_otp/migration.sql
    @zomars
    zomars authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    ff7128c View commit details
    Browse the repository at this point in the history

  11. fix error

    @anikdhabal
    anikdhabal committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    bb1fc76 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'main' into booking_otp

    @anikdhabal
    anikdhabal authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    7bd99bc View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2024

  1. Merge branch 'main' into booking_otp

    @anikdhabal
    anikdhabal authored Aug 25, 2024
    Configuration menu
    Copy the full SHA
    3a4f992 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. Merge branch 'main' into booking_otp

    @anikdhabal
    anikdhabal authored Aug 29, 2024
    Configuration menu
    Copy the full SHA
    f96e175 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2024

  1. Merge branch 'main' into booking_otp

    @anikdhabal
    anikdhabal authored Sep 2, 2024
    Configuration menu
    Copy the full SHA
    401c80c View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. Merge branch 'main' into booking_otp 

    Signed-off-by: zomars <zomars@me.com>

# Conflicts:
#	packages/emails/src/templates/OrganizerRequestEmail.tsx
    @zomars
    zomars committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    c0c66ac View commit details
    Browse the repository at this point in the history

  2. Added feature flag for new confirmation email 

    Signed-off-by: zomars <zomars@me.com>
    @zomars
    zomars committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    60ace20 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2024

  1. Discard changes to packages/emails/src/templates/OrganizerRequestEmai… 

    …l.tsx
    @zomars
    zomars authored Sep 21, 2024
    Configuration menu
    Copy the full SHA
    5defa3f View commit details
    Browse the repository at this point in the history

  2. Update features.repository.ts

    @zomars
    zomars committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    1cd5f93 View commit details
    Browse the repository at this point in the history

  3. More fixes 

    Signed-off-by: zomars <zomars@me.com>
    @zomars
    zomars committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    a116648 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into booking_otp

    @zomars
    zomars committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    f38a7a4 View commit details
    Browse the repository at this point in the history