Rapid-router

Bug Fixes

- Remove django jquery ([1077](https://github.com/ocadotechnology/rapid-router/pull/1077),
[`acb0cfd`](https://github.com/ocadotechnology/rapid-router/commit/acb0cfd903b63ab9726db0154b9d7910a7c4549b))

* removed django-jquery

* Revert "removed django-jquery"

This reverts commit eedf0671965130f29e36c064c9afa10c2b7262b7.

* removed django-jquery again

* disabled reCaptcha on tests

Bug Fixes

- Fix typo in contributing docs ([1075](https://github.com/ocadotechnology/rapid-router/pull/1075),
[`3cc8cb1`](https://github.com/ocadotechnology/rapid-router/commit/3cc8cb1b617db71bbf89f735bf9a3b7e1d9a1b93))

* fix: Fix typo in contributing docs

Features

- Run futurize stage2 to theoretically support Python 3 (whilst still supporting Py2)
([1072](https://github.com/ocadotechnology/rapid-router/pull/1072),
[`1f9dfab`](https://github.com/ocadotechnology/rapid-router/commit/1f9dfab3efa2099955e9f31b739da61c246980ef))

* Futurize /game python files

* Futurize views

* Futurize test files and compilers files

* Merge branch 'master' into port_to_python_3

* futurize stage 2 with unicode literals

Signed-off-by: Niket <niket.shah1ocado.com>

* install python-future

* Revert "futurize stage 2 with unicode literals"

This reverts commit 901176a76578ddd09ea0b119c4bf6d3cbc91717c.

* Run futurize stage2

* Update Pipfile.lock

Bug Fixes

- Rapid Rudolph is coming to town
([1070](https://github.com/ocadotechnology/rapid-router/pull/1070),
[`465849e`](https://github.com/ocadotechnology/rapid-router/commit/465849e9b23c09a290b542c9967656256c28588e))

* fix: Rapid Rudolph is coming to town

Revert "Rapid Rudolph back to the North Pole - Fixes 942 (943)"

This reverts commit cc7aac20b734bbd91d094d3be12552cbb973501d.

Conflicts: game/theme.py

* Merge branch 'master' into rapid_rudolph_2019

Bug Fixes

- Install master branch of portal
([1071](https://github.com/ocadotechnology/rapid-router/pull/1071),
[`dd6e111`](https://github.com/ocadotechnology/rapid-router/commit/dd6e1111dc35e21413331a555e46a1b639ef7866))

* fix: Install master branch of portal

Build System

- **deps**: Bump django-js-reverse from 0.6.1 to 0.9.1
([1066](https://github.com/ocadotechnology/rapid-router/pull/1066),
[`120118c`](https://github.com/ocadotechnology/rapid-router/commit/120118ca87e94d6e3e683164b98995802bae625c))

* build(deps): bump django-js-reverse from 0.6.1 to 0.9.1

Bumps [django-js-reverse](https://github.com/ierror/django-js-reverse) from 0.6.1 to 0.9.1. -
[Release notes](https://github.com/ierror/django-js-reverse/releases) -
[Changelog](https://github.com/ierror/django-js-reverse/blob/master/CHANGELOG.rst) -
[Commits](https://github.com/ierror/django-js-reverse/compare/v0.6.1...v0.9.1)

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

* Update Chromedriver version in Travis

* Update pipfile lock

Features

- Upgrade to Django 1.11.24 ([1055](https://github.com/ocadotechnology/rapid-router/pull/1055),
[`511af78`](https://github.com/ocadotechnology/rapid-router/commit/511af78816269d37846aba7232c65273796f62b1))

* upgrade django to 1.11

* pointed to portal upgrade branch

* Merge remote-tracking branch 'origin/master' into django111

* Merge branch 'master' into django111

* Initialise selenium in selenium test case

* use pytest

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

* install dependencies from Pipfile on travis

* stop on fail for testing

* isntall lower version of selenium

* upgrade django selenium clean

* update code to be compatible with django selenium clean 0.3.2

* update chromedriver

* use staticliveservertestcase

* collect files anyways

* Use live server test case

* fix import error

* Update Pipfile.lock

* print page source

* see what the login page looks like after the login fails

* put print on correct test

* add more travis debugging

* correct code split

* add more deubgging statements

* add more debugging

* always log on

* Revert "always log on"

This reverts commit abaac8c568ce27c72bb93b90572c10b95e66c91d.

* Extend teardown function to log out after tests end

* Revert "stop on fail for testing"

This reverts commit 7db4b277c74430dbd322aee28e024021ec3cb104.

Conflicts: .travis.yml Pipfile.lock

* Removed unnecessary libraries + move coverage to Travis only

* Bring back static collection

* dummy commit to unblock Travis

* Upgrade Selenium

* Add pytest-cov to Travis

* Remove blank line