4236 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
chrisw	f012ec57c0	Allow user to add multiple reply-to addresses	2017-09-25 17:05:41 +01:00
Venus Bailey	fe541b849b	Merge pull request #1506 from alphagov/vb-platform-admin-admin ... Platform Admin timeout problem	2017-09-25 13:24:01 +01:00
venusbb	b0e267f677	Fixed tests	2017-09-22 23:09:44 +01:00
venusbb	0895717680	Merge branch 'master' of https://github.com/alphagov/notifications-admin into vb-platform-admin-admin	2017-09-22 15:47:19 +01:00
venusbb	3a1e76ba92	Progress: passed trial_mode to /service end point	2017-09-22 15:46:52 +01:00
Chris Hill-Scott	241e3c2232	Merge pull request #1504 from alphagov/77-78 ... 77-78 for Legal Aid Agency	2017-09-21 15:28:41 +01:00
Pete Herlihy	033872c34e	And now to 79	2017-09-21 15:10:42 +01:00
Chris Hill-Scott	7327f4b611	Merge pull request #1503 from alphagov/logoless-organisations ... Allow creation of an organisation without a logo	2017-09-21 13:01:44 +01:00
Pete Herlihy	d5ff02e5f7	77-78 for Legal Aid Agency	2017-09-21 12:08:30 +01:00
Chris Hill-Scott	d01c397bb4	Allow creation of an organisation without a logo ... Now we have the org banner branding, not all organisations need a logo. So it shouldn’t be an error to not provide one. Depends on: - [ ] https://github.com/alphagov/notifications-api/pull/1265	2017-09-21 11:57:39 +01:00
Sakis	3628f7d7d3	Merge pull request #1489 from alphagov/bump_utils ... Bump utils to 21.2.0	2017-09-21 10:57:05 +01:00
Chris Hill-Scott	9b663d0865	Merge pull request #1502 from alphagov/bbsrc ... Add Biotechnology and Biological Sciences Research Council to email domain list	2017-09-21 10:21:51 +01:00
Leo Hemsted	a1a4a28955	Merge pull request #1501 from alphagov/accepted-letters-on-api ... show letters as accepted, not created or sending, on the api page	2017-09-20 16:51:55 +01:00
Chris Hill-Scott	6d421a0424	Add Biotechnology and Biological Sciences Research Council to email domain list ... > BBSRC is an executive non-departmental public body, sponsored by the > Department for Business, Energy & Industrial Strategy. – https://www.gov.uk/government/organisations/biotechnology-biological-sciences-research-council	2017-09-20 16:23:18 +01:00
Leo Hemsted	03397f416e	move status mapping logic to the api client ... also added tests 👼	2017-09-20 16:02:15 +01:00
Leo Hemsted	f8fab35ee7	show letters as accepted, not created or sending, on the api page	2017-09-20 14:38:15 +01:00
Chris Waszczuk	1054002432	Merge pull request #1499 from gov-cjwaszczuk/master ... Add a non-GOV.UK banner option for email branding	2017-09-19 15:08:29 +01:00
venusbb	d14bdbe899	Merge branch 'master' of https://github.com/alphagov/notifications-admin into vb-platform-admin-admin	2017-09-19 14:44:06 +01:00
chrisw	4312789b60	Add a non-GOV.UK banner option for email branding ... Added extra radio button for 'org_banner' option Updated service setting template to display appropriate text when option is selected Updated tests to also accomodate new radio option	2017-09-19 13:34:31 +01:00
venusbb	2a5acd9c77	platform-admin in progress	2017-09-19 10:13:12 +01:00
Chris Hill-Scott	edaa7b85b0	Merge pull request #1493 from alphagov/pyup-update-cffi-1.10.0-to-1.11.0 ... Update cffi to 1.11.0	2017-09-19 09:22:05 +01:00
Chris Hill-Scott	2cbd9b8049	Merge pull request #1490 from alphagov/prevent-duplicate-form-submissions ... Prevent doubling clicking form submissions	2017-09-19 09:21:47 +01:00
Chris Hill-Scott	6fa9d1f4b8	Merge pull request #1498 from alphagov/remove-gfm ... Remove Github-Flavored Markdown dependency	2017-09-19 09:20:11 +01:00
Chris Hill-Scott	0dca997880	Merge pull request #1496 from alphagov/running-without-six ... Remove six dependency	2017-09-19 09:20:04 +01:00
Chris Hill-Scott	22b6dfa667	Merge pull request #1497 from alphagov/remove-lxml ... Remove lxml package	2017-09-19 09:19:55 +01:00
Chris Hill-Scott	6d22b27df2	Merge pull request #1486 from alphagov/fix-wrapping-email-reply-to ... Fix overlapping text on settings page	2017-09-18 10:39:14 +01:00
Chris Hill-Scott	170f3a1da0	Merge pull request #1485 from alphagov/rename-template-permission-label ... Rename manage templates permission	2017-09-18 10:39:06 +01:00
Chris Hill-Scott	f7f44974b4	Merge pull request #1484 from alphagov/row-errors-before-trial-mode-error ... Show row errors before trial mode errors	2017-09-18 10:38:59 +01:00
Chris Hill-Scott	4d1c10c48c	Remove Github-Flavored Markdown dependency ... This was used when we published the documentation in the app.	2017-09-18 10:15:07 +01:00
Chris Hill-Scott	4fa19a67dc	Merge pull request #1492 from alphagov/pyup-update-pytest-mock-1.6.2-to-1.6.3 ... Update pytest-mock to 1.6.3	2017-09-18 09:57:46 +01:00
Chris Hill-Scott	0789c37d48	Remove lxml package ... We don’t use lxml directly. Our dependencies (eg html5lib) do, but we should just install whatever version they specify.	2017-09-18 09:54:40 +01:00
Chris Hill-Scott	a49c30a92d	Remove six dependency ... six is used for Python 2/3 compatibility. We never run under Python 2.	2017-09-18 09:34:31 +01:00
pyup-bot	8fca1345c7	Update cffi from 1.10.0 to 1.11.0	2017-09-16 16:47:27 +01:00
pyup-bot	d6545ad104	Update pytest-mock from 1.6.2 to 1.6.3	2017-09-16 01:22:27 +01:00
venusbb	aa5b53f429	Merge branch 'master' of https://github.com/alphagov/notifications-admin into vb-platform-admin-admin	2017-09-15 15:49:57 +01:00
Chris Hill-Scott	3c8c3be0c3	Merge pull request #1488 from alphagov/remove-moto ... Remove unused test dependency	2017-09-15 14:47:34 +01:00
venusbb	4d794a464b	Add and pass notifications filter trial_mode_services	2017-09-15 14:45:57 +01:00
Chris Hill-Scott	4ac90c066a	Prevent doubling clicking form submissions ... Have seen users complaining that they got an invitation email twice. This is probably because they clicked the button twice even though they think they only clicked it once. Double form submission is a common issue on web pages, and there are a number of different ways to prevent it. I’ve chosen to do it this way because: - temporarily, not permanently disabling the button means that this addresses the double clicking issue without breaking things if the user did, really want to click the button again deliberately (for whatever reason) - doing it with a `data` attribute, rather than the `disabled` attribute means that the interaction behaviour of the button doesn’t change ( `disabled` buttons can’t be focused, for example)	2017-09-15 14:29:56 +01:00
Chris Hill-Scott	d7370c1816	Rename manage templates permission ... ‘Add and edit’ is the language we use next to the checkbox. Also helps disambiguate it from the ‘manage service’ permission.	2017-09-15 11:36:00 +01:00
Athanasios Voutsadakis	f030f6b37d	Bump utils to 21.2.0 ... This will stop logging the request, as it is logged by nginx-access logs	2017-09-15 11:01:58 +01:00
Chris Hill-Scott	cd7c5219e9	Remove unused test dependency	2017-09-15 10:31:55 +01:00
Chris Hill-Scott	2a84d14a73	Fix overlapping text on settings page ... Think this broke when we split the setting page up into three sections. This forces the text to wrap onto multiple lines even if it doesn’t contain spaces (for example an email address).	2017-09-14 13:10:56 +01:00
Chris Hill-Scott	c26d308a32	Show row errors before trial mode errors ... It’s useful to be able to play with the CSV upload thing and find out how it works before you’re interrupted by the error telling you that you’ve got as far as you can in trial mode.	2017-09-14 12:21:40 +01:00
Sakis	1be2101d07	Merge pull request #1479 from alphagov/bump_utils ... Bump utils to 21.0.0	2017-09-13 10:32:07 +01:00
Chris Hill-Scott	1bde893854	Merge pull request #1481 from alphagov/pyup-update-moto-1.1.2-to-1.1.4 ... Update moto to 1.1.4	2017-09-12 09:50:03 +01:00
pyup-bot	0b0bd03de2	Update moto from 1.1.2 to 1.1.4	2017-09-11 20:47:22 +01:00
Athanasios Voutsadakis	a912f2377d	Bump utils to 21.0.0 ... This changes the log file handler to WatchedFileHandler which should successfully handle different processes writing to the same logrotated file.	2017-09-08 16:17:02 +01:00
Leo Hemsted	4dbd149351	Merge pull request #1478 from alphagov/pyup-update-moto-1.1.1-to-1.1.2 ... Update moto to 1.1.2	2017-09-08 10:19:13 +01:00
Leo Hemsted	f6ff916bce	Merge pull request #1473 from alphagov/pyup-update-notifications-python-client-4.3.1-to-4.4.0 ... Update notifications-python-client to 4.4.0	2017-09-08 10:18:58 +01:00
Leo Hemsted	54dc1713e6	Merge pull request #1477 from alphagov/pyup-update-pytest-3.2.1-to-3.2.2 ... Update pytest to 3.2.2	2017-09-08 10:18:42 +01:00