Commit Graph

3843 Commits

Author SHA1 Message Date
pyup-bot
b2d77fb795 Update pytz from 2016.4 to 2017.2 2017-07-12 09:19:07 +01:00
pyup-bot
f5bc2e57e7 Update pyexcel-ods3 from 0.1.1 to 0.4.0 2017-07-12 09:19:07 +01:00
pyup-bot
0388fae20e Update pyexcel-xlsx from 0.1.0 to 0.4.0 2017-07-12 09:19:07 +01:00
pyup-bot
7d0aad45dd Update pyexcel-xls from 0.1.0 to 0.4.0 2017-07-12 09:19:07 +01:00
pyup-bot
4a3c0fb8c7 Update pyexcel-io from 0.1.0 to 0.4.2 2017-07-12 09:19:07 +01:00
pyup-bot
1cef7325ce Update pyexcel from 0.2.1 to 0.5.0 2017-07-12 09:19:06 +01:00
pyup-bot
1565214dee Update lxml from 3.6.0 to 3.8.0 2017-07-12 09:19:06 +01:00
pyup-bot
b2fc4e1711 Update py-gfm from 0.1.2 to 0.1.3 2017-07-12 09:19:06 +01:00
pyup-bot
26d766f152 Update credstash from 1.8.0 to 1.13.2 2017-07-12 09:18:11 +01:00
pyup-bot
77ba0703fe Update flask-login from 0.3.2 to 0.4.0 2017-07-12 09:18:11 +01:00
pyup-bot
a42cdca038 Update flask-wtf from 0.11 to 0.14.2 2017-07-12 09:18:11 +01:00
pyup-bot
5529a14e32 Update flask from 0.10.1 to 0.12.2 2017-07-12 09:18:10 +01:00
pyup-bot
81e00e248f Update ago from 0.0.8 to 0.0.9 2017-07-12 09:18:10 +01:00
pyup-bot
d59a69bfe1 Update cffi from 1.9.1 to 1.10.0 2017-07-12 09:18:10 +01:00
Chris Hill-Scott
7664ffb998 Merge pull request #1358 from alphagov/remove-pygments
Remove unused dependency
2017-07-12 09:10:29 +01:00
kentsanggds
18e7f3eccb Merge pull request #1346 from alphagov/allow-email-and-sms-to-be-disabled
Allow email and sms to be disabled
2017-07-10 12:43:17 +01:00
Ken Tsang
bdf3f20f4c Fixed tests 2017-07-10 12:25:01 +01:00
Ken Tsang
e3e6376c68 Updated action_blocked text 2017-07-10 12:12:41 +01:00
Chris Hill-Scott
cfa63b450e Merge pull request #1359 from alphagov/fix-inbound-page
Fix 500 on two-way conversation page
2017-07-07 14:28:00 +01:00
Chris Hill-Scott
84a291f24f No idea why this is failing on Jenkins 2017-07-07 14:16:18 +01:00
Chris Hill-Scott
91a071ce5d Fix import conflict 2017-07-07 14:04:49 +01:00
Chris Hill-Scott
61fd27c4f6 Fix 500 on two-way conversation page
We changed the schema used by the endpoint that searches for
notifications by recipient. So the admin app was looking for the wrong
thing in the JSON.

This is hard to catch in tests because it relies on our fixtures
matching what the API really returns.

This commit fixes the code to use the correct key to lookup the template
content from the JSON.

This also exposed the fact that we weren’t passing in the
personalisation any more (perhaps got lost in the re-reverts somehow)
so users were only seeing the template in the inbound view, not the
full message content.
2017-07-07 10:16:33 +01:00
Chris Hill-Scott
b69198bc0f Remove unused dependency
We used this for code highlighting when we had documentation in the
admin app.
2017-07-06 14:29:34 +01:00
Chris Hill-Scott
9f4018b36f Merge pull request #1355 from alphagov/fix-page-title-notification
Fix page title on notification page
2017-07-06 14:08:37 +01:00
Pete Herlihy
fbdf16e513 Merge pull request #1356 from alphagov/63-64
63-64 and 31-32 for Ofsted IT
2017-07-06 14:05:36 +01:00
Pete Herlihy
dab897b7d9 And 65... 2017-07-06 14:05:21 +01:00
Pete Herlihy
a978cd644f 63-64 and 31-32 for Ofsted IT 2017-07-06 11:21:52 +01:00
Katie Smith
aaadd867f7 Refactor code to check whether email/sms is enabled 2017-07-05 09:15:58 +01:00
Katie Smith
42a8474415 Stop users from editing/adding templates without the correct permission
If sending SMS is disabled for a service, it should not be possible to
add or modify SMS templates. If a user tries to do this, they should see
a different page with a link to go back. The same thing should happen
with email templates.
2017-07-05 09:15:32 +01:00
Katie Smith
95f9d26e91 Allow sending sms to be disabled
Platform admins can now disable sending sms for a service. If sending
sms is disabled, this will also hide all the other sms options in the
Settings table.
2017-07-05 09:15:32 +01:00
Katie Smith
5986dfd415 Allow sending emails to be disabled
Platform admins can now disable sending of emails for a service. If
sending emails is disabled, this will also hide the option to change the
Email reply to address.
2017-07-05 09:15:32 +01:00
Chris Hill Scott
17199f0c26 Test for page titles in client request fixture
We’re frequently ending up with mismatched page titles on our pages
because:
- they’re hard to spot in the browsers tab bar
- new pages are often created by copy pasting old ones

