Commit Graph

7170 Commits

Author SHA1 Message Date
Leo Hemsted
b8c8372f77 Merge pull request #1617 from alphagov/remove-flask-script
remove flask-script
2017-11-15 17:47:30 +00:00
Leo Hemsted
ddf88b70c0 clean up logic around existing users accepting invites
* if the service issuing the invite does not have permission to edit
  auth types, don't let them do anything. This will stop them turning
  existing email_auth users back to sms auth
* if the user hasn't got a mobile number, but the invite is for sms
  login, don't do anything either. They won't have a phone number if
  they signed up via an email_auth invite previously.

in these cases, we accept the invite and add the user to the service
as normal, however, just don't update the user's auth type.
2017-11-15 17:19:32 +00:00
Athanasios Voutsadakis
9bfda11bcf Merge branch 'master' into add_proxy_header_check 2017-11-15 17:18:00 +00:00
Athanasios Voutsadakis
7d4fdba237 Fix PEP8 2017-11-15 16:56:39 +00:00
Chris Hill-Scott
8f4081bdb4 Add a hint to explain why SMS auth is unavailable
If we’re going to ‘disable’ radio buttons then we should always tell
users why the radio button is disabled.

This is what we found with the API key choices anyway.
2017-11-15 16:20:49 +00:00
Leo Hemsted
ab4504f517 fix logged in user not having auth type set from invite 2017-11-15 15:42:23 +00:00
Venus Bailey
f039e64a6d Merge pull request #1594 from alphagov/vb-free-sms-history
Use annual_billing tables at backend for getting and updating free_sm…
2017-11-15 14:57:46 +00:00
Chris Hill-Scott
fdb8ec67c1 Merge pull request #1647 from alphagov/quis-patch-1
Fix typo in tests
2017-11-15 13:30:02 +00:00
Chris Hill-Scott
d117f313a2 Fix typo in tests 2017-11-15 13:28:35 +00:00
Chris Hill-Scott
c39821f72e Merge pull request #1646 from alphagov/type-oh-no
Fix spelling mistake
2017-11-15 13:24:14 +00:00
Chris Hill-Scott
427300f201 Fix spelling mistake 2017-11-15 13:24:04 +00:00
Chris Hill-Scott
1e05e16aa1 Merge pull request #1645 from alphagov/pyup-update-pytest-3.2.3-to-3.2.5
Update pytest to 3.2.5
2017-11-15 13:13:53 +00:00
Chris Hill-Scott
6c8c76247c Merge pull request #1642 from alphagov/meta
Add a meta description tag to the product page
2017-11-15 13:07:26 +00:00
pyup-bot
96b1241806 Update pytest from 3.2.3 to 3.2.5 2017-11-15 12:05:25 +00:00
Athanasios Voutsadakis
36663bd9ac Load route_secret config 2017-11-15 12:05:05 +00:00
Chris Hill-Scott
d6fec9f921 Add named argument for clarity 2017-11-15 09:59:52 +00:00
Chris Hill-Scott
a8e62a564d Add meta description tag to homepage
Google tries to auto-generate a snippet of a site’s content to show in
search results. Currently it’s not doing a great job of this for Notify.

There’s a chance that if we give it better content in the site’s meta
description then it will use that instead. Worth a go…

The content is adapted from the blue box on the product page.

It’s 145 characters, which is within the 160 characters recommended[1]

It matches the content in the page, and contains words that users are
likely to be searching for (GOV.UK Notify, emails, text messages).

It’s only on the homepage, because it shouldn’t be duplicated across
multiple pages.

