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

Fix dev with 270 #126

Merged
merged 12 commits into from
Jul 4, 2024
Merged

Fix dev with 270 #126

merged 12 commits into from
Jul 4, 2024

Commits on Jun 12, 2024

  1. INCT-270 feat: creat a banUser

    @Ustin4
    Ustin4 committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    3db6eaa View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. INCT-270 feat: creat a banUser

    @Ustin4
    Ustin4 committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    c32c381 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. INCT-270 feat: creat a banUser

    @Ustin4
    Ustin4 committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    a065b64 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2024

  1. INCT-254 fix: confict merge after testing with local dev

    @Ustin4
    Ustin4 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    cef9e8e View commit details
    Browse the repository at this point in the history

  2. INCT-254 fix: confict merge after testing with local dev

    @Ustin4
    Ustin4 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    43c4c97 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. INCT-254 fix: confict merge after testing with local dev

    @Ustin4
    Ustin4 committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    e755731 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. INCT-254 fix: confict merge after testing with local dev

    @Ustin4
    Ustin4 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    343d5f8 View commit details
    Browse the repository at this point in the history

  2. INCT-254 fix: confict merge after testing with local dev

    @Ustin4
    Ustin4 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    a0d3971 View commit details
    Browse the repository at this point in the history

  3. INCT-254 fix: confict merge after testing with local dev

    @Ustin4
    Ustin4 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    b93c93e View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. INCT-254 fix: confict merge after testing with local dev

    @Ustin4
    Ustin4 committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    8ea9d6a View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. Merge branch 'refs/heads/INCT-270' into fix-dev-with-270 

    # Conflicts:
#	src/entities/users/api/usersApi.ts
#	src/widgets/superAdmin/userList/UserList.module.scss
#	src/widgets/superAdmin/userList/UserList.tsx
    @Ustin4
    Ustin4 committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    f57aeb3 View commit details
    Browse the repository at this point in the history

  2. INCT-271 fix: conflict with dev 270

    @Ustin4
    Ustin4 committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    6f3e265 View commit details
    Browse the repository at this point in the history