Merge branch 'master' into development
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 1 deletion.gitignore
- SciPost_v1/settings/local_geert.py 0 additions, 11 deletionsSciPost_v1/settings/local_geert.py
- affiliations/models.py 3 additions, 1 deletionaffiliations/models.py
- colleges/admin.py 11 additions, 1 deletioncolleges/admin.py
- colleges/constants.py 49 additions, 0 deletionscolleges/constants.py
- colleges/forms.py 23 additions, 1 deletioncolleges/forms.py
- colleges/migrations/0003_prospectivefellow_prospectivefellowevent.py 48 additions, 0 deletions...grations/0003_prospectivefellow_prospectivefellowevent.py
- colleges/migrations/0004_auto_20180629_0825.py 19 additions, 0 deletionscolleges/migrations/0004_auto_20180629_0825.py
- colleges/migrations/0005_auto_20180701_2110.py 21 additions, 0 deletionscolleges/migrations/0005_auto_20180701_2110.py
- colleges/migrations/0006_auto_20180703_1208.py 20 additions, 0 deletionscolleges/migrations/0006_auto_20180703_1208.py
- colleges/models.py 52 additions, 2 deletionscolleges/models.py
- colleges/templates/colleges/_prospectivefellow_card.html 55 additions, 0 deletionscolleges/templates/colleges/_prospectivefellow_card.html
- colleges/templates/colleges/_prospectivefellow_event_li.html 6 additions, 0 deletionscolleges/templates/colleges/_prospectivefellow_event_li.html
- colleges/templates/colleges/prospectivefellow_confirm_delete.html 25 additions, 0 deletions.../templates/colleges/prospectivefellow_confirm_delete.html
- colleges/templates/colleges/prospectivefellow_form.html 16 additions, 0 deletionscolleges/templates/colleges/prospectivefellow_form.html
- colleges/templates/colleges/prospectivefellow_list.html 68 additions, 0 deletionscolleges/templates/colleges/prospectivefellow_list.html
- colleges/urls.py 37 additions, 0 deletionscolleges/urls.py
- colleges/views.py 138 additions, 3 deletionscolleges/views.py
- comments/forms.py 1 addition, 1 deletioncomments/forms.py
- comments/templates/comments/_vet_comment_form.html 2 additions, 2 deletionscomments/templates/comments/_vet_comment_form.html
Loading
Please register or sign in to comment