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: Admin can create/edit MembershipTemplates #54

Merged
merged 9 commits into from
Apr 28, 2024
Merged

feat: Admin can create/edit MembershipTemplates #54

merged 9 commits into from
Apr 28, 2024

Commits on Apr 12, 2024

  1. Progress

    @LobeTia
    LobeTia committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    88e11ba View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2024

  1. First working iteration

    @LobeTia
    LobeTia committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    af1f542 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/27/admin-can-create-membership

    @LobeTia
    LobeTia authored Apr 13, 2024
    Configuration menu
    Copy the full SHA
    d21d5fa View commit details
    Browse the repository at this point in the history

  3. Lint fixed

    @LobeTia
    LobeTia committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    a6d7b3f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into feat/27/admin-can-create-membership

    @LobeTia
    LobeTia authored Apr 13, 2024
    Configuration menu
    Copy the full SHA
    44d5489 View commit details
    Browse the repository at this point in the history

  5. Last implementation details

    @LobeTia
    LobeTia committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    170f293 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/feat/27/admin-can-create-members… 

    …hip' into feat/27/admin-can-create-membership
    @LobeTia
    LobeTia committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    c33a117 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. Merge remote-tracking branch 'origin/main' into feat/27/admin-can-cre… 

    …ate-membership

# Conflicts:
#	src/app/admin/@unauthenticated/components/discordSignIn.tsx
#	src/app/admin/layout.tsx
#	src/app/devPage.tsx
#	src/app/members/@authenticated/page.tsx
#	src/app/page.tsx
#	src/app/signup/page.tsx
    @LobeTia
    LobeTia committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    08d4ba8 View commit details
    Browse the repository at this point in the history

  2. Lint fixed

    @LobeTia
    LobeTia committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    d346ae9 View commit details
    Browse the repository at this point in the history