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
Martyn Inglis
07bb074bd3
Remove usnused things from the template call
2016-03-21 13:31:53 +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
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
461b374f68
Do not throw 404 if email address is not found on sign in.
...
https://www.pivotaltracker.com/story/show/115947639
2016-03-21 11:48:16 +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
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
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
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
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
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
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
minglis
803cb60402
Merge pull request #267 from alphagov/set-up-api-integration-link
...
Add page explaining how to send template using API
2016-03-15 12:03:02 +00:00
Martyn Inglis
98833497dd
Merge branch 'master' of github.com:alphagov/notifications-admin
2016-03-15 09:36:52 +00:00
Chris Hill-Scott
9827c83879
Revert "Stub out the send letters page"
...
Reverts alphagov/notifications-admin#201
2016-03-15 08:33:51 +00:00
Chris Hill-Scott
8e7b0edc4d
Add page explaining how to send template using API
...
Would like to test something like this and see how well it works.
Intention of having this page is so:
- template IDs are discoverable (https://www.pivotaltracker.com/story/show/115404593 )
- it’s obvious there’s an ‘automated’ way to send messages, as well as the CSV
way (we’ve seen people oblivious to this in research)
2016-03-15 07:11:01 +00:00
Martyn Inglis
71abecf34c
Merge branch 'master' of github.com:alphagov/notifications-admin
2016-03-14 17:06:19 +00:00
Adam Shimali
8561391cd2
The verify view was not passing along the next param to the two factor
...
view.
Now if it is passed and it is a url on the same domain that request
originates from then it is used.
2016-03-14 16:58:39 +00:00
Chris Hill-Scott
91b4545adc
Don’t mix errors with valid rows
...
Brings in: https://github.com/alphagov/notifications-utils/pull/11
Changes the number of rows shown to be at most 15 (either 15 rows with errors
or 15 valid rows.
2016-03-14 16:53:21 +00:00
Martyn Inglis
6c5f9f4cb2
Fix ordering of jobs
2016-03-14 16:50:02 +00:00
Adam Shimali
67484d3f35
Merge pull request #269 from alphagov/invite-registration-sms-only
...
Change new invite registration flow to only need
2016-03-14 10:55:31 +00:00
Chris Hill-Scott
a4d00cf67e
Merge pull request #266 from alphagov/better-placeholder-guidance
...
Fix bugs and gripes with adding and editing templates
2016-03-14 10:45:00 +00:00
Chris Hill-Scott
144de21745
Make nav and page headings reflect permissions
...
> If you have the Edit templates permission but not the Send messages permission, the navigation should read
>
> - Text message templates
> - Email templates
> - Letter templates
>
> The page headings should also read
>
> - Text message templates
> - Email templates
> - Letter templates
respectively
https://www.pivotaltracker.com/story/show/115488955
2016-03-14 10:39:53 +00:00
Chris Hill-Scott
370fd68a2c
Fix innaccurate headings on add/edit template page
...
The same `.html` file is shared between adding a template and editing a
template.
The page heading needs to be contextual to the URL, either ‘add’ or ‘edit’.
Somewhere along the way this got lost; this commit reinstates it.
2016-03-14 10:39:52 +00:00
Adam Shimali
164bdad4f2
Change new invite registration flow to only need
...
sms for verification.
This may change again soon with story to split 2 factor
pages, but for now is correct.
2016-03-14 09:43:34 +00:00
Rebecca Law
6e3bf97af4
Remove services_dao.insert_new_service.
...
Update api_client.create_service to return the service id.
Fix unit tests.
2016-03-13 09:37:17 +00:00
Rebecca Law
f81dccc513
Merge pull request #263 from alphagov/error-handling
...
Fix bug in error handlers.
2016-03-11 10:52:53 +00:00
Rebecca Law
f63a85d003
Fix bug in error handlers.
...
Correct spelling error
2016-03-11 10:16:06 +00:00
Chris Hill-Scott
02dfb2820d
Merge pull request #256 from alphagov/name-1-not-test-name
...
Use ‘name 1’ when sending yourself a message
2016-03-10 19:41:12 +00:00
Rebecca Law
bb82413718
Merge pull request #260 from alphagov/error-handling
...
Error handling
2016-03-10 16:29:59 +00:00
Rebecca Law
4ba801edab
Merge branch 'master' into error-handling
...
Conflicts:
app/main/views/invites.py
2016-03-10 15:03:21 +00:00
Adam Shimali
54f871dfba
Only actually call api to verify code if both are present in form.
2016-03-10 14:57:29 +00:00
Rebecca Law
735ca07dee
Handle HTTPError from API and routing errors from flask.
...
Removed catching the HTTPError where applicable.
2016-03-10 14:56:47 +00:00
Nicholas Staples
6ea8491b39
Service name uniqueness handled in all cases and tests passing.
2016-03-10 14:29:31 +00:00
Chris Hill-Scott
25103aaef0
Use ‘name 1’ when sending yourself a message
...
We reckon this is better than ‘test name’, ‘test date’, etc.
2016-03-10 12:03:26 +00:00
Adam Shimali
986edfa317
Check user invite status not accepted before proceeding with flow.
2016-03-10 11:57:40 +00:00
Rebecca Law
f6d98b63ea
Refactored register_errorhandlers so that it handles HTTPError
...
Remove most cases where we catch HTTPError
2016-03-10 11:53:29 +00:00
Adam Shimali
4c323a9a99
Added error message on template for failing to choose permissions.
...
For error message over ride from WTF forms radio field created
custom field.
2016-03-09 17:42:47 +00:00
Adam Shimali
0095e4b608
Updated from git comments. Return status code 400 for duplicate
...
email address.
2016-03-09 16:05:17 +00:00
Adam Shimali
33c92a4e29
Fix for duplicate email registration that meant flash error not being
...
displayed.
The error message does not specify the error is a duplicate email
address so as not to reveal which emails are current user accounts.
2016-03-09 16:05:17 +00:00