Commit Graph

7172 Commits

Author SHA1 Message Date
Chris Hill-Scott
eeeaa5546e Merge pull request #2781 from alphagov/pyup-update-coveralls-1.5.1-to-1.6.0
Update coveralls to 1.6.0
2019-02-19 10:19:28 +00:00
Chris Hill-Scott
203393de23 Merge pull request #2783 from alphagov/pyup-update-flake8-3.7.5-to-3.7.6
Update flake8 to 3.7.6
2019-02-19 10:19:17 +00:00
Chris Hill-Scott
420b17cd49 Merge pull request #2784 from alphagov/torridge.gov.uk
Mark agreement signed by Torridge District Council
2019-02-19 10:19:01 +00:00
Chris Hill-Scott
f0af083892 Mark agreement signed by Torridge District Council 2019-02-19 10:12:09 +00:00
pyup-bot
7be7861473 Update flake8 from 3.7.5 to 3.7.6 2019-02-18 21:48:03 +00:00
pyup-bot
12ddd5c514 Update coveralls from 1.5.1 to 1.6.0 2019-02-18 18:57:55 +00:00
Chris Hill-Scott
86e6f4a843 Merge pull request #2779 from alphagov/oxford.gov.uk
Mark agreement signed by Oxford City Council
2019-02-18 16:14:50 +00:00
Chris Hill-Scott
877556c2d7 Mark agreement signed by Oxford City Council 2019-02-18 16:08:01 +00:00
Chris Hill-Scott
61b8e10fc0 Merge pull request #2765 from alphagov/folder-after-delete-template
Return to a template’s folder after deleting it
2019-02-18 13:22:27 +00:00
Chris Hill-Scott
782d705857 Merge pull request #2778 from alphagov/southwark
Added Southwark council agreement
2019-02-18 12:20:51 +00:00
Pete Herlihy
ffa5cb6a1c Added Southwark council agreement 2019-02-18 12:14:14 +00:00
Pea (Malgorzata Tyczynska)
cdbbdda730 Merge pull request #2771 from alphagov/update_passowrds_blacklist
Update common passwords blacklist
2019-02-18 11:02:40 +00:00
Chris Hill-Scott
d83622d3b4 Merge pull request #2777 from alphagov/antrim-and-newtonabbey-runneymede-east-riding-of-yorkshire
Mark agreement signed by 3 councils
2019-02-18 10:43:41 +00:00
Chris Hill-Scott
24ba4235d1 Mark agreement signed by 3 councils
- Antrim and Newtonabbey
- Runneymede
- East Riding of Yorkshire
2019-02-18 10:12:22 +00:00
Pea Tyczynska
3f6e0b6631 Update common passwords blacklist
I did the update following instructions from this commit:
https://github.com/alphagov/notifications-admin/
commit/136662bd309d986a9b7c3e0ee76588612c1ab761

Password repositiories I used were:
darkweb2017-top10000.txt
probable-v2-top12000.txt
twitter-banned.txt
2019-02-15 13:43:46 +00:00
Chris Hill-Scott
51e56614c0 Merge pull request #2767 from alphagov/barnsley
Signed contract from Barnsley
2019-02-15 10:12:10 +00:00
Katie Smith
a4b41537d8 Merge pull request #2768 from alphagov/remove-add-template-by-type-links
Removed links to add_template_by_type_endpoint
2019-02-15 09:28:01 +00:00
Katie Smith
862d077f66 Removed links to add_template_by_type_endpoint
The endpoint was removed, but was still linked to in a couple of
places. Some old links were no longer needed, so have been removed.

We do still need a link to `add_template_by_type` on the 'Choose reply'
page - this page is used to allow to let someone pick a template to
reply to inbound SMS with. Since the link only appears if they have no
SMS templates, we now link to `.choose_template` with the templates and
folders form already opened at the option to add a template.
2019-02-15 08:06:06 +00:00
Pete Herlihy
8a79f879ac Signed contract from Barnsley 2019-02-14 14:53:25 +00:00
Chris Hill-Scott
6a66ee0a4f Merge pull request #2756 from alphagov/clean-up-domains
Clean up domains file
2019-02-14 11:27:34 +00:00
Pea (Malgorzata Tyczynska)
42990fe376 Merge pull request #2759 from alphagov/remove_all_service_postage_references
Remove all service postage references
2019-02-14 11:19:15 +00:00
Pea Tyczynska
f0b82e7d3b Remove all service postage references
Since service.postage field has been removed from our model
and database.
2019-02-14 11:05:39 +00:00
Chris Hill-Scott
a7b090d287 Return to a template’s folder after deleting it
It’s disconcerting going back to the root if a template is in a deeply
nested folder. Especially if you’re trying to delete multiple templates.
2019-02-14 10:32:50 +00:00
Chris Hill-Scott
46b56c950d Merge pull request #2764 from alphagov/fix-misaligned-checkboxes
Fix misaligned checkboxes
2019-02-13 17:33:44 +00:00
Chris Hill-Scott
1ddf5b5176 Fix misaligned checkboxes
The template list wasn’t getting the right class applied because the
check was referring to an undefined variable (`can_manage_folders`) that
should have been removed when all other references to it were.
2019-02-13 17:25:06 +00:00
Chris Hill-Scott
b2ed3e01b4 Merge pull request #2752 from alphagov/remove-folder-flag
Remove code that is redundant now that all users have folders
2019-02-13 17:10:24 +00:00
Chris Hill-Scott
303638be92 Merge pull request #2763 from alphagov/hmrc-defra-mod
Add some central gov. domains we don’t yet have
2019-02-13 17:10:12 +00:00
Chris Hill-Scott
d02b4c2148 Add some central gov. domains we don’t yet have
So we can auto-assign their letter logos.

