Commit Graph

1178 Commits

Author SHA1 Message Date
Chris Hill-Scott
c40b9872a5 Merge pull request #308 from alphagov/pricing-page
Add pricing to the help page
2016-03-21 09:58:27 +00:00
Chris Hill-Scott
2d74c89ef2 Merge pull request #306 from alphagov/add-ga
Add Google Analytics
2016-03-21 09:58:12 +00:00
NIcholas Staples
d3758b53e3 Merge pull request #305 from alphagov/api_service_permissions
Api service permissions
2016-03-21 09:54:43 +00:00
NIcholas Staples
dbe8b5b6ec Merge pull request #304 from alphagov/add_valid_email_regexes
Add valid email regexes
2016-03-21 09:54:33 +00:00
Chris Hill-Scott
e6c55158a8 Add pricing to the help page\n https://www.pivotaltracker.com/story/show/115257059 2016-03-20 10:53:23 +00:00
NIcholas Staples
ef1ec2c9a1 Merge pull request #307 from alphagov/fix_for_syntax
Syntax fix
2016-03-18 15:42:44 +00:00
Nicholas Staples
24dbdc8202 Syntax fix 2016-03-18 15:37:58 +00:00
minglis
85b63fca81 Merge pull request #295 from alphagov/resize-textbox
Make textboxes expand to fit contents
2016-03-18 15:24:55 +00:00
Chris Hill-Scott
0cda624657 Add Google Analytics
https://www.pivotaltracker.com/story/show/115861923

Makes some changes to the content security policy, to allow
the Google Analytics JS and trakcing image to be loaded,
copied from @alexmuller’s excellent work on GOV.UK:

https://gdstechnology.blog.gov.uk/2015/02/12/experimenting-with-content-security-policy-on-gov-uk/
https://github.com/alphagov/frontend/pull/733
2016-03-18 15:06:37 +00:00
Nicholas Staples
c9334bb9be Merge remote-tracking branch 'origin/master' into api_service_permissions 2016-03-18 14:43:10 +00:00
Nicholas Staples
c5efd87e31 Updated nav and choose template permissions. 2016-03-18 14:43:03 +00:00
minglis
0c43232c0c Merge pull request #287 from alphagov/notification_history_page
Notification history page
2016-03-18 14:32:55 +00:00
Nicholas Staples
4f63b68b4a merge with master 2016-03-18 12:07:50 +00:00
Nicholas Staples
8a203c0155 Valid email domains added and tests passing. 2016-03-18 12:05:50 +00:00
Martyn Inglis
b8db00d4d9 Fixing tests broken by bad revert 2016-03-18 11:46:17 +00:00
Adam Shimali
a1203d75ea Unit test bug fix. Page structure change. 2016-03-18 11:20:08 +00:00
Adam Shimali
7ee173de51 Merge pull request #293 from alphagov/single-verify-code
Changed registration flow to first send email verification link that
2016-03-18 11:03:27 +00:00
Nicholas Staples
3d08eb624b Merge with new master. 2016-03-18 10:16:14 +00:00
Chris Hill-Scott
8f0dd98d13 Remove method that maintain’s scroll parity
Since we don’t anticipate placeholder textboxes ever scrolling in the future,
this can be removed.
2016-03-18 09:24:25 +00:00
Martyn Inglis
11db35f9bd Remoevd used propeties 2016-03-18 09:19:53 +00:00
Chris Hill-Scott
0f3b0b38bc Make textboxes expand to fit contents
This applies to any textbox which has placeholders.

There are two reasons to do this:

1. Scrolling in textboxes is fiddly, especially on touch devices
2. Keeping the placeholders aligned with the textbox is fiddly too

These can both be avoided by always having the textbox be larger than its
contents so it never needs to scroll.

By default—and unlike other block-level elements—textboxes dont expand to fit
their contents. The layer with the placeholders in _does_ however, because it’s
a normal block-level element.

Since the layer with the placeholders always has an exact copy of what in the
textbox, we can set the textbox’s height to match the height of the layer with
the placeholders, and do this every time the content changes.
2016-03-18 09:19:21 +00:00
Martyn Inglis
cb570a814b Merge branch 'master' of github.com:alphagov/notifications-admin 2016-03-18 08:57:30 +00:00
Martyn Inglis
61e810fd52 Make dev run script align with prod run scripts
- we don't pass ENV into create_app anymore
2016-03-18 08:56:55 +00:00
Chris Hill-Scott
5e50be931e Merge pull request #285 from alphagov/cookie-page
Add information about cookies, add a help page
2016-03-17 17:06:01 +00:00
Martyn Inglis
d044576e08 Order of imports means the config doesn't get set up properly 2016-03-17 16:48:12 +00:00
minglis
f6ee5dc8c6 Merge pull request #292 from alphagov/update-config-for-staging-live
Start aligning Admin app with config styles used elsewhere
2016-03-17 15:42:57 +00:00
Adam Shimali
2792bece54 Changed registration flow to first send email verification link that
when visited sends sms code for second step of account verification.

At that second step user enters just sms code sent to users mobile
number.

Also moved dao calls that simply proxied calls to client to calling
client directly.

