Commit Graph

4447 Commits

Author SHA1 Message Date
Rebecca Law
5e175954d2 Merge pull request #1600 from alphagov/add-letters-to-platform-admin
Add letter counts to the platform admin page.
2017-11-02 10:16:02 +00:00
Leo Hemsted
e6f5b08f21 Merge pull request #1592 from alphagov/load-service-err
make sure load_service_before_request handles 404s
2017-11-01 16:47:25 +00:00
Leo Hemsted
80b5af6ed9 Merge branch 'master' into load-service-err 2017-11-01 16:43:51 +00:00
Leo Hemsted
6742560b33 Merge pull request #1599 from alphagov/new-acc-email-validation
New account verification emails no longer call API
2017-11-01 16:43:04 +00:00
Pete Herlihy
1d2b761161 Merge pull request #1597 from alphagov/100-102
100-102 for GOV.UK Email and SSCSA
2017-11-01 16:38:56 +00:00
Rebecca Law
4acfd4101f Add letter counts to the platform admin page.
The big number counts are based on how many messages have been delivered. For letters we are using the requested count.
2017-11-01 16:33:06 +00:00
Leo Hemsted
9eb5e6a532 make sure invite tokens still check token on admin for error handler to kick in 2017-11-01 16:17:04 +00:00
Leo Hemsted
19f731ec07 add error handler that catches invalid tokens, and returns 404 2017-11-01 15:47:05 +00:00
Leo Hemsted
aff9d47323 don't hit API when checking new account email-token
we currently store new account email verify tokens in the database, and
check against that to work out if they've expired. But we don't need to
do that, tokens have their own timing mechanism. So lets just use that,
and free up the database to do other things.

Also, standardised the forgot password, change email, and new account
email verification timeouts to all be an hour, from the config val
'EMAIL_EXPIRY_SECONDS'
2017-11-01 15:32:24 +00:00
Pete Herlihy
fafb8dc75b 100-102 for GOV.UK Email and SSCSA 2017-11-01 14:50:15 +00:00
Pete Herlihy
756bdd3181 Merge pull request #1595 from alphagov/98-100
98 to 100 services..... woo hoo....
2017-10-31 16:13:44 +00:00
Pete Herlihy
061ef3dddc 98 to 100 services..... woo hoo....
Also corrected the org count to 44 as HM Passports Office isn't a separate org from Home Office.
2017-10-31 12:27:34 +00:00
Chris Hill-Scott
e665f35acc Merge pull request #1590 from alphagov/pyup-update-pytz-2017.2-to-2017.3
Update pytz to 2017.3
2017-10-31 09:12:38 +00:00
Chris Hill-Scott
1f035cb2d7 Merge pull request #1589 from alphagov/analytics-failwhale
Standardise analytics code on failwhale
2017-10-31 09:04:32 +00:00
Leo Hemsted
0c7bc350d7 Merge pull request #1593 from alphagov/fix-auth-rollout
add auth_type default to InvitedUser object
2017-10-30 17:43:57 +00:00
Leo Hemsted
273b864dce add auth_type default to InvitedUser object
we unpack the api invited user rest endpoint results straight into the
InvitedUser object, so we should make sure that any fields added to
the api response are mentioned here
2017-10-30 17:38:50 +00:00
Leo Hemsted
3128b5424d make sure load_service_before_request handles 404s
if it 404s, because the service id doesn't exist, then it should die
gracefully (showing a 404 error page), rather than what it currently
does, which is die kicking and screaming with a 500
2017-10-30 16:59:24 +00:00
Chris Waszczuk
76730579e1 Merge pull request #1591 from gov-cjwaszczuk/master
Fixed broken edit functionality
2017-10-30 15:40:32 +00:00
chrisw
d02cd67b0d Fixed broken edit functionality 2017-10-30 15:31:35 +00:00
pyup-bot
2ec3c26b2e Update pytz from 2017.2 to 2017.3 2017-10-30 14:25:43 +00:00
Chris Waszczuk
dd88d007e1 Merge pull request #1580 from gov-cjwaszczuk/master
Added Multiple SMS sender functionality
2017-10-30 13:49:21 +00:00
chrisw
4e721c95ce Added Multiple SMS sender functionality 2017-10-30 13:40:34 +00:00
Chris Hill-Scott
3b272e3d8d Standardise analytics code on failwhale
Missed this page when doing 62fcc2429f
2017-10-30 11:48:44 +00:00
Leo Hemsted
8ec50971eb Merge pull request #1588 from alphagov/email-auth-toggle
Email auth toggle
2017-10-27 15:00:20 +01:00
Leo Hemsted
fcef77738c add test to make sure all buttons are plat admin only 2017-10-27 14:34:38 +01:00
Leo Hemsted
69b766b3c9 test on python3.5 2017-10-27 13:10:12 +01:00
Chris Hill-Scott
090622cc36 Merge pull request #1586 from alphagov/multipler
Fix spelling mistake on pricing page
2017-10-27 13:05:19 +01:00
Chris Hill-Scott
aaad23d895 Merge pull request #1583 from alphagov/add-ga-settings
Standardise Google Analytics tracking across GaaP
2017-10-27 13:05:07 +01:00
Chris Hill-Scott
b3d4da129a Merge pull request #1587 from alphagov/search-console
Add Google search console verification code
2017-10-27 13:04:56 +01:00
Leo Hemsted
ba07fcff2d move all mocks and things to the fixture to avoid duplication 2017-10-27 12:07:22 +01:00
Leo Hemsted
151605180a Add email auth platform admin toggle
also added tests to check visibility, url, and button content
2017-10-27 11:44:40 +01:00
Chris Hill-Scott
36423d71e7 Add Google search console verification code
This proves to Google search console that we own this domain, and will let us start getting some more insights about how and when Notify appears in search results.
2017-10-27 11:33:10 +01:00
Leo Hemsted
0ea68f9c6d fix linter errors 2017-10-27 10:56:03 +01:00
Chris Hill-Scott
5fd4778e87 Fix spelling mistake on pricing page 2017-10-27 09:10:29 +01:00
Pete Herlihy
e049243c7d Merge pull request #1585 from alphagov/90-96
90 96
2017-10-26 16:20:00 +01:00
Pete Herlihy
5f57d3ddaf And now 98..... Local Land Charges 2017-10-26 16:19:44 +01:00
Pete Herlihy
2e9733460a And acutally 97 now for UC Transfers Mgmt 2017-10-26 14:41:34 +01:00
Pete Herlihy
c387854920 90-96 services and 41-45 orgs 2017-10-26 14:16:04 +01:00
Pete Herlihy
b4fccc02ea Merge pull request #1584 from alphagov/strapline
Better strapline on the homepage
2017-10-26 14:10:20 +01:00
Pete Herlihy
81978e071c Better strapline on the homepage 2017-10-26 12:58:02 +01:00
Chris Hill-Scott
828c2de475 Merge pull request #1581 from alphagov/not-set-not-none
Look for correct text when determining text colour
2017-10-26 12:28:11 +01:00
Chris Hill-Scott
a94bdfa366 Merge pull request #1582 from alphagov/show-letters-contact-with-linebreaks
Tidy up layout of letter contact blocks
2017-10-26 12:28:00 +01:00
Chris Hill-Scott
62fcc2429f Standardise Google Analytics tracking across GaaP
These are the settings that our analytics person has said we should be
using across all the GaaP products.

