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,037 Commits 51 Branches 59 Tags
4678a12d334d74656eb3db90d8ee397e95ad23cf
Commit Graph

330 Commits

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
Adam Shimali
9bc5d08d52 Flash message to confirm invitation accepted and user has been 
added to service.
 2016-03-08 08:18:41 +00:00
Martyn Inglis
5429107f93 Removed remember me checkbox 
- remember me functionality always applied.
 2016-03-07 14:39:20 +00:00
Adam Shimali
208a586948 Filter out accepted invites in template not client. 2016-03-07 13:59:54 +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
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
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
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
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
8287e1bad1 Fix permission names, all tests passing. 2016-03-03 12:15:24 +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
a4a93116be Put real notifications on job page 2016-03-03 11:38:38 +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
9b31761001 Merge remote-tracking branch 'origin/master' into add_send_permission 2016-03-03 09:20:19 +00:00
Nicholas Staples
1b59e5c7f1 Review comments fixed. All tests passing. 2016-03-03 09:02:56 +00:00
Adam Shimali
6ba13a6513 [WIP] New user can now accept invite and will be made to 
register. On succesful register and verfication they
will be added to service and forwarded to dashboard.

Nothing is done yet with the permissions requested in the
invite to the user.
 2016-03-02 17:52:32 +00:00
Adam Shimali
f9626a7626 Merge pull request #218 from alphagov/cancel-invited-user 
Cancel invited user
 2016-03-02 17:31:43 +00:00
Rebecca Law
8acfc06432 Merge branch 'master' into cancel-invited-user 2016-03-02 17:25:17 +00:00
Rebecca Law
789264a863 Change label to exclude the type of message being sent. 
Fix send email to self, it was always using mobile number to send mesasge. This fixes that.
 2016-03-02 17:02:41 +00:00
Nicholas Staples
dde2fba705 Merge with master again. 2016-03-02 13:53:05 +00:00
NIcholas Staples
f0e0006a7c Merge pull request #213 from alphagov/accept-phone-or-email-column 
Accept CSVs with 'email address' or 'phone number'
 2016-03-02 11:27:24 +00:00
Chris Hill-Scott
b57ac2f7e5 Accept CSVs with 'email address' or 'phone number' 
CSV files currently have ‘to’ as the recipient column. This is changing in
https://github.com/alphagov/notifications-api/pull/109

The admin app also has to validate that the CSV files have the right columns,
because the API expects any CSV that it’s given to have been checked (also we
want things to actually work).

This commit is the minimum code change needed. In the future it should reuse
the same code as the API for processing CSV files. This will need more thinking.
 2016-03-02 10:41:35 +00:00
Rebecca Law
bfea4a42bc Merge branch 'master' into cancel-invited-user 
Conflicts:
	app/notify_client/invite_api_client.py
	tests/app/main/views/test_manage_users.py
 2016-03-01 18:01:20 +00:00
Adam Shimali
5f02d4cefe [WIP] Post does not need any data 
Invites rest module can use invited user object instead
of dict.
 2016-03-01 17:23:23 +00:00
Rebecca Law
8e6bd2471d Change method to a get. 
Fix path param in invite_api_client.cancel_invited_user
 2016-03-01 17:00:01 +00:00
Rebecca Law
219c740071 Add button to cancel invitation of invited user. 2016-03-01 16:12:26 +00:00
Nicholas Staples
efaf826e86 Merge with master. 2016-03-01 15:53:58 +00:00
Nicholas Staples
d3bc390b6c Merge with master. 2016-03-01 15:23:00 +00:00
Adam Shimali
5f3c72729e [WIP] Start of user accepting invite. 
This commit only deals with acceptance by
users who are already in system.

Changed invite client to return invited user objects
instead of dictionaries.

Added commented out test. fixed up fixtures to return invited user
object for invites
 2016-03-01 14:10:35 +00:00
Martyn Inglis
7b5e8061e2 Slight (bad) hack to ensure that the ticks appear on the manage user page 
- changes imports for utils from broken version on previous branch
 2016-03-01 10:45:13 +00:00
Martyn Inglis
f0b5ac9ceb Merge branch 'master' of github.com:alphagov/notifications-admin 2016-03-01 09:57:52 +00:00
Martyn Inglis
d0d2d24b66 Changed import path for python client 2016-03-01 09:57:45 +00:00
Nicholas Staples
ffe30c3070 Permissions added for templates and send_messages pages. All tests passing. 
Fix up page heading.
 2016-02-29 17:18:12 +00:00
Nicholas Staples
a8db812c5a Remove print statement. 2016-02-29 15:34:22 +00:00
Nicholas Staples
58351a094c Merge with master. 2016-02-29 14:59:15 +00:00
Nicholas Staples
48943527ec API keys hooked up and working. All tests passing. 2016-02-29 14:57:07 +00:00
Adam Shimali
8c10c36f50 Invite user form now posts permissions string to api with 
data to create invite.
 2016-02-29 11:03:35 +00:00
Adam Shimali
c76717942f Manage user pages now surfaces invited users 
fetched from api.
 2016-02-26 15:34:12 +00:00