Merge branch 'master' into development
No related branches found
No related tags found
Showing
- SciPost_v1/settings/base.py 18 additions, 2 deletionsSciPost_v1/settings/base.py
- SciPost_v1/settings/local_jorran.py 5 additions, 5 deletionsSciPost_v1/settings/local_jorran.py
- SciPost_v1/urls.py 13 additions, 0 deletionsSciPost_v1/urls.py
- colleges/admin.py 7 additions, 6 deletionscolleges/admin.py
- colleges/constants.py 39 additions, 39 deletionscolleges/constants.py
- colleges/forms.py 12 additions, 10 deletionscolleges/forms.py
- colleges/migrations/0007_potentialfellowship_potentialfellowshipevent.py 39 additions, 0 deletions...ions/0007_potentialfellowship_potentialfellowshipevent.py
- colleges/migrations/0008_prosfellow_to_potfellowship.py 50 additions, 0 deletionscolleges/migrations/0008_prosfellow_to_potfellowship.py
- colleges/migrations/0009_auto_20180916_2134.py 33 additions, 0 deletionscolleges/migrations/0009_auto_20180916_2134.py
- colleges/migrations/0010_auto_20180917_2117.py 20 additions, 0 deletionscolleges/migrations/0010_auto_20180917_2117.py
- colleges/models.py 25 additions, 30 deletionscolleges/models.py
- colleges/templates/colleges/_potentialfellowship_card.html 44 additions, 0 deletionscolleges/templates/colleges/_potentialfellowship_card.html
- colleges/templates/colleges/_potentialfellowship_event_li.html 0 additions, 0 deletions...ges/templates/colleges/_potentialfellowship_event_li.html
- colleges/templates/colleges/potentialfellowship_confirm_delete.html 3 additions, 3 deletions...emplates/colleges/potentialfellowship_confirm_delete.html
- colleges/templates/colleges/potentialfellowship_form.html 7 additions, 2 deletionscolleges/templates/colleges/potentialfellowship_form.html
- colleges/templates/colleges/potentialfellowship_list.html 78 additions, 0 deletionscolleges/templates/colleges/potentialfellowship_list.html
- colleges/urls.py 32 additions, 22 deletionscolleges/urls.py
- colleges/views.py 57 additions, 56 deletionscolleges/views.py
- finances/admin.py 3 additions, 1 deletionfinances/admin.py
- finances/constants.py 27 additions, 0 deletionsfinances/constants.py
Loading
Please register or sign in to comment