Merge branch 'master' into development
Showing
- funders/forms.py 15 additions, 2 deletionsfunders/forms.py
- funders/migrations/0004_auto_20170726_2037.py 24 additions, 0 deletionsfunders/migrations/0004_auto_20170726_2037.py
- funders/migrations/0005_grant_further_details.py 20 additions, 0 deletionsfunders/migrations/0005_grant_further_details.py
- funders/models.py 9 additions, 2 deletionsfunders/models.py
- funders/templates/funders/funders.html 2 additions, 0 deletionsfunders/templates/funders/funders.html
- funders/templates/funders/query_crossref_for_funder.html 1 addition, 0 deletionsfunders/templates/funders/query_crossref_for_funder.html
- journals/constants.py 6 additions, 0 deletionsjournals/constants.py
- journals/helpers.py 12 additions, 0 deletionsjournals/helpers.py
- journals/migrations/0041_publication_funders_generic.py 21 additions, 0 deletionsjournals/migrations/0041_publication_funders_generic.py
- journals/models.py 8 additions, 1 deletionjournals/models.py
- journals/templates/journals/_publication_details.html 1 addition, 1 deletionjournals/templates/journals/_publication_details.html
- journals/templates/journals/create_citation_list_metadata.html 1 addition, 1 deletion...als/templates/journals/create_citation_list_metadata.html
- journals/templates/journals/create_funding_info_metadata.html 1 addition, 1 deletion...nals/templates/journals/create_funding_info_metadata.html
- journals/templates/journals/create_metadata_xml.html 1 addition, 1 deletionjournals/templates/journals/create_metadata_xml.html
- journals/templates/journals/harvest_citedby_links.html 1 addition, 1 deletionjournals/templates/journals/harvest_citedby_links.html
- journals/templates/journals/manage_metadata.html 35 additions, 7 deletionsjournals/templates/journals/manage_metadata.html
- journals/templates/journals/metadata_xml_deposit.html 1 addition, 1 deletionjournals/templates/journals/metadata_xml_deposit.html
- journals/templates/journals/publication_detail.html 5 additions, 34 deletionsjournals/templates/journals/publication_detail.html
- journals/urls/general.py 9 additions, 0 deletionsjournals/urls/general.py
- journals/views.py 65 additions, 18 deletionsjournals/views.py
Loading
Please register or sign in to comment