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

..

api-keys

Add radio buttons for choosing the API key type

2016-07-06 10:12:20 +01:00

dashboard

Admin app uses the new API response formats.

2016-08-18 15:30:57 +01:00

jobs

Derive markup dashboard from rendered partials

2016-06-28 13:07:20 +01:00

manage-users

…

service-settings

Remove and/or from request to go live page

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

templates

Show full email template on single template page

2016-07-13 08:55:59 +01:00

user-profile

Changed some more instances of "confirmation" code to "security" code

2016-08-22 12:52:05 +01:00

add-service.html

…

all-services.html

…

api-keys.html

Replace documentation link with links to clients

2016-08-10 10:31:10 +01:00

cancelled-invitation.html

…

check.html

request stats for today from send page from GET /service/:id endpoint

2016-07-25 14:46:27 +01:00

choose-service.html

…

cookies.html

…

delivery-and-failure.html

Removed 'states are the same for email and text' blurb.

2016-07-11 15:01:28 +01:00

documentation.html

…

edit-email-template.html

Add Gwen’s initial guidance about formatting

2016-08-02 09:42:30 +01:00

edit-sms-template.html

Move template guidance underneath

2016-08-02 09:29:11 +01:00

edit-user-permissions.html

…

feedback.html

…

forgot-password.html

…

invite-user.html

…

manage-users.html

Put email address on team page

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

new-password.html

…

notification.html

…

notifications.html

Don’t let _set_status_filters mutate original list

2016-08-05 11:02:30 +01:00

password-reset-sent.html

…

platform-admin.html

Platform admin: Highlight service in research mode

2016-06-23 17:47:19 +01:00

pricing.html

mmg rates set to 1.65p

2016-07-06 16:10:19 +01:00

provider.html

…

providers.html

…

register-from-invite.html

Change 'verification code' to 'security code'

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

register.html

Change 'verification code' to 'security code'

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

registration-continue.html

Another content change from Gwen

2016-08-22 15:47:25 +01:00

resend-email-verification.html

…

send-from-api.html

Remove example personalisation from template page

2016-08-10 10:31:21 +01:00

send-test.html

Make a function for parsing help query param

2016-07-05 17:29:41 +01:00

send.html

Don’t hide the example on the send page

2016-07-01 14:27:58 +01:00

service-settings.html

Add a page to set organisation and branding option

2016-08-12 10:31:43 +01:00

signedout.html

Add beta banner to homepage

2016-07-28 09:08:15 +01:00

signin.html

Remove ‘register account’ language

2016-06-30 10:46:06 +01:00

styleguide.html

…

temp-history.html

…

terms-of-use.html

…

text-not-received-2.html

Changed some more instances of "confirmation" code to "security" code

2016-08-22 12:52:05 +01:00

text-not-received.html

Changed some more instances of "confirmation" code to "security" code

2016-08-22 12:52:05 +01:00

trial-mode.html

…

two-factor.html

Change 'verification code' to 'security code'

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

usage.html

mmg rates set to 1.65p

2016-07-06 16:10:19 +01:00

user-profile.html

Keep Last changed text.

2016-06-28 10:40:39 +01:00

verification-not-received.html

Change 'verification code' to 'security code'

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

verify-mobile.html

Merge branch 'master' into more_wording_changes

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

weekly.html

Fix page title

2016-08-05 09:40:21 +01:00