Codeforlife-portal

Fix

* fix: changed XTCP header setting to autoconfig (1101)

* changed xtco setting to autoconfig ([`9a96ce8`](https://github.com/ocadotechnology/codeforlife-portal/commit/9a96ce86e37d0bf6d9661c44243dd4f3752f9d88))

Unknown

* 2.20.1 ([`5b8cd99`](https://github.com/ocadotechnology/codeforlife-portal/commit/5b8cd99a69c3d97b19bd2b73254519bc9660e141))

Feature

* feat: install django security middleware for STS and XCTO HTTP headers (1097)

* Added X type content and STS headers

* added csp

* Removed CSP, to add in a different PR

* codeclimate fix

* updated dependencies

* Revert &34;updated dependencies&34;

This reverts commit 899bc2b071bb9e982d93b4824dccdac059b4ec02.

* removed security, using django security middleware to set XTCO

* removed security app ([`7ab9182`](https://github.com/ocadotechnology/codeforlife-portal/commit/7ab918297d5681ef170befdb25933cd25c7429e1))

Unknown

* 2.20.0 ([`3857418`](https://github.com/ocadotechnology/codeforlife-portal/commit/38574189b110e111ce3be96aaf3957ac1bd70f6b))

Feature

* feat: upgrade django to 1.11.24 (1030)

* upgraded django to 1.11.24

* version conflict fix

* deleted pipfile.lock

* updated django-selenium-clean

* Merge branch &39;master&39; into upgrade_to_django_1_11

Conflicts:
Pipfile.lock
setup.py

* Merge branch &39;master&39; into upgrade_to_django_1_11

* Merge branch &39;master&39; into upgrade_to_django_1_11

Signed-off-by: Niket Shah <masterniketgmail.com>

Conflicts:
portal/urls.py

* fix merge conflict error

Signed-off-by: Niket Shah <masterniketgmail.com>

* update django two factor auth dep

Signed-off-by: Niket Shah <masterniketgmail.com>

* remove cache setting to see if rapid router tests pass without this error

Signed-off-by: Niket Shah <masterniketgmail.com>

* Merge branch &39;master&39; into upgrade_to_django_1_11

Conflicts:
setup.py

* Merge branch &39;master&39; into upgrade_to_django_1_11

* Fix urllib version

* Bring back rapid router in setup.py ([`9a85fab`](https://github.com/ocadotechnology/codeforlife-portal/commit/9a85fab05992bcdbf30602af673d9703cf54ad4a))

Unknown

* 2.19.0 ([`3a0a48e`](https://github.com/ocadotechnology/codeforlife-portal/commit/3a0a48eb241a8168f982418c7761a239ad857cea))

Feature

* feat: Remove online status feature (1093)

* fix: remove online status feature

* fix codeclimate issue ([`7c8b4d4`](https://github.com/ocadotechnology/codeforlife-portal/commit/7c8b4d4056de4d74cb9d455bf3e87220fcc9eaf2))

Unknown

* 2.18.0 ([`219da47`](https://github.com/ocadotechnology/codeforlife-portal/commit/219da47d88b4cc841a23e23ae54a288e3b0ee9b0))

Build

* build: bump urllib3 from 1.23 to 1.24.2 (1088)

* build: bump urllib3 from 1.23 to 1.24.2

Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.23 to 1.24.2.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/master/CHANGES.rst)
- [Commits](https://github.com/urllib3/urllib3/compare/1.23...1.24.2)

Signed-off-by: dependabot[bot] <supportgithub.com>

* Update pipfile lock ([`fba0243`](https://github.com/ocadotechnology/codeforlife-portal/commit/fba0243b8a6453ef63f038820db4bb05876b0bf8))

* build: bump pillow from 3.3.2 to 5.4.1 (1083)

* build(deps): bump pillow from 3.3.2 to 6.2.0

Bumps [pillow](https://github.com/python-pillow/Pillow) from 3.3.2 to 6.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/3.3.2...6.2.0)

Signed-off-by: dependabot[bot] <supportgithub.com>

* Update lock

* Downgrade Pillow to 5.4.1 so that reportlab doesn&39;t break

* Revert pipfile lock

* Update pipfile properly ([`53a9aee`](https://github.com/ocadotechnology/codeforlife-portal/commit/53a9aee30c468537f8454d0d3fc9414a219d4eb4))

Feature

* feat: update list of contributors (1091)

* Fixes 1090 - add thanks ([`1e9057d`](https://github.com/ocadotechnology/codeforlife-portal/commit/1e9057d71bf3468aedac13b0475b9b71699f240e))

Unknown

* 2.17.0 ([`0595905`](https://github.com/ocadotechnology/codeforlife-portal/commit/0595905f5d86481d56aeb029b01408baf853fd08))

Feature

* feat: removed transparent subnav from RR page, deleted aimmo preview page (1064)

* removed transparent subnav from RR page, deleted aimmo preview page

* Merge branch &39;master&39; into remove_transparent_banner

Signed-off-by: Niket Shah <masterniketgmail.com>

Conflicts:
portal/templates/portal/play_aimmo_preview.html
portal/templates/portal/play_rapid-router.html

* Fix urls and minor css issues

Signed-off-by: Niket Shah <masterniketgmail.com> ([`e6ef252`](https://github.com/ocadotechnology/codeforlife-portal/commit/e6ef252d006dd1087760afc3c8707e7b7426db56))

Unknown

* 2.16.0 ([`0def5e1`](https://github.com/ocadotechnology/codeforlife-portal/commit/0def5e1e08380ac0cb34abc43cb41f11b6df06af))