There is still a place where a user will be a sent a code for
verification to their email namely if they update email address.
2016-03-17 15:19:51 +00:00
Chris Hill-Scott
3945889e4e Add a link to help page from the trial mode banner 2016-03-17 14:58:17 +00:00
Chris Hill-Scott
774ac17ee9 Add a help page that explains trial mode
> We start in trial mode and there are a bunch of things that we need to know, so
> let's explain this with a page, accessed from the footer. Not requiring log in.
> Should explain:
> 50 messages per day
> Can only send to yourself or team members
> How to go live
> We can then link to this from the dashboard (and any other place) where we
> tell you that you're in trial mode.

https://www.pivotaltracker.com/story/show/115775751
2016-03-17 14:52:34 +00:00
Chris Hill-Scott
d1becbe1e3 Add cookie banner text, page, and footer links
> Let’s start the footer links with the cookie page.
> Banner to say: "GOV.UK Notify uses cookies to make the site simpler. Find out
> more about cookies"
> Standard style one... see
> https://www.registertovote.service.gov.uk/register-to-vote/cookies or
> https://www.digitalmarketplace.service.gov.uk/cookies
>
> Let's link to the feedback form too...
> https://docs.google.com/forms/d/1AL8U-xJX_HAFEiQiJszGQw0PcEaEUnYATSntEghNDGo/viewform
> Call it Support and feedback

https://www.pivotaltracker.com/story/show/115483375
2016-03-17 14:52:34 +00:00
Chris Hill-Scott
dcc253bf61 Merge pull request #291 from alphagov/new-dash
Put some statistics on the dashboard
2016-03-17 14:49:20 +00:00
Rebecca Law
643d047705 Fix division by zero 2016-03-17 14:40:08 +00:00
Chris Hill-Scott
b38ae08ad6 Put some statistics on the dashboard
This commit adds two new sections to the dashboard

1. A banner telling you about trial mode, including a count of how many messages
   you have left today, which is a restriction of trial mode

2. Panels with counts of how many emails and text messages have been sent in a
   day, plus the failure rates for each

It does **not**:
- link through to any further information about what trial mode is (coming
  later)
- link through to pages for the failure rates (coming later)
- change the ‘recent jobs’ section to ‘recent notifications’
2016-03-17 14:06:12 +00:00
Martyn Inglis
2473b09beb Start aligning Admin app with config styles used elsewhere
- no config overrides - now all set in environment
- use different files for staging and live too allow for differently named env variables
- updates to run_app and run_tests scripts to set correct environment (test/development) so correct config picked up
- use environment file on deployed environments to pick correct config
2016-03-17 13:45:59 +00:00
Chris Hill-Scott
d04bde5486 Add API client for notification statistic
Adds a client for the endpoints added in
67c4bd2263
2016-03-17 13:15:41 +00:00
Nicholas Staples
0411238dd9 Add in anchor link, and update link in notification history. 2016-03-17 10:59:47 +00:00
minglis
85348c05b3 Merge pull request #288 from alphagov/live-deployment
Adding live codedeploy deployment block
2016-03-17 10:08:53 +00:00
Martyn Inglis
820a9b811e Typo in bucket name 2016-03-17 09:37:10 +00:00
Martyn Inglis
9e9990edc3 Adding live codedeploy deployment block
- on same account hence same keys as staging
- differs only in deployment-group name and S3 bucket
2016-03-17 09:15:25 +00:00
Nicholas Staples
a13ecc5cb5 whoops test fixes. 2016-03-16 17:05:27 +00:00
Nicholas Staples
b0ca855ba8 Notification history page added and pagination, tests all working. 2016-03-16 16:57:10 +00:00
Nicholas Staples
f41106f4db Merge remote-tracking branch 'origin/master' 2016-03-16 16:53:55 +00:00
Rebecca Law
cc15d92aaa Merge pull request #286 from alphagov/always-return-password-resent-page
Fix to forgot password
2016-03-16 14:39:42 +00:00
Rebecca Law
271e194e1c Should show the sent password reset link page when the user is not found. 2016-03-16 14:19:41 +00:00
Chris Hill-Scott
2292ea4d15 Merge pull request #278 from alphagov/revert-201-stub-send-letters
Revert "Stub out the send letters page"
2016-03-16 11:11:31 +00:00
Adam Shimali
693433e2f8 Merge pull request #284 from alphagov/do-not-send-email
Do not send email in case of invite.
2016-03-15 17:15:15 +00:00
Adam Shimali
4adbcebc6f Do not send email in case of invite.
The user does not have to validate the email token, but it
was still being sent.
2016-03-15 16:58:26 +00:00
NIcholas Staples
4782d8ca1f Merge pull request #273 from alphagov/add_service_manager_message
added message if not templates and doesn't have ability to add templa…
2016-03-15 15:59:59 +00:00
Adam Shimali
e658793a83 Merge pull request #283 from alphagov/already-user-invite-bug-fix
Accept invite if user already part of service bug fix
2016-03-15 15:48:16 +00:00
Adam Shimali
7dca13407c Additional check needed to see if user was already a user for the
service that they were invited to.
2016-03-15 15:32:30 +00:00