Commit Graph

8664 Commits

Author SHA1 Message Date
Tom Byers
cd2232e511 Add GOVUK Frontend to the frontend build
- copies across the images
- adds the Sass folder to the Sass include paths

JS is added file-by-file so will be added when
specific files are needed.
2019-11-22 17:44:16 +00:00
Tom Byers
32aba71ab7 Add GOVUK Frontend Sass, configured for this app
Like:

https://github.com/alphagov/govuk-frontend/blob/v2.13.0/package/all.scss

...but specifying the components to include,
starting with the ones that make up the
govuk_template and setting any variables needed.
2019-11-22 17:44:16 +00:00
karlchillmaid
0599f54a83 Merge pull request #3191 from alphagov/update-trial-mode-content
Update trial mode content
2019-11-22 14:59:47 +00:00
karlchillmaid
fd5121b8f1 Amend request to go live content 2019-11-22 14:47:59 +00:00
Chris Hill-Scott
585189115f re-fix tests 2019-11-22 14:30:12 +00:00
karlchillmaid
23ab557dbb Update request to go live 2019-11-22 14:24:07 +00:00
karlchillmaid
72ab59f34c Update request to go live content 2019-11-22 14:22:32 +00:00
karlchillmaid
6675793241 Update link text 2019-11-22 14:17:15 +00:00
Chris Hill-Scott
3ef822683f Fix tests
There’s an extra paragraph in the request to go live text now, so we
need to skip it to find the good stuff.
2019-11-22 14:12:25 +00:00
Chris Hill-Scott
57a5163033 Merge pull request #3192 from alphagov/update-get-started-page
Update request to go live content
2019-11-22 14:00:08 +00:00
karlchillmaid
93dcb7e0b8 Update API integration information 2019-11-22 10:13:54 +00:00
karlchillmaid
c926a0175e Add request to go live instructions 2019-11-21 15:53:52 +00:00
karlchillmaid
dfea129564 Replace your with the 2019-11-21 09:33:51 +00:00
karlchillmaid
9ab92adf8f Replace 'set up' with 'add'
This matches the language we use in the service
2019-11-20 14:58:50 +00:00
karlchillmaid
02d9d1042b Update request to go live content 2019-11-20 14:22:46 +00:00
karlchillmaid
4e7a5aaaa1 Update app/templates/views/trial-mode.html
Co-Authored-By: Chris Hill-Scott <me@quis.cc>
2019-11-20 13:45:29 +00:00
Pea (Malgorzata Tyczynska)
d07a370658 Merge pull request #3179 from alphagov/validate-service-and-org-name
Validate service and organisation name
2019-11-20 13:37:10 +00:00
Pea Tyczynska
21e6d994b9 Validate service and organisation name 2019-11-20 13:31:01 +00:00
karlchillmaid
3d6b66b21d Update content 2019-11-20 11:34:03 +00:00
karlchillmaid
b5fb43212a Update lead in and second bullet 2019-11-20 11:32:42 +00:00
karlchillmaid
1a25ac9676 Update trial mode content 2019-11-20 11:25:36 +00:00
Chris Hill-Scott
ebb29b82a9 Merge pull request #3189 from alphagov/update-tags-new-taxonomy
Update Zendesk tags to reflect new taxonomy
2019-11-20 10:59:17 +00:00
Chris Hill-Scott
e24b72f974 Merge pull request #3190 from alphagov/product-page-pricing-letters-update
Update product page with new letter prices
2019-11-20 10:58:40 +00:00
Chris Hill-Scott
a3ae9e8ba0 Update product page with new letter prices
We updated the letter pricing in https://github.com/alphagov/notifications-admin/pull/3128

The minimum price has gone up from 30p to 35p
2019-11-20 10:53:39 +00:00
Chris Hill-Scott
12b7c5d5e8 Remove notify_go_live_incomplete tag
The new taxonomy doesn't have a `notify_go_live_incomplete` tag. We
replaced this with `notify_go_live_incomplete_mou` because the only way
users can submit an incomplete request is if they do not agree to the
MOU.

These are the incomplete tags:

- `notify_go_live_incomplete_mou`
- `notify_go_live_incomplete_reply_to`
- `notify_go_live_incomplete_shared_email`
- `notify_go_live_incomplete_templates`

Of those, only the first one is applied automatically.
2019-11-19 16:42:25 +00:00
Chris Hill-Scott
7a5d301104 Update Zendesk tags to reflect new taxonomy
Requests to go live and email branding requests come through to Zendesk
with tags attached automatically.

With the revised taxonomy some of these tags need to be updated, as
summarised in this spreadsheet.

In addition, `notify_action` tag has to be added in each of those cases.

Old|New
---|---
`notify_request_to_go_live_complete`|`notify_go_live_complete`
`notify_request_to_go_live_incomplete`|`notify_go_live_incomplete`
`notify_action_add_branding`|`notify_branding`
`notify_request_to_go_live_incomplete_mou`|`notify_go_live_incomplete_mou`
`notify_request_to_go_live`|`notify_go_live`

