Merge branch 'master' into development
Showing
- colleges/models.py 8 additions, 6 deletionscolleges/models.py
- colleges/views.py 2 additions, 6 deletionscolleges/views.py
- invitations/views.py 1 addition, 1 deletioninvitations/views.py
- mails/templates/mail_templates/registration_invitation.html 7 additions, 5 deletionsmails/templates/mail_templates/registration_invitation.html
- mails/templates/mail_templates/submissions_assignment_failed.html 17 additions, 0 deletions...mplates/mail_templates/submissions_assignment_failed.html
- mails/templates/mail_templates/submissions_assignment_failed.json 8 additions, 0 deletions...mplates/mail_templates/submissions_assignment_failed.json
- mails/templates/mails/mail_form.html 7 additions, 1 deletionmails/templates/mails/mail_form.html
- mails/views.py 6 additions, 0 deletionsmails/views.py
- mails/widgets.py 4 additions, 5 deletionsmails/widgets.py
- partners/models.py 21 additions, 19 deletionspartners/models.py
- partners/templates/partners/_prospective_partner_card.html 6 additions, 4 deletionspartners/templates/partners/_prospective_partner_card.html
- partners/views.py 5 additions, 4 deletionspartners/views.py
- scipost/static/scipost/info/AnnualReports/AnnualReport_2015.pdf 0 additions, 0 deletions...t/static/scipost/info/AnnualReports/AnnualReport_2015.pdf
- scipost/static/scipost/info/AnnualReports/AnnualReport_2016.pdf 0 additions, 0 deletions...t/static/scipost/info/AnnualReports/AnnualReport_2016.pdf
- scipost/static/scipost/info/AnnualReports/AnnualReport_2017.pdf 0 additions, 0 deletions...t/static/scipost/info/AnnualReports/AnnualReport_2017.pdf
- scipost/templates/partials/scipost/personal_page/account.html 9 additions, 0 deletions...ost/templates/partials/scipost/personal_page/account.html
- scipost/templates/scipost/bare_base.html 1 addition, 1 deletionscipost/templates/scipost/bare_base.html
- scipost/templates/scipost/foundation.html 15 additions, 15 deletionsscipost/templates/scipost/foundation.html
- submissions/forms.py 16 additions, 8 deletionssubmissions/forms.py
- submissions/templates/partials/submissions/admin/editorial_assignment_failed.html 13 additions, 0 deletions...rtials/submissions/admin/editorial_assignment_failed.html
Loading
Please register or sign in to comment