Commit Graph

5159 Commits

Author SHA1 Message Date
karlchillmaid
d37a3557c4 Correct apostrophe, add VAT 2019-04-16 16:47:52 +01:00
karlchillmaid
43f23046d5 Correct apostrophe 2019-04-16 16:46:44 +01:00
karlchillmaid
fccab8103c Correct link, apostrophe and contraction 2019-04-16 16:44:35 +01:00
Chris Hill-Scott
3e969280fc Remove pricing stuff from organisation model
We’re not linking to the agreement from the pricing page any more, so we don’t need to talk about whether an organisation has signed it or not.
2019-04-16 15:45:36 +01:00
karlchillmaid
f3a2e695fb Merge pull request #2858 from alphagov/features-content-updates
Update features and footer content and answer some common support questions.
2019-04-16 15:42:51 +01:00
Chris Hill-Scott
f05e5af6d8 Update footer to reflect new features navigation" 2019-04-16 15:22:37 +01:00
Chris Hill-Scott
1f0195c1d1 Remove ‘using notify’ from nav (it’s a redirect now) 2019-04-16 15:20:00 +01:00
Chris Hill-Scott
0303d6a018 Indent sub navigation items 2019-04-16 15:19:28 +01:00
karlchillmaid
6366417568 Merge pull request #2914 from alphagov/correct-time-formatting
Correct time formatting
2019-04-16 15:07:04 +01:00
Chris Hill-Scott
ae403c5b5a Update app/templates/views/trial-mode.html
Co-Authored-By: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
2019-04-16 14:44:45 +01:00
Chris Hill-Scott
042a61a930 Update app/templates/views/trial-mode.html
Co-Authored-By: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
2019-04-16 14:44:37 +01:00
Chris Hill-Scott
8872e30567 Update app/templates/views/support/index.html
Co-Authored-By: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
2019-04-16 14:44:21 +01:00
Chris Hill-Scott
99ef4d61ff Update app/templates/views/pricing.html
Co-Authored-By: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
2019-04-16 14:44:02 +01:00
Chris Hill-Scott
78333b70b9 Update app/templates/views/pricing.html
Co-Authored-By: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
2019-04-16 14:43:53 +01:00
Chris Hill-Scott
232b8aa9c8 Update app/templates/views/pricing.html
Co-Authored-By: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
2019-04-16 14:43:43 +01:00
Chris Hill-Scott
163f8561e1 Update app/templates/views/message-status.html
Co-Authored-By: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
2019-04-16 14:43:34 +01:00
Chris Hill-Scott
534c5b1986 Update app/templates/views/features/letters.html
Co-Authored-By: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
2019-04-16 14:43:22 +01:00
Chris Hill-Scott
59e981030a Update app/templates/views/features/emails.html
Co-Authored-By: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
2019-04-16 14:43:10 +01:00
karlchillmaid
0ee322f137 Merge branch 'master' into features-content-updates 2019-04-16 13:50:50 +01:00
karlchillmaid
527d8ff10f Correct table 2019-04-16 13:49:46 +01:00
Tom Byers
1d88324175 Revert "Update diff-dom package to 3.1.0"
This reverts commit 01b97986f6.
2019-04-16 13:09:15 +01:00
karlchillmaid
b7c955c010 Make the formatting of postage times consistent 2019-04-16 10:39:50 +01:00
karlchillmaid
0bf1068a3e Make the formatting of postage times consistent
Make the formatting of postage times consistent with the rest of the service, and the GOV.UK style guide.
2019-04-16 10:34:46 +01:00
karlchillmaid
521c7824d6 Update link 2019-04-16 10:25:33 +01:00
karlchillmaid
487919970b Update link 2019-04-16 10:25:02 +01:00
karlchillmaid
3f4ca1018d Updated link 2019-04-16 10:23:10 +01:00
karlchillmaid
d12c184d7e Update links 2019-04-16 10:21:01 +01:00
karlchillmaid
fe8e10a42a Update links
One left to do
2019-04-16 10:19:45 +01:00
karlchillmaid
6830a412de Update links 2019-04-16 10:18:33 +01:00
karlchillmaid
27d4b702cc Update links
One left to do
2019-04-16 10:16:19 +01:00
karlchillmaid
839fc99f30 Update links 2019-04-16 10:04:12 +01:00
Tom Byers
7a6579e8cb Merge pull request #2903 from alphagov/update-node-version
Update node version
2019-04-15 15:44:22 +01:00
karlchillmaid
230ba7bcb1 Update link 2019-04-15 15:28:37 +01:00
karlchillmaid
d97707652f Update links 2019-04-15 15:22:50 +01:00
Chris Hill-Scott
8626777fde Don’t let services go live without an organisation
We shouldn’t be making services live without an agreement in place. In
order to have an agreement in place we need to know what organisation
operates the service.

