1853 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Chris Hill-Scott	ab239615c0	Merge pull request #596 from alphagov/update-deskpro-key-name ... Use correct key to set team in DeskPro	2016-05-23 09:32:42 +01:00
NIcholas Staples	5bcd2a6378	Merge pull request #597 from alphagov/job_row_number ... Added in notification row number for job pages.	2016-05-20 16:56:08 +01:00
Nicholas Staples	3f404d01b0	Added in notification row number for job pages.	2016-05-20 16:13:01 +01:00
Chris Hill-Scott	228abf4526	Use correct key to set team in DeskPro ... For the `POST` ticket endpoint, the parameter is `agent_team_id`: https://manuals.deskpro.com/html/developer-apps/api/api-tickets.html#id2	2016-05-20 15:58:20 +01:00
NIcholas Staples	d9dda51062	Merge pull request #595 from alphagov/template_versions_link_design ... Beautify the template version links and template link page.	2016-05-20 14:20:28 +01:00
Nicholas Staples	83f25cd89b	Beautify the template version links and template link page.	2016-05-20 13:58:16 +01:00
Pete Herlihy	cb65f5f2f8	Merge pull request #594 from alphagov/feedback-flash ... Setting the style for the flash message on feedback page	2016-05-20 12:40:37 +01:00
Pete Herlihy	c73087074b	Nice feedback message.	2016-05-20 12:20:58 +01:00
Pete Herlihy	4e2cc0250a	Setting the style for the flash message on feedback page ... Was using the default of dangerous - which it shouldn't. Obvs.	2016-05-20 11:00:33 +01:00
Rebecca Law	19761331e3	Merge pull request #593 from alphagov/doctidy ... doc tidy	2016-05-20 09:57:41 +01:00
Adam Shimali	d55281e4b0	Missing deskpro config for stating and live	2016-05-19 15:41:27 +01:00
Adam Shimali	4c2ee8e8ed	Updated for correct desk pro env vars	2016-05-19 11:04:45 +01:00
Catherine Heywood	7f4ad1d3cd	doc tidy	2016-05-19 10:55:39 +01:00
Adam Shimali	e608b60d93	Merge pull request #589 from alphagov/import-cleanup ... Removed unused imports	2016-05-18 16:26:58 +01:00
Adam Shimali	3563dcc010	Merge pull request #591 from alphagov/team-id-for-deskpro ... Renamed DESKPRO_TEAM_ID to DESKPRO_DEPT_ID	2016-05-18 16:24:19 +01:00
Adam Shimali	e181940966	Renamed DESKPRO_TEAM_ID to DESKPRO_DEPT_ID to match name of param in ... api call. Added DESKPRO_ASSIGNED_AGENT_TEAM_ID so that tickets routed correctly.	2016-05-18 15:03:23 +01:00
Adam Shimali	25170e7e42	Removed unused imports	2016-05-18 14:39:06 +01:00
Martyn Inglis	0172797fb5	Changed user for elb register/deregister scripts	2016-05-18 13:30:01 +01:00
minglis	a892f44696	Merge pull request #588 from alphagov/no-downtime-deploys ... No downtime deploys	2016-05-18 13:22:24 +01:00
Martyn Inglis	664ae33108	Formatting	2016-05-18 13:10:51 +01:00
Martyn Inglis	44b0bd3092	Scripts added to deregister admin app from ELB on deploy ... - Application Stop state will deregister - Application Start state re-registers Ensures that the App instance is not receiving traffic before stopping the app as part of a code deploy These scripts are from : https://blogs.aws.amazon.com/application-management/post/Tx39X8HM93NXU47/Use-AWS-CodeDeploy-to-Deploy-to-Amazon-EC2-Instances-Behind-an-Elastic-Load-Bala Adapted to remove notion of Autoscaling groups (which we don't use) and to use a named ELB, allows common file to be common and start/stop to be changed.	2016-05-18 13:08:51 +01:00
Rebecca Law	613ff1a05e	Merge pull request #585 from alphagov/format-failures ... Notifications page filters	2016-05-18 12:19:10 +01:00
Rebecca Law	6c14d925c5	Fix test to use a real status	2016-05-18 12:05:26 +01:00
Rebecca Law	5e27861515	Merge branch 'format-failures' of github.com:alphagov/notifications-admin into format-failures	2016-05-18 12:00:34 +01:00
Adam Shimali	a20fc1aa47	If user clicks failed or both filters for notifications status view, ... append all other failure states to query to api.	2016-05-18 11:44:58 +01:00
Rebecca Law	37327dfbb0	Add a filter to format notification status to a readible label.	2016-05-18 09:54:50 +01:00
Chris Hill-Scott	97b268182b	Merge pull request #579 from alphagov/add-expand-collapse-to-send-guidance ... On page load, hide the instructions for uploading a file	2016-05-17 16:30:16 +01:00
Chris Hill-Scott	2ba801ff73	Add polyfill for HTML5 <details> element ... The details element is fairly new. It doesn’t work in all browsers, and isn’t keyboard/screenreader accessible even in some new browsers. This commit adds the Polyfill script from GOV.UK elements[1] which polyfills these features for browsers that don’t support them. 1. http://govuk-elements.herokuapp.com/typography/#typography-hidden-text	2016-05-17 14:54:05 +01:00
Chris Hill-Scott	c6ab4d2c94	Hide the instructions for formatting a CSV ... > On the send pages, we have a call to action in the middle of the > page with lots of words and placeholder buttony looking things > above and below it.... > > You'll also see this every time you use this page, even though you > probably get it after a single use. > > So let's wrap it up under a usefully titled (?) help link that > expands to reveal all the things. This commit implements the above. It also rewords the messaging to talk about various spreadsheet formats, not just CSV.	2016-05-17 14:52:40 +01:00
minglis	95065c436c	Merge pull request #578 from alphagov/timezones ... Convert timezones using pytz.	2016-05-17 14:52:36 +01:00
Martyn Inglis	e54c309594	Convert timezones using pytz.	2016-05-17 14:00:40 +01:00
Chris Hill-Scott	7703b87aa7	Merge pull request #574 from alphagov/add-lxml-to-req ... Add lxml 3.6.0 to requirements.	2016-05-17 13:54:19 +01:00
Chris Hill-Scott	f4da9350dc	Merge pull request #571 from alphagov/fix-blank-column-headers ... Handle CSV files with blank column headers	2016-05-17 13:54:12 +01:00
Adam Shimali	e20ce561e9	Merge pull request #575 from alphagov/reply-to-email-surfaced ... If service has reply to show it in form	2016-05-17 13:25:58 +01:00
Chris Hill-Scott	3944c67a0a	Handle CSV files with blank column headers ... Implements https://github.com/alphagov/notifications-utils/pull/32	2016-05-17 13:25:54 +01:00
Chris Hill-Scott	158d4d6c43	Merge pull request #566 from alphagov/refactor-sending ... Refactor and tidy up sending	2016-05-17 11:40:09 +01:00
Adam Shimali	d141af4b94	If service has reply to show it in form	2016-05-17 11:35:10 +01:00
Chris Hill-Scott	5625ef6eee	Merge pull request #558 from alphagov/template-stats-2 ... Make template usage on dashboard easier to scan	2016-05-17 11:26:49 +01:00
Rebecca Law	c4de547b74	Merge pull request #568 from alphagov/template_history_view ... Template history view	2016-05-17 08:50:40 +01:00
Rebecca Law	93c4f37d08	Add lxml 3.6.0 to requirements.	2016-05-17 08:48:17 +01:00
Adam Shimali	ed74280044	Merge pull request #570 from alphagov/reply-to-email ... Admin app settings to save reply to email address for service.	2016-05-16 17:51:05 +01:00
Chris Hill-Scott	37fff2da63	Revert "Install lxml first on ubuntu" ... This reverts commit 844f9c4276.	2016-05-16 17:22:26 +01:00
Rebecca Law	844f9c4276	Install lxml first on ubuntu	2016-05-16 16:43:55 +01:00
Chris Hill-Scott	d39717d348	Merge pull request #567 from alphagov/uncomment-out-tests ... Uncomment commented-out tests	2016-05-16 14:29:10 +01:00
Adam Shimali	18a0b94d98	Admin app settings to save reply to email address for service.	2016-05-16 13:10:51 +01:00
Chris Hill-Scott	000d630cae	Use Spreadsheet class to generate example CSVs ... This means not repeating a bunch of `with StringIO` blocks all over the place.	2016-05-16 13:05:41 +01:00
Chris Hill-Scott	e84436d0e1	Make s3upload function return the UUID ... Generating the UUID can be can be contained within this function, thus any other part of the code using it doesn’t have to do the ID-generating stuff itself.	2016-05-16 13:05:41 +01:00
Chris Hill-Scott	b35f2d7e61	Merge pull request #565 from alphagov/accept-common-spreadsheet-formats ... Accept common spreadsheet formats, not just CSV	2016-05-16 13:05:14 +01:00
Rebecca Law	d4225de45e	Update json structure for unit tests.	2016-05-16 11:53:22 +01:00
Chris Hill-Scott	f2a5d77853	Uncomment commented-out tests ... Accidentally(?) introduced in 2792bece54	2016-05-16 10:53:15 +01:00