Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

H

hub
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Package registry
- Terraform modules
- Contributor analytics

Snippets Groups Projects

abfcd4e5

Commit abfcd4e5 authored Jul 14, 2023 by HeJ

Downloads
- Plain Diff

Merge branch 'develop' into 'production'

prod: fixes for abuse/report links, SoS events and village orga exports

See merge request hub/hub!591

parents db9cfb5c dc001fcf

Branches

Tags

No related merge requests found

Changes 10

Show whitespace changes

Inline Side-by-side

Showing

src/backoffice/forms.py 1 addition, 0 deletions

src/backoffice/forms.py
src/backoffice/views/assemblyteam.py 5 additions, 5 deletions

src/backoffice/views/assemblyteam.py
src/backoffice/views/events.py 1 addition, 2 deletions

src/backoffice/views/events.py
src/core/abuse.py 6 additions, 6 deletions

src/core/abuse.py
src/core/locale/de/LC_MESSAGES/django.po 4 additions, 1 deletion

src/core/locale/de/LC_MESSAGES/django.po
src/core/locale/en/LC_MESSAGES/django.po 3 additions, 0 deletions

src/core/locale/en/LC_MESSAGES/django.po
src/core/management/commands/housekeeping.py 67 additions, 3 deletions

src/core/management/commands/housekeeping.py
src/core/models/events.py 9 additions, 0 deletions

src/core/models/events.py
src/hub/settings/base.py 1 addition, 1 deletion

src/hub/settings/base.py
src/plainui/jinja2/plainui/components/event_info.html 1 addition, 1 deletion

src/plainui/jinja2/plainui/components/event_info.html

with 98 additions and 19 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

Impressum - Datenschutzerklärung