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
968 Commits 51 Branches 59 Tags
f9626a7626c736b59115222eca58283f17d11a37
Commit Graph

968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Shimali
f9626a7626 Merge pull request #218 from alphagov/cancel-invited-user 
Cancel invited user
 2016-03-02 17:31:43 +00:00
Adam Shimali
9bab136993 Merge pull request #221 from alphagov/minor-fixes 
Minor fixes
 2016-03-02 17:25:18 +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
Rebecca Law
1b64a212ea Change label to exclude the type of message being sent. 2016-03-02 16:49:16 +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
0b8b419798 Fix missing import on template for email_message. 
https://www.pivotaltracker.com/story/show/113991355
 2016-03-02 09:55:59 +00:00
Rebecca Law
65f4506028 Show status of invited user on manage team page. 2016-03-02 09:28:33 +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
Rebecca Law
ce5bf4e3ab Merge pull request #215 from alphagov/accept-invite 
[WIP] Start of user accepting invite.
 2016-03-01 17:37:12 +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
minglis
e3740f314f Merge pull request #214 from alphagov/fix-user-page-persmission-view 
Fix user page persmission view
 2016-03-01 10:51:42 +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
minglis
900f4cd7ff Merge pull request #211 from alphagov/connect_api_keys_permission 
Connect api keys permission
 2016-02-29 15:48:38 +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
Rebecca Law
5c885c545c Merge pull request #210 from alphagov/create-invite-with-permissions 
Invite user form now posts permissions string to api with
 2016-02-29 11:38:44 +00:00
Adam Shimali
9c748404e1 Merge pull request #209 from alphagov/better-csv-guidance 
Give users better guidance about CSV files
 2016-02-29 11:04:48 +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
Chris Hill-Scott
0cce5db3d1 Give users better guidance about CSV files 
This commit adds some guidance on the ‘Add recipients’ page about what should
be in the CSV file. The guidance is contextual to the template, and based on
the problems that we saw users having yesterday.
 2016-02-26 16:23:56 +00:00
NIcholas Staples
827de42d3a Merge pull request #208 from alphagov/view-user-invites 
Manage user pages now surfaces invited users
 2016-02-26 15:45:52 +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
9730db0e89 Merge pull request #206 from alphagov/drop-preview-service-name 
Make ‘add service’ flow one page again
 2016-02-26 15:05:21 +00:00
NIcholas Staples
f99b9f4918 Merge pull request #207 from alphagov/quis-patch-1 
Use correct API endpoint in docs
 2016-02-26 15:05:20 +00:00
Chris Hill-Scott
865ea3ca4f Use correct API endpoint in docs 
This has confused people, should change it before the site visits next week.
 2016-02-26 15:00:32 +00:00
NIcholas Staples
ff2a0c3807 Merge pull request #204 from alphagov/send-user-invite 
[WIP] Invite user form now submits data to api.
 2016-02-26 13:49:44 +00:00
NIcholas Staples
b185b1552d Merge pull request #205 from alphagov/bring-back-sass-lint 
Bring back SASS lint
 2016-02-26 13:48:03 +00:00
Chris Hill-Scott
1cbd37a920 Bring back SASS lint 
The problem with SASS lint that we found in
https://github.com/alphagov/notifications-admin/pull/202
has been fixed (see https://github.com/sasstools/sass-lint/pull/550).

This commit reverts #202, re-enabling linting of SASS files.
 2016-02-26 13:23:33 +00:00
Chris Hill-Scott
f129cc3db2 Reword the add service page 
Without the preview service name we probably have to go back to communicating
a bit more on the add service page. This commit brings back the two bullet
points about where the service name will appear, and tries to tie it into the
nice words that Matt Sheret wrote for us.
 2016-02-26 13:17:58 +00:00
Chris Hill-Scott
ce221fc40b Drop ‘preview service name’ page 
This page:
- confused users in research
- didn’t communicate what it was intended to (eg the generated email address,
  how your service name would appear in messages)

This commit removes the page so that after typing in the service name the user
is sent straight to the dashboard for their new service.
 2016-02-26 13:12:25 +00:00
Adam Shimali
0de80bba97 [WIP] Invite user form now submits data to api. 2016-02-26 13:07:35 +00:00
NIcholas Staples
1adb5e673c Merge pull request #203 from alphagov/s3-mocks 
Moto s3 mocks removed
 2016-02-26 12:19:19 +00:00
Adam Shimali
73cf793566 Merge from master 2016-02-26 12:11:55 +00:00
Adam Shimali
d7bad32ac3 Removed moto mocks and mock s3 upload and download directly. 
Also updated csv reading to use correct module and do more
work to remove empty fields and trailing commas.
 2016-02-26 12:04:17 +00:00
Adam Shimali
77c9c9a323 Merge pull request #201 from alphagov/stub-send-letters 
Stub out the send letters page
 2016-02-26 12:03:32 +00:00
Adam Shimali
12e1ff2f53 Merge pull request #200 from alphagov/email-flow-fixes 
Consolidate page templates for emails + texts
 2016-02-26 12:02:14 +00:00
Chris Hill-Scott
04e7aac99c Column headers on the check page should always be blue 2016-02-26 11:57:14 +00:00
Chris Hill-Scott
2f91848a42 Prefix text messages with service name 
Brings in: https://github.com/alphagov/notifications-utils/pull/4
 2016-02-26 11:57:13 +00:00
Chris Hill-Scott
70ef2f5a6f Fix example CSV for email templates 
It should populate the CSV file with the user’s email address, not their phone
number.
 2016-02-26 11:57:13 +00:00
Chris Hill-Scott
a51d92c87a Consolidate page templates for emails + texts 
Use one page template for each of:
- choosing a message template
- adding recipients
- checking an email message
- looking at a job

This commit consolidates the two templates into one, and adds logic to show
the SMS message pattern or the email message pattern depending on the type of
template.

It also gives email templates a bit more width, because the body and the from
address tend to be quite long.
 2016-02-26 11:57:13 +00:00
Adam Shimali
2c4119e2e0 Merge pull request #202 from alphagov/remove-sass-linting 
Temporarily remove SASS linting
 2016-02-26 11:54:32 +00:00