Rebecca Law 39c9d9ebe9 Merge branch 'master' into refactor-query-filters ...

Conflicts:
	app/permission/rest.py

2016-06-16 10:26:17 +01:00

..

authentication

…

celery

Rename first send_email to send_email_v1.

2016-06-13 16:16:56 +01:00

clients

tests for send_sms through mmg/firetext

2016-06-01 15:59:44 +01:00

dao

Change endpoint responses where there are marshalling, unmarshalling

2016-06-15 14:37:51 +01:00

events

…

invite

…

job

…

notifications

move all send_notification tests to separate file

2016-06-15 12:27:57 +01:00

provider_details

…

service

API recieves full set of permissions names on create of user

2016-06-06 12:37:06 +01:00

status

…

template

Order templates by newest created first

2016-06-06 10:44:40 +01:00

template_statistics

fix template api tests being inconsistent by adding ordering

2016-06-09 11:24:04 +01:00

user

Change endpoint responses where there are marshalling, unmarshalling

2016-06-15 14:37:51 +01:00

__init__.py

…

conftest.py

Use notify to send email verification

2016-06-13 14:57:41 +01:00

test_encryption.py

…

test_schemas.py

add test file for schemas

2016-06-10 16:34:20 +01:00