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,304 Commits 51 Branches 59 Tags
d1665e71098ef1a2fcbc5795575e5e64e7a742db
Commit Graph

1304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Hill-Scott
d1665e7109 Make ‘get started’ work for emails and texts 
Previously the ‘get started’ block on the dashboard pushed users into
starting with a text message. This led to users writing email content
into a tet message template because it didn’t match their expectations.

Also, the ‘send yourself a test’ link from the dashboard:
- wasn’t much used, because users responded to the similar call to
  action on the choose template page instead
- was confusing if you had created an email template because it
  presupposed that you’d created a text message template

So this commit changes the ‘get started’ block to be a choice between
creating an email template or a text message template. We reckon that
the language of ‘set up’ will help establish that templates are not
equivalent to individual messages. This language is now repeated on the
‘choose template’ page when you don’t have templates as well.
 2016-04-01 07:58:23 +01:00
Martyn Inglis
51baa4a210 Adding docs folder 2016-03-31 15:02:44 +01:00
Adam Shimali
559a62889a Merge pull request #361 from alphagov/remove-flash-messages-from-invite 
Removed some un needed flash messages raised as bugs.
 2016-03-31 10:32:12 +01:00
Adam Shimali
3f57aa917c Updated from git comments 2016-03-31 10:23:13 +01:00
Adam Shimali
5346367866 updated mock expectations 2016-03-31 10:14:49 +01:00
Adam Shimali
fc01735d70 Removed some un needed flash messages raised as bugs. 
In the process found a couple of edge cases of incorrect
use of invitation links by other users which are now
handled.
 2016-03-31 09:44:01 +01:00
Rebecca Law
8391af9d40 Merge pull request #362 from alphagov/fix-bad-permission 
Fix bug with creating the invited user permission list.
 2016-03-30 17:56:01 +01:00
Rebecca Law
0c58d73914 Sort permissions. 2016-03-30 17:50:32 +01:00
Rebecca Law
c4b65d6af9 Fix bug with creating the invited user permission list. 2016-03-30 17:39:19 +01:00
Chris Hill-Scott
4f00ea6965 Merge pull request #360 from alphagov/tidy-footer-link 
Tidied up the footer to put the about links in the right place
 2016-03-30 17:29:32 +01:00
Pete Herlihy
8b05f2c080 Tidied up the footer to put the about links in the right place 2016-03-30 15:47:00 +01:00
NIcholas Staples
9de80d685a Merge pull request #359 from alphagov/fix_sent_today_bug 
Fix sent today bug and removed unused file.
 2016-03-30 12:16:55 +01:00
Nicholas Staples
0b2eeb19c5 Fix sent today bug and removed unused file. 
Code quality fix.
 2016-03-30 12:12:31 +01:00
Rebecca Law
f3507af006 Merge pull request #358 from alphagov/fix-permissions 
Add view_activity permissions
 2016-03-30 11:36:49 +01:00
Rebecca Law
e67bb5f716 Fix main_nav for platform admin 
Renamed or_ to any_
 2016-03-30 11:30:18 +01:00
Chris Hill-Scott
d8d8584f70 Merge pull request #355 from alphagov/align-heading-on-pages-with-grid 
Visually align headings inside grid rows
 2016-03-30 11:10:05 +01:00
Rebecca Law
953f2a2245 Add comment to describe view_activity 2016-03-30 10:57:03 +01:00
NIcholas Staples
6960751223 Merge pull request #353 from alphagov/remove_template_dao 
Removed template_dao file and replaced with straight use of the servi…
 2016-03-30 10:54:00 +01:00
Rebecca Law
542d0f939e Add comment when adding the view_activity permission as a default. 
Refactor client.login method so that we can start to migrate to one way to login for unit tests.
 2016-03-30 10:53:15 +01:00
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
ff9d3d72ad Fixed merge conflicts with master. 
Code quality fixes.
 2016-03-30 10:26:01 +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
Chris Hill-Scott
d537da330e Visually align headings inside grid rows 
When the first heading on the page is inside a grid row, it doesn’t
vertically align properly with the navigation. This is because it
isn’t targeted by the selector that does this for pages without
an initial grid row.

This commit:
- adds an extra selector to target these headings
- makes the ‘add new thing’ buttons maintain their alignment with
  the page heading
 2016-03-29 16:15:15 +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