Chris Hill-Scott
0435015211
Merge pull request #332 from alphagov/make-permissions-checkboxes
...
Set permissions with checkboxes, not yes/no inputs
2016-03-22 17:42:34 +00:00
Chris Hill-Scott
c138a4a5e0
Set permissions with checkboxes, not yes/no inputs
...
The yes/no pattern didn’t work too well, because:
- it didn’t read naturally as a question and answer
- often users left them completely unclicked if they didn’t want to set
the permission (rather than clicking no)
This commit changes both the invite and edit user pages to use
checkboxes to set permissions. If also rewords these pages to read more
naturally, and explain what the permissions mean.
This meant changing some of the view logic around invites and
persmissions, and I ended up refactoring a bunch of it because I found
it hard to understand what was going on.
2016-03-22 17:18:43 +00:00
Chris Hill-Scott
bb168c5e8d
Merge pull request #325 from alphagov/view_only_team_members
...
View only team members
2016-03-22 15:53:02 +00:00
Adam Shimali
8fc154d3d2
When user clicks on verification link but doesn't complete
...
verification, if they try to use link again the code will
have been used. Therefore they will need a new email with new
link to use for verification.
2016-03-22 13:43:44 +00:00
Nicholas Staples
42eac5c359
Merge with master.
2016-03-21 16:48:40 +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
Nicholas Staples
a482fac02a
Manage team, now has a view only version of the page which requires no permissions.
2016-03-21 15:25:19 +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
Rebecca Law
a66f634d9b
Added a test for the all_services view
2016-03-21 13:50:56 +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
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
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
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
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
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
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
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
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
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
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
Rebecca Law
7eb4bcc592
Remove unused method
...
Added more tests
2016-03-17 14:25:28 +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
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
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
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
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
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