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

f6b135b2

Verified Commit f6b135b2 authored 4 years ago by Jonathan Weth

Downloads
- Plain Diff

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

parents 46259cb0 151dd117

No related branches found

No related tags found

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

Pipeline #3490 passed 4 years ago

Stage: test

Stage: build

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

aleksis/apps/alsijil/forms.py 22 additions, 7 deletions

aleksis/apps/alsijil/forms.py
aleksis/apps/alsijil/model_extensions.py 4 additions, 0 deletions

aleksis/apps/alsijil/model_extensions.py
aleksis/apps/alsijil/templates/alsijil/absences/register.html 10 additions, 2 deletions

...sis/apps/alsijil/templates/alsijil/absences/register.html
aleksis/apps/alsijil/views.py 18 additions, 4 deletions

aleksis/apps/alsijil/views.py

with 54 additions and 13 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