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

…

add_service.py

Don’t create an example email template

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

all_services.py

rename api_client to service_api_client

2016-07-15 15:23:23 +01:00

api_keys.py

Talk about trial mode on API keys page

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

choose_service.py

rename api_client to service_api_client

2016-07-15 15:23:23 +01:00

code_not_received.py

when not logged in, redirect to sign-in

2016-06-17 13:53:48 +01:00

dashboard.py

Sort scheduled jobs so soonest is first

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

feedback.py

handle if user doesn't provide name/email

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

forgot_password.py

…

index.py

Add a component for picking the time to send a job

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

invites.py

Change when invite gets marked as accepeted.

2016-06-08 11:52:26 +01:00

jobs.py

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

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

manage_users.py

Expand permissions to all possible values on admin before posting to

2016-06-06 12:40:21 +01:00

new_password.py

Removed unused imports

2016-05-18 14:39:06 +01:00

platform_admin.py

added tests for reworked platform admin page

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

providers.py

Removed unused imports

2016-05-18 14:39:06 +01:00

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

send.py

Don’t allow test messages to be scheduled

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

service_settings.py

Make email branding settings a table

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

sign_in.py

Change when invite gets marked as accepeted.

2016-06-08 11:52:26 +01:00

sign_out.py

Redirect to homepage after signout

2016-06-22 14:37:02 +01:00

styleguide.py

Updated notifications_utils version and associated code. Added email subject formatting for placeholders.

2016-04-14 12:00:55 +01:00

templates.py

Actually use the right exception class.

2016-08-24 12:12:19 +01:00

two_factor.py

when not logged in, redirect to sign-in

2016-06-17 13:53:48 +01:00

user_profile.py

Removed unused imports

2016-05-18 14:39:06 +01:00

verify.py

when not logged in, redirect to sign-in

2016-06-17 13:53:48 +01:00