Merge branch 'dev_JSC_20181010_improvements'
Showing
- SciPost_v1/settings/base.py 2 additions, 0 deletionsSciPost_v1/settings/base.py
- SciPost_v1/urls.py 2 additions, 0 deletionsSciPost_v1/urls.py
- finances/migrations/0007_auto_20181011_2146.py 19 additions, 0 deletionsfinances/migrations/0007_auto_20181011_2146.py
- finances/models.py 1 addition, 0 deletionsfinances/models.py
- finances/templates/finances/finances.html 22 additions, 3 deletionsfinances/templates/finances/finances.html
- finances/templates/finances/subsidy_list.html 24 additions, 3 deletionsfinances/templates/finances/subsidy_list.html
- finances/views.py 12 additions, 0 deletionsfinances/views.py
- organizations/managers.py 13 additions, 0 deletionsorganizations/managers.py
- organizations/models.py 14 additions, 0 deletionsorganizations/models.py
- organizations/templates/organizations/_organization_card.html 3 additions, 0 deletions...nizations/templates/organizations/_organization_card.html
- organizations/templates/organizations/organization_list.html 11 additions, 3 deletionsorganizations/templates/organizations/organization_list.html
- organizations/templatetags/organizations_extras.py 4 additions, 0 deletionsorganizations/templatetags/organizations_extras.py
- scipost/templates/scipost/about.html 1 addition, 1 deletionscipost/templates/scipost/about.html
- scipost/templates/scipost/foundation.html 1 addition, 3 deletionsscipost/templates/scipost/foundation.html
- sponsors/__init__.py 0 additions, 0 deletionssponsors/__init__.py
- sponsors/admin.py 3 additions, 0 deletionssponsors/admin.py
- sponsors/migrations/__init__.py 0 additions, 0 deletionssponsors/migrations/__init__.py
- sponsors/models.py 3 additions, 0 deletionssponsors/models.py
- sponsors/static/sponsors/SciPost_Sponsorship_Agreement.pdf 0 additions, 0 deletionssponsors/static/sponsors/SciPost_Sponsorship_Agreement.pdf
- sponsors/templates/sponsors/base.html 15 additions, 0 deletionssponsors/templates/sponsors/base.html
Loading
Please register or sign in to comment