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/urls/general.py scipost/templates/scipost/footer.html scipost/templates/scipost/index.html scipost/templates/scipost/navbar.html scipost/templates/scipost/personal_page.html submissions/templates/submissions/_single_report_content.html
No related branches found
No related tags found
Showing
- SciPost_v1/settings/base.py 1 addition, 0 deletionsSciPost_v1/settings/base.py
- SciPost_v1/settings/production.py 1 addition, 0 deletionsSciPost_v1/settings/production.py
- journals/admin.py 6 additions, 2 deletionsjournals/admin.py
- journals/constants.py 9 additions, 0 deletionsjournals/constants.py
- journals/migrations/0024_publication_lastest_citedby_update.py 20 additions, 0 deletions...als/migrations/0024_publication_lastest_citedby_update.py
- journals/migrations/0025_auto_20170708_1154.py 20 additions, 0 deletionsjournals/migrations/0025_auto_20170708_1154.py
- journals/migrations/0026_auto_20170708_1542.py 30 additions, 0 deletionsjournals/migrations/0026_auto_20170708_1542.py
- journals/migrations/0027_auto_20170710_0805.py 39 additions, 0 deletionsjournals/migrations/0027_auto_20170710_0805.py
- journals/migrations/0028_auto_20170710_0906.py 24 additions, 0 deletionsjournals/migrations/0028_auto_20170710_0906.py
- journals/migrations/0029_remove_publication_latest_crossref_deposit.py 19 additions, 0 deletions...ations/0029_remove_publication_latest_crossref_deposit.py
- journals/migrations/0030_auto_20170710_1051.py 20 additions, 0 deletionsjournals/migrations/0030_auto_20170710_1051.py
- journals/migrations/0031_clockssmetadata.py 24 additions, 0 deletionsjournals/migrations/0031_clockssmetadata.py
- journals/migrations/0032_auto_20170711_0952.py 19 additions, 0 deletionsjournals/migrations/0032_auto_20170711_0952.py
- journals/migrations/0033_auto_20170711_2041.py 41 additions, 0 deletionsjournals/migrations/0033_auto_20170711_2041.py
- journals/migrations/0034_publication_cc_license.py 20 additions, 0 deletionsjournals/migrations/0034_publication_cc_license.py
- journals/migrations/0035_auto_20170714_0609.py 22 additions, 0 deletionsjournals/migrations/0035_auto_20170714_0609.py
- journals/models.py 34 additions, 3 deletionsjournals/models.py
- journals/templates/journals/add_author.html 1 addition, 1 deletionjournals/templates/journals/add_author.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
Loading
Please register or sign in to comment