Martyn Inglis 886b206d63 Merge branch 'master' into email-templates ...

Conflicts:
	app/user/rest.py
	tests/app/user/test_rest.py

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

..

0001_initialise_data.py

…

0002_add_templates.py

…

0003_create_tokens.py

…

0004_create_jobs.py

…

0005_add_job_details.py

Add convenience fields to job to make processing

2016-01-16 10:14:48 +00:00

0006_add_user_details.py

Add rest of user model fields to api.

2016-01-19 11:39:59 +00:00

0007_change_to_api_keys.py

Update the down revision to the version 0006 file.

2016-01-19 12:17:01 +00:00

0008_add_verify_codes.py

All tests working, second time around.

2016-01-21 17:29:24 +00:00

0009_unique_service_to_key_name.py

Merge fix.

2016-01-22 14:52:07 +00:00

0010_add_queue_name_to_service.py

Add sms notifications from a service to a queue.

2016-01-27 17:42:05 +00:00

0011_uuid_service_id.py

Change services.id to a UUID

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

0012_add_status_to_job.py

Another migration fix

2016-02-02 17:22:24 +00:00

0013_add_notifications.py

[WIP] New model class and dao for notification. This will be used for

2016-02-09 12:03:40 +00:00

0014_job_id_nullable.py

job on notification now nullable.

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

0015_add_permissions.py

Permissions added.

2016-02-19 14:47:45 +00:00

0015_add_subject_line.py

Merge branch 'master' into email-templates

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

0016_add_email_from.py

Update model

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

0017_emailfrom_notnull.py

Update model

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

0018_unique_emailfrom.py

Update model

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

0019_unique_servicename.py

Update model

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