darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-05 10:53:28 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,283 Commits 51 Branches 59 Tags
c99df69025ee1fbd9ae637d24d8d085f3435245e
Commit Graph

1283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rebecca Law
c99df69025 Merge branch 'master' into fix-permissions 
Conflicts:
	app/main/views/jobs.py
	tests/app/main/views/test_manage_users.py
 2016-03-30 10:36:55 +01:00
NIcholas Staples
1a8d4fda69 Merge pull request #357 from alphagov/remove_user_dao 
Merged with master.
 2016-03-30 10:16:09 +01:00
Nicholas Staples
48daac7b94 Merging conflict with two_factor.py 
Fixed merge mistake with two_factor.py.
 2016-03-30 10:11:06 +01:00
NIcholas Staples
62ca57a5de Merge pull request #351 from alphagov/remove_service_dao 
service_dao file has been removed and replaced with just using the se…
 2016-03-30 09:52:06 +01:00
Rebecca Law
1cfaeec7b2 Merge branch 'master' into fix-permissions 2016-03-30 09:32:24 +01:00
Rebecca Law
eb72c6e5bf Refactor unit test 2016-03-30 09:31:53 +01:00
Rebecca Law
017baca5e5 Add proper mocks for the test. 
Updated the localhost in the environment_test file so that if the tests fail if a mock is missing.
 2016-03-30 08:41:07 +01:00
Nicholas Staples
6ad7be9083 Fix test. 2016-03-29 22:50:51 +01:00
Nicholas Staples
644336b151 Merge with master. 2016-03-29 22:50:40 +01:00
Rebecca Law
a4629a290a Add view_activity to decorator. 2016-03-29 17:46:53 +01:00
Rebecca Law
99bd94799e Remove access_developer_docs permission, it doesn't make sense to need it. 
Add view_activity permission when the permissions are being editted.
 2016-03-29 17:33:12 +01:00
Adam Shimali
3e16fc1962 Merge pull request #356 from alphagov/back-after-send-bug 
After send sms or email to self or batch back button bug
 2016-03-29 17:04:54 +01:00
Adam Shimali
08d4e13185 Updated to use client instead of dao 2016-03-29 16:59:06 +01:00
Adam Shimali
0bbe35cd7d Reintroduced send sms to self test 2016-03-29 16:52:33 +01:00
Adam Shimali
f3fd5f6b15 After sending sms or email to self or batch then then back button 
does not take user to check page, but rather the start of sending
either sms or email.
 2016-03-29 16:23:01 +01:00
Rebecca Law
04c5b0187c Test the right url for choose_template 2016-03-29 15:40:33 +01:00
Adam Shimali
0ac16dd5ff Merge pull request #352 from alphagov/sign-in-bug-fix 
If user is pending it means they have not verified email yet
 2016-03-29 15:24:39 +01:00
Rebecca Law
01959b8576 Update invited user to have the view_activity permission. 
Update dashboard.html for view_activity
 2016-03-29 15:20:43 +01:00
Rebecca Law
b79901fe28 With the addition of has_permissions on the dashboard, jobs, and manage_users pages a platform admin user or a users with no permissions on the service could no longer see the page. 
A new permission has been added, view_activity, to resolve this issue.
Another pull request in notifications-admin will be required to update all users with a default permission of view_activity.
 2016-03-29 13:23:36 +01:00
Adam Shimali
db24a633c1 Better flash message for users with active accounts who click on 
verification link again.
 2016-03-29 13:21:51 +01:00
Adam Shimali
352f169fb1 If user is pending it means they have not verified email yet 
Added better checking on re use of consumed verification link.
 2016-03-29 13:12:06 +01:00
Chris Hill-Scott
3f73b4bcdb Merge pull request #350 from alphagov/click-logo-redirect 
Only show ‘Choose service’ if multiple services
 2016-03-29 11:29:03 +01:00
Chris Hill-Scott
017ce18744 Merge pull request #347 from alphagov/strip-trailing-rows 
Strip trailing CSV rows, relax phone validation
 2016-03-29 11:17:10 +01:00
Chris Hill-Scott
eb279c88d4 Only show ‘Choose service’ if multiple services 
When the user clicks ‘GOV.UK Notify’ in the header, they should, by
default, be redirected to the dashboard for their service. They should
only see the ‘Choose service’ page if they have multiple services.

This also allows some logic to be factored out of the template, so one
route now handles all this redirection.

In the future we might want to keep the last-used service in the
session, and always redirect to that. But for now, this should fix most
of the confusion for first-time users.
 2016-03-29 10:44:50 +01:00
