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,130 Commits 51 Branches 59 Tags
4adbcebc6f38f45ef100b0d2dfb4ae3aae0f683c
Commit Graph

100 Commits

Author SHA1 Message Date
NIcholas Staples
cf195b3a16 Merge pull request #271 from alphagov/remove-dao-layer 
Start to remove the dao layer
 2016-03-14 09:42:22 +00:00
Rebecca Law
34e7d21855 Remove sender module, code was moved to api. 2016-03-13 09:39:29 +00:00
Rebecca Law
6e3bf97af4 Remove services_dao.insert_new_service. 
Update api_client.create_service to return the service id.
Fix unit tests.
 2016-03-13 09:37:17 +00:00
Rebecca Law
9d2fbca557 Merge pull request #264 from alphagov/fix-sign-in-tests 
Fix to sign in test and user model
 2016-03-11 14:59:49 +00:00
Adam Shimali
069a549d57 Bug fix for passing list of empty string if no permissions selected for 
invite.

Send empty list instead.
 2016-03-11 12:50:25 +00:00
Rebecca Law
58c748e703 Noticed that the api was being called when running the unit tests. 
This also lead me to find the the failed_login_in count was always returning 0.
 2016-03-11 11:47:21 +00:00
Rebecca Law
f6d98b63ea Refactored register_errorhandlers so that it handles HTTPError 
Remove most cases where we catch HTTPError
 2016-03-10 11:53:29 +00:00
Rebecca Law
74a85a532b Merge branch 'master' into forgot-password 2016-03-09 10:47:00 +00:00
Nicholas Staples
a1c4600b29 Exact permissions added. 2016-03-08 16:54:07 +00:00
Rebecca Law
29ddad60e7 Merge branch 'master' into forgot-password 
Conflicts:
	app/main/views/two_factor.py
 2016-03-08 15:03:25 +00:00
Nicholas Staples
eb994ff189 Change put to post for service update. 2016-03-08 10:40:07 +00:00
Rebecca Law
3e969b3640 Re-implement forgot password 2016-03-07 18:18:52 +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
e1de40429c Merge pull request #231 from alphagov/add_manage_service_permission 
Add manage service permission
 2016-03-04 11:07:34 +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
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
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
Nicholas Staples
1f2fe2a1e4 Fixed up client for permission setting. All tests passing. 2016-03-03 10:24:49 +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
Nicholas Staples
dde2fba705 Merge with master again. 2016-03-02 13:53:05 +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
Rebecca Law
73e5fe2907 Change cancel_invited_user client to not return anything. 2016-03-01 17:56:39 +00:00
Adam Shimali
98169550d8 [WIP] no data needed for post to create add user to service 2016-03-01 17:32:04 +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
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
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
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
Adam Shimali
0de80bba97 [WIP] Invite user form now submits data to api. 2016-02-26 13:07:35 +00:00
Martyn Inglis
942d255384 Merge branch 'master' into celery-jobs 2016-02-25 10:34:20 +00:00
Adam Shimali
602d505dc7 Merge pull request #196 from alphagov/get-users-for-service 
Get users for service
 2016-02-24 17:41:45 +00:00
Nicholas Staples
c959678c49 Remember me functionality added and tested. 
Merge extra.

Fixed comment.
 2016-02-24 17:32:15 +00:00
Rebecca Law
2905d11fe4 Get users for service to show on the manage team page. 
Calls api endpoint /service/<service_id>/users to retrieve all users associated with the service
 2016-02-24 17:32:15 +00:00
Martyn Inglis
c51d44fe43 Merge branch 'master' into celery-jobs 
Conflicts:
	app/main/views/sms.py
 2016-02-24 15:46:38 +00:00
Martyn Inglis
6e1267826f Removed print statement 2016-02-24 15:45:46 +00:00
Martyn Inglis
8247f3d568 Added subject to client calls for templates 2016-02-24 09:23:38 +00:00
Adam Shimali
d6f88f79e2 Admin uses correct endpoint for getting user by email address. 2016-02-23 12:47:48 +00:00
Adam Shimali
6c56f9be31 Add count of rows in csv file as a notification count. 2016-02-22 14:53:37 +00:00
Adam Shimali
a86be302ce Merge pull request #186 from alphagov/email-templates 
Email templates
 2016-02-22 13:34:45 +00:00
Nicholas Staples
980c01e10c Fix bug with send_verify_code not including the to field. 2016-02-22 12:33:59 +00:00