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

4f8c9961

Commit 4f8c9961 authored 6 years ago by Jonathan Weth

Committed by root 6 years ago

Downloads
- Plain Diff

Merge branch 'feature/smartplan-optimization' into dev

parents a8aa8e2e 35f3f996

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

biscuit/apps/chronos/pdf.py 5 additions, 7 deletions

biscuit/apps/chronos/pdf.py
biscuit/apps/chronos/templates/timetable/all.html 3 additions, 3 deletions

biscuit/apps/chronos/templates/timetable/all.html
biscuit/apps/chronos/templates/timetable/datepicker.html 29 additions, 9 deletions

biscuit/apps/chronos/templates/timetable/datepicker.html
biscuit/apps/chronos/templates/timetable/myplan.html 2 additions, 6 deletions

biscuit/apps/chronos/templates/timetable/myplan.html
biscuit/apps/chronos/templates/timetable/plan.html 4 additions, 3 deletions

biscuit/apps/chronos/templates/timetable/plan.html
biscuit/apps/chronos/templates/timetable/quicklaunch.html 3 additions, 3 deletions

biscuit/apps/chronos/templates/timetable/quicklaunch.html
biscuit/apps/chronos/templates/timetable/substitution.html 3 additions, 3 deletions

biscuit/apps/chronos/templates/timetable/substitution.html
biscuit/apps/chronos/tests.py 0 additions, 3 deletions

biscuit/apps/chronos/tests.py
biscuit/apps/chronos/urls.py 3 additions, 3 deletions

biscuit/apps/chronos/urls.py
biscuit/apps/chronos/views.py 12 additions, 6 deletions

biscuit/apps/chronos/views.py

with 64 additions and 46 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