Martyn Inglis 9fbd410474 Merge branch 'master' into use_new_template_stats_endpoint ...

Conflicts:
	app/notify_client/template_statistics_api_client.py

2016-08-22 16:47:42 +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

Make _attach_current_user a pure function

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

models.py

Updated flask-login to version 0.3.2

2016-05-04 14:06:14 +01:00

notification_api_client.py

…

organisations_client.py

Add a page to set organisation and branding option

2016-08-12 10:31:43 +01:00

provider_client.py

Make _attach_current_user a pure function

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

service_api_client.py

send organisation back in correct variable

2016-08-15 11:15:49 +01:00

statistics_api_client.py

remove unused call to notification statistics

2016-08-11 12:07:50 +01:00

status_api_client.py

…

template_statistics_api_client.py

Merge branch 'master' into use_new_template_stats_endpoint

2016-08-22 16:47:42 +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