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
959 Commits 51 Branches 59 Tags
bfea4a42bc814c29a65b264d8bc1b145cb64222d
Commit Graph

74 Commits

Author SHA1 Message Date
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
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
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
Adam Shimali
b4ddcaa9b1 Merge pull request #185 from alphagov/user_permission 
User permissions added with test.
 2016-02-22 10:36:50 +00:00
Martyn Inglis
6616182ab3 Slight changes to match new API features: 
- get user now throws a 404 so handle that
- making a service now needs one user not many to create
 2016-02-19 16:38:08 +00:00
Nicholas Staples
32e37d89fb User permissions added with test. 2016-02-19 16:38:04 +00:00
Rebecca Law
cffd66c62e Updated the api_client call to send_verify_code 
The api has now has an user/<user_id>/email-code and user/<user_id>/sms-code
This commit requires an update to the python-client. Make sure the PR for that version has been merged first and the tag push using scripts/push_tag.sh
 2016-02-19 16:08:44 +00:00
Rebecca Law
8d6c61f3ad Merge pull request #172 from alphagov/upgrade_notifications_python_client 
notifications-python_client upgraded to 0.2.5
 2016-02-12 09:46:15 +00:00
Nicholas Staples
737e490276 Fix error with invalid token causing an error. 2016-02-11 16:23:41 +00:00
Nicholas Staples
48368584d9 notifications-python_client upgraded to 0.2.5 2016-02-11 15:27:08 +00:00
Adam Shimali
90a17bc0a7 Service and job id were incorrectly in bucket name. 2016-02-04 12:06:06 +00:00
Adam Shimali
b73a5d8710 Pass selected template id to api when creating job. 
Moved query params for original file name and template id
to session.
 2016-02-01 11:28:36 +00:00
Adam Shimali
c5100ad176 Merge pull request #127 from alphagov/status_page_update 
Status page update
 2016-01-29 15:59:04 +00:00
Adam Shimali
4ea50499c3 List and individual job pages now fetch data from api. 
Few bug fixes around job uuid.
 2016-01-29 15:35:35 +00:00
Nicholas Staples
bed1116587 Status update added. 2016-01-29 14:41:07 +00:00
Adam Shimali
5196436645 Better bucket name pending possible change to uuid for service primary 
key.

Also small bugfix around file name and original file name
 2016-01-29 12:19:50 +00:00
Adam Shimali
0995cd2e3c Uploading csv creates job via api 2016-01-29 10:30:02 +00:00
Adam Shimali
5f52c0d3d6 Inherit from flask usermixin for default implementation of 
is_authenticated and is_anonymous
 2016-01-28 15:34:02 +00:00
Nicholas Staples
c123098e14 Bug fixes. 2016-01-27 17:26:22 +00:00
Nicholas Staples
ff8a727759 Fix for updated client. 2016-01-27 17:13:56 +00:00
Nicholas Staples
2d35f5f36a All tests passing and merged with master. 2016-01-27 16:30:33 +00:00
Nicholas Staples
6959d695d3 Working tests, hopefully all code changes done. 2016-01-27 12:22:32 +00:00
Rebecca Law
1c9b71a750 Fix bug with user model. Removed is_locked from serialized method. 2016-01-26 14:34:21 +00:00
Adam Shimali
4674bd6b68 Reintroduce some tests. A bit of cleanup of mocks. 
User object fields made a bit clearer and simple test to
verify user added.
 2016-01-23 23:14:50 +00:00
Nicholas Staples
81cd0cc7c3 Fix for updating service name. 2016-01-22 15:26:56 +00:00
Rebecca Law
fd11e863da Fix bug with variable names 2016-01-22 11:21:30 +00:00
Adam Shimali
3e19fa50d2 Incorrect url passed to BaseApiClient which already has base_url. 
Also added getter and setter of failed login count, although that is
yet to be synced with api.
 2016-01-22 10:27:14 +00:00
Rebecca Law
64af225d2d fix code style 2016-01-22 10:02:41 +00:00
Rebecca Law
4ea59688b8 Remove base url for the token creation. 
Fix variable name.
 2016-01-22 10:01:14 +00:00