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

Temp jwt #42

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Temp jwt #42

wants to merge 21 commits into from

Commits on Jan 4, 2023

  1. trying-docker

    @G0maa
    G0maa committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    f33dbeb View commit details
    Browse the repository at this point in the history

  2. temporary JWT

    @G0maa
    G0maa committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    7cfb45b View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2023

  1. Merge branch 'docker' into temp-jwt

    @G0maa
    G0maa committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    fe57523 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2023

  1. Keeping up with master

    @G0maa
    G0maa committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    d828671 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into temp-jwt

    @G0maa
    G0maa committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    a78a7c4 View commit details
    Browse the repository at this point in the history

  3. Tests now accept JWT and Sessions

    @G0maa
    G0maa committed Jan 8, 2023
    Configuration menu
    Copy the full SHA
    80116c1 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2023

  1. PUT & GET for Holidays

    @G0maa
    G0maa committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    833d9c4 View commit details
    Browse the repository at this point in the history

  2. adding a description column for subjects

    @G0maa
    G0maa committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    fd29453 View commit details
    Browse the repository at this point in the history

  3. changes to fees

    @G0maa
    G0maa committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    7d60c43 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'samir-requires' into temp-jwt

    @G0maa
    G0maa committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    2bd695b View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2023

  1. Changes to User Model & Enums 

    - studyYear now supports from 1 - 6.
- educationType now supportts Elementary & Middle options.
- Added 2 scopes for user, one for exluding password column by default,
- and the other includes it by default (needs more testing).
    @G0maa
    G0maa committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    ef296e5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'samir-requires' into temp-jwt

    @G0maa
    G0maa committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    5f53845 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2023

  1. trying to show needed properties in fees

    @G0maa
    G0maa committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    bc9d326 View commit details
    Browse the repository at this point in the history

  2. fixing bugs

    @G0maa
    G0maa committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    b441254 View commit details
    Browse the repository at this point in the history

  3. fixing put of fee

    @G0maa
    G0maa committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    5cbcc74 View commit details
    Browse the repository at this point in the history

  4. fix put again

    @G0maa
    G0maa committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    85c6ddf View commit details
    Browse the repository at this point in the history

  5. adding teacher role to get all ACs

    @G0maa
    G0maa committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    d7aadf1 View commit details
    Browse the repository at this point in the history

  6. temp put for teacher

    @G0maa
    G0maa committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    2d5c46e View commit details
    Browse the repository at this point in the history

  7. all optional

    @G0maa
    G0maa committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    0d2fd83 View commit details
    Browse the repository at this point in the history

  8. allowing students to edit

    @G0maa
    G0maa committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    19d1c16 View commit details
    Browse the repository at this point in the history

  9. partial user

    @G0maa
    G0maa committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    7932dc9 View commit details
    Browse the repository at this point in the history