Merge branch 'master' into dev_JSC_20181113_contrib_duplicates
No related branches found
No related tags found
Showing
- SciPost_v1/settings/base.py 0 additions, 5 deletionsSciPost_v1/settings/base.py
- petitions/templates/petitions/petition_email.html 2 additions, 2 deletionspetitions/templates/petitions/petition_email.html
- requirements.txt 0 additions, 1 deletionrequirements.txt
- scipost/fields.py 66 additions, 0 deletionsscipost/fields.py
- scipost/forms.py 2 additions, 2 deletionsscipost/forms.py
- scipost/templates/scipost/ExpSustDrive2018.html 5 additions, 4 deletionsscipost/templates/scipost/ExpSustDrive2018.html
- scipost/templates/widgets/nocaptcha.html 23 additions, 0 deletionsscipost/templates/widgets/nocaptcha.html
- scipost/views.py 2 additions, 1 deletionscipost/views.py
- scipost/widgets.py 41 additions, 1 deletionscipost/widgets.py
- templates/email/partners_followup_mail.html 3 additions, 3 deletionstemplates/email/partners_followup_mail.html
- templates/email/partners_followup_mail.json 4 additions, 4 deletionstemplates/email/partners_followup_mail.json
- templates/email/partners_initial_mail.html 5 additions, 5 deletionstemplates/email/partners_initial_mail.html
- templates/email/partners_initial_mail.json 4 additions, 4 deletionstemplates/email/partners_initial_mail.json
Loading
Please register or sign in to comment