Commit Graph

2851 Commits

Author SHA1 Message Date
venusbb
33a2909a76 reverse code not seperating trial_mode_services 2017-10-02 14:26:08 +01:00
Chris Hill-Scott
7b12b7e03d Merge pull request #1513 from alphagov/add-letters-to-go-live
Add letters to the request to go live page
2017-10-02 10:53:08 +01:00
Leo Hemsted
cf3f4d5cee Merge pull request #1516 from alphagov/empty-inbound-sms
make sure inbound sms page doesn't break if you receive a blank inbou…
2017-09-29 13:51:30 +01:00
Leo Hemsted
bb44479b3e disable statsd when testing
or it won't run if you're offline
2017-09-29 10:16:20 +01:00
Leo Hemsted
57b4971ac1 update conftest and tests to contain accurate test data
specifically, we identify inbound vs outbound by presence of
"notify_number", so ensure that test content actually contains that
field
2017-09-29 10:15:17 +01:00
Pete Herlihy
74992da1c8 Adding acas.org.uk to whitelist 2017-09-29 09:24:07 +01:00
Chris Hill-Scott
26d1bda43c Update email-message.scss
Got my first and last mixed up…
2017-09-28 16:15:48 +01:00
Chris Hill-Scott
84a225ffdb Merge pull request #1517 from alphagov/right-padding-email-message
Fix overridden padding on email subject
2017-09-28 16:03:55 +01:00
Leo Hemsted
b1e809e82a make sure inbound sms page doesn't break if you receive a blank inbound message 2017-09-28 15:37:18 +01:00
Imdad Ahad
a273cfe951 Merge pull request #1511 from alphagov/imdad-katie-feat-make-add-letter-contact-validation
Make the letter contact block (service settings form) compulsory
2017-09-28 11:23:56 +01:00
Chris Hill-Scott
06caccdd26 Fix overridden padding on email subject
Something in a new version of GOV.UK Elements, Template, or Frontend
Toolkit has introduced a rules which removes padding for the last
column in a table.

This is undesirable in the case of email message previews.
2017-09-28 10:47:33 +01:00
Chris Hill-Scott
2f6cf3df38 Refactor permissions handling to use sets
We didn’t like the nested conditional way of doing this. So this commit
refactors the way that permissions are set by:

- splitting it up into multiple, clearly named methods
- treating the list of permissions as `set`s, which they naturally are,
  because you can’t have duplicate permissions (this removes a lot of
  the complexity around having to test for membership before removing
  a permission, for example)
2017-09-27 12:02:17 +01:00
Chris Hill-Scott
fb3e7b5fde Add letters to the request to go live page
It’s not either text messages, or emails, or both now – it’s any
combination of the three channels.

This commit adds ‘letters’ as an option on the request to go live page
by changing the radio buttons to a group of checkboxes, so the user can
choose as many or as few as they want.

This commit also does a bunch of housekeeping stuff around the tests for
this page, because they haven’t been touched in quite some time.
2017-09-27 10:46:52 +01:00
Imdad Ahad
fdabe814cc Make the letter contact block (service settings form) compulsory 2017-09-26 14:41:07 +01:00
Chris Hill-Scott
9581a3bb77 Allow services to turn international SMS on/off
We didn’t make this self-service before because the pricing information
wasn’t published (ie we had to send it to services that asked for it).

Now that we publish pricing information in the app, there’s no reason
why services can’t make an informed decision about whether they want
international SMS or not.

So this commit:
- removes the platform admin button
- adds some radio buttons that our users can click with their mice
2017-09-26 14:21:06 +01:00
Chris Waszczuk
1dcfae41d1 Merge pull request #1509 from gov-cjwaszczuk/master
Allow user to add multiple reply-to addresses
2017-09-26 09:48:45 +01:00
Chris Hill-Scott
ab6e49ac6a Merge pull request #1508 from alphagov/default-notification-style
Change text style of default banner
2017-09-26 09:29:27 +01:00
chrisw
f012ec57c0 Allow user to add multiple reply-to addresses 2017-09-25 17:05:41 +01:00
Chris Hill-Scott
0b1a08deef Change text style of default banner
The green text looks nicer than the black text.

The bold makes it stand out more.
2017-09-25 15:09:26 +01:00
venusbb
b0e267f677 Fixed tests 2017-09-22 23:09:44 +01:00
venusbb
0895717680 Merge branch 'master' of https://github.com/alphagov/notifications-admin into vb-platform-admin-admin 2017-09-22 15:47:19 +01:00
venusbb
3a1e76ba92 Progress: passed trial_mode to /service end point 2017-09-22 15:46:52 +01:00
Chris Hill-Scott
241e3c2232 Merge pull request #1504 from alphagov/77-78
77-78 for Legal Aid Agency
2017-09-21 15:28:41 +01:00
Pete Herlihy
033872c34e And now to 79 2017-09-21 15:10:42 +01:00
Chris Hill-Scott
7327f4b611 Merge pull request #1503 from alphagov/logoless-organisations
Allow creation of an organisation without a logo
2017-09-21 13:01:44 +01:00
Pete Herlihy
d5ff02e5f7 77-78 for Legal Aid Agency 2017-09-21 12:08:30 +01:00
Chris Hill-Scott
d01c397bb4 Allow creation of an organisation without a logo
Now we have the org banner branding, not all organisations need a logo.
So it shouldn’t be an error to not provide one.

