Fix merge conflict
No related branches found
No related tags found
Showing
- common/utils.py 12 additions, 4 deletionscommon/utils.py
- scipost/management/commands/export_contributors.py 3 additions, 1 deletionscipost/management/commands/export_contributors.py
- scipost/views.py 2 additions, 2 deletionsscipost/views.py
- submissions/templates/submissions/_form_submission_cycle_choice.html 62 additions, 60 deletions.../templates/submissions/_form_submission_cycle_choice.html
- submissions/utils.py 21 additions, 3 deletionssubmissions/utils.py
- submissions/views.py 7 additions, 7 deletionssubmissions/views.py
- templates/email/_footer.html 5 additions, 5 deletionstemplates/email/_footer.html
- templates/email/new_activation_link.html 1 addition, 1 deletiontemplates/email/new_activation_link.html
- templates/email/new_activation_link_html.html 1 addition, 1 deletiontemplates/email/new_activation_link_html.html
- templates/email/referee_response_to_EIC.html 1 addition, 1 deletiontemplates/email/referee_response_to_EIC.html
- templates/email/referee_response_to_EIC_html.html 1 addition, 1 deletiontemplates/email/referee_response_to_EIC_html.html
- templates/email/registration_request_received.html 1 addition, 1 deletiontemplates/email/registration_request_received.html
- templates/email/registration_request_received_html.html 1 addition, 1 deletiontemplates/email/registration_request_received_html.html
- templates/email/report_delivered_eic.html 2 additions, 1 deletiontemplates/email/report_delivered_eic.html
- templates/email/report_delivered_eic_html.html 1 addition, 1 deletiontemplates/email/report_delivered_eic_html.html
- templates/email/submission_cycle_reinvite_referee.html 15 additions, 0 deletionstemplates/email/submission_cycle_reinvite_referee.html
- templates/email/submission_cycle_reinvite_referee_html.html 28 additions, 0 deletionstemplates/email/submission_cycle_reinvite_referee_html.html
- templates/email/submission_eic_reappointment.html 10 additions, 5 deletionstemplates/email/submission_eic_reappointment.html
- templates/email/submission_eic_reappointment_html.html 4 additions, 4 deletionstemplates/email/submission_eic_reappointment_html.html
Loading
Please register or sign in to comment