Merge branch 'development' into improve/jorran
Conflicts: journals/templates/journals/create_citation_list_metadata.html journals/templates/journals/create_funding_info_metadata.html journals/templates/journals/create_metadata_xml.html journals/templates/journals/publication_detail.html
No related branches found
No related tags found
Showing
- comments/models.py 4 additions, 0 deletionscomments/models.py
- comments/templates/comments/_add_comment_form.html 1 addition, 0 deletionscomments/templates/comments/_add_comment_form.html
- comments/templates/comments/_comment_card_content.html 1 addition, 1 deletioncomments/templates/comments/_comment_card_content.html
- comments/templates/comments/_single_comment.html 2 additions, 3 deletionscomments/templates/comments/_single_comment.html
- comments/templates/comments/_vet_comment_form.html 2 additions, 2 deletionscomments/templates/comments/_vet_comment_form.html
- comments/templates/comments/add_comment.html 22 additions, 0 deletionscomments/templates/comments/add_comment.html
- comments/urls.py 1 addition, 0 deletionscomments/urls.py
- comments/views.py 26 additions, 4 deletionscomments/views.py
- 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
Loading
Please register or sign in to comment