Rebecca Law 402f55be23 Merge branch 'master' into platform-admin ...

Conflicts:
	app/__init__.py
	app/main/views/add_service.py
	app/main/views/jobs.py
	app/templates/main_nav.html
	tests/app/main/views/test_dashboard.py
	tests/conftest.py

2016-03-18 16:32:10 +00:00

..

api-keys

Make page titles consistent

2016-02-08 09:23:51 +00:00

dashboard

Add a link to help page from the trial mode banner

2016-03-17 14:58:17 +00:00

jobs

Fix bug which prevented viewing an email job

2016-03-09 12:25:33 +00:00

service-settings

Make page titles consistent

2016-02-08 09:23:51 +00:00

user-profile

…

add-service.html

Reword the add service page

2016-02-26 13:17:58 +00:00

all-services.html

A platform admin user is able to see a list of all services.

2016-03-17 10:46:47 +00:00

api-keys.html

Add pages to invite, edit, and delete users

2016-02-22 13:39:02 +00:00

cancelled-invitation.html

Added from_user name and service name for the cancelled invitation message.

2016-03-04 15:17:04 +00:00

check.html

Don’t mix errors with valid rows

2016-03-14 16:53:21 +00:00

choose-service.html

Make page titles consistent

2016-02-08 09:23:51 +00:00

choose-template.html

Merge branch 'master' into platform-admin

2016-03-18 16:32:10 +00:00

cookies.html

Add cookie banner text, page, and footer links

2016-03-17 14:52:34 +00:00

documentation.html

Add page explaining how to send template using API

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

edit-email-template.html

Fix innaccurate headings on add/edit template page

2016-03-14 10:39:52 +00:00

edit-sms-template.html

Fix innaccurate headings on add/edit template page

2016-03-14 10:39:52 +00:00

edit-user-permissions.html

Added error message on template for failing to choose permissions.

2016-03-09 17:42:47 +00:00

forgot-password.html

Make page titles consistent

2016-02-08 09:23:51 +00:00

help.html

Add a link to help page from the trial mode banner

2016-03-17 14:58:17 +00:00

invite-user.html

Move ‘new thing’ buttons alongside heading

2016-03-14 10:39:53 +00:00

manage-users.html

Completion of the platform admin user story.

2016-03-18 16:20:37 +00:00

new-password.html

Make page titles consistent

2016-02-08 09:23:51 +00:00

notification.html

Make page titles consistent

2016-02-08 09:23:51 +00:00

notifications.html

Add in anchor link, and update link in notification history.

2016-03-17 10:59:47 +00:00

password-reset-sent.html

Make page titles consistent

2016-02-08 09:23:51 +00:00

register-from-invite.html

Display email address that invitee will be registered with.

2016-03-09 11:27:26 +00:00

register.html

Use typographic quotes

2016-02-17 10:42:14 +00:00

registration-continue.html

Changed registration flow to first send email verification link that

2016-03-17 15:19:51 +00:00

resend-email-verification.html

Changed registration flow to first send email verification link that

2016-03-17 15:19:51 +00:00

send-from-api.html

Add page explaining how to send template using API

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

send.html

Add page explaining how to send template using API

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

service_dashboard.html

Merge branch 'master' into platform-admin

2016-03-18 16:32:10 +00:00

service-settings.html

Move ‘new thing’ buttons alongside heading

2016-03-14 10:39:53 +00:00

signedout.html

Make page titles consistent

2016-02-08 09:23:51 +00:00

signin.html

Don’t allow autocomplete on register page

2016-02-17 10:41:03 +00:00

styleguide.html

Added error message on template for failing to choose permissions.

2016-03-09 17:42:47 +00:00

text-not-received-2.html

Make page titles consistent

2016-02-08 09:23:51 +00:00

text-not-received.html

Make page titles consistent

2016-02-08 09:23:51 +00:00

two-factor.html

Removed remember me checkbox

2016-03-07 14:39:20 +00:00

user-profile.html

Make page titles consistent

2016-02-08 09:23:51 +00:00

verification-not-received.html

Make page titles consistent

2016-02-08 09:23:51 +00:00

verify-mobile.html

Make page titles consistent

2016-02-08 09:23:51 +00:00