Merge branch 'master' into refereeing
Showing
- SciPost_v1/settings/base.py 9 additions, 2 deletionsSciPost_v1/settings/base.py
- SciPost_v1/urls.py 1 addition, 0 deletionsSciPost_v1/urls.py
- colleges/migrations/0010_auto_20180917_2117.py 20 additions, 0 deletionscolleges/migrations/0010_auto_20180917_2117.py
- funders/migrations/0009_funder_org.py 22 additions, 0 deletionsfunders/migrations/0009_funder_org.py
- funders/migrations/0010_repopulate_funder_orgs.py 26 additions, 0 deletionsfunders/migrations/0010_repopulate_funder_orgs.py
- funders/migrations/0011_remove_funder_organization.py 19 additions, 0 deletionsfunders/migrations/0011_remove_funder_organization.py
- funders/migrations/0012_auto_20180922_1609.py 21 additions, 0 deletionsfunders/migrations/0012_auto_20180922_1609.py
- funders/models.py 1 addition, 1 deletionfunders/models.py
- funders/templates/funders/funder_link_organization.html 1 addition, 1 deletionfunders/templates/funders/funder_link_organization.html
- journals/admin.py 8 additions, 2 deletionsjournals/admin.py
- journals/forms.py 37 additions, 4 deletionsjournals/forms.py
- journals/migrations/0035_orgpubfraction.py 26 additions, 0 deletionsjournals/migrations/0035_orgpubfraction.py
- journals/migrations/0036_auto_20180918_1723.py 20 additions, 0 deletionsjournals/migrations/0036_auto_20180918_1723.py
- journals/migrations/0037_publication_pubfractions_confirmed_by_authors.py 20 additions, 0 deletions...ons/0037_publication_pubfractions_confirmed_by_authors.py
- journals/migrations/0038_auto_20180922_1505.py 27 additions, 0 deletionsjournals/migrations/0038_auto_20180922_1505.py
- journals/migrations/0039_repopulate_orgs.py 33 additions, 0 deletionsjournals/migrations/0039_repopulate_orgs.py
- journals/migrations/0040_auto_20180922_1544.py 28 additions, 0 deletionsjournals/migrations/0040_auto_20180922_1544.py
- journals/migrations/0041_auto_20180922_1609.py 31 additions, 0 deletionsjournals/migrations/0041_auto_20180922_1609.py
- journals/models.py 44 additions, 2 deletionsjournals/models.py
- journals/templates/journals/allocate_orgpubfractions.html 79 additions, 0 deletionsjournals/templates/journals/allocate_orgpubfractions.html
Loading
Please register or sign in to comment