It would be hard to write some kind of macro that spat out the h1
and the page title because they go into different blocks in the
parent template.

Instead, we can catch these mistakes by testing for them. Going
forward we should be using the `client_request` fixture for testing.
So it makes sense to put the page title test in here so that we
get it for free in every test – same way we do for testing response
codes.

fixup! Test for page titles in client request fixture
2017-07-05 09:01:46 +01:00
Chris Hill Scott
7ff6075e0a Fix page title on 404
Should match the `<h1>` on the page
2017-07-04 14:28:58 +01:00
Chris Hill Scott
dd52f60828 Fix page titles on preview page
Should match the `<h1>`
2017-07-04 14:28:12 +01:00
Chris Hill Scott
5a76244d6d Fix page title on individual notification page
Should match `<h1>` on the page.
2017-07-04 14:27:20 +01:00
Chris Hill Scott
ecc506306b Move helper function
`test_utils.py` is actually a file for testing some utils, not
some utils for testing.

Test helper functions and fixtures are better placed in conftest,
and also means that we can use them in conftest.
2017-07-04 14:17:36 +01:00
Chris Hill-Scott
11adf17330 Merge pull request #1354 from alphagov/no-template-link-tour
Don’t link to template in tour
2017-07-04 09:51:18 +01:00
Chris Hill-Scott
5a519ae637 Merge pull request #1353 from alphagov/bump-utils-sms-character-count-validation
Bump utils to count characters in SMS properly
2017-07-04 09:51:12 +01:00
Chris Hill-Scott
8585f3bdba Merge pull request #1350 from alphagov/package-lock
Add `package-lock.json` to version control
2017-07-04 09:51:05 +01:00
Chris Hill Scott
702fa1bbb4 Bump utils to count characters in SMS properly
Brings in:
- [ ] https://github.com/alphagov/notifications-utils/pull/172
2017-07-04 09:47:53 +01:00
Chris Hill Scott
584f849a3d Don’t link to template in tour
We want people to go to the dashboard, not get distracted by clicking
the tempting blue link.
2017-07-04 09:32:09 +01:00
Chris Hill-Scott
f37c4a7f71 Merge pull request #1349 from alphagov/61-63
61-63 and 29-31 orgs
2017-07-04 09:00:55 +01:00
Chris Hill-Scott
ef45a1d83f Merge pull request #1343 from alphagov/show-template-as-first-step-of-tour
Change step 1 of tour to only show the template
2017-07-04 08:55:16 +01:00
Chris Hill-Scott
7c09be1d84 Merge pull request #1344 from alphagov/99-problems-but-hundred-aint-one
Never say ‘report is 100% complete…’ on job page
2017-07-04 08:55:10 +01:00
Rebecca Law
50eb94f095 Merge pull request #1352 from alphagov/fix-permission
Fix permissions for sending one off notifications.
2017-07-03 17:41:04 +01:00
Chris Hill Scott
7d2500d8d9 Don’t show diffs for package-json.lock
We don’t care about how this file changes.
2017-07-03 17:29:51 +01:00
Rebecca Law
fb256b4147 Add unit test 2017-07-03 17:21:44 +01:00
Chris Hill-Scott
c940c8a8d8 Never say ‘report is 100% complete…’ on job page
This message is meant to indicate that generating the report is still in
progress. Saying 100% contradicts this because 100% sounds like
‘complete’.

Reason this is happening is because rounding 99.5 to 0 decimal places
gives you 100.

So let’s make sure it never gets above 99.0
2017-07-03 16:56:26 +01:00
Rebecca Law
3f6930d176 Fix permissions for sending one off notifications. 2017-07-03 16:39:57 +01:00
Chris Hill-Scott
56a59e7729 Merge pull request #1351 from alphagov/end-tour-with-template-id
Fix link to dashboard from end of tour
2017-07-03 16:00:00 +01:00