Martyn Inglis ffbe94f390 Merge branch 'master' into celery-spike ...

Conflicts:
	app/notifications/rest.py

2016-02-15 11:12:07 +00:00

..

authentication

bumped client version

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

celery

Merge branch 'master' into celery-spike

2016-02-12 09:36:49 +00:00

dao

[WIP] Added endpoints under /job for creating, updating and reading

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

job

[WIP] Added endpoints under /job for creating, updating and reading

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

notifications

Merge branch 'master' into celery-spike

2016-02-15 11:12:07 +00:00

service

Change services.id to a UUID

2016-02-02 14:22:22 +00:00

status

version file has been updated to include a travis commit and time of build.

2016-02-01 11:37:22 +00:00

template

…

user

Removed alpha client imports.

2016-02-09 16:13:48 +00:00

__init__.py

Merge branch 'master' into celery-spike

2016-02-12 09:36:49 +00:00

aws_sqs.py

Return notification_id on create notification endpoints

2016-02-10 12:46:52 +00:00

encryption.py

…

errors.py

…

models.py

job on notification now nullable.

2016-02-10 11:08:24 +00:00

schemas.py

Code review fix.

2016-02-12 14:08:48 +00:00

version.py

Fix for pull request comment.

2016-02-02 11:06:22 +00:00