This commit also makes sure our tracking code is identical across all
the templates that have it in (including the obsfucation of UUIDs). We
may want to remove the ID obsfucation later on, but for now let’s make
sure it’s happening consistently in all the places.
2017-10-26 11:11:05 +01:00
Chris Hill-Scott
127c381d22 Tidy up layout of letter contact blocks
Linebreaks are an important part of the letter contact block, and make
it easier to read.

Bold text works for short pieces of info like email addresses or phone
numbers, but is too heavy for the letter contact blocks because they
tend to be longer.
2017-10-25 11:46:12 +01:00
Chris Hill-Scott
a51059e174 Look for correct text when determining text colour
We used to say ‘None’ if this was empty. Now we say ‘Not set’. The thing
that decides whether to make the text grey or not was looking for ‘None’
(the old thing).
2017-10-24 17:15:16 +01:00
Chris Hill-Scott
2386a05cb7 Merge pull request #1579 from alphagov/right-align-reply
Right-align reply link in conversation view
2017-10-24 12:24:14 +01:00
Chris Hill-Scott
056c88be2a Merge pull request #1534 from alphagov/collect-service-type
Collect organisation type when user creates a service and use it to calculate text message allowance
2017-10-24 12:24:07 +01:00
Chris Hill-Scott
e49693281a Right-align reply link in conversation view
So that it lines up with the outbpund messages.

Also the ‘send’ button is usually right-aligned when using Whatsapp,
iMessage, etc.
2017-10-24 12:00:51 +01:00
Rebecca Law
e1ca1c02b2 Merge pull request #1568 from alphagov/improve-platform-admin
Improve the performance of /platform-admin
2017-10-24 11:51:25 +01:00
Rebecca Law
aaeec3f7ac Remove the extra function - oops 2017-10-24 11:35:30 +01:00