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

1032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
NIcholas Staples
b78a321d90 Merge pull request #238 from alphagov/show-invite-email 
Show invite email
 2016-03-08 08:49:00 +00:00
NIcholas Staples
877b59cf05 Merge pull request #240 from alphagov/invite-flash-messages 
Flash message to confirm invitation accepted and user has been
 2016-03-08 08:45:54 +00:00
Adam Shimali
9bc5d08d52 Flash message to confirm invitation accepted and user has been 
added to service.
 2016-03-08 08:18:41 +00:00
Chris Hill-Scott
614e454186 Merge pull request #239 from alphagov/auto-remember-me 
Removed remember me checkbox
 2016-03-07 14:53:44 +00:00
Martyn Inglis
5429107f93 Removed remember me checkbox 
- remember me functionality always applied.
 2016-03-07 14:39:20 +00:00
Adam Shimali
5b37145f61 Wrap un editiable email address for invite in p tag to give 
it some space from rest of form.
 2016-03-07 14:09:03 +00:00
Adam Shimali
9941d72d4a Merge branch 'filter-invites' into show-invite-email 2016-03-07 14:03:13 +00:00
Adam Shimali
208a586948 Filter out accepted invites in template not client. 2016-03-07 13:59:54 +00:00
Adam Shimali
569f61578e Invited user email is shown on regiser from intive page but is not 
editable.
 2016-03-07 11:55:18 +00:00
Adam Shimali
ee86f400b0 Filter out accepted invites from manage users page 
Added basic test of invite client.
 2016-03-07 10:33:36 +00:00
minglis
48a8be9ea4 Merge pull request #234 from alphagov/invite-permissions-status 
[WIP] Add call to api to update invitation to accepted.
 2016-03-04 16:18:20 +00:00
Rebecca Law
41b08b7ca1 Added from_user name and service name for the cancelled invitation message. 2016-03-04 15:17:04 +00:00
Rebecca Law
8074c6ea7f Add cancelled-invite html. 
If a invited user accepts a cancelled invitation they are directed to a page telling them the invitation is cancelled.
Without this they were able to register and were added to the service.
 2016-03-04 14:42:52 +00:00
Martyn Inglis
8a46031203 Merge branch 'staging' 2016-03-04 13:38:33 +00:00
Martyn Inglis
b70fc63a76 Setup travis for staging deploys 2016-03-04 13:27:57 +00:00
Chris Hill-Scott
049004c1b3 Merge pull request #235 from alphagov/fix-bad-first-column 
Validate column heading.
 2016-03-04 11:38:57 +00:00
Rebecca Law
e1de40429c Merge pull request #231 from alphagov/add_manage_service_permission 
Add manage service permission
 2016-03-04 11:07:34 +00:00
Rebecca Law
f6db12b094 Merge pull request #227 from alphagov/poll-job-page 
Make job page poll for updates
 2016-03-04 11:07:14 +00:00
Rebecca Law
e3c692ede7 Validate column heading. 
Still need to show that it is the heading that is wrong.
 2016-03-04 10:09:46 +00:00
Adam Shimali
a974e6e157 [WIP] Add call to api to update invitation to accepted. 
When flow for invited user is complete, that is
when user has been added to service, update invitation
to accepted
 2016-03-03 18:13:56 +00:00
Martyn Inglis
b62312ef64 Call update script 2016-03-03 17:07:48 +00:00
Rebecca Law
b9fcafa095 Merge pull request #232 from alphagov/invite-permissions-status 
[WIP] Add permissions to invited user
 2016-03-03 16:57:13 +00:00
minglis
2059367098 Merge pull request #233 from alphagov/status-page 
Status page
 2016-03-03 16:55:09 +00:00
Martyn Inglis
82a6c737ec Fixed pep8 2016-03-03 16:50:06 +00:00
Martyn Inglis
76ccb99666 Fixed up the health check page 2016-03-03 16:41:21 +00:00
Adam Shimali
1ff9d671eb [WIP] pass invite instead of permissions to make update of invite easier if all goes well 2016-03-03 16:37:22 +00:00
Rebecca Law
0fd2572b08 Merge pull request #225 from alphagov/revalidate-csv-file 
Revalidate file upload
 2016-03-03 16:33:30 +00:00
