Martyn Inglis 9fbd410474 Merge branch 'master' into use_new_template_stats_endpoint ...

Conflicts:
	app/notify_client/template_statistics_api_client.py

2016-08-22 16:47:42 +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

separate detailed and normal service_api_client.get_service

2016-07-20 14:12:22 +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

Admin app now in line with new API response for template statistics

2016-08-22 13:14:35 +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

Rewrite prev/next test to use BeautifulSoup

2016-08-05 11:33:32 +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

Platform admin: Highlight service in research mode

2016-06-23 17:47:19 +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

Merge pull request #859 from alphagov/point-documentation-at-clients

2016-08-11 16:44:14 +01:00

test_service_settings.py

separate branding/org test into two tests

2016-08-16 14:46:59 +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

Don’t show send/edit links for deleted template

2016-07-01 13:35:48 +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