Merge branch 'master' into dev/jdw
No related branches found
No related tags found
Showing
- .mailmap 12 additions, 0 deletions.mailmap
- package-lock.json 370 additions, 359 deletionspackage-lock.json
- package.json 19 additions, 18 deletionspackage.json
- requirements.txt 12 additions, 9 deletionsrequirements.txt
- scipost_django/SciPost_v1/settings/base.py 10 additions, 3 deletionsscipost_django/SciPost_v1/settings/base.py
- scipost_django/SciPost_v1/settings/local_JSC.py 4 additions, 0 deletionsscipost_django/SciPost_v1/settings/local_JSC.py
- scipost_django/SciPost_v1/signalprocessors.py 1 addition, 1 deletionscipost_django/SciPost_v1/signalprocessors.py
- scipost_django/SciPost_v1/urls.py 31 additions, 3 deletionsscipost_django/SciPost_v1/urls.py
- scipost_django/api/urls.py 0 additions, 1 deletionscipost_django/api/urls.py
- scipost_django/careers/templates/careers/jobapplication_detail.html 2 additions, 2 deletions...ango/careers/templates/careers/jobapplication_detail.html
- scipost_django/careers/templates/careers/jobopening_list.html 1 addition, 1 deletion...ost_django/careers/templates/careers/jobopening_list.html
- scipost_django/careers/views.py 2 additions, 1 deletionscipost_django/careers/views.py
- scipost_django/colleges/forms.py 1 addition, 47 deletionsscipost_django/colleges/forms.py
- scipost_django/colleges/templates/colleges/college_list.html 1 addition, 1 deletionscipost_django/colleges/templates/colleges/college_list.html
- scipost_django/colleges/templates/colleges/fellowship_submission_remove.html 3 additions, 3 deletions...eges/templates/colleges/fellowship_submission_remove.html
- scipost_django/colleges/templates/colleges/fellowship_submission_remove_voting.html 0 additions, 28 deletions...mplates/colleges/fellowship_submission_remove_voting.html
- scipost_django/colleges/templates/colleges/submission_add_for_voting.html 0 additions, 30 deletions...olleges/templates/colleges/submission_add_for_voting.html
- scipost_django/colleges/templates/colleges/submission_fellowships.html 9 additions, 3 deletions...o/colleges/templates/colleges/submission_fellowships.html
- scipost_django/colleges/templates/colleges/submission_voting_fellows.html 0 additions, 48 deletions...olleges/templates/colleges/submission_voting_fellows.html
- scipost_django/colleges/urls.py 54 additions, 55 deletionsscipost_django/colleges/urls.py
Loading
Please register or sign in to comment