Nicholas Staples
b3249831cf Fix up front end so you can navigate to the edit page. 2016-03-03 15:43:53 +00:00
Rebecca Law
72ec653846 Add mock_has_permissions on new test 2016-03-03 15:39:15 +00:00
Rebecca Law
3e1d60af86 Merge branch 'master' into revalidate-csv-file 2016-03-03 15:38:14 +00:00
Rebecca Law
35c3be5146 Add test. 
Remove else since it is not needed.
 2016-03-03 15:26:52 +00:00
Nicholas Staples
e5e9db88fd Functionality_added, tests passing. 2016-03-03 14:32:19 +00:00
Chris Hill-Scott
990e626631 Remove tick banner 
I’d like to see if we can get away without this now that the page updates. In
research the ‘We’ve started’ part of the message confused people, especially
when they’d only sent one message.
 2016-03-03 14:28:36 +00:00
Chris Hill-Scott
b31c9fbc0d Make job page poll for updates 
This is a first go at having the job page update without refreshing.

The approach I’ve taken is to do all the rendering of HTML on the server side,
rather than use a Javascipt templating engine like mustache. This ensures that
we don’t have to maintain two sets of templates.

So the approach is to split the job page into partials. These partials can then:
- be included in the job page to render the whole page
- be rendered indivudually and then returned as a blob of HTML inside a JSON
  response

Then I’ve added a Javascript module which looks for areas of the page that should
be reloaded. For each area of the page it will poll a URL and re-render that
section of the page when it gets new HTML. It implements some throttling so that
API calls will never happen more frequently than 0.67 times/second.
 2016-03-03 14:28:36 +00:00
NIcholas Staples
0e663e044f Merge pull request #226 from alphagov/real-data-on-job-page 
Put real data on job page
 2016-03-03 14:27:10 +00:00
Nicholas Staples
9e710711cb Updated form and fixed existing tests. 2016-03-03 13:00:12 +00:00
Nicholas Staples
32b84f4ce2 Merge remote-tracking branch 'origin/master' into add_manage_service_permission 2016-03-03 12:21:30 +00:00
NIcholas Staples
30cc01059b Merge pull request #228 from alphagov/update_permission_name 
Fix permission names, all tests passing.
 2016-03-03 12:19:57 +00:00
Nicholas Staples
8287e1bad1 Fix permission names, all tests passing. 2016-03-03 12:15:24 +00:00
Rebecca Law
4190b5b119 Merge pull request #224 from alphagov/update_permissions_client 
Update permissions client
 2016-03-03 11:38:51 +00:00
Chris Hill-Scott
d9073862fa Put data from job on job page 
The main change is showing the finished time if the job is finished, rather
than the start time.
 2016-03-03 11:38:38 +00:00
Chris Hill-Scott
3a3e4258ef Remove template column 
As one of our user research participants pointed out, this column is redundant
because we’re showing the template on the page already.
 2016-03-03 11:38:38 +00:00
Chris Hill-Scott
a4a93116be Put real notifications on job page 2016-03-03 11:38:38 +00:00
Chris Hill-Scott
2f76ef27ce Add API client for notifications 
This commit adds an API client for the notifications endpoints added in:
https://github.com/alphagov/notifications-api/pull/113
 2016-03-03 11:15:50 +00:00
Chris Hill-Scott
542f097b6d Make the template preview work 
The template was displaying raw, eg ‘Hello ((name))’

This commit changes it to use the `.formatted_as_markup` property so the
template is rendered with:
- the placeholders as blue lozenges
- the service name prefixing the message
 2016-03-03 11:15:50 +00:00
Rebecca Law
584fac9683 If the file was invalid and Upload a CSV file was clicked, the job was created, then the send would fail when sending the file, trying to replace a placeholder that didn't exist. 
This commit calls send_messages again if the files exist on the request.
 2016-03-03 11:14:43 +00:00
NIcholas Staples
a9b9927115 Merge pull request #222 from alphagov/bootstrap-front-end 
Add frontend install and build to bootstrap script
 2016-03-03 11:03:09 +00:00
Nicholas Staples
1f2fe2a1e4 Fixed up client for permission setting. All tests passing. 2016-03-03 10:24:49 +00:00
Nicholas Staples
cee4384231 Merge remote-tracking branch 'origin/master' into update_permissions_client 2016-03-03 10:21:09 +00:00
Chris Hill-Scott
1d9cace0e5 Merge pull request #217 from alphagov/add_send_permission 
Add send permission
 2016-03-03 09:55:44 +00:00