Merge branch 'reportpdf' into subevents
Without this merge, the `Submission` db-table will throw integrityerrors due to parallel-unmerged-migrations. Conflicts: submissions/managers.py
No related branches found
No related tags found
Showing
- comments/templates/comments/_comment_identifier.html 1 addition, 1 deletioncomments/templates/comments/_comment_identifier.html
- comments/templates/comments/_comment_tex_template.html 11 additions, 0 deletionscomments/templates/comments/_comment_tex_template.html
- partners/migrations/0012_auto_20170625_1253.py 20 additions, 0 deletionspartners/migrations/0012_auto_20170625_1253.py
- partners/migrations/0027_merge_20170707_1857.py 16 additions, 0 deletionspartners/migrations/0027_merge_20170707_1857.py
- scipost/management/commands/add_groups_and_permissions.py 7 additions, 0 deletionsscipost/management/commands/add_groups_and_permissions.py
- scipost/static/scipost/assets/css/_code.scss 4 additions, 0 deletionsscipost/static/scipost/assets/css/_code.scss
- scipost/templates/scipost/personal_page.html 6 additions, 2 deletionsscipost/templates/scipost/personal_page.html
- scipost/templatetags/texfilters.py 26 additions, 0 deletionsscipost/templatetags/texfilters.py
- scipost/views.py 14 additions, 8 deletionsscipost/views.py
- submissions/admin.py 1 addition, 0 deletionssubmissions/admin.py
- submissions/constants.py 6 additions, 8 deletionssubmissions/constants.py
- submissions/forms.py 13 additions, 1 deletionsubmissions/forms.py
- submissions/managers.py 21 additions, 7 deletionssubmissions/managers.py
- submissions/migrations/0046_auto_20170625_1311.py 34 additions, 0 deletionssubmissions/migrations/0046_auto_20170625_1311.py
- submissions/migrations/0047_auto_20170625_1331.py 29 additions, 0 deletionssubmissions/migrations/0047_auto_20170625_1331.py
- submissions/migrations/0048_auto_20170721_0931.py 30 additions, 0 deletionssubmissions/migrations/0048_auto_20170721_0931.py
- submissions/migrations/0048_merge_20170707_1857.py 16 additions, 0 deletionssubmissions/migrations/0048_merge_20170707_1857.py
- submissions/migrations/0049_submission_pdf_refereeing_pack.py 20 additions, 0 deletions...issions/migrations/0049_submission_pdf_refereeing_pack.py
- submissions/migrations/0050_auto_20170707_2126.py 24 additions, 0 deletionssubmissions/migrations/0050_auto_20170707_2126.py
- submissions/migrations/0051_merge_20170721_0934.py 16 additions, 0 deletionssubmissions/migrations/0051_merge_20170721_0934.py
Loading
Please register or sign in to comment