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
946 Commits 51 Branches 59 Tags
a8db812c5a9822f6ea72bf44134ed2219a2c5c74
Commit Graph

946 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Chris Hill-Scott
d53dfec3fd Temporarily remove SASS linting 
Trying to install gulp-sass-lint fails because some of its dependencies are not
met:
> npm install gulp-sass-lint
> npm ERR! Darwin 15.3.0
> npm ERR! argv "/usr/local/bin/node" "/usr/local/bin/npm" "install" "gulp-sass-lint"
> npm ERR! node v5.7.0
> npm ERR! npm  v3.7.5
>
> npm ERR! No compatible version found: lodash.upperfirst@^3.0.0
> npm ERR! Valid install targets:
> npm ERR! 4.1.2, 4.1.1, 4.1.0, 4.0.2, 4.0.1, 4.0.0
> npm ERR!

This commit removes it until we can work out what the problem is.
 2016-02-26 11:46:52 +00:00
Chris Hill-Scott
8d81c4d984 Stub out the send letters page 2016-02-25 17:34:53 +00:00
Adam Shimali
f9da10bd1e Merge pull request #199 from alphagov/celery-jobs 
Celery jobs
 2016-02-25 15:31:02 +00:00
Martyn Inglis
10d595c7a9 Merge branch 'master' into celery-jobs 2016-02-25 11:30:28 +00:00
Martyn Inglis
87391f2aa1 Renamed header of CSV to be 'to' - matches API 2016-02-25 11:30:09 +00:00
minglis
b4fd7f4ffd Merge pull request #198 from alphagov/fix-create-sms-template 
Fix create SMS template
 2016-02-25 10:50:32 +00:00
minglis
bd9d594e16 Merge pull request #197 from alphagov/broken-dashboard-link 
Fix broken link on dashboard
 2016-02-25 10:48:51 +00:00
Chris Hill-Scott
c733b4318e Fix create SMS template 
When creating an SMS template the form validation was looking for a subject.
SMS messages don’t have a subject.
 2016-02-25 10:43:48 +00:00
Martyn Inglis
942d255384 Merge branch 'master' into celery-jobs 2016-02-25 10:34:20 +00:00
Chris Hill-Scott
522bf0566a Fix broken link on dashboard 
The link in the yellow box for adding a template was missing the parameter
specifying what type of template should be created.
 2016-02-25 10:21:40 +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
Adam Shimali
53f704b8ed Merge pull request #195 from alphagov/remember_me_sign_on 
Remember me functionality added and tested.
 2016-02-24 17:36:40 +00:00
Rebecca Law
658a53422b Verify mock is called in the test 2016-02-24 17:32:15 +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
Adam Shimali
bcf21f5ab2 Merge pull request #193 from alphagov/email-templates-part-2 
Allow creation and editing of email templates
 2016-02-24 17:27:51 +00:00
Adam Shimali
97cebe4511 Skip any boto related teset 2016-02-24 17:21:44 +00:00
Adam Shimali
2989f62252 Remove more mocks 2016-02-24 16:52:55 +00:00
Adam Shimali
588248deb0 Remove some mocks 2016-02-24 16:52:02 +00:00
Rebecca Law
ff5a20b817 Add mock_get_service to unit test 2016-02-24 16:40:39 +00:00
Rebecca Law
1d5bbd0d85 Set python version to 3.5 from 3.4 2016-02-24 16:27:17 +00:00
Rebecca Law
d24cea904b Bump the version of notifications-python-client 2016-02-24 16:24:50 +00:00