darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-05 19:03:30 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,235 Commits 52 Branches 59 Tags
0435015211d368615af2f476d2e8afc6ea5134ca
Commit Graph

1235 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
71db3495d2 Merge pull request #330 from alphagov/quis-patch-1 
Add deployment badges
 2016-03-22 15:53:23 +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
Chris Hill-Scott
0449a0bd4b Merge pull request #321 from alphagov/remove_get_started 
Only added 'Get Started' if you have the appropriate permissions.
 2016-03-22 15:52:56 +00:00
Adam Shimali
40fdbca28b Merge pull request #333 from alphagov/registration-bug-fix 
Fix for trying to verify email on partially complete registration
 2016-03-22 14:43:52 +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
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
Chris Hill-Scott
c7f9b24cee Add deployment badges 2016-03-22 09:39:08 +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
Nicholas Staples
42eac5c359 Merge with master. 2016-03-21 16:48:40 +00:00
Nicholas Staples
fc483fe20e Merge with master. 2016-03-21 16:39:33 +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
Nicholas Staples
47786fa8e1 Pete request update. 2016-03-21 15:39:01 +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
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
Pete Herlihy
68dd66e7e4 Changed references to sent text messages, to say batch messages 2016-03-21 15:25:04 +00:00
Nicholas Staples
a41a723fa7 Merge remote-tracking branch 'origin/master' into view_only_team_members 2016-03-21 15:24:47 +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
Nicholas Staples
dad5bf9e00 Only added 'Get Started' if you have the appropriate permissions. 2016-03-21 14:11:51 +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