Merge branch 'development' into partners/wip (49e2c3a4) · 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

49e2c3a4

"scipost_django/SciPost_v1/settings/production_do1.py" did not exist on "b8bb2419172211b57b06b1b43255ab32fac8193a"

Commit 49e2c3a4 authored 7 years ago by Jorran de Wit

Downloads
- Plain Diff

Merge branch 'development' into partners/wip

parents 7f747e39 d5a5825e

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

partners/forms.py 4 additions, 0 deletions

partners/forms.py
partners/templates/partners/_prospective_partner_card.html 1 addition, 0 deletions

partners/templates/partners/_prospective_partner_card.html
partners/templates/partners/email_prospartner_generic.html 29 additions, 0 deletions

partners/templates/partners/email_prospartner_generic.html
partners/urls.py 5 additions, 1 deletion

partners/urls.py
partners/utils.py 10 additions, 0 deletions

partners/utils.py
partners/views.py 33 additions, 2 deletions

partners/views.py
submissions/migrations/0047_submission_acceptance_date.py 34 additions, 0 deletions

submissions/migrations/0047_submission_acceptance_date.py
submissions/models.py 1 addition, 0 deletions

submissions/models.py
submissions/templates/submissions/_submission_summary_short.html 6 additions, 0 deletions

...ions/templates/submissions/_submission_summary_short.html
submissions/views.py 1 addition, 0 deletions

submissions/views.py
templates/email/email_prospartner_contact.html 6 additions, 3 deletions

templates/email/email_prospartner_contact.html
templates/email/email_prospartner_contact_html.html 7 additions, 3 deletions

templates/email/email_prospartner_contact_html.html

with 137 additions and 9 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