Commit Graph

4258 Commits

Author SHA1 Message Date
Chris Hill-Scott
8d4418cf61 Equalise spacing
Make the amount of space above and below is equal, and consistent with
the spacing when we show the checkbox.
2017-09-28 10:42:04 +01:00
Chris Hill-Scott
e65e98a9f1 Fix indentation 2017-09-28 10:42:03 +01:00
Chris Hill-Scott
8fb55ffa78 Grey out None when email reply to not set
This is consistent with how we differentiate other ‘unset’ values on the
settings page.
2017-09-28 10:42:03 +01:00
Chris Hill-Scott
f9390b4fc5 Delete .gitattributes 2017-09-27 16:11:38 +01:00
Chris Hill-Scott
1037cb29c4 Merge pull request #1514 from alphagov/remove-package-lock
Remove package-lock.json
2017-09-27 16:11:16 +01:00
Chris Hill-Scott
d0a8cdecb0 Merge pull request #1515 from alphagov/pyup-update-pyexcel-0.5.3-to-0.5.4
Update pyexcel to 0.5.4
2017-09-27 16:05:57 +01:00
Chris Hill-Scott
f800cacf36 Merge pull request #1510 from alphagov/self-serve-international
Allow services to turn international text messaging on and off
2017-09-27 15:56:26 +01:00
pyup-bot
64f722e35f Update pyexcel from 0.5.3 to 0.5.4 2017-09-27 13:31:44 +01:00
Chris Hill-Scott
c11a15338c Remove package-lock.json
I don’t think we’re getting any benefit from it. Especially since we’re
not running any Node code in production, but just using it to build the
frontend.

The downside is we keep getting these massive diffs which means we don’t
get an accurate line count on pull requests.

Followed instructions here:
https://codeburst.io/disabling-package-lock-json-6be662f5b97d
2017-09-27 12:15: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
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 Hill-Scott
3906b31929 Optionally let client_request test for redirect
A common pattern we employ is `POST`-redirect-`GET`. To write tests for
this we often check that the URL of the redirect is what we’re
expecting.

With the way `client_request` is currently set up, there’s no way to do
this because the response isn’t exposed to the test.

So this commit adds an extra parameter which will let us test for
redirects.
2017-09-26 14:07:01 +01:00
Sakis
4b96e7ba1b Merge pull request #1505 from alphagov/configure-gunicorn-errorlog
Configure gunicorn errorlog
2017-09-26 11:01:48 +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
Chris Hill-Scott
7797b670a9 Merge pull request #1507 from alphagov/pyup-update-whitenoise-3.3.0-to-3.3.1
Update whitenoise to 3.3.1
2017-09-26 09:29:22 +01:00
chrisw
f012ec57c0 Allow user to add multiple reply-to addresses 2017-09-25 17:05:41 +01:00
Athanasios Voutsadakis
1e9c04c583 Change .info to .error 2017-09-25 16:24:11 +01:00
Chris Hill-Scott
324cec90cd Merge pull request #1500 from alphagov/bump-govuk-packages
Update versions of GOV.UK packages
2017-09-25 15:27:52 +01:00
Chris Hill-Scott
48b49ebdd3 Update versions of GOV.UK packages
GOV.UK elements:
- Changelog: https://github.com/alphagov/govuk_elements/blob/master/packages/govuk-elements-sass/CHANGELOG.md#311
- Full changes: https://github.com/alphagov/govuk_elements/compare/v3.0.3...v3.1.1

GOV.UK template:
- Changelog: https://github.com/alphagov/govuk_template/blob/master/CHANGELOG.md
- Full changes: https://github.com/alphagov/govuk_template/compare/v0.19.2...v0.22.3

GOV.UK frontend toolkit:
- Changelog: https://github.com/alphagov/govuk_frontend_toolkit/blob/master/CHANGELOG.md#701
- Full changes: https://github.com/alphagov/govuk_frontend_toolkit/compare/v5.2.0...v7.0.1
2017-09-25 15:20:35 +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
Venus Bailey
fe541b849b Merge pull request #1506 from alphagov/vb-platform-admin-admin
Platform Admin timeout problem
2017-09-25 13:24:01 +01:00
pyup-bot
298070d6c0 Update whitenoise from 3.3.0 to 3.3.1 2017-09-23 18:37:39 +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
Athanasios Voutsadakis
79752d2754 Configure gunicorn errorlog
Related: alphagov/notifications-api/pull/1274
2017-09-22 15:41:41 +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
Sakis
3628f7d7d3 Merge pull request #1489 from alphagov/bump_utils
Bump utils to 21.2.0
2017-09-21 10:57:05 +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
Leo Hemsted
a1a4a28955 Merge pull request #1501 from alphagov/accepted-letters-on-api
show letters as accepted, not created or sending, on the api page
2017-09-20 16:51:55 +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
Chris Waszczuk
1054002432 Merge pull request #1499 from gov-cjwaszczuk/master
Add a non-GOV.UK banner option for email branding
2017-09-19 15:08:29 +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
edaa7b85b0 Merge pull request #1493 from alphagov/pyup-update-cffi-1.10.0-to-1.11.0
Update cffi to 1.11.0
2017-09-19 09:22:05 +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
6fa9d1f4b8 Merge pull request #1498 from alphagov/remove-gfm
Remove Github-Flavored Markdown dependency
2017-09-19 09:20:11 +01:00
Chris Hill-Scott
0dca997880 Merge pull request #1496 from alphagov/running-without-six
Remove six dependency
2017-09-19 09:20:04 +01:00
Chris Hill-Scott
22b6dfa667 Merge pull request #1497 from alphagov/remove-lxml
Remove lxml package
2017-09-19 09:19:55 +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
Chris Hill-Scott
f7f44974b4 Merge pull request #1484 from alphagov/row-errors-before-trial-mode-error
Show row errors before trial mode errors
2017-09-18 10:38:59 +01:00