Martyn Inglis 530c8a2faa Fixed merge issues

2016-02-22 13:27:47 +00:00

..

authentication

Fix all other dependant classes that are affected by the DAO / Service / Model changes

2016-02-19 15:54:11 +00:00

celery

Fixes added.

2016-02-22 13:02:09 +00:00

dao

Refactored the services dao to be a little cleaner

2016-02-19 15:53:15 +00:00

job

Update config

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

notifications

Setup celery config

2016-02-17 10:22:25 +00:00

service

Generate the email_from from the service name.

2016-02-19 17:07:59 +00:00

template

…

user

Fixed merge issues

2016-02-22 13:27:47 +00:00

__init__.py

…

conftest.py

Merge branch 'master' into email-templates

2016-02-22 13:12:24 +00:00

test_encryption.py

…