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

..

views

Merge branch 'master' into remove-code-that-handled-old-new-job-api

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

__init__.py

…

test_add_service_form.py

Update the service name validation in the ServiceNameForm and AddServiceForm to check the email_safe version

2016-03-31 15:17:05 +01:00

test_asset_fingerprinter.py

…

test_choose_time_form.py

Add a component for picking the time to send a job

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

test_create_api_key_form.py

Talk about trial mode on API keys page

2016-08-10 17:04:22 +01:00

test_errorhandlers.py

…

test_errors_for_csv.py

Change order of errors for bad CSV files

2016-06-03 16:26:58 +01:00

test_permissions.py

Fix main_nav for platform admin

2016-03-30 11:30:18 +01:00

test_two_factor_form.py

Merging conflict with two_factor.py

2016-03-30 10:11:06 +01:00

test_user.py

…

test_validators.py

Add some explaining to the SMS sender page

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