Commit Graph

463 Commits

Author SHA1 Message Date
Chris Hill-Scott
8febc39669 Merge pull request #322 from alphagov/use-real-api-endpoints
Use real API endpoints in documentation
2016-03-21 17:33:33 +00:00
Chris Hill-Scott
aed600d4b5 Merge pull request #328 from alphagov/update-text-on-request-to-go-live
Update text on Request to go live page
2016-03-21 17:31:02 +00:00
Chris Hill-Scott
ccf3cfebcf Merge pull request #326 from alphagov/dashboard-link-to-jobs
Updated the dashboard link to jobs to be more accurate
2016-03-21 17:28:59 +00:00
Chris Hill-Scott
a32fd36b1b Use real API endpoints in documentation
There is no need to make the API endpoints environment-specific. But it
is still useful to know what the endpoint is.

Also fixes a broken link on the integration page.
2016-03-21 16:36:15 +00:00
Henry Hadlow
e4ba3c8a7b Update text on Request to go live page 2016-03-21 16:17:20 +00:00
Rebecca Law
abef0ae793 Add all-services link for platform admin user on the choose-services page 2016-03-21 16:06:48 +00:00
Rebecca Law
300cdf00bd Added more test for the side nav 2016-03-21 15:36:47 +00:00
Pete Herlihy
68dd66e7e4 Changed references to sent text messages, to say batch messages 2016-03-21 15:25:04 +00:00
Pete Herlihy
c122e75903 Changed references to sent text messages, to say batch messages 2016-03-21 15:23:46 +00:00
Adam Shimali
b775b60633 In registration flow then request resend of sms should
redirect to verify not two-factor.
2016-03-21 14:00:05 +00:00
Rebecca Law
9270d1722b Merge branch 'master' into platform-admin 2016-03-21 13:51:27 +00:00
Adam Shimali
792b42017a Revert "In registration flow If new sms requested then check and send redirected to two factor" 2016-03-21 13:44:53 +00:00
minglis
234fe387df Merge pull request #315 from alphagov/change-column-headings
Few changes to column headings for clarity
2016-03-21 13:40:16 +00:00
Chris Hill-Scott
5e393c3976 Merge pull request #310 from alphagov/remove-delete-link
Remove ‘delete this service’ link
2016-03-21 13:32:42 +00:00
Chris Hill-Scott
849c5718bc Merge pull request #316 from alphagov/title-help-page
Fixed the title tag on the help page
2016-03-21 13:30:53 +00:00
Rebecca Law
8ab4a5b150 Merge branch 'master' into platform-admin
Conflicts:
	tests/app/main/views/test_dashboard.py
2016-03-21 13:23:46 +00:00
Chris Hill-Scott
304b411bd5 Merge pull request #309 from alphagov/move-documentation-page
Move documentation into footer, not behind login
2016-03-21 13:14:04 +00:00
Pete Herlihy
7db4f2fe60 Fixed the title tag on the help page
It was showing Cookies.
2016-03-21 13:13:28 +00:00
Martyn Inglis
1f7b3a0ad4 Few changes to column headings for clarity
- Removed "Failed" and "Total costs" on jobs page
- Changed "Sent" to "Processed" on jobs page.
- Removed "sent" from dashboard page on jobs table.
2016-03-21 13:07:12 +00:00
Adam Shimali
c2c98248a1 If new sms requested, then check and send redirected to two factor
in all cases but should have redirected to verify for pending users.
2016-03-21 12:32:07 +00:00
Rebecca Law
a1ef676fab Merge branch 'master' into platform-admin
Conflicts:
	app/main/views/send.py
2016-03-21 12:18:44 +00:00
Chris Hill-Scott
93b85fc342 Remove ‘delete this service’ link
> We have an option to delete a service, which looks good, but then
> doesn't delete the service.
>
> Until we have the ability to delete, let's ged rid of the link.

https://www.pivotaltracker.com/story/show/115775329
2016-03-21 10:55:32 +00:00
Chris Hill-Scott
2c3c802d5c Move documentation into footer, not behind login
https://www.pivotaltracker.com/story/show/115775183
2016-03-21 10:39:57 +00:00
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
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
Rebecca Law
13d9acf7dd Completion of the platform admin user story. 2016-03-18 16:20:37 +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
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
Rebecca Law
d003dc4aa9 [WIP]: fixing unit tests 2016-03-18 10:49:22 +00:00
Nicholas Staples
3d08eb624b Merge with new master. 2016-03-18 10:16:14 +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
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
Nicholas Staples
0411238dd9 Add in anchor link, and update link in notification history. 2016-03-17 10:59:47 +00:00
Rebecca Law
b28fbc16d7 A platform admin user is able to see a list of all services.
Each service on the list is linked to the dashboard page of the service.
The platform admin user can see/edit templates, see/invite users, see/edit service settings.
The platform admin user can not send messages, see/edit api keys and developer docs.
2016-03-17 10:46:47 +00:00
Nicholas Staples
b0ca855ba8 Notification history page added and pagination, tests all working. 2016-03-16 16:57:10 +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
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
Rebecca Law
5ae582f9be Remove reference to deleted endpoint 2016-03-15 12:02:03 +00:00