Merge branch 'guests_schools' into 'main' (7ba5c76a) · Commits · BDE / nk20 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

nk20
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

7ba5c76a

Commit 7ba5c76a authored 3 weeks ago by quark

Downloads
- Plain Diff

Merge branch 'guests_schools' into 'main'

add school field to guest

See merge request !302

parents 60355196 702ddb56

Branches Add_some_permissions

No related tags found

1 merge request!302add school field to guest

Pipeline #14995 passed with stages

in 15 minutes and 8 seconds

Changes 10
Pipelines 2

Hide whitespace changes

Inline Side-by-side

Showing

apps/activity/admin.py 1 addition, 1 deletion

apps/activity/admin.py
apps/activity/api/views.py 2 additions, 2 deletions

apps/activity/api/views.py
apps/activity/forms.py 1 addition, 1 deletion

apps/activity/forms.py
apps/activity/migrations/0006_guest_school.py 18 additions, 0 deletions

apps/activity/migrations/0006_guest_school.py
apps/activity/models.py 5 additions, 0 deletions

apps/activity/models.py
apps/activity/tables.py 1 addition, 1 deletion

apps/activity/tables.py
apps/activity/tests/test_activities.py 4 additions, 0 deletions

apps/activity/tests/test_activities.py
apps/activity/views.py 1 addition, 0 deletions

apps/activity/views.py
docs/apps/activity.rst 1 addition, 0 deletions

docs/apps/activity.rst
locale/fr/LC_MESSAGES/django.po 23 additions, 23 deletions

locale/fr/LC_MESSAGES/django.po

with 57 additions and 28 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