Fix merge conflict
No related branches found
No related tags found
Showing
- commentaries/templates/commentaries/_commentary_summary.html 1 addition, 1 deletioncommentaries/templates/commentaries/_commentary_summary.html
- funders/forms.py 2 additions, 2 deletionsfunders/forms.py
- journals/behaviors.py 7 additions, 3 deletionsjournals/behaviors.py
- journals/constants.py 11 additions, 0 deletionsjournals/constants.py
- journals/forms.py 189 additions, 82 deletionsjournals/forms.py
- journals/managers.py 30 additions, 36 deletionsjournals/managers.py
- journals/migrations/0017_auto_20180310_1103.py 31 additions, 0 deletionsjournals/migrations/0017_auto_20180310_1103.py
- journals/migrations/0018_auto_20180310_1112.py 26 additions, 0 deletionsjournals/migrations/0018_auto_20180310_1112.py
- journals/migrations/0019_auto_20180310_1115.py 26 additions, 0 deletionsjournals/migrations/0019_auto_20180310_1115.py
- journals/migrations/0020_auto_20180310_1137.py 46 additions, 0 deletionsjournals/migrations/0020_auto_20180310_1137.py
- journals/migrations/0021_auto_20180310_1137.py 20 additions, 0 deletionsjournals/migrations/0021_auto_20180310_1137.py
- journals/migrations/0022_auto_20180310_1154.py 23 additions, 0 deletionsjournals/migrations/0022_auto_20180310_1154.py
- journals/migrations/0023_journal_structure.py 20 additions, 0 deletionsjournals/migrations/0023_journal_structure.py
- journals/migrations/0024_auto_20180310_1740.py 50 additions, 0 deletionsjournals/migrations/0024_auto_20180310_1740.py
- journals/models.py 170 additions, 31 deletionsjournals/models.py
- journals/templates/journals/_base.html 9 additions, 5 deletionsjournals/templates/journals/_base.html
- journals/templates/journals/add_author.html 0 additions, 2 deletionsjournals/templates/journals/add_author.html
- journals/templates/journals/journal_accepted.html 1 addition, 1 deletionjournals/templates/journals/journal_accepted.html
- journals/templates/journals/journal_issue_detail.html 2 additions, 2 deletionsjournals/templates/journals/journal_issue_detail.html
- journals/templates/journals/journal_issues.html 1 addition, 1 deletionjournals/templates/journals/journal_issues.html
Loading
Please register or sign in to comment