Merge branch 'master' into dev_JSC_20191113_apimail
Showing
- colleges/templates/colleges/college_detail.html 1 addition, 1 deletioncolleges/templates/colleges/college_detail.html
- colleges/templates/colleges/colleges.html 1 addition, 1 deletioncolleges/templates/colleges/colleges.html
- colleges/templates/colleges/potentialfellowship_list.html 1 addition, 1 deletioncolleges/templates/colleges/potentialfellowship_list.html
- commentaries/forms.py 3 additions, 2 deletionscommentaries/forms.py
- commentaries/tests/test_forms.py 4 additions, 4 deletionscommentaries/tests/test_forms.py
- commentaries/tests/test_views.py 6 additions, 6 deletionscommentaries/tests/test_views.py
- comments/factories.py 2 additions, 1 deletioncomments/factories.py
- comments/models.py 3 additions, 2 deletionscomments/models.py
- comments/templates/comments/_add_comment_form.html 1 addition, 1 deletioncomments/templates/comments/_add_comment_form.html
- common/utils.py 6 additions, 4 deletionscommon/utils.py
- conflicts/services.py 2 additions, 2 deletionsconflicts/services.py
- cronjobs/cronjob_production_daily.sh 0 additions, 0 deletionscronjobs/cronjob_production_daily.sh
- cronjobs/cronjob_production_eachhour.sh 0 additions, 0 deletionscronjobs/cronjob_production_eachhour.sh
- cronjobs/cronjob_production_eachminute.sh 0 additions, 0 deletionscronjobs/cronjob_production_eachminute.sh
- cronjobs/cronjob_production_sundays.sh 0 additions, 0 deletionscronjobs/cronjob_production_sundays.sh
- cronjobs/cronjob_production_weekdays.sh 0 additions, 0 deletionscronjobs/cronjob_production_weekdays.sh
- cronjobs/cronjob_production_weekly.sh 0 additions, 0 deletionscronjobs/cronjob_production_weekly.sh
- cronjobs/cronjob_staging_daily.sh 0 additions, 0 deletionscronjobs/cronjob_staging_daily.sh
- cronjobs/cronjob_staging_eachminute.sh 0 additions, 0 deletionscronjobs/cronjob_staging_eachminute.sh
- cronjobs/cronjob_staging_weekly.sh 0 additions, 0 deletionscronjobs/cronjob_staging_weekly.sh
Loading
Please register or sign in to comment