Merge branch 'master' into development
No related branches found
No related tags found
Showing
- README.md 82 additions, 0 deletionsREADME.md
- SciPost_v1/settings/base.py 37 additions, 21 deletionsSciPost_v1/settings/base.py
- SciPost_v1/settings/local_boris.py 42 additions, 0 deletionsSciPost_v1/settings/local_boris.py
- SciPost_v1/settings/local_jorran.py 5 additions, 0 deletionsSciPost_v1/settings/local_jorran.py
- SciPost_v1/settings/staging.py 5 additions, 0 deletionsSciPost_v1/settings/staging.py
- SciPost_v1/settings/staging_release.py 29 additions, 0 deletionsSciPost_v1/settings/staging_release.py
- SciPost_v1/urls.py 12 additions, 0 deletionsSciPost_v1/urls.py
- celerybeat.pid 1 addition, 0 deletionscelerybeat.pid
- colleges/forms.py 1 addition, 1 deletioncolleges/forms.py
- finances/migrations/0007_auto_20181011_2146.py 19 additions, 0 deletionsfinances/migrations/0007_auto_20181011_2146.py
- finances/models.py 1 addition, 0 deletionsfinances/models.py
- finances/templates/finances/finances.html 22 additions, 3 deletionsfinances/templates/finances/finances.html
- finances/templates/finances/subsidy_list.html 24 additions, 3 deletionsfinances/templates/finances/subsidy_list.html
- finances/views.py 15 additions, 0 deletionsfinances/views.py
- invitations/views.py 4 additions, 0 deletionsinvitations/views.py
- journals/api.py 0 additions, 16 deletionsjournals/api.py
- journals/constants.py 7 additions, 1 deletionjournals/constants.py
- journals/migrations/0046_auto_20181020_2008.py 21 additions, 0 deletionsjournals/migrations/0046_auto_20181020_2008.py
- journals/migrations/0047_auto_20181023_0829.py 20 additions, 0 deletionsjournals/migrations/0047_auto_20181023_0829.py
- journals/migrations/0048_auto_20181023_2150.py 21 additions, 0 deletionsjournals/migrations/0048_auto_20181023_2150.py
Loading
Please register or sign in to comment