darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-06-21 05:32:44 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,040 Commits 57 Branches 61 Tags
f4eaf0bbad05cb8890fa681494f69fedd47bfd17
Commit Graph

6040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Hill-Scott
f4eaf0bbad Merge pull request #2272 from alphagov/pyup-update-coveralls-1.4.0-to-1.5.0 
Update coveralls to 1.5.0
 2018-09-03 16:20:04 +01:00
Sakis
0fb5f4afcb Merge pull request #2280 from alphagov/remove-header-check-staging 
Disable paas-proxy header check on staging
 2018-09-03 15:29:19 +01:00
Chris Hill-Scott
13f8c12963 Merge pull request #2281 from alphagov/pyxcel-0.5.9.1 
Update pyexcel to 0.5.9.1
 2018-09-03 14:18:40 +01:00
Chris Hill-Scott
17f5098cb1 Update pyexcel to 0.5.9.1 
0.5.9 seems to have disappeared and is causing tests to fail on Jenkins.

https://github.com/pyexcel/pyexcel/compare/v0.5.9...v0.5.9.1
 2018-09-03 13:53:37 +01:00
Athanasios Voutsadakis
c64433b3e7 Disable paas-proxy header check on staging 
See: alphagov/notifications-api#2052
 2018-09-03 11:10:58 +01:00
Chris Hill-Scott
75a48e7bc1 Merge pull request #2277 from alphagov/pyup-update-pyexcel-io-0.5.9-to-0.5.9.1 
Update pyexcel-io to 0.5.9.1
 2018-09-03 10:49:05 +01:00
Chris Hill-Scott
9d54a360fe Merge branch 'master' into pyup-update-pyexcel-io-0.5.9-to-0.5.9.1 2018-09-03 10:29:07 +01:00
Chris Hill-Scott
a5840e2173 Merge pull request #2278 from alphagov/pyup-update-pyexcel-xls-0.5.7-to-0.5.8 
Update pyexcel-xls to 0.5.8
 2018-09-03 10:23:07 +01:00
Chris Hill-Scott
c000fbc8ae Freeze requirements 2018-09-03 10:14:53 +01:00
Chris Hill-Scott
a13ea0f5f6 Freeze requirements 2018-09-03 10:13:51 +01:00
Chris Hill-Scott
28f1bcd7f3 Merge pull request #2265 from alphagov/pyup-update-pyexcel-0.5.8-to-0.5.9 
Update pyexcel to 0.5.9
 2018-09-03 10:00:28 +01:00
pyup-bot
8d6df5b1fd Update pyexcel-xls from 0.5.7 to 0.5.8 2018-09-03 09:56:45 +01:00
pyup-bot
c56843741f Update pyexcel-io from 0.5.9 to 0.5.9.1 2018-09-03 09:55:48 +01:00
Chris Hill-Scott
4fc585201a Merge branch 'master' into pyup-update-pyexcel-0.5.8-to-0.5.9 2018-09-03 09:52:01 +01:00
Chris Hill-Scott
18fcd05434 Merge pull request #2251 from alphagov/pyup-update-pyexcel-io-0.5.8-to-0.5.9 
Update pyexcel-io to 0.5.9
 2018-09-03 09:51:20 +01:00
Chris Hill-Scott
78e4929278 Merge pull request #2275 from alphagov/ignore-pytest-cache 
Don’t version control Pytest cache
 2018-09-03 09:41:25 +01:00
Chris Hill-Scott
7d951ad1f3 Don’t version control Pytest cache 
Pytest moved its cache from `./.cache` (which is in our `.gitignore`) to
`./.pytest_cache` (which isn’t).

It’s annoying having to be careful not to commit it all the time, so
this commit makes it ignored.

See https://github.com/pytest-dev/pytest/issues/3286 for more context.
 2018-09-03 09:33:04 +01:00
Chris Hill-Scott
a1e06efefe Merge pull request #2274 from alphagov/remove-service-branding-property 
Remove `branding` attribute from service model
 2018-08-31 14:13:57 +01:00
Chris Hill-Scott
631c3478ae Remove branding attribute from service model 
To correspond with us dropping this column from the database.

Remove the attribute from the model gives us more confidence that it’s
not being used (because it will raise exceptions in any tests that refer
to it).
 2018-08-31 14:05:33 +01:00
Tom Byers
3655e63d34 Merge pull request #2262 from alphagov/remove_branding_type_from_set_email_branding_page 
Remove branding type from set email branding page
 2018-08-31 13:56:44 +01:00
Chris Hill-Scott
d2503e8a26 Merge pull request #2266 from alphagov/remove-reference-to-service-branding 
Remove reference to service branding on the settings page
 2018-08-31 13:48:29 +01:00
Chris Hill-Scott
d825f09b0b Merge pull request #2273 from alphagov/explain-sms-sender 
Explain text message sender
 2018-08-31 11:18:22 +01:00
Chris Hill-Scott
7f458ad066 Explain text message sender 
We sometimes have to do this over support tickets as part of the go-live
process; now we’re directing people to add a sender (as part of the task
list) we can explain what it is in context.
 2018-08-31 10:50:59 +01:00
