Sync branch 'master' into hotfix
Showing
- SciPost_v1/settings/base.py 0 additions, 6 deletionsSciPost_v1/settings/base.py
- colleges/templates/colleges/_potentialfellowship_card.html 37 additions, 17 deletionscolleges/templates/colleges/_potentialfellowship_card.html
- colleges/templates/colleges/base.html 13 additions, 0 deletionscolleges/templates/colleges/base.html
- colleges/templates/colleges/potentialfellowship_confirm_delete.html 1 addition, 1 deletion...emplates/colleges/potentialfellowship_confirm_delete.html
- colleges/templates/colleges/potentialfellowship_detail.html 21 additions, 0 deletionscolleges/templates/colleges/potentialfellowship_detail.html
- colleges/templates/colleges/potentialfellowship_form.html 6 additions, 1 deletioncolleges/templates/colleges/potentialfellowship_form.html
- colleges/templates/colleges/potentialfellowship_list.html 24 additions, 11 deletionscolleges/templates/colleges/potentialfellowship_list.html
- colleges/templatetags/colleges_extras.py 48 additions, 0 deletionscolleges/templatetags/colleges_extras.py
- colleges/urls.py 7 additions, 2 deletionscolleges/urls.py
- colleges/views.py 12 additions, 2 deletionscolleges/views.py
- common/forms.py 6 additions, 0 deletionscommon/forms.py
- common/utils.py 16 additions, 0 deletionscommon/utils.py
- cronjob_production_eachhour.sh 9 additions, 0 deletionscronjob_production_eachhour.sh
- finances/forms.py 2 additions, 1 deletionfinances/forms.py
- finances/migrations/0008_subsidy_amount_publicly_shown.py 20 additions, 0 deletionsfinances/migrations/0008_subsidy_amount_publicly_shown.py
- finances/models.py 1 addition, 0 deletionsfinances/models.py
- finances/templates/finances/_subsidy_card.html 2 additions, 2 deletionsfinances/templates/finances/_subsidy_card.html
- finances/templates/finances/subsidy_list.html 1 addition, 1 deletionfinances/templates/finances/subsidy_list.html
- finances/views.py 1 addition, 1 deletionfinances/views.py
- journals/migrations/0053_auto_20181118_1758.py 21 additions, 0 deletionsjournals/migrations/0053_auto_20181118_1758.py
Loading
Please register or sign in to comment