Rebecca Law a1ef676fab Merge branch 'master' into platform-admin ...

Conflicts:
	app/main/views/send.py

2016-03-21 12:18:44 +00:00

..

api-keys

…

dashboard

Add a link to help page from the trial mode banner

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

jobs

…

service-settings

…

user-profile

Valid email domains added and tests passing.

2016-03-18 12:05:50 +00:00

add-service.html

…

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

…

cancelled-invitation.html

…

check.html

Don’t mix errors with valid rows

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

choose-service.html

…

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

…

forgot-password.html

Valid email domains added and tests passing.

2016-03-18 12:05:50 +00:00

help.html

Add pricing to the help page\n https://www.pivotaltracker.com/story/show/115257059

2016-03-20 10:53:23 +00:00

invite-user.html

Valid email domains added and tests passing.

2016-03-18 12:05:50 +00:00

manage-users.html

Completion of the platform admin user story.

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

new-password.html

…

notification.html

…

notifications.html

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

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

password-reset-sent.html

…

register-from-invite.html

…

register.html

Valid email domains added and tests passing.

2016-03-18 12:05:50 +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

…

signin.html

…

styleguide.html

…

text-not-received-2.html

…

text-not-received.html

…

two-factor.html

…

user-profile.html

…

verification-not-received.html

…

verify-mobile.html

…