Merge branch 'development' into directrec
Showing
- SciPost_v1/settings/staging.py 3 additions, 0 deletionsSciPost_v1/settings/staging.py
- affiliations/managers.py 4 additions, 0 deletionsaffiliations/managers.py
- affiliations/models.py 7 additions, 4 deletionsaffiliations/models.py
- affiliations/templates/affiliations/base.html 13 additions, 0 deletionsaffiliations/templates/affiliations/base.html
- affiliations/templates/affiliations/institution_detail.html 26 additions, 0 deletionsaffiliations/templates/affiliations/institution_detail.html
- affiliations/templates/affiliations/institution_list.html 10 additions, 4 deletionsaffiliations/templates/affiliations/institution_list.html
- affiliations/urls.py 3 additions, 1 deletionaffiliations/urls.py
- affiliations/views.py 8 additions, 3 deletionsaffiliations/views.py
- colleges/models.py 8 additions, 6 deletionscolleges/models.py
- colleges/views.py 2 additions, 6 deletionscolleges/views.py
- comments/managers.py 3 additions, 0 deletionscomments/managers.py
- comments/models.py 7 additions, 5 deletionscomments/models.py
- comments/templates/comments/_comment_card_content.html 3 additions, 2 deletionscomments/templates/comments/_comment_card_content.html
- comments/templates/comments/_comment_card_extended_for_author.html 5 additions, 1 deletion...templates/comments/_comment_card_extended_for_author.html
- comments/templates/comments/_comment_tex_template.html 2 additions, 2 deletionscomments/templates/comments/_comment_tex_template.html
- comments/templates/partials/comments/comments_list.html 1 addition, 1 deletioncomments/templates/partials/comments/comments_list.html
- comments/utils.py 16 additions, 6 deletionscomments/utils.py
- comments/views.py 4 additions, 4 deletionscomments/views.py
- funders/managers.py 12 additions, 0 deletionsfunders/managers.py
- funders/migrations/0003_auto_20180425_2146.py 20 additions, 0 deletionsfunders/migrations/0003_auto_20180425_2146.py
Loading
Please register or sign in to comment