Merge branch 'master' into development (255e1f60) · 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

255e1f60

Commit 255e1f60 authored 7 years ago by Jorran de Wit

Downloads
- Plain Diff

Merge branch 'master' into development

parents 01d1b451 ad7ba475

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

partners/forms.py 17 additions, 27 deletions

partners/forms.py
partners/templates/partners/dashboard.html 1 addition, 1 deletion

partners/templates/partners/dashboard.html
partners/urls.py 0 additions, 2 deletions

partners/urls.py
partners/utils.py 2 additions, 2 deletions

partners/utils.py
partners/views.py 12 additions, 14 deletions

partners/views.py
scipost/management/commands/add_groups_and_permissions.py 5 additions, 5 deletions

scipost/management/commands/add_groups_and_permissions.py
templates/email/email_contact_new_for_activation.html 1 addition, 1 deletion

templates/email/email_contact_new_for_activation.html
templates/email/email_contact_new_for_activation.txt 1 addition, 1 deletion

templates/email/email_contact_new_for_activation.txt

with 39 additions and 53 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