Martyn Inglis cb265896a7 Merge branch 'master' into move-sms-notifications-into-celery ...

Conflicts:
	app/__init__.py
	tests/conftest.py

2016-02-17 09:14:37 +00:00

..

authentication

bumped client version

2016-02-09 18:48:02 +00:00

celery

Don't send the SMS if we have failed to save in the database

2016-02-16 17:42:04 +00:00

dao

Fixed up the get_notitication endpoint

2016-02-16 11:22:44 +00:00

job

Update config

2016-02-16 16:01:50 +00:00

notifications

Building tests for the tasks class

2016-02-16 17:17:02 +00:00

service

Fix a intermittent test.

2016-02-10 13:09:36 +00:00

template

…

user

…

__init__.py

…

conftest.py

Don't send the SMS if we have failed to save in the database

2016-02-16 17:42:04 +00:00

test_encryption.py

Extracted serialiser for encryption into a flask module

2016-02-16 15:28:30 +00:00