Martyn Inglis 1ad2665bfe Merge branch 'master' into remove-code-that-handled-old-new-job-api ...

Conflicts:
	app/main/views/jobs.py
	app/notify_client/job_api_client.py

2016-09-05 14:29:58 +01:00

..

__init__.py

…

test_accept_invite.py

remove get_statistics_for_service from statistics_api_client

2016-07-20 15:54:30 +01:00

test_add_service.py

Don’t create an example email template

2016-07-01 13:26:57 +01:00

test_all_services.py

…

test_api_keys.py

Always use 12h times

2016-08-31 16:58:34 +01:00

test_choose_services.py

…

test_code_not_received.py

Merge branch 'master' into more_wording_changes

2016-08-22 12:54:10 +01:00

test_dashboard.py

Sort scheduled jobs so soonest is first

2016-08-31 16:59:24 +01:00

test_email_preview.py

Add a ‘private’ preview email template endpoint

2016-07-12 16:46:46 +01:00

test_feedback.py

handle if user doesn't provide name/email

2016-08-04 18:01:08 +01:00

test_forgot_password.py

…

test_headers.py

Allow images to be served from live domain

2016-07-12 16:46:46 +01:00

test_index.py

…

test_jobs.py

Show message on job page if job is scheduled

2016-08-31 16:58:52 +01:00

test_manage_users.py

Tidy layout of team page

2016-07-07 12:43:35 +01:00

test_new_password.py

…

test_platform_admin.py

added tests for reworked platform admin page

2016-08-24 17:39:20 +01:00

test_providers.py

…

test_register.py

If a user has already registered with the email they will get a different email when the register again.

2016-07-12 11:53:30 +01:00

test_send.py

Don’t allow test messages to be scheduled

2016-08-31 16:59:04 +01:00

test_service_settings.py

Make email branding settings a table

2016-08-24 15:26:04 +01:00

test_sign_in.py

…

test_sign_out.py

remove get_statistics_for_service from statistics_api_client

2016-07-20 15:54:30 +01:00

test_styleguide.py

…

test_template_history.py

Link back to all template versions from 1 version

2016-06-12 14:35:58 +01:00

test_templates.py

Fixed formatting issues

2016-09-05 13:38:47 +01:00

test_two_factor.py

Change 'verification code' to 'security code'

2016-08-22 11:46:07 +01:00

test_user_profile.py

…

test_verify.py

Change 'verification code' to 'security code'

2016-08-22 11:46:07 +01:00