Merge branch 'master' into dev_JSC_20171002_SPBcampaign
No related branches found
No related tags found
Showing
- SciPost_v1/settings/base.py 1 addition, 1 deletionSciPost_v1/settings/base.py
- SciPost_v1/urls.py 1 addition, 1 deletionSciPost_v1/urls.py
- finances/__init__.py 0 additions, 0 deletionsfinances/__init__.py
- finances/admin.py 0 additions, 0 deletionsfinances/admin.py
- finances/apps.py 5 additions, 0 deletionsfinances/apps.py
- finances/migrations/__init__.py 0 additions, 0 deletionsfinances/migrations/__init__.py
- finances/models.py 0 additions, 0 deletionsfinances/models.py
- finances/templates/finances/timesheets.html 1 addition, 1 deletionfinances/templates/finances/timesheets.html
- finances/tests.py 0 additions, 0 deletionsfinances/tests.py
- finances/urls.py 0 additions, 0 deletionsfinances/urls.py
- finances/views.py 1 addition, 1 deletionfinances/views.py
- partners/migrations/0033_auto_20171003_1512.py 21 additions, 0 deletionspartners/migrations/0033_auto_20171003_1512.py
- production/admin.py 1 addition, 0 deletionsproduction/admin.py
- production/forms.py 6 additions, 0 deletionsproduction/forms.py
- production/migrations/0015_auto_20170914_2237.py 1 addition, 1 deletionproduction/migrations/0015_auto_20170914_2237.py
- production/migrations/0021_auto_20171003_1512.py 19 additions, 0 deletionsproduction/migrations/0021_auto_20171003_1512.py
- production/migrations/0022_auto_20171003_1525.py 19 additions, 0 deletionsproduction/migrations/0022_auto_20171003_1525.py
- production/templates/production/partials/production_stream_card.html 2 additions, 4 deletions...templates/production/partials/production_stream_card.html
- production/templates/production/production.html 4 additions, 4 deletionsproduction/templates/production/production.html
- scipost/static/scipost/assets/css/_pool.scss 4 additions, 0 deletionsscipost/static/scipost/assets/css/_pool.scss
Loading
Please register or sign in to comment