Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

AlekSIS-App-Alsijil
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

4cf0c8e6

Verified Commit 4cf0c8e6 authored 4 years ago by Jonathan Weth

Downloads
- Plain Diff

Merge branch 'master' into 73-add-rules-and-permissions

parents f3cc545c 607ae327

No related branches found

No related tags found

1 merge request!49Resolve "Add rules and permissions"

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

aleksis/apps/alsijil/forms.py 5 additions, 0 deletions

aleksis/apps/alsijil/forms.py
aleksis/apps/alsijil/model_extensions.py 59 additions, 1 deletion

aleksis/apps/alsijil/model_extensions.py
aleksis/apps/alsijil/static/css/alsijil/full_register.css 30 additions, 93 deletions

aleksis/apps/alsijil/static/css/alsijil/full_register.css
aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html 70 additions, 1 deletion

...apps/alsijil/templates/alsijil/class_register/lesson.html
aleksis/apps/alsijil/templates/alsijil/partials/absences.html 6 additions, 0 deletions

...sis/apps/alsijil/templates/alsijil/partials/absences.html
aleksis/apps/alsijil/templates/alsijil/partials/tardinesses.html 3 additions, 0 deletions

.../apps/alsijil/templates/alsijil/partials/tardinesses.html
aleksis/apps/alsijil/templates/alsijil/print/full_register.html 337 additions, 299 deletions

...s/apps/alsijil/templates/alsijil/print/full_register.html
aleksis/apps/alsijil/views.py 5 additions, 7 deletions

aleksis/apps/alsijil/views.py

with 515 additions and 401 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment