Martyn Inglis c51d44fe43 Merge branch 'master' into celery-jobs ...

Conflicts:
	app/main/views/sms.py

2016-02-24 15:46:38 +00:00

..

__init__.py

108537814: Implementation of 3 factor authentication.

2015-12-04 16:27:11 +00:00

api_client.py

Slight changes to match new API features:

2016-02-19 16:38:08 +00:00

api_key_api_client.py

notifications-python_client upgraded to 0.2.5

2016-02-11 15:27:08 +00:00

job_api_client.py

Merge branch 'master' into celery-jobs

2016-02-24 15:46:38 +00:00

sender.py

Working tests, hopefully all code changes done.

2016-01-27 12:22:32 +00:00

status_api_client.py

notifications-python_client upgraded to 0.2.5

2016-02-11 15:27:08 +00:00

user_api_client.py

Admin uses correct endpoint for getting user by email address.

2016-02-23 12:47:48 +00:00