Depending on where people sit in these organisations they my or may not have signed the MOU, so it’s `None` not `True` or `False`.
2019-02-13 17:02:44 +00:00
Tom Byers
a9933010dc Merge pull request #2761 from alphagov/fix-sticky-stopping-bug
Fix bug which makes the sticky controls snap to the top of its scroll area
2019-02-13 16:08:31 +00:00
Chris Hill-Scott
323c0d7ada Merge pull request #2762 from alphagov/letter-logo-reword
Finesse wording on letter branding request page
2019-02-13 15:59:02 +00:00
Chris Hill-Scott
eae708a1bc Finesse wording on letter branding request page
Telling people to ask if they want a different logo doesn’t make sense
if they don’t have one at all.
2019-02-13 15:46:59 +00:00
Chris Hill-Scott
82eeb91e79 Merge pull request #2680 from alphagov/add-logo-button-letter-template
Add an ‘add logo’ button on the letter template
2019-02-13 15:20:21 +00:00
Chris Hill-Scott
9bf92b2054 Only direct people to choosing a logo if they don’t have one
Once they have their logo set up people don’t typically need to change
it so we shouldn’t distract them with a button.
2019-02-13 15:12:36 +00:00
Chris Hill-Scott
77aba35c49 Add an ‘add logo’ button
Because some people don’t know they can put their own logo on letters:

> The HM Government Logo is at the top of the letter and we can't see
> a way of putting the [organisation] logo on

> We are intending to use the letter template feature for the first time
> and wondered whether the branding is configurable or whether the HM
> Government header is the standard default.

> Can we replace HM Government logo with our own in the letter? IF yes,
> then how?

> I don't seem to be able to set the branding on the letters to be
> [organisation]. it's always HM government. Is there something that
> needs enabling for this account?

No-one actually wants the HM Government logo (no-one is sending real
letters using it). So we should leave the space blank and put a button
there prompting people to add their own logo.
2019-02-13 15:12:36 +00:00
Chris Hill-Scott
2d0942d988 Remove redundant setting of variables
The included template doesn’t use these variables.
2019-02-13 15:12:35 +00:00
Tom Byers
994c9397fe Fix the logic handling spacing between stickys 2019-02-13 14:49:42 +00:00
Chris Hill-Scott
f9f8b6e99c Merge pull request #2750 from alphagov/embiggen-all-the-things
Embiggen all the things
2019-02-13 14:45:57 +00:00
Leo Hemsted
0ca48cd1b3 Merge pull request #2753 from alphagov/template-preview-logo
use letter branding object instead of letter_logo_filename
2019-02-13 14:04:10 +00:00
Leo Hemsted
0e3d47bc08 use letter branding object instead of letter_logo_filename
This is part of migrating away from dvla organisations. This only
affects in-app previews and not actual letters printed by the api.
2019-02-13 13:52:06 +00:00
Chris Hill-Scott
f2604494f0 Fix hover colour for ‘Switch service’ link 2019-02-13 13:32:31 +00:00
Chris Hill-Scott
1e82b6f8b3 Use pseudo elements not borders
This is the technique that GOV.UK Frontend uses to make clickable areas
of buttons bigger.

See: 47407edcb5/src/components/button/_button.scss (L89)
2019-02-13 13:28:32 +00:00
Katie Smith
bd8ff7ec52 Merge pull request #2751 from alphagov/update-letter-branding
Allow letter branding to be updated
2019-02-13 09:19:47 +00:00
Chris Hill-Scott
b64ceb9858 Add option to output just domains from script 2019-02-12 16:59:13 +00:00
Chris Hill-Scott
dd906c8a32 Merge pull request #2758 from alphagov/conwy.gov.uk
Mark agreement signed by Conwy
2019-02-12 15:34:55 +00:00
Katie Smith
31a1c1ca51 Pass service domain to api when adding a new service
We need to pass the domain to api when adding a service so that api can
link the domain of the service with a letter brand.
2019-02-12 14:59:29 +00:00
Katie Smith
1cb1ce310a Add update_letter_branding view function
This works in a similar way to the create_letter_branding view function,
but with a few minor differences:
* Since we already have a file, uploading a file is no longer required
(since we can just use the current file if a new one is not uploaded)
* We save the changes in the database, then upload the new files to S3.
If saving to S3 raises an error, we now rollback the database changes to
prevent any errors when trying to view letters with the original logo.
2019-02-12 14:59:29 +00:00
Katie Smith
53627fd1ba Add update letter branding method to letter branding client 2019-02-12 14:59:29 +00:00
Chris Hill-Scott
9087f5a890 Mark agreement signed by Conwy 2019-02-12 14:33:24 +00:00
Rebecca Law
8efb075550 Merge pull request #2757 from alphagov/update-email-domain
Update email domains
2019-02-12 14:13:09 +00:00
Rebecca Law
8fa95159ab Adult Social Care Workforce Data Set service is funded by the Department of Health and Social Care and is being delivered by Skills for Care as a delivery partner 2019-02-12 13:59:49 +00:00