Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

85752ec4

Verified Commit 85752ec4 authored 4 years ago by Jonathan Weth

Downloads
- Plain Diff

Merge branch 'master' into 51-pdf-export-for-timetables

parents 759e6fbd 48c5e565

No related branches found

No related tags found

1 merge request!77Resolve "PDF export for timetables"

Pipeline #5974 passed 4 years ago

Stage: test

Stage: build

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.github/PULL_REQUEST_TEMPLATE.md 11 additions, 0 deletions

.github/PULL_REQUEST_TEMPLATE.md
aleksis/apps/chronos/model_extensions.py 5 additions, 1 deletion

aleksis/apps/chronos/model_extensions.py
aleksis/apps/chronos/models.py 1 addition, 3 deletions

aleksis/apps/chronos/models.py
aleksis/apps/chronos/templates/chronos/partials/elements.html 3 additions, 3 deletions

...sis/apps/chronos/templates/chronos/partials/elements.html
aleksis/apps/chronos/templates/chronos/partials/lesson.html 1 addition, 3 deletions

aleksis/apps/chronos/templates/chronos/partials/lesson.html
aleksis/apps/chronos/templates/chronos/partials/supervision.html 1 addition, 1 deletion

.../apps/chronos/templates/chronos/partials/supervision.html
aleksis/apps/chronos/templates/chronos/partials/week_timetable.html 4 additions, 4 deletions

...ps/chronos/templates/chronos/partials/week_timetable.html

with 26 additions and 15 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