Rebecca Law 6f338f17ac Merge branch 'master' into invitation ...

Conflicts:
	scripts/run_celery.sh

2016-02-29 16:14:35 +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

Add subject line to the invitation email.

2016-02-29 16:12:12 +00:00

dao

[WIP] invited user now has comma separated permission values

2016-02-29 14:05:02 +00:00

invite

Merge branch 'master' into invitation

2016-02-29 16:14:35 +00:00

job

Fix for git commit review.

2016-02-29 11:50:43 +00:00

notifications

Working permissions and all tests passing.

2016-02-26 15:00:29 +00:00

permissions

Default permissions added on service creation. All tests working.

2016-02-26 17:11:30 +00:00

service

Default permissions added on service creation. All tests working.

2016-02-26 17:11:30 +00:00

template

Changed error format on template subject duplication error

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

user

Manage template permission added. All tests passing.

2016-02-29 15:21:35 +00:00

__init__.py

Move job processing into celery

2016-02-24 17:12:30 +00:00

conftest.py

[WIP] invited user now has comma separated permission values

2016-02-29 14:05:02 +00:00

test_csv.py

Renamed the header of the CSV to 'to' from 'number' to allow for email jobs

2016-02-25 09:59:50 +00:00

test_encryption.py

Extracted serialiser for encryption into a flask module

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