Merge branch 'master' into dev_JSC_20191113_apimail
Showing
- README.rst 1 addition, 1 deletionREADME.rst
- SciPost_v1/settings/base.py 48 additions, 5 deletionsSciPost_v1/settings/base.py
- SciPost_v1/settings/local_JSC.py 6 additions, 0 deletionsSciPost_v1/settings/local_JSC.py
- SciPost_v1/settings/production.py 11 additions, 3 deletionsSciPost_v1/settings/production.py
- SciPost_v1/urls.py 13 additions, 7 deletionsSciPost_v1/urls.py
- api/urls.py 6 additions, 0 deletionsapi/urls.py
- api/views.py 85 additions, 0 deletionsapi/views.py
- colleges/admin.py 7 additions, 2 deletionscolleges/admin.py
- colleges/converters.py 19 additions, 0 deletionscolleges/converters.py
- colleges/factories.py 13 additions, 1 deletioncolleges/factories.py
- colleges/forms.py 3 additions, 1 deletioncolleges/forms.py
- colleges/managers.py 5 additions, 20 deletionscolleges/managers.py
- colleges/migrations/0015_auto_20200906_0714.py 35 additions, 0 deletionscolleges/migrations/0015_auto_20200906_0714.py
- colleges/migrations/0016_populate_colleges.py 29 additions, 0 deletionscolleges/migrations/0016_populate_colleges.py
- colleges/migrations/0017_fellowship_college.py 19 additions, 0 deletionscolleges/migrations/0017_fellowship_college.py
- colleges/migrations/0018_fellowship_set_college.py 25 additions, 0 deletionscolleges/migrations/0018_fellowship_set_college.py
- colleges/migrations/0019_auto_20200906_1436.py 19 additions, 0 deletionscolleges/migrations/0019_auto_20200906_1436.py
- colleges/migrations/0020_auto_20200925_1617.py 18 additions, 0 deletionscolleges/migrations/0020_auto_20200925_1617.py
- colleges/migrations/0021_potentialfellowship_college.py 19 additions, 0 deletionscolleges/migrations/0021_potentialfellowship_college.py
- colleges/migrations/0022_potentialfellowship_set_college.py 25 additions, 0 deletionscolleges/migrations/0022_potentialfellowship_set_college.py
Loading
Please register or sign in to comment