Depends on:
- [ ] https://github.com/alphagov/notifications-api/pull/1265
2017-09-21 11:57:39 +01:00
Chris Hill-Scott
9b663d0865 Merge pull request #1502 from alphagov/bbsrc
Add Biotechnology and Biological Sciences Research Council to email domain list
2017-09-21 10:21:51 +01:00
Chris Hill-Scott
6d421a0424 Add Biotechnology and Biological Sciences Research Council to email domain list
> BBSRC is an executive non-departmental public body, sponsored by the
> Department for Business, Energy & Industrial Strategy.

– https://www.gov.uk/government/organisations/biotechnology-biological-sciences-research-council
2017-09-20 16:23:18 +01:00
Leo Hemsted
03397f416e move status mapping logic to the api client
also added tests 👼
2017-09-20 16:02:15 +01:00
Leo Hemsted
f8fab35ee7 show letters as accepted, not created or sending, on the api page 2017-09-20 14:38:15 +01:00
venusbb
d14bdbe899 Merge branch 'master' of https://github.com/alphagov/notifications-admin into vb-platform-admin-admin 2017-09-19 14:44:06 +01:00
chrisw
4312789b60 Add a non-GOV.UK banner option for email branding
Added extra radio button for 'org_banner' option
Updated service setting template to display appropriate text when option is selected
Updated tests to also accomodate new radio option
2017-09-19 13:34:31 +01:00
venusbb
2a5acd9c77 platform-admin in progress 2017-09-19 10:13:12 +01:00
Chris Hill-Scott
2cbd9b8049 Merge pull request #1490 from alphagov/prevent-duplicate-form-submissions
Prevent doubling clicking form submissions
2017-09-19 09:21:47 +01:00
Chris Hill-Scott
6d22b27df2 Merge pull request #1486 from alphagov/fix-wrapping-email-reply-to
Fix overlapping text on settings page
2017-09-18 10:39:14 +01:00
Chris Hill-Scott
170f3a1da0 Merge pull request #1485 from alphagov/rename-template-permission-label
Rename manage templates permission
2017-09-18 10:39:06 +01:00
venusbb
4d794a464b Add and pass notifications filter trial_mode_services 2017-09-15 14:45:57 +01:00
Chris Hill-Scott
4ac90c066a Prevent doubling clicking form submissions
Have seen users complaining that they got an invitation email twice.
This is probably because they clicked the button twice even though they
think they only clicked it once.

Double form submission is a common issue on web pages, and there are a
number of different ways to prevent it. I’ve chosen to do it this way
because:
- temporarily, not permanently disabling the button means that this
  addresses the double clicking issue without breaking things if the
  user did, really want to click the button again deliberately (for
  whatever reason)
- doing it with a `data` attribute, rather than the `disabled` attribute
  means that the interaction behaviour of the button doesn’t change (
  `disabled` buttons can’t be focused, for example)
2017-09-15 14:29:56 +01:00
Chris Hill-Scott
d7370c1816 Rename manage templates permission
‘Add and edit’ is the language we use next to the checkbox.

Also helps disambiguate it from the ‘manage service’ permission.
2017-09-15 11:36:00 +01:00
Chris Hill-Scott
2a84d14a73 Fix overlapping text on settings page
Think this broke when we split the setting page up into three sections.
This forces the text to wrap onto multiple lines even if it doesn’t
contain spaces (for example an email address).
2017-09-14 13:10:56 +01:00
Chris Hill-Scott
c26d308a32 Show row errors before trial mode errors
It’s useful to be able to play with the CSV upload thing and find out
how it works before you’re interrupted by the error telling you that
you’ve got as far as you can in trial mode.
2017-09-14 12:21:40 +01:00
Pete Herlihy
2d9ad0f90a Merge pull request #1476 from alphagov/wmfs.net
Adding wmmfs.net to allowed domains
2017-09-08 10:17:08 +01:00
Pete Herlihy
00b5e0c993 Adding West Midlands Fire Service 2017-09-07 16:44:56 +01:00
chrisw
dc2f88f28c Fixed typo on delivery & failure page
Under 'Phone number or email address does not exist' section - there was a typo, ammended to say 'existent' rather than 'existant'
2017-09-06 16:31:58 +01:00
Rebecca Law
74e7590fbc If a service does not have an inbound number and they click change on Receive text messages, they should see a message saying contact the Notify team to enable this feature.
That will now happen again.
2017-09-05 16:18:29 +01:00
Pete Herlihy
a3791f52f3 Merge pull request #1468 from alphagov/data-flow-picture
Data flow picture
2017-09-05 14:09:57 +01:00
Pete Herlihy
75ddfbf559 Merge pull request #1469 from alphagov/75-76
75-76 For ONS Surveys
2017-09-05 14:09:37 +01:00
Pete Herlihy
49f29a232a And now 77 for 37 with Care Quality Commission 2017-09-05 13:28:02 +01:00
Chris Waszczuk
ad4d4f18af Fixed typo 2017-09-05 10:57:28 +01:00