Merge (da76f310) · Commits · SciPost / SciPost · GitLab

SciPost Code Repository

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

da76f310

Commit da76f310 authored 6 years ago by Jorran de Wit

Downloads
- Plain Diff

Merge

parents c3e65018 712cc76c

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

SciPost_v1/settings/local_jorran.py 0 additions, 7 deletions

SciPost_v1/settings/local_jorran.py
common/forms.py 1 addition, 3 deletions

common/forms.py
finances/forms.py 66 additions, 30 deletions

finances/forms.py
finances/templates/finances/timesheets.html 39 additions, 27 deletions

finances/templates/finances/timesheets.html
finances/templates/finances/timesheets_detailed.html 80 additions, 0 deletions

finances/templates/finances/timesheets_detailed.html
finances/urls.py 11 additions, 40 deletions

finances/urls.py
finances/views.py 11 additions, 9 deletions

finances/views.py
requirements.txt 1 addition, 1 deletion

requirements.txt

with 209 additions and 117 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

SciPost Code Repository