Martyn Inglis 1ad2665bfe Merge branch 'master' into remove-code-that-handled-old-new-job-api ...

Conflicts:
	app/main/views/jobs.py
	app/notify_client/job_api_client.py

2016-09-05 14:29:58 +01:00

..

__init__.py

Make _attach_current_user a pure function

2016-08-11 17:07:55 +01:00

api_key_api_client.py

Make _attach_current_user a pure function

2016-08-11 17:07:55 +01:00

events_api_client.py

…

invite_api_client.py

Make _attach_current_user a pure function

2016-08-11 17:07:55 +01:00

job_api_client.py

Merge branch 'master' into remove-code-that-handled-old-new-job-api

2016-09-05 14:29:58 +01:00

models.py

…

notification_api_client.py

…

organisations_client.py

Make email branding settings a table

2016-08-24 15:26:04 +01:00

provider_client.py

Make _attach_current_user a pure function

2016-08-11 17:07:55 +01:00

service_api_client.py

Fix admin app putting service into research mode

2016-08-23 10:16:27 +01:00

status_api_client.py

…

template_statistics_api_client.py

Merged in the defensive code by mistake

2016-08-22 16:56:43 +01:00

user_api_client.py

If a user has already registered with the email they will get a different email when the register again.

2016-07-12 11:53:30 +01:00