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,300 Commits 51 Branches 59 Tags
5346367866bdd41d7a397cad55056520ece5fdc5
Commit Graph

98 Commits

Author SHA1 Message Date
Rebecca Law
e67bb5f716 Fix main_nav for platform admin 
Renamed or_ to any_
 2016-03-30 11:30:18 +01:00
Rebecca Law
c99df69025 Merge branch 'master' into fix-permissions 
Conflicts:
	app/main/views/jobs.py
	tests/app/main/views/test_manage_users.py
 2016-03-30 10:36:55 +01:00
Nicholas Staples
48daac7b94 Merging conflict with two_factor.py 
Fixed merge mistake with two_factor.py.
 2016-03-30 10:11:06 +01:00
Rebecca Law
017baca5e5 Add proper mocks for the test. 
Updated the localhost in the environment_test file so that if the tests fail if a mock is missing.
 2016-03-30 08:41:07 +01:00
Rebecca Law
a4629a290a Add view_activity to decorator. 2016-03-29 17:46:53 +01:00
Rebecca Law
99bd94799e Remove access_developer_docs permission, it doesn't make sense to need it. 
Add view_activity permission when the permissions are being editted.
 2016-03-29 17:33:12 +01:00
Nicholas Staples
961ed6b362 Functionality added to existing endpoint without a user_has_permission decorator, tests passing. 
Fix tests.
 2016-03-23 14:26:12 +00:00
Nicholas Staples
f3689cc113 Functionality added and all tests working. 
Update correct use of permissions form.
 2016-03-23 10:56:14 +00:00
Rebecca Law
402f55be23 Merge branch 'master' into platform-admin 
Conflicts:
	app/__init__.py
	app/main/views/add_service.py
	app/main/views/jobs.py
	app/templates/main_nav.html
	tests/app/main/views/test_dashboard.py
	tests/conftest.py
 2016-03-18 16:32:10 +00:00
Rebecca Law
13d9acf7dd Completion of the platform admin user story. 2016-03-18 16:20:37 +00:00
minglis
0c43232c0c Merge pull request #287 from alphagov/notification_history_page 
Notification history page
 2016-03-18 14:32:55 +00:00
Adam Shimali
7ee173de51 Merge pull request #293 from alphagov/single-verify-code 
Changed registration flow to first send email verification link that
 2016-03-18 11:03:27 +00:00
Rebecca Law
d003dc4aa9 [WIP]: fixing unit tests 2016-03-18 10:49:22 +00:00
Nicholas Staples
3d08eb624b Merge with new master. 2016-03-18 10:16:14 +00:00
minglis
f6ee5dc8c6 Merge pull request #292 from alphagov/update-config-for-staging-live 
Start aligning Admin app with config styles used elsewhere
 2016-03-17 15:42:57 +00:00
Adam Shimali
2792bece54 Changed registration flow to first send email verification link that 
when visited sends sms code for second step of account verification.

At that second step user enters just sms code sent to users mobile
number.

Also moved dao calls that simply proxied calls to client to calling
client directly.

There is still a place where a user will be a sent a code for
verification to their email namely if they update email address.
 2016-03-17 15:19:51 +00:00
Rebecca Law
7eb4bcc592 Remove unused method 
Added more tests
 2016-03-17 14:25:28 +00:00
Chris Hill-Scott
b38ae08ad6 Put some statistics on the dashboard 
This commit adds two new sections to the dashboard

1. A banner telling you about trial mode, including a count of how many messages
   you have left today, which is a restriction of trial mode

2. Panels with counts of how many emails and text messages have been sent in a
   day, plus the failure rates for each

It does **not**:
- link through to any further information about what trial mode is (coming
  later)
- link through to pages for the failure rates (coming later)
- change the ‘recent jobs’ section to ‘recent notifications’
 2016-03-17 14:06:12 +00:00
Martyn Inglis
2473b09beb Start aligning Admin app with config styles used elsewhere 
- no config overrides - now all set in environment
- use different files for staging and live too allow for differently named env variables
- updates to run_app and run_tests scripts to set correct environment (test/development) so correct config picked up
- use environment file on deployed environments to pick correct config
 2016-03-17 13:45:59 +00:00
Chris Hill-Scott
d04bde5486 Add API client for notification statistic 
Adds a client for the endpoints added in
67c4bd2263
 2016-03-17 13:15:41 +00:00
Rebecca Law
b28fbc16d7 A platform admin user is able to see a list of all services. 
Each service on the list is linked to the dashboard page of the service.
The platform admin user can see/edit templates, see/invite users, see/edit service settings.
The platform admin user can not send messages, see/edit api keys and developer docs.
 2016-03-17 10:46:47 +00:00
Nicholas Staples
b0ca855ba8 Notification history page added and pagination, tests all working. 2016-03-16 16:57:10 +00:00
Adam Shimali
67484d3f35 Merge pull request #269 from alphagov/invite-registration-sms-only 
Change new invite registration flow to only need
 2016-03-14 10:55:31 +00:00
Adam Shimali
164bdad4f2 Change new invite registration flow to only need 
sms for verification.

This may change again soon with story to split 2 factor
pages, but for now is correct.
 2016-03-14 09:43:34 +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
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
Nicholas Staples
6ea8491b39 Service name uniqueness handled in all cases and tests passing. 2016-03-10 14:29:31 +00:00
Rebecca Law
87496aa884 Revert config changes so it doesn't break local dev builds. 
Update tests
 2016-03-09 09:29:35 +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
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
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
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
e5e9db88fd Functionality_added, tests passing. 2016-03-03 14:32:19 +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
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
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
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
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