Commit Graph

9121 Commits

Author SHA1 Message Date
karlchillmaid
dabc2b91f6 Create branding-and-customisation.html 2020-01-22 13:49:07 +00:00
karlchillmaid
7da98c3745 Create send-a-file-by-email.html 2020-01-22 13:49:07 +00:00
karlchillmaid
6f1f57cc22 Add {% endblock %} 2020-01-22 13:49:07 +00:00
karlchillmaid
5418958c16 Create create-and-send-messages.html 2020-01-22 13:49:07 +00:00
karlchillmaid
d6a8954304 Create edit-and-format-messages.html 2020-01-22 13:49:07 +00:00
karlchillmaid
9a61f3c56d Update filename 2020-01-22 13:49:06 +00:00
karlchillmaid
b239b8cb13 Update path 2020-01-22 13:49:06 +00:00
karlchillmaid
830b1f5274 Update content 2020-01-22 13:49:06 +00:00
karlchillmaid
fef1a92cce Create upload-a-letter.html 2020-01-22 13:49:06 +00:00
karlchillmaid
327673abfa Update file name 2020-01-22 13:49:06 +00:00
karlchillmaid
bad465021b Fix heading and content 2020-01-22 13:49:06 +00:00
karlchillmaid
95a92060c0 Remove alternative content 2020-01-22 13:49:05 +00:00
karlchillmaid
6741b5d55e Add links to list 2020-01-22 13:49:05 +00:00
karlchillmaid
cf0d9c5821 Add bulk sending content 2020-01-22 13:49:05 +00:00
karlchillmaid
55e4393a81 Add anchor link 2020-01-22 13:49:05 +00:00
karlchillmaid
b4479c783b Fix anchor link 2020-01-22 13:49:05 +00:00
karlchillmaid
d7711421d9 Add anchor link 2020-01-22 13:49:05 +00:00
karlchillmaid
b9ec7df023 Add anchor link 2020-01-22 13:48:24 +00:00
karlchillmaid
cb8166efa0 Correct anchor link 2020-01-22 13:48:24 +00:00
karlchillmaid
edc7a28a70 Add anchor links 2020-01-22 13:48:24 +00:00
karlchillmaid
c1f3f5c99e Update links 2020-01-22 13:48:24 +00:00
karlchillmaid
4b598d463c Add list of links 2020-01-22 13:48:24 +00:00
karlchillmaid
7b49a566c5 Update content 2020-01-22 13:48:23 +00:00
karlchillmaid
7057f79532 Update upload letters content 2020-01-22 13:48:23 +00:00
karlchillmaid
3bdcc0ec32 Update upload letters content 2020-01-22 13:48:23 +00:00
karlchillmaid
ebd91fabd2 Update sms sender content 2020-01-22 13:47:33 +00:00
karlchillmaid
747d60175e Update branding content 2020-01-22 13:47:33 +00:00
karlchillmaid
c7c9d6c3de Update reply-to address content 2020-01-22 13:47:32 +00:00
karlchillmaid
7068271f39 Update page title and content 2020-01-22 13:47:32 +00:00
karlchillmaid
bcf12a20b4 Update personalisation content 2020-01-22 13:47:31 +00:00
karlchillmaid
07306e948d Add heading IDs 2020-01-22 13:47:31 +00:00
karlchillmaid
917687f567 Update title and h1 2020-01-22 13:47:30 +00:00
karlchillmaid
e43190b936 Create page and add content 2020-01-22 13:47:30 +00:00
Tom Byers
945701c607 Merge pull request #3273 from alphagov/fix-ga-config
Update Google Analytics tracker config
2020-01-22 13:00:55 +00:00
Tom Byers
cfdc83a336 Update tests 2020-01-22 12:26:55 +00:00
Tom Byers
0885dde2c1 Update Google Analytics tracker config
Removes the following fields from the tracker
config:
- `name`, which was erroring due to it
  including a `.`
- `displayFeaturesTask` which seems to be
  deprecated

Also refactors the `create` command to put all
fields into the options parameter, as shown in the
developer docs:

https://developers.google.com/analytics/devguides/collection/analyticsjs/creating-trackers
2020-01-22 12:10:01 +00:00
Leo Hemsted
1cd96d7e2f Merge pull request #3271 from alphagov/bump-python
fix service letter contact blocks
2020-01-21 17:41:37 +00:00
Leo Hemsted
5bbbdc3cd9 fix xss with service letter contact blocks
service contact blocks contain new lines - and jinja2 normally ignores
newlines (as in it keeps them as new lines) - but we need to turn them
into `<br>` tags so that we can show the formatting that the user has
added. We were previously just doing `{{ block | nl2br | safe }}`. nl2br
turns the new lines into `<br>` tags, and then `safe` tells jinja that
it doesn't need to escape the html.

this causes issues if the user adds `<script>alert(1)</script>` to their
contact block (or some other evil xss hack), where that will get let
through due to the safe flag

To solve this, use `Markup(html='escape')` to sanitise any html, and
then convert new lines to <br>.

bump utils

another xss
2020-01-21 17:34:49 +00:00
Leo Hemsted
c57aec8cd5 Merge pull request #3270 from alphagov/bump-python
bump python version
2020-01-21 15:17:30 +00:00
Leo Hemsted
edfcd49861 bump python version
we all run 3.6 locally, we test against 3.6 both locally and on
concourse, and the latest version of openpyxl (required by
pyexcel-xlsx) doesn't support 3.5 anymore
2020-01-21 15:10:43 +00:00
Leo Hemsted
772a47e870 Merge pull request #3269 from alphagov/reqs-bump
bump requirements
2020-01-21 14:55:40 +00:00
Leo Hemsted
9620559a55 bump requirements 2020-01-21 14:47:18 +00:00
David McDonald
8a41b63e23 Merge pull request #3267 from alphagov/bank-hols
Add more bank holiday dates
2020-01-21 10:24:02 +00:00
Chris Hill-Scott
6ff9dac161 Merge pull request #3254 from alphagov/letter-validation-short-messages
Add separate messages for precompiled letters that have failed validation
2020-01-21 10:02:58 +00:00
Chris Hill-Scott
68bc41685c Merge pull request #3266 from alphagov/job-status-not-on-uploads
Don’t assume a job’s status will be present
2020-01-21 10:02:51 +00:00
David McDonald
8d2053216f Add more bank holiday dates 2020-01-20 17:14:54 +00:00
Chris Hill-Scott
0202f73f9a Remove job_status from allowed properties
We can’t guarantee it’s always present, so shouldn’t allow direct access
to it.
2020-01-20 16:47:09 +00:00
Chris Hill-Scott
34f209a08b Fix mixed-up error messages
The too many pages error was being returned when the file couldn’t be
read. This commit corrects the error message, and adds a test to make
sure this case is covered.
2020-01-20 15:54:07 +00:00
Chris Hill-Scott
1fc0f58541 Add test for plural form of error message 2020-01-20 15:50:16 +00:00
Chris Hill-Scott
bc7deebcc7 Split test in two for readability 2020-01-20 15:46:03 +00:00