https://yoast.com/meta-descriptions/
2017-11-15 09:53:08 +00:00
Athanasios Voutsadakis
061b057f24 Merge branch 'master' into add_proxy_header_check 2017-11-14 18:02:53 +00:00
Leo Hemsted
3bb083bc89 Merge pull request #1641 from alphagov/user-profile-changes
User profile changes
2017-11-14 17:06:56 +00:00
Leo Hemsted
5353a26bbf make sure auth type is set when registering 2017-11-14 17:01:04 +00:00
Leo Hemsted
6df775fb11 use mapping_table on user-profile page 2017-11-14 16:54:53 +00:00
Leo Hemsted
1559c074d1 Merge pull request #1640 from alphagov/email-invite
Email invites!
2017-11-14 16:45:51 +00:00
venusbb
a9f06c23f7 Commit out using the new end points until data is migrated 2017-11-14 16:23:08 +00:00
Leo Hemsted
8c14113da5 only show mobile number on register from invite page if user is sms_auth
also clean up the way the form is invoked - it now populates from an
invited_user object
2017-11-14 15:53:38 +00:00
Athanasios Voutsadakis
5b978bc0f4 Bump utils version in requirements 2017-11-14 15:26:07 +00:00
Athanasios Voutsadakis
0d2adfcce2 Add basic tests 2017-11-14 15:26:03 +00:00
Leo Hemsted
c8dbd819ef add tests for registering from an email_auth invite 2017-11-14 15:18:14 +00:00
Leo Hemsted
4c39562821 make big old test give some clues about where it fails by checking response codes of requests 2017-11-14 15:18:14 +00:00
Leo Hemsted
65ba7e88c8 refactor RegisterFromInvite to make auth_type required, and update test fixtures 2017-11-14 15:18:14 +00:00
chrisw
79393c97ef Updated invite email auth user flow 2017-11-14 15:18:14 +00:00
Athanasios Voutsadakis
5574200607 Copy set_config_values from api 2017-11-14 14:51:17 +00:00
Athanasios Voutsadakis
5f0e6beb79 Add before_request to check header 2017-11-14 14:40:32 +00:00
Athanasios Voutsadakis
a7dbde39e9 Rename utils module 2017-11-14 14:38:26 +00:00
venusbb
581759931f Merge branch 'master' of https://github.com/alphagov/notifications-admin into vb-free-sms-history 2017-11-14 09:40:05 +00:00
Chris Hill-Scott
694a92e92a Merge pull request #1638 from alphagov/fix-misleading-wording-choose-sms-sender
Fix misleading wording on choose text message sender/email reply to pages
2017-11-13 12:23:36 +00:00
Chris Hill-Scott
b6b0e81349 Merge pull request #1637 from alphagov/pyup-update-pyexcel-io-0.5.3-to-0.5.4
Update pyexcel-io to 0.5.4
2017-11-13 12:23:30 +00:00
Chris Hill-Scott
23a1c388f3 Add a link to download a PDF of a sent letter
This is useful for service teams to keep a copy for their records. The
letter won’t be available in Notify once the 7 day retention period has
passed.
2017-11-13 12:17:16 +00:00
Chris Hill-Scott
87a3bd38eb Retitle choose sender page as first page in flow
We have a sort of principle that when clicking a link, the page you land
on should be titled the same as the link you clicked.

This also reduces unnecessary repetition between the page title and the
form label.
2017-11-13 11:59:39 +00:00
Chris Hill-Scott
beffb9e123 Reword choose sender/reply to address pages
Make it clear that:

- In the case of text messages, it’s about who the message comes from
- In the case of emails, it’s about where the user will reply to
2017-11-13 11:56:05 +00:00
pyup-bot
27254599e5 Update pyexcel-io from 0.5.3 to 0.5.4 2017-11-10 21:17:59 +00:00
Chris Hill-Scott
6995ddc8f5 Don’t list all letter address cols if some missing
If you’ve spelt ‘postcode’ wrong, or missed only ‘address_line_2’ then
it’s pretty noisy to be told that your file needs columns called address
line 1, address line 2, and postcode.

It’s better to be specific about which column you need to fix in order
to get past this error. As a principle, we’ve found it better to tell
get people to fix one error at a time, rather than overwhelm them with a
list of errors to correct – this is why we split the recipient column
errors out separately in the first place.
2017-11-10 10:10:34 +00:00
Chris Hill-Scott
1412933356 Make dashboard totals smaller if numbers are big
Numbers over a billion overflow the two column layout. Numbers over one
hundred thousand overflow the three column layout.

This commit makes the type size smaller in these cases, so that the
numbers still fit in the boxes.
2017-11-09 17:50:19 +00:00
Chris Waszczuk
03447c10da Merge pull request #1633 from gov-cjwaszczuk/master
Updated code used flow
2017-11-09 17:11:28 +00:00
chrisw
04f6d0a5e0 Updated code used flow 2017-11-09 17:06:57 +00:00
Chris Waszczuk
888ac5bf85 Merge pull request #1622 from gov-cjwaszczuk/master
Alter login flow to allow for email auth login
2017-11-09 16:33:32 +00:00
chrisw
0fac7125d2 Don't 'use my own number' if user doesn't have one 2017-11-09 16:09:00 +00:00
chrisw
1effec78e5 alter login flow to allow for email auth login 2017-11-09 16:07:28 +00:00
Rebecca Law
ef5f5ca43a Merge pull request #1628 from alphagov/remove-unused-code-for-sms-sender
Remove unused routes
2017-11-09 15:59:09 +00:00
Leo Hemsted
ca373e9d88 add templates in a loop 2017-11-09 15:54:49 +00:00
Leo Hemsted
724093ac19 Merge pull request #1632 from alphagov/user-activation-stuff-for-real
User activation stuff for real
2017-11-09 15:42:13 +00:00