Codeforlife-portal

Feature

* feat: Dotmailer integration (1168)

* update pipfile.lock

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

* Replace add_to_salesforce with add_to_dotmailer

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

* inject dotmailer preferences through settings

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

* add pytest-mock

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

* add test for add_to_dotmailer

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

* run black

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

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

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

Conflicts:
Pipfile.lock

* Merge branch &39;master&39; into dotmailer_integration ([`5946d97`](https://github.com/ocadotechnology/codeforlife-portal/commit/5946d976390f2b3cdb3279da46c8a153c570c0c2))

Fix

* fix: Remove ratelimit (1177)

* fix: Remove ratelimit

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

Feature

* feat: Add django-hijack to admin pages (1173)

* Test django-hijack

* Make hijack subnav fit with our styles

* Move hijack buttons to individual models

* Remove front page news model

* Make migration

* Install modules

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

Conflicts:
portal/admin.py
portal/models.py

* Disable logout button when hijacked

* Fix versions and run Black

* Add migration test ([`6d2aa16`](https://github.com/ocadotechnology/codeforlife-portal/commit/6d2aa1690fa99db624e60a6df57fbf01c9a84f64))

Fix

* fix: Replace __unicode__ with __str__ in models (1172)

* fix: Replace __unicode__ with __str__ in models

* Run Black

* Revert to random username + add more model filters ([`87ce52e`](https://github.com/ocadotechnology/codeforlife-portal/commit/87ce52e28e07b9ef9cd44a506b7564cf6a36bc5a))

Fix

* fix: Use same logic as aimmo for game creation (1167)

* fix: Use same logic as aimmo for game creation

* Try manually installing latest aimmo to see if that&39;s the problem

* Install latest versions of aimmo and rapid-router in Travis ([`2a936d5`](https://github.com/ocadotechnology/codeforlife-portal/commit/2a936d54cd6e0582ffefe31511ce37f7922c646c))

Fix

* fix: Strengthen random password generator (1165)

* fix: Strengthen random password generator ([`a4a3290`](https://github.com/ocadotechnology/codeforlife-portal/commit/a4a3290e95c8e3deea9669f55f46d25b34a05f0d))