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

b05c4e90

Commit b05c4e90 authored 4 months ago by Roang

Downloads
- Plain Diff

Merge branch 'fix/time_display' into 'develop'

fix time display and ordering

Closes #602

See merge request hub/hub!1101

parents d7e3b78a 7c074fdc

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/backoffice/templates/backoffice/event/components/list_content.html 6 additions, 2 deletions

...e/templates/backoffice/event/components/list_content.html
src/backoffice/templatetags/c3assemblies.py 5 additions, 2 deletions

src/backoffice/templatetags/c3assemblies.py
src/core/locale/de/LC_MESSAGES/django.po 3 additions, 0 deletions

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/templatetags/conference_time.py 29 additions, 0 deletions

src/core/templatetags/conference_time.py
src/plainui/jinja2.py 2 additions, 0 deletions

src/plainui/jinja2.py
src/plainui/views/general.py 2 additions, 0 deletions

src/plainui/views/general.py

with 50 additions and 4 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