Merge branch 'master' into development
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- SciPost_v1/settings/base.py 4 additions, 3 deletionsSciPost_v1/settings/base.py
- SciPost_v1/settings/production.py 0 additions, 2 deletionsSciPost_v1/settings/production.py
- SciPost_v1/settings/staging.py 28 additions, 0 deletionsSciPost_v1/settings/staging.py
- SciPost_v1/settings/staging_1.py 0 additions, 15 deletionsSciPost_v1/settings/staging_1.py
- SciPost_v1/wsgi_staging.py 1 addition, 1 deletionSciPost_v1/wsgi_staging.py
- common/helpers/__init__.py 8 additions, 0 deletionscommon/helpers/__init__.py
- crobjob_staging_short.sh 0 additions, 10 deletionscrobjob_staging_short.sh
- cronjob_production_daily.sh 8 additions, 0 deletionscronjob_production_daily.sh
- cronjob_production_eachminute.sh 2 additions, 2 deletionscronjob_production_eachminute.sh
- cronjob_production_weekly.sh 8 additions, 0 deletionscronjob_production_weekly.sh
- cronjob_staging_daily.sh 8 additions, 0 deletionscronjob_staging_daily.sh
- cronjob_staging_eachminute.sh 9 additions, 0 deletionscronjob_staging_eachminute.sh
- cronjob_staging_long.sh 0 additions, 8 deletionscronjob_staging_long.sh
- cronjob_staging_weekly.sh 8 additions, 0 deletionscronjob_staging_weekly.sh
- invitations/models.py 6 additions, 7 deletionsinvitations/models.py
- journals/constants.py 5 additions, 1 deletionjournals/constants.py
- journals/search_indexes.py 4 additions, 0 deletionsjournals/search_indexes.py
- journals/templates/journals/grants_form.html 6 additions, 0 deletionsjournals/templates/journals/grants_form.html
- journals/views.py 7 additions, 1 deletionjournals/views.py
Loading
Please register or sign in to comment