If a service comes along but belongs to an organisation we don’t know
about then we should create that organisation. This commits removes the
link, which should force this to happen.
2019-04-12 22:42:23 +01:00
Chris Hill-Scott
700e073d0f Stop sending service domain to the API
The API doesn’t look at it, and the rest of the admin code isn’t calling
the method with this argument any more.
2019-04-12 17:15:51 +01:00
Pea (Malgorzata Tyczynska)
5ac6255be7 Merge pull request #2897 from alphagov/overlay-for-failed-letters
Precompiled show preview with overlay when validation fails
2019-04-12 16:37:53 +01:00
Chris Hill-Scott
8084dce705 Merge pull request #2896 from alphagov/remove-domains-yml
Use organisations from database rather than YAML file
2019-04-12 16:37:15 +01:00
Tom Byers
a8a29698cb Replace gulp-base64 with gulp-base64-inline
The gulp-base64 package has 11 dependencies with
vulnerabilities listed against them as of this
time. It also doesn't seem to be maintained any
more. The last commit was in 2015 and there are
issues and pull requests up to bump the
dependencies.

This replaces it with gulp-base64-inline.

gulp-base64-inline takes a single path, which it
prepends to any image paths it finds. Our image
paths are actually URLs, not filesystem paths so
we need to send it a relative path to repoint the
URL.

This commit includes changes that remove a few
`@import`s from one of our sass partials.

They aren't needed as those files are imported
further up the stack and `_typography.scss` has an
import in it that overwrites the new
`_url-helpers.scss` we added here.
2019-04-12 15:36:57 +01:00
Tom Byers
01b97986f6 Update diff-dom package to 3.1.0
Since it moved to ES Modules in version 2.3.1,
diff-dom stopped including the `diffDOM.js` file
in its NPM package.

We don't do any kind of bundling in our build yet,
just concatenation of our scripts and some
minification of the results so we can't take
advantage of this yet.

The `diffDOM.js` file is still available in the
Github release so this moves to referencing that
in the `package.json` instead, until we start
using a bundler.

I opened an issue to check this is what the author
intended:

https://github.com/fiduswriter/diffDOM/issues/84

The latest version also adds Rollup as a peer
dependency.
2019-04-12 15:36:57 +01:00
Chris Hill-Scott
3212915a51 Simplifying code for checking email domains
Since this code isn’t trying to inherit from the code that also looked
up domain names in `domains.yml` it can go back to being a lot simpler.

This code is thoroughly tested already here:
a249382e69/tests/app/main/test_validators.py (L74-L155)
2019-04-12 15:23:08 +01:00
Chris Hill-Scott
07c7544049 Use crown not crown_status as prop name
It’s confusing having a property name which is different from the
attribute returned in the JSON from the API.
2019-04-12 15:23:08 +01:00
Chris Hill-Scott
5d091b214a Remove domains.yml file
Since we’ve now removed the code that reads this file, it can safely be
deleted.
2019-04-12 15:23:08 +01:00
Chris Hill-Scott
9d99c78c3a Remove code that reads domains.yml
Since we’ve removed calls to this code from the rest of the app, it can
safely be removed now.
2019-04-12 15:23:08 +01:00
Chris Hill-Scott
470b8a2912 Remove domains from branding forms
We’re deprecating storing the domain as text on a branding in favour of
a database relationship between branding and organisation.

We need to do this now in order to remove the validation on these fields
(which depends on the data in `domains.yml`)
2019-04-12 15:23:07 +01:00
Chris Hill-Scott
9684e962ae Refactor go live tags into service model
Since this function only takes one argument, a service, it might as well
be a method of the service.
2019-04-12 15:19:32 +01:00
Chris Hill-Scott
3565ffc33f Remove dependence on domains.yml from settings
Settings looked at `domains.yml` when users were making go live requests
or email branding requests.

This will allow us to remove the `domains.yml` file, by using
information about organisations that is now stored in the database
instead.
2019-04-12 15:19:31 +01:00
Chris Hill-Scott
b41c3779c4 Merge pull request #2906 from alphagov/auto-service-counts
Automate counting of live services and orgs
2019-04-12 14:15:41 +01:00
Chris Hill-Scott
835d11d8d6 Remove domains.yml dependence from agreement pages
This will allow us to remove the `domains.yml` file, by using
information about organisations that is now stored in the database
instead.
2019-04-12 14:12:10 +01:00
Chris Hill-Scott
98249158cb Stop trying to infer branding when adding services
The API handles this now.
2019-04-12 14:08:33 +01:00