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
Adam Shimali
10de99e97f
Merge pull request #331 from alphagov/config-fix
...
Get config values from env.
2016-03-22 10:49:22 +00:00
Chris Hill-Scott
823c258d71
Merge pull request #312 from alphagov/remove-service-name-from-email-templates
...
Only prefix SMS templates with service name
2016-03-22 10:29:47 +00:00
Adam Shimali
3b984358bb
Get config values from env.
2016-03-22 10:29:25 +00:00
Rebecca Law
43aaa85247
Merge pull request #329 from alphagov/move-history-link-up
...
Updates to side nav
2016-03-22 08:55:35 +00:00
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
Rebecca Law
de8cf23626
Renamed Notification history to View activity
...
Moved View activity under service name
No line under h2
Removed Job history from side nav
2016-03-21 17:01:31 +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
21407bb221
Merge pull request #318 from alphagov/platform-admin
...
Platform admin
2016-03-21 16:13:56 +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
b9528d49c4
Merge branch 'master' into platform-admin
2016-03-21 15:37:35 +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
de2dacfaf7
Merge pull request #320 from alphagov/verify-2-factor-bug
...
In registration flow re send sms code
2016-03-21 14:17:03 +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
Adam Shimali
774b16b7a8
Merge pull request #317 from alphagov/revert-314-verify-and-two-factor-bug-fix
...
Revert "In registration flow If new sms requested then check and send redirected to two factor"
2016-03-21 13:52:19 +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
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
Martyn Inglis
07bb074bd3
Remove usnused things from the template call
2016-03-21 13:31:53 +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
Adam Shimali
635248fa5a
Merge pull request #314 from alphagov/verify-and-two-factor-bug-fix
...
In registration flow If new sms requested then check and send redirected to two factor
2016-03-21 13:10:18 +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
Rebecca Law
18633af83c
Merge pull request #313 from alphagov/do-not-throw-404
...
Do not throw 404 if email address is not found on sign in.
2016-03-21 11:55:04 +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
c92879dba0
Only prefix SMS templates with service name
...
Implements: https://github.com/alphagov/notifications-utils/pull/13
Fixes: https://www.pivotaltracker.com/story/show/115879891
2016-03-21 11:24:43 +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
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