5596 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Pete Herlihy	79161702b4	Snuck a new one in...	2018-06-15 17:06:00 +01:00
Pete Herlihy	e197e2b4fc	263 services and 86 organisations ... Details here... https://docs.google.com/spreadsheets/d/1JYhE5sJaOJUVMPPDenO2eKqElC75Rygxb1_2mpRKy98/edit#gid=0	2018-06-15 16:55:00 +01:00
Pete Herlihy	5ee6e1c6c3	Merge pull request #2115 from alphagov/zendesk-formattin ... Zendesk formatting to make tickets easier to read	2018-06-15 16:36:23 +01:00
Leo Hemsted	ad8e95302c	fix pete's broken tests	2018-06-15 16:27:17 +01:00
Pete Herlihy	81de3701b5	Found a couple of commas down the back of the sofa....	2018-06-15 16:03:45 +01:00
Pete Herlihy	2e6deaabeb	Added the message back	2018-06-15 15:33:21 +01:00
Pete Herlihy	7dcbad1ba8	Tidied up the formatting on the feedback tickets	2018-06-15 15:30:45 +01:00
Pete Herlihy	669a8a7053	Tweaked the formatting of the Zendesk messages	2018-06-15 15:11:13 +01:00
Katie Smith	c27863a076	Merge pull request #2110 from alphagov/show-contact-link-link ... Show contact link on service settings page	2018-06-12 10:43:44 +01:00
Katie Smith	0633af4e4a	Truncate contact link text on settings page ... The contact link on the settings page should be truncated instead of the text being wrapped and overflowing on to multiple lines. This adds in an option to the text_field macro to truncate long text fields. This setting has been used to truncate the API callback URLs too on the services/<service_id>/api/callbacks page.	2018-06-12 10:21:24 +01:00
Katie Smith	33277ce3e2	Make a contact_link required when turning upload_document permission on ... When a platform admin user clicks on the button to add the 'upload_document' permission to a service, they should be taken to the page to add a contact_link if the service does not already have one.	2018-06-12 10:21:24 +01:00
Katie Smith	8a559aceb5	Display contact link on service settings page ... The contact link for the service now gets displayed on the service settings page if the service has the 'upload_document' permission. There are no changes to the appearance of the service settings page if a service does not have the 'upload_document' permission.	2018-06-12 10:21:24 +01:00
Katie Smith	02988c224b	Merge pull request #2100 from alphagov/contact-url-page ... Add page to change a service's contact link	2018-06-12 10:20:51 +01:00
Chris Hill-Scott	421b539af0	Merge pull request #2112 from alphagov/galleries ... Adding nationalgalleries.org - Scottish NDPB	2018-06-11 11:53:38 +01:00
Chris Hill-Scott	b080b19d28	Merge pull request #2111 from alphagov/duplicate-example ... Don’t duplicate columns in example spreadsheet	2018-06-11 11:53:28 +01:00
Pete Herlihy	3442b9bc48	Adding nationalgalleries.org - Scottish NDPB	2018-06-11 11:30:28 +01:00
Katie Smith	e1d4181be3	Add page to change a service's contact link ... Added a page which lets users with the 'manage_service' permission change the contact link for their service. There are no links to this page yet since only services using document download will need to set a contact link.	2018-06-11 10:36:18 +01:00
Chris Hill-Scott	4b37ca4021	Don’t duplicate columns in example spreadsheet ... If a template has a placeholder like `((email address))` then the sample spreadsheet and CSV file have the email column twice. Trying to upload this spreadsheet will result in a ‘duplicate column’ error. This commit fixes it so that the column will only appear once.	2018-06-08 13:28:02 +01:00
Chris Hill-Scott	1fc4e1657d	Merge pull request #2108 from alphagov/no-redact-letters ... Don’t let people redact letter templates	2018-06-08 10:20:27 +01:00
Chris Hill-Scott	1f35214726	Merge pull request #2107 from alphagov/tech-docs-java ... Use new tech docs format for Java client	2018-06-08 10:20:05 +01:00
Chris Hill-Scott	8137f9c3a6	Don’t let people redact letter templates ... It doesn’t work, so we shouldn’t show the link.	2018-06-07 13:43:34 +01:00
Chris Hill-Scott	a80938a963	Use new tech docs format for Java client ... Because it’s (nearly) ready to go now.	2018-06-07 12:08:30 +01:00
Chris Hill-Scott	79454c109c	Merge pull request #2090 from alphagov/allow-row-preview-trial-mode-letters ... Allow users to preview all letters in trial mode	2018-06-07 11:55:22 +01:00
Chris Hill-Scott	ea6620083b	Persist original file name when previewing row	2018-06-07 11:03:09 +01:00
Chris Hill-Scott	e74d408953	Allow users to preview all letters in trial mode ... If you’re in trial mode you can’t send letters for real. But you can still upload a spreadsheet with multiple rows, and there’s no reason why you shouldn’t be able to explore how Notify populate the letter for each row of the spreadsheet (since this is something we let you do when you can send the messages for real).	2018-06-07 11:03:09 +01:00
Chris Hill-Scott	8ce0c175e8	Merge pull request #2106 from alphagov/pyup-update-httpretty-0.9.4-to-0.9.5 ... Update httpretty to 0.9.5	2018-06-07 11:02:11 +01:00
pyup-bot	881ee1bf97	Update httpretty from 0.9.4 to 0.9.5	2018-06-06 18:12:07 +01:00
Rebecca Law	e5589448a2	Merge pull request #2105 from alphagov/platform-admin-page-for-complaints ... Email complaints page for platform admins	2018-06-06 15:55:00 +01:00
Rebecca Law	2bece35aba	Docker is using a different version of pytest, and assert_called_once is newly introduced.	2018-06-06 15:46:18 +01:00
Rebecca Law	84445d154d	When someone complains about an email from the platform we get a callback from SES. ... A new platform admin page Email complaints has been added to surface those complaints. Eventually the complaints will be visible to the services so they can remove the email address from their mailing list. Next thing to implement is "x email complaints" warning on the platform admin summary page.	2018-06-06 15:22:48 +01:00
Rebecca Law	9fc2347ceb	Merge pull request #2104 from alphagov/tfgm.com ... Adding Transport for Greater Manchester to whitelist (local authority)	2018-06-06 15:05:15 +01:00
Pete Herlihy	ef46542b34	Adding Transport for Greater Manchester to whitelist (local authority)	2018-06-06 14:52:10 +01:00
Chris Hill-Scott	2d3e8585c4	Merge pull request #2103 from alphagov/carmarthenshire.gov.uk ... Mark agreement signed by Carmarthenshire Council	2018-06-06 12:14:19 +01:00
Chris Hill-Scott	2df029703a	Merge pull request #2102 from alphagov/pyup-update-pytest-3.6.0-to-3.6.1 ... Update pytest to 3.6.1	2018-06-06 12:13:27 +01:00
Chris Hill-Scott	749e2c89d3	Mark agreement signed by Carmarthenshire Council	2018-06-06 10:55:57 +01:00
pyup-bot	3e4f5ebef3	Update pytest from 3.6.0 to 3.6.1	2018-06-05 13:14:32 +01:00
Pete Herlihy	217cf9abd4	Merge pull request #2101 from alphagov/esfrs.org ... Adding East Sussex Fire and Rescue Service	2018-06-05 13:14:23 +01:00
Pete Herlihy	56787f3ca4	Adding East Sussex Fire and Rescue Service	2018-06-05 11:53:14 +01:00
Richard Chapman	8a2edeb4a6	Merge pull request #2099 from alphagov/229-251 ... Service (and organisation) count update	2018-06-01 14:08:11 +01:00
Pete Herlihy	44d0fbb176	Service (and organisation) count update ... Deets here https://docs.google.com/spreadsheets/d/1JYhE5sJaOJUVMPPDenO2eKqElC75Rygxb1_2mpRKy98/edit?usp=sharing	2018-06-01 11:42:37 +01:00
Leo Hemsted	07a14c4627	Merge pull request #2080 from alphagov/refactor-metadata-writing ... Refactor how we decide to set metadata	2018-05-30 14:30:13 +01:00
Leo Hemsted	6fc9e7ef9e	Merge pull request #2092 from alphagov/pyup-update-pytest-3.5.1-to-3.6.0 ... Update pytest to 3.6.0	2018-05-30 14:28:44 +01:00
Pete Herlihy	05e49f97bd	Merge pull request #2098 from alphagov/ac.uk-addresses-to-whitelist ... Adding .ac.uk domain to the whitelist	2018-05-30 11:51:31 +01:00
Pete Herlihy	1787c8a05c	Adding .ac.uk domain to the whitelist	2018-05-30 11:43:40 +01:00
Rebecca Law	fb2aa3f918	Merge pull request #2097 from alphagov/ft-usage-page-as-default ... Rename the method for usage and update the tests.	2018-05-29 15:37:01 +01:00
Rebecca Law	6bdb8b7210	Rename the method for usage and update the tests.	2018-05-29 15:31:40 +01:00
Rebecca Law	ec03ec1e60	Merge pull request #2094 from alphagov/use-ft-usage ... Start using the data from ft_billing for the usage page.	2018-05-29 14:59:31 +01:00
Pete Herlihy	5b381e6fa9	Merge pull request #2096 from alphagov/privacy-tweaks ... Updated the privacy statement for consistency with GDS styles	2018-05-25 15:58:07 +01:00
Pete Herlihy	c779dbee6f	Updated page title to match h1 on privacy page	2018-05-25 14:54:56 +01:00
Katie Smith	348ef71c1b	Merge pull request #2095 from alphagov/use-new-sanitise-text-utils-class ... Bump utils and sanitise header values	2018-05-25 13:22:34 +01:00