Commit Graph

7170 Commits

Author SHA1 Message Date
Athanasios Voutsadakis
b56addb4ff Remove GUNICORN_CMD_ARGS before we start our app
Cloudfoundry adds this env var which forces gunicorn to print
its access log to stdout because reasons.

This also takes precedence over *anything* we put in our config file,
including disabling the access logs.

Related commit:
7b350f292a (diff-153f90501612878d9c6fcd50247547bcR526)
2018-06-25 16:39:18 +01:00
Rebecca Law
72b0637f92 Add the download activity link for notifications.
This works locally for a long running request and a large number of messages. However I suspect that nginx may be timing out the request. I'd like to try this on staging.
2018-06-25 16:29:40 +01:00
Leo Hemsted
b554077961 Merge pull request #2126 from alphagov/gunicorn-logs
disable gunicorn access logs
2018-06-25 11:40:23 +01:00
Leo Hemsted
4adee9cc43 Merge pull request #2125 from alphagov/handle-405s
handle 405 METHOD NOT ALLOWEDs
2018-06-25 11:40:17 +01:00
Leo Hemsted
cc3b2f1ab9 disable gunicorn access logs
they're turning up in syslog, which means they're getting into kibana now

also move config settings from manifest to gunicorn_config.py
2018-06-25 11:24:31 +01:00
Leo Hemsted
e81f302084 handle 405 METHOD NOT ALLOWEDs
(show the "something went wrong" error page).

also catch any other werkzeug http exceptions and show an appropriate
template, if it exists
2018-06-22 18:07:18 +01:00
Chris Hill-Scott
6354ddc6f7 Merge pull request #2120 from alphagov/pyup-update-pytest-3.6.1-to-3.6.2
Update pytest to 3.6.2
2018-06-21 14:59:21 +01:00
Chris Hill-Scott
a25f8207f7 Merge pull request #2122 from alphagov/kent.gov.uk
Mark agreement signed by Kent County Council
2018-06-21 14:59:02 +01:00
Chris Hill-Scott
1d7eb06a1d Merge pull request #2124 from alphagov/27691
Update count of services and organisations
2018-06-21 14:58:11 +01:00
Chris Hill-Scott
3b0b090b22 Update count of services and organisations 2018-06-21 14:46:32 +01:00
Chris Hill-Scott
1a50650144 Merge pull request #2118 from alphagov/264-270
Updated service and org count on as at 18 June 2018
2018-06-21 14:39:20 +01:00
Chris Hill-Scott
a77692db46 Merge pull request #2121 from alphagov/sussex-tmbc
Add Sussex, Tonbridge & Malling Borough Council
2018-06-21 14:38:57 +01:00
Chris Hill-Scott
42938e29b9 Fix syntax 2018-06-21 14:38:11 +01:00
Sakis
3495c4ca3a Merge pull request #2123 from alphagov/paas-syslog-drain
Enable syslog drain on all environments
2018-06-21 12:55:09 +01:00
Athanasios Voutsadakis
f1eecd4e18 Enable syslog drain on all environments 2018-06-21 11:48:48 +01:00
Chris Hill-Scott
340fd1a2d0 Mark agreement signed by Kent County Council
Signed 20/6/2018
2018-06-21 09:43:38 +01:00
Chris Hill-Scott
6c0440225e Add Sussex, Tonbridge & Malling Borough Council
All three has signed the agreement recently.
2018-06-20 13:36:31 +01:00
pyup-bot
9c5cfd957f Update pytest from 3.6.1 to 3.6.2 2018-06-20 13:25:32 +01:00
Pete Herlihy
c381e22467 Updated service and org count on as at 18 June 2018
As per https://docs.google.com/spreadsheets/d/1JYhE5sJaOJUVMPPDenO2eKqElC75Rygxb1_2mpRKy98/edit#gid=503930061
2018-06-18 17:12:32 +01:00
Chris Hill-Scott
81dc9a0092 Merge pull request #2063 from alphagov/pyup-update-flask-0.12.2-to-1.0.2
Update flask to 1.0.2
2018-06-18 13:51:14 +01:00
Chris Hill-Scott
24ea894f71 Merge pull request #2116 from alphagov/263-services
263 services and 86 organisations
2018-06-18 13:51:08 +01:00
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