Merge branch 'development' into improve/jorran
No related branches found
No related tags found
Showing
- SciPost_v1/settings/base.py 28 additions, 0 deletionsSciPost_v1/settings/base.py
- mailing_lists/forms.py 1 addition, 4 deletionsmailing_lists/forms.py
- mailing_lists/migrations/0005_mailchimplist_subscriber_count.py 20 additions, 0 deletions...g_lists/migrations/0005_mailchimplist_subscriber_count.py
- mailing_lists/models.py 72 additions, 12 deletionsmailing_lists/models.py
- mailing_lists/templates/mailing_lists/mailchimplist_form.html 1 addition, 1 deletion...ing_lists/templates/mailing_lists/mailchimplist_form.html
- mailing_lists/views.py 9 additions, 2 deletionsmailing_lists/views.py
- partners/admin.py 10 additions, 8 deletionspartners/admin.py
- partners/constants.py 20 additions, 2 deletionspartners/constants.py
- partners/forms.py 27 additions, 0 deletionspartners/forms.py
- partners/migrations/0009_auto_20170608_1710.py 20 additions, 0 deletionspartners/migrations/0009_auto_20170608_1710.py
- partners/migrations/0010_auto_20170608_2049.py 31 additions, 0 deletionspartners/migrations/0010_auto_20170608_2049.py
- partners/migrations/0011_auto_20170609_2234.py 25 additions, 0 deletionspartners/migrations/0011_auto_20170609_2234.py
- partners/models.py 28 additions, 2 deletionspartners/models.py
- partners/templates/partners/_prospartner_event_li.html 1 addition, 1 deletionpartners/templates/partners/_prospartner_event_li.html
- partners/templates/partners/_prospective_partner_card.html 23 additions, 21 deletionspartners/templates/partners/_prospective_partner_card.html
- partners/templates/partners/email_prospartner_contact.html 29 additions, 0 deletionspartners/templates/partners/email_prospartner_contact.html
- partners/templates/partners/manage_partners.html 3 additions, 1 deletionpartners/templates/partners/manage_partners.html
- partners/templates/partners/supporting_partners.html 5 additions, 4 deletionspartners/templates/partners/supporting_partners.html
- partners/templatetags/partners_extras.py 28 additions, 0 deletionspartners/templatetags/partners_extras.py
- partners/urls.py 3 additions, 1 deletionpartners/urls.py
Loading
Please register or sign in to comment