Merge branch 'master' into mini-sprint-may-2019
Showing
- Procfile 1 addition, 1 deletionProcfile
- README.md 0 additions, 2 deletionsREADME.md
- opentech/apply/funds/blocks.py 40 additions, 6 deletionsopentech/apply/funds/blocks.py
- opentech/apply/funds/edit_handlers.py 6 additions, 1 deletionopentech/apply/funds/edit_handlers.py
- opentech/apply/funds/migrations/0060_add_duration_type_in_duration_block.py 27 additions, 0 deletions...ds/migrations/0060_add_duration_type_in_duration_block.py
- opentech/apply/funds/models/applications.py 1 addition, 1 deletionopentech/apply/funds/models/applications.py
- opentech/apply/funds/templates/funds/application_base.html 4 additions, 2 deletionsopentech/apply/funds/templates/funds/application_base.html
- opentech/apply/funds/templates/funds/applicationsubmission_admin_detail.html 1 addition, 0 deletions...s/templates/funds/applicationsubmission_admin_detail.html
- opentech/apply/funds/templates/funds/applicationsubmission_detail.html 1 addition, 1 deletion...y/funds/templates/funds/applicationsubmission_detail.html
- opentech/apply/funds/tests/factories/blocks.py 1 addition, 1 deletionopentech/apply/funds/tests/factories/blocks.py
- opentech/apply/utils/options.py 1 addition, 0 deletionsopentech/apply/utils/options.py
- opentech/public/forms/templates/public_forms/form_page.html 2 additions, 2 deletionsopentech/public/forms/templates/public_forms/form_page.html
- opentech/public/news/feeds.py 81 additions, 0 deletionsopentech/public/news/feeds.py
- opentech/public/news/migrations/0010_newsfeedsettings.py 29 additions, 0 deletionsopentech/public/news/migrations/0010_newsfeedsettings.py
- opentech/public/news/models.py 15 additions, 0 deletionsopentech/public/news/models.py
- opentech/public/news/templates/news/news_index.html 1 addition, 0 deletionsopentech/public/news/templates/news/news_index.html
- opentech/public/urls.py 3 additions, 1 deletionopentech/public/urls.py
- opentech/settings/base.py 3 additions, 0 deletionsopentech/settings/base.py
- opentech/static_src/src/fonts/montserrat/Montserrat-Light.woff 0 additions, 0 deletions...ech/static_src/src/fonts/montserrat/Montserrat-Light.woff
- opentech/static_src/src/javascript/apply/application-form.js 36 additions, 0 deletionsopentech/static_src/src/javascript/apply/application-form.js
Loading
Please register or sign in to comment