Chris Hill-Scott
f921a2dcb6 Strip trailing CSV rows, relax phone validation 
Implements (and depends on):
- https://github.com/alphagov/notifications-utils/pull/14
- https://github.com/alphagov/notifications-utils/pull/15
 2016-03-24 20:34:24 +00:00
Adam Shimali
8a55e61dac Merge pull request #349 from alphagov/doc-change-for-notifications-api 
Fix docs to line up with api
 2016-03-24 16:24:24 +00:00
Chris Hill-Scott
ae9dded1db Merge pull request #348 from alphagov/add-pricing-skip-link 
Add skip link to jump to pricing section of help
 2016-03-24 15:59:05 +00:00
Adam Shimali
92e0fc8269 Fix docs to line up with api 2016-03-24 14:40:20 +00:00
Chris Hill-Scott
8cc9acb09b Add skip link to jump to pricing section of help 2016-03-24 14:11:11 +00:00
Chris Hill-Scott
b6170073fa Merge pull request #346 from alphagov/fix-request-to-go-live-page 
Fix request to go live page
 2016-03-24 11:26:53 +00:00
Henry Hadlow
e2fb4844c8 Fix request to go live page 
- Remove duplicate page heading
- Add `list list-bullet` classes to `ul` to get bulleted list
 2016-03-24 10:36:56 +00:00
Adam Shimali
72733a1f85 Merge pull request #342 from alphagov/new-config 
Clean up config a bit. Get values for config from environment.
 2016-03-23 15:30:46 +00:00
Adam Shimali
ecf31628c9 Set debug for test 2016-03-23 15:07:04 +00:00
Adam Shimali
3e167c69f2 Clean up config a bit. Get values for config from environment. 
Removed some old redundant config.
 2016-03-23 15:07:04 +00:00
NIcholas Staples
faaedb318d Merge pull request #338 from alphagov/service_user_permission 
Functionality added to existing endpoint without a user_has_permissio…
 2016-03-23 14:48:10 +00:00
Nicholas Staples
961ed6b362 Functionality added to existing endpoint without a user_has_permission decorator, tests passing. 
Fix tests.
 2016-03-23 14:26:12 +00:00
Chris Hill-Scott
b0939cfa63 Merge pull request #340 from alphagov/fix-for-broken-images 
Fix for images
 2016-03-23 14:15:37 +00:00
Chris Hill-Scott
920fcaae7f Fix for images 2016-03-23 14:14:50 +00:00
Chris Hill-Scott
e6a2970d3e Merge pull request #335 from alphagov/dashboard-updates 
Dashboard updates
 2016-03-23 13:53:22 +00:00
Chris Hill-Scott
45ea12e13f Improve display of failure rates 
https://www.pivotaltracker.com/story/show/116052359

- add absolute numbers for failures
- make percentages accurate to 1 decimal place (50.0%)
- make error colour appear if failures go above 3.0%
- make error colour boolean (don’t interpolate between the colours)
 2016-03-23 13:47:54 +00:00
Chris Hill-Scott
4411f8cb37 Allow custom interval on AJAX sections of page 
Some pages with AJAX should update quickly, because the data is likely
to be changing quickly, and be finished changing sooner. Other pages we
want to have tick over a bit slower.

This commit adds an optional ‘interval’ parameter to the updateContent
modules, which sets how often the page should ping the server for an
update.

It then sets the interval for the dashboard page to be 10 seconds,
rather than the default 1.5 seconds.
 2016-03-23 13:40:23 +00:00
Chris Hill-Scott
5c57f5b588 Make dashboard stats update dynamically 
https://www.pivotaltracker.com/story/show/115874485

This uses the same component as on the jobs page to make a partial
section of the page update itself periodically.
 2016-03-23 13:40:23 +00:00
Chris Hill-Scott
bb08589875 Merge pull request #323 from alphagov/add-terms-of-use 
Add Terms of use page
 2016-03-23 13:33:45 +00:00
Chris Hill-Scott
a3e3036458 Remove service-specific links and data 2016-03-23 11:23:36 +00:00
Chris Hill-Scott
bce535b15d Make external link icons appear 2016-03-23 11:19:11 +00:00
NIcholas Staples
35e093ee34 Merge pull request #337 from alphagov/remove_user_from_service 
Functionality added and all tests working.
 2016-03-23 11:03:02 +00:00
Nicholas Staples
f3689cc113 Functionality added and all tests working. 
Update correct use of permissions form.
 2016-03-23 10:56:14 +00:00
Henry Hadlow
887c97facd Add Terms of use page 2016-03-23 10:26:21 +00:00
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