5985 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Chris Hill-Scott	d7f42a868c	Merge pull request #2244 from alphagov/request-letter-branding ... Tell people they can have their logo on letters	2018-08-29 15:52:58 +01:00
Sakis	162fd3773e	Merge pull request #2258 from alphagov/remove-header-check-preview ... Disable paas-proxy header check on preview	2018-08-29 14:58:54 +01:00
Chris Hill-Scott	6a20deba87	Merge pull request #2259 from alphagov/331-446 ... Update service count to 346 and orgs to 112	2018-08-29 11:54:00 +01:00
Chris Hill-Scott	8546d1b62b	Merge pull request #2256 from alphagov/pyup-update-pytest-3.7.2-to-3.7.3 ... Update pytest to 3.7.3	2018-08-29 11:44:45 +01:00
Pete Herlihy	1569babc57	Update service count to 346 and orgs to 112	2018-08-29 11:41:30 +01:00
Chris Hill-Scott	7563ad16ed	Merge pull request #2255 from alphagov/pyup-update-pytest-xdist-1.22.5-to-1.23.0 ... Update pytest-xdist to 1.23.0	2018-08-29 11:40:02 +01:00
Chris Hill-Scott	f6c3a8f817	Merge pull request #2257 from alphagov/lbbd ... Alias Barking and Dagenham council’s domain	2018-08-29 10:50:33 +01:00
Athanasios Voutsadakis	c7cce495bd	Disable paas-proxy header check on preview ... See: https://github.com/alphagov/notifications-api/pull/2052	2018-08-28 13:58:31 +01:00
Chris Hill-Scott	b0694977c2	Alias Barking and Dagenham council’s domain	2018-08-28 09:47:24 +01:00
pyup-bot	d120e6069c	Update pytest from 3.7.2 to 3.7.3	2018-08-26 21:47:12 +01:00
pyup-bot	5a440ebd89	Update pytest-xdist from 1.22.5 to 1.23.0	2018-08-25 06:04:09 +01:00
Chris Hill-Scott	408d2173cb	Merge pull request #2254 from alphagov/midsussex.gov.uk ... Mark agreement signed by Mid Sussex District Council	2018-08-24 17:30:14 +01:00
Chris Hill-Scott	cfc41085a1	Mark agreement signed by Mid Sussex District Council	2018-08-24 17:20:29 +01:00
Rebecca Law	54b63ed5e5	Merge pull request #2249 from alphagov/add-brand-type-to-email-branding ... Add brand type to email branding.	2018-08-24 13:50:36 +01:00
Rebecca Law	be050657f6	Default the brand_type for new email brands	2018-08-24 13:11:40 +01:00
Chris Hill-Scott	4f584de7b2	Merge pull request #2253 from alphagov/hereforeshire.gov.uk ... Mark agreement signed by Herefordshire council	2018-08-24 12:29:33 +01:00
Chris Hill-Scott	74b480d967	Mark agreement signed by Herefordshire council	2018-08-24 12:24:31 +01:00
Rebecca Law	2b08b84c9e	Merge branch 'master' into add-brand-type-to-email-branding	2018-08-24 11:09:31 +01:00
Rebecca Law	f7f202b670	Fix the EmailBranding	2018-08-23 17:44:34 +01:00
Tom Byers	f2df914dc1	Merge pull request #2248 from alphagov/add-filter-to-branding-selection ... Add filter to branding selection	2018-08-23 15:12:09 +01:00
Rebecca Law	34d938ce18	Add brand type to email branding. ... Removed banner_colour and single_id_colour. We only really need one colour now.	2018-08-23 14:21:41 +01:00
Chris Hill-Scott	d68cc68def	Make page title semi-consistent ... We tend to use ‘Add’ rather than ‘Create’ in other places.	2018-08-23 09:52:50 +01:00
Chris Hill-Scott	9b9acfa291	Select a branding with a link, not form ... Selecting a branding just takes you to a new page, it doesn’t change any state. Links are generally the way you go from one page to another on the web.	2018-08-23 09:52:50 +01:00
Chris Hill-Scott	1e28fe4ffd	Remove redundant argument ... This `branding_dict` is not used in the Jinja template anywhere.	2018-08-23 09:51:33 +01:00
Chris Hill-Scott	0e7ed2b0cf	Put ‘add new’ button at top of page ... One of the most frequent tasks done on this page is adding a new branding. Current to do this you have to: - scroll to the bottom - scan for the ‘Create a new email branding’ option that visually looks just like all the other brandings - submit a form This commit makes change it to one clearly differentiated button at the top of the page. This is consistent for how we let users add templates and team members.	2018-08-23 09:49:23 +01:00
Tom Byers	7d6714ed68	Add live-search visibility test for conversations ... It is only shown if the number of messages don't fit onto the screen.	2018-08-22 19:03:52 +01:00
Tom Byers	3bc7c1c224	Add test for live-search on templates page ... Includes addition of a mock for a list of templates long enough to need a live-search.	2018-08-22 19:03:52 +01:00
Tom Byers	3b4c49a2c3	Add test helper to generate service templates	2018-08-22 19:03:52 +01:00
Tom Byers	cff43abfc6	Add live-search to /email-branding page	2018-08-22 19:03:46 +01:00
Tom Byers	3ea94128c6	Add live-search to set-email-branding page	2018-08-22 19:03:38 +01:00
Tom Byers	0015f086ea	Add test helper to mock email brandings	2018-08-22 18:25:02 +01:00
Tom Byers	47798b218c	Make live-search into a component	2018-08-22 17:42:04 +01:00
Chris Hill-Scott	71be0eaeb4	Merge pull request #2246 from alphagov/input-not-change ... Fix colour preview not loading on page load	2018-08-22 16:57:02 +01:00
Chris Hill-Scott	3483490f03	Fix colour preview not loading on page load ... The event was changed from `change` to `input`. The trigger was not updated accordingly.	2018-08-22 16:51:16 +01:00
Chris Hill-Scott	6193f049f5	Merge pull request #2242 from alphagov/colour-preview-refactor ... Refactor hex colour preview Javascript	2018-08-22 16:38:10 +01:00
Chris Hill-Scott	b10f0747ae	Use input event not keyup ... The `oninput` event is a more performant way to detect changes to a textbox’s contents (compared to `onkeydown`, `onpaste`, etc). It’s not supported in older browsers, but since this is a likely to be used by platform admin users only that’s OK.	2018-08-22 16:31:05 +01:00
Chris Hill-Scott	6501105768	Refactor to not repeat lots of Jinja code	2018-08-22 16:31:05 +01:00
Chris Hill-Scott	b73e42650d	Refactor hex colour preview Javascript ... This commit improves the code that previews a hex colour when setting up or changing an email branding. Specifically it: - refactors the Javascript to conform to our patterns (module pattern, preprocessed with Gulp) - makes the code work when there are multiple colour previews on one page It also does some visual prettifying, because I couldn’t help myself…	2018-08-22 16:31:05 +01:00
Chris Hill-Scott	864e732c38	Merge pull request #2241 from alphagov/add-colours-and-domain-to-email-branding ... New columns for email branding	2018-08-22 16:29:42 +01:00
Rebecca Law	473c8378fc	Created a method to decide which colour to pass into the notifications-utils method to preview the template. ... Removed the ServiceCreateEmailBranding form - it is identical to the other form.	2018-08-22 12:56:08 +01:00
Chris Hill-Scott	6c8345045f	Merge pull request #2245 from alphagov/bump-utils-long-letters ... Bump utils to show error message for long letters	2018-08-22 09:41:28 +01:00
Chris Hill-Scott	2ca2176f76	Merge pull request #2205 from alphagov/pyup-update-eventlet-0.22.1-to-0.24.1 ... Update eventlet to 0.24.1	2018-08-22 09:36:46 +01:00
Chris Hill-Scott	270a563fea	Bump utils to show error message for long letters ... Brings in: - [ ] https://github.com/alphagov/notifications-utils/pull/518	2018-08-22 09:32:34 +01:00
Chris Hill-Scott	b2d8937f94	Tweak wording	2018-08-21 15:19:26 +01:00
karlchillmaid	d8f5896f9d	Merge pull request #2243 from alphagov/reply-to_address_label_change ... Rename 'reply-to address' in Settings	2018-08-21 10:23:43 +01:00
Chris Hill-Scott	0b86a12fdd	Tell people they can have their logo on letters ... At the moment there’s nothing in Notify that says the logo on letter templates can be changed from ‘HM Government’. While some people guess that it’s possible, or are motivated enough to enquire, others might be assuming that the branding can’t be changed (and thus deciding Notify letters aren’t for them). In the future we should make this process slicker (eg with a file upload) but the easiest, quickest improvement to make for now is: - let people know that the branding can be changed - direct them to support if they do want to change it	2018-08-21 09:56:20 +01:00
Chris Hill-Scott	7530fbf731	Fix the tests and catch a few more examples	2018-08-20 18:05:46 +01:00
karlchillmaid	36e8a9b3cc	Corrected the page title ... Corrected the page title to 'Data retention'	2018-08-20 16:59:35 +01:00
karlchillmaid	60f64ee5e5	'Email reply-to address' updated ... Updated 'reply-to address' to include a hyphen	2018-08-20 16:50:56 +01:00
karlchillmaid	e18f1727d1	'Email reply-to addresses' updated ... Updated 'reply-to address' to include a hyphen	2018-08-20 16:48:21 +01:00