– https://docs.google.com/spreadsheets/d/1o5ATsFsVK8Qpj7x8QvxX-SfEuBZ75028GEySVcdBFYU/edit#gid=0https://www.pivotaltracker.com/story/show/169842970
2019-11-19 15:46:29 +00:00
karlchillmaid
94ee7b16d9 Merge pull request #3180 from alphagov/update-error-page-content
Update error page content
2019-11-19 09:39:14 +00:00
karlchillmaid
128e0de0e4 Merge pull request #3188 from alphagov/fix-quotes
Fix quotes
2019-11-19 08:37:06 +00:00
karlchillmaid
2ae8cc6e68 Fix quotes 2019-11-18 17:09:34 +00:00
Chris Hill-Scott
0361fb6991 Fix duplicated ‘GOV.UK Notify’ in page titles
The `per_page_title` block appends ‘– GOV.UK Notify’ – there’s no need
to hard code it (see e4b040b380/app/templates/admin_template.html (L15))
2019-11-18 17:08:20 +00:00
karlchillmaid
6abd8da4a1 Merge pull request #3186 from alphagov/security-page-content-updates
Update Classifications and security vetting content
2019-11-18 17:05:17 +00:00
Leo Hemsted
e4b040b380 Merge pull request #3187 from alphagov/bump-utils
bump reqs
2019-11-18 15:21:52 +00:00
Leo Hemsted
f85bd3a8dd bump reqs
utils bump, and a bunch of test dependencies
can't bump pytest-xdist as it requires pytest>4
2019-11-18 14:59:02 +00:00
karlchillmaid
7065f158d9 Update Classifications and security vetting 2019-11-18 13:48:54 +00:00
Chris Hill-Scott
32cc08432c Merge pull request #3160 from alphagov/no-min-height-sticky-button
Remove min-height from sticky submit buttons
2019-11-15 12:35:21 +00:00
Chris Hill-Scott
3d9d841eae Merge pull request #3183 from alphagov/send-thousands
Comma-delimit thousands in ‘Send’ button
2019-11-13 16:59:09 +00:00
Chris Hill-Scott
db86abc2c2 Merge pull request #3184 from alphagov/prefer-non-all-urls
Prefer shorter URL
2019-11-13 15:58:36 +00:00
Chris Hill-Scott
37f0c4459b Prefer shorter URL
Flask will pick the first route that matches. Decorators get applied
from innermost to outermost.

So if the same endpoint is served at `/abc` and `/123` the one used
when `url_for` is generating a URL is whichever decorator is lowest
(in terms of line number).

It doesn’t functionally make a difference, but it’s causing the
functional tests to fail at the moment. And shorter URLs are nicer, so
I think it makes sense to change here, rather than change the tests.
2019-11-13 15:13:57 +00:00
Chris Hill-Scott
0d2f1a0716 Merge pull request #3182 from alphagov/fix-template-type-all
Add a specific route for template_type=all
2019-11-13 14:22:30 +00:00
Chris Hill-Scott
91283c99b9 Add a specific route for template_type=all
`all` is not a real template type, so for links to template folders that
apply to all template types we have a URL that looks like:
```
/services/<uuid:service_id>/templates
```

However Flask only generates this url when `url_for` is called with
`template_type=None`. If called with `template_type=all` then Flask will
generate a URL like
```
/services/<uuid:service_id>/templates/all
```

However attempting to load this URL will now 404, since `all` is not a
template type recognised by the regex introduced in
https://github.com/alphagov/notifications-admin/pull/3176

It would be nice to not have URLs with `all` in them at all, but since
people might have bookmarked them we need to support them indefinitely.

Also considered but decided against adding `all` to the set of template
types because it might cause other problems, for example attempting to
create a new template with a type of `all` would never work.
2019-11-13 14:17:30 +00:00
Chris Hill-Scott
c3b2017f47 Comma-delimit thousands in ‘Send’ button
Matches the style of how we display numbers in the thousands elsewhere.
2019-11-13 13:29:49 +00:00
Chris Hill-Scott
a0f6f9b137 Add a specific route for template_type=all
`all` is not a real template type, so for links to template folders that
apply to all template types we have a URL that looks like:
```
/services/<uuid:service_id>/templates/folders/<uuid:template_folder_id>
```

However Flask only generates this url when `url_for` is called with
`template_type=None`. If called with `template_type=all` then Flask will
generate a URL like
```
/services/<uuid:service_id>/templates/all/folders/<uuid:template_folder_id>
```

However attempting to load this URL will now 404, since `all` is not a
template type recognised by the regex introduced in
https://github.com/alphagov/notifications-admin/pull/3176

It would be nice to not have URLs with `all` in them at all, but since
people might have bookmarked them we need to support them indefinitely.

Also considered but decided against adding `all` to the set of template
types because it might cause other problems, for example attempting to
create a new template with a type of `all` would never work.
2019-11-13 12:53:53 +00:00
Leo Hemsted
7735c23428 Merge pull request #3175 from alphagov/pyup-scheduled-update-2019-11-04
Scheduled weekly dependency update for week 44
2019-11-13 12:18:40 +00:00
Chris Hill-Scott
24dc438446 Merge pull request #3176 from alphagov/require-uuids-in-urls
Be stricter about the format of URL parameters
2019-11-13 10:33:31 +00:00
Tom Byers
272c6a3c91 Update tests with new error message content 2019-11-12 17:06:06 +00:00
Tom Byers
74e280ce51 Fix reference to main.support in views 2019-11-12 17:02:38 +00:00
Tom Byers
059fb66fae Merge pull request #3173 from alphagov/dependabot/npm_and_yarn/jquery-3.4.1
Bump jquery from 1.12.4 to 3.4.1
2019-11-11 14:23:06 +00:00
Tom Byers
47781cc929 Change treatment of space character in URLs
jQuery changed it from using '+' to '%20' between
versions 1 and 3. This updates the test to match.
2019-11-11 12:08:21 +00:00
Leo Hemsted
846895dca2 frozen reqs 2019-11-11 12:05:32 +00:00
pyup-bot
d58624c767 Update notifications-python-client from 5.3.0 to 5.4.0 2019-11-11 12:04:23 +00:00