pyup-bot
7765f732a1 Update coveralls from 1.4.0 to 1.5.0 2018-08-31 06:33:21 +01:00
Chris Hill-Scott
810de02307 Freeze requirements 2018-08-30 17:10:59 +01:00
Chris Hill-Scott
2686f4f0e2 Freeze requirements 2018-08-30 17:08:35 +01:00
Tom Byers
d12fa00066 Update tests to allow new 'GOV.UK' label 2018-08-30 16:03:20 +01:00
Chris Hill-Scott
334a93efa7 Merge pull request #2269 from alphagov/reword-template-instruction 
Reword templates line on go live task list
 2018-08-30 15:57:54 +01:00
Tom Byers
4f67502806 Add tests for changes to brand request page 
Tests the new code that gets the brand type from
the email_branding model. Includes checks for a
service without the email_branding field set.

It also amends the test for a POST from that page,
removing mocking of the email_branding client.
This test runs against the default service which
has its email_branding field set to None so no
call is made to the client. It's testing the
brand_type values selected so doesn't need the
service to have an email_branding already set.
 2018-08-30 15:54:28 +01:00
Chris Hill-Scott
2ff81ea59d Reword templates line on go live task list 
This version might read a little clearer and look a little neater.
 2018-08-30 14:36:40 +01:00
Pete Herlihy
edcfa1887c Merge pull request #2267 from alphagov/pricing-increase 
Advising about future letter pricing from 1 October
 2018-08-30 12:10:08 +01:00
Pete Herlihy
18985821a9 Advising about future letter pricing from 1 October 
This is just the pricing page, we'll sort the pricing table etc separately...

W're removing non-crown pricing as we won't be charged differently any more.  But we will retain the concept of non-crown as we may change differently ourselves in the future.
 2018-08-30 11:53:52 +01:00
Tom Byers
c2075b6d71 Make label for None branding_style read as 'GOV.UK' 2018-08-30 11:44:36 +01:00
Tom Byers
ad0ffcc3f3 Fix issue that happens with branding_style of None 
Setting the branding_style to 'None' causes the
API to remove the email_branding field from a
service model. The branding request page
controller was depending on that value being
to present get the brand type.

The email preview page (used in an iframe on
various pages) wasn't able to recognise a
branding_style of 'None', causing a blank page to
render.
 2018-08-30 11:38:47 +01:00
Chris Hill-Scott
6be90f4d8a Merge pull request #2264 from alphagov/pyup-update-pytest-3.7.3-to-3.7.4 
Update pytest to 3.7.4
 2018-08-30 09:31:36 +01:00
Chris Hill-Scott
5143de5c06 Merge pull request #2263 from alphagov/pyup-update-coveralls-1.3.0-to-1.4.0 
Update coveralls to 1.4.0
 2018-08-30 09:30:32 +01:00
Chris Hill-Scott
896072f169 Remove reference to service branding on settings 
This attribute is deprecated in favour of an attribute on the
`email_branding` itself.
 2018-08-30 09:20:44 +01:00
pyup-bot
17a8567839 Update pyexcel from 0.5.8 to 0.5.9 2018-08-30 07:30:20 +01:00
pyup-bot
2328075924 Update pytest from 3.7.3 to 3.7.4 2018-08-29 22:32:18 +01:00
pyup-bot
3cfe5a07e5 Update coveralls from 1.3.0 to 1.4.0 2018-08-29 16:32:24 +01:00
Tom Byers
1d3b5fda62 Update brand request tests 2018-08-29 16:16:21 +01:00
Tom Byers
272049bb17 Update branding request page 
It was getting the brand_type from the service
model. This changes the controller to get it from
the new email_branding model instead.
 2018-08-29 16:16:21 +01:00
Tom Byers
55f5cc8e1e Update tests for changes 
Removes any checks for branding_type from tests
for set_email_branding page.

Updates tests for email preview page (usually
iframed) so non-default brand_type is got from the
email_branding model instead of a GET param.
 2018-08-29 16:16:21 +01:00
Tom Byers
151488fa78 Update email preview page 
No longer requires the branding_type GET param.

Retains the 'govuk' default brand.
 2018-08-29 16:16:15 +01:00
Chris Hill-Scott
5b5aada3b7 Merge pull request #2261 from alphagov/robots.txt 
Serve robots.txt from the admin app
 2018-08-29 16:04:26 +01:00
Chris Hill-Scott
09876532ae Serve robots.txt from the admin app 
We’re getting rid of the PaaS proxy, which is where this file is
currently served from.

Values copied from 3632313fdf/ansible/roles/nginx/files/robots.txt
 2018-08-29 15:54:17 +01:00
Chris Hill-Scott
fab754a535 Merge pull request #2260 from alphagov/remove-govuk-from-brand-type 
Remove GOV.UK as option when creating a branding
 2018-08-29 15:53:19 +01:00
Chris Hill-Scott
87040c153c Merge pull request #2250 from alphagov/task-list-go-live 
Try to get more users to do the things we require before going live
 2018-08-29 15:53:10 +01:00
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