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

Role management #260

Merged
merged 13 commits into from
Apr 9, 2024
Merged

Role management #260

merged 13 commits into from
Apr 9, 2024

Commits on Apr 9, 2024

  1. chore: add make teacher script

    @tyboro2002 @EwoutV
    tyboro2002 authored and EwoutV committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    ce45857 View commit details
    Browse the repository at this point in the history

  2. fix: added psychology faculty icon

    @EwoutV
    EwoutV committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    a9933a9 View commit details
    Browse the repository at this point in the history

  3. fix: faculty image filter

    @EwoutV
    EwoutV committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    d87a653 View commit details
    Browse the repository at this point in the history

  4. chore: linting

    @EwoutV
    EwoutV committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    9c83c4e View commit details
    Browse the repository at this point in the history

  5. feat: role user mixin

    @EwoutV
    EwoutV committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    f0e09bf View commit details
    Browse the repository at this point in the history

  6. Calendar view improvements (#257) 

    * chore: add make teacher script

* fix: added psychology faculty icon

---------

Co-authored-by: tyboro2002 <verslypetybo@hotmail.com>
    @EwoutV @tyboro2002
    EwoutV and tyboro2002 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    fad0aaa View commit details
    Browse the repository at this point in the history

  7. chore: user permissions account for is_active

    @EwoutV
    EwoutV committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    23caf49 View commit details
    Browse the repository at this point in the history

  8. chore: added role management tests, extracted common logic in helpers

    @EwoutV
    EwoutV committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    b99f4d8 View commit details
    Browse the repository at this point in the history

  9. fix: student service parameter

    @EwoutV
    EwoutV committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    5391b8f View commit details
    Browse the repository at this point in the history

  10. Merge branch 'development' into role-management

    @EwoutV
    EwoutV committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    aef4787 View commit details
    Browse the repository at this point in the history

  11. chore: linting

    @EwoutV
    EwoutV committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    48ed93b View commit details
    Browse the repository at this point in the history

  12. chore: removed comment in seeder

    @EwoutV
    EwoutV committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    622a21e View commit details
    Browse the repository at this point in the history

  13. Merge branch 'development' into role-management 

    # Conflicts:
#	backend/api/management/commands/seed_db.py
    @EwoutV
    EwoutV committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    708a201 View commit details
    Browse the repository at this point in the history