Commit Graph

4285 Commits

Author SHA1 Message Date
Chris Hill-Scott
ac0315e968 Bump utils to 19.0.4
Brings in:
- [ ] https://github.com/alphagov/notifications-utils/pull/212
2017-08-25 09:34:12 +01:00
pyup-bot
af0e33c123 Update pyexcel-xls from 0.4.0 to 0.4.1 2017-08-25 07:15:53 +01:00
Rebecca Law
62ccd822ff Merge pull request #1444 from alphagov/remove-unused-endpoint
Removed service_api_client.get_monthly_notification_stats
2017-08-24 16:34:57 +01:00
Chris Hill-Scott
ea95493b42 Merge pull request #1445 from alphagov/inbound-sms-number-shown-bug
Put the inbound number on the invite page
2017-08-24 14:03:50 +01:00
Chris Hill-Scott
d958b5f00f Merge pull request #1446 from alphagov/no-n-dvla
Don’t add newlines to DVLA markup view of template
2017-08-24 13:58:49 +01:00
Chris Hill-Scott
da70310f8e Merge pull request #1407 from alphagov/no-letters-trial-mode
Don’t let users in trial mode send letters
2017-08-24 13:58:43 +01:00
Chris Hill-Scott
7e097e887e Make sure empty inbox also show the correct number
…since it’s divorced from the SMS sender now.
2017-08-24 13:57:12 +01:00
Chris Hill-Scott
9c080466a7 Don’t add newlines to DVLA markup view of template
It’s more confusing than helpful.
2017-08-24 11:44:43 +01:00
Chris Hill-Scott
66e4129c54 Make tests more comprehensive 2017-08-24 10:13:14 +01:00
Chris Hill-Scott
453ee44dfb Put the inbound number on the invite page
Inbound number and SMS sender are divorced from each other now. This
page was assuming that they were the same thing.
2017-08-24 10:02:02 +01:00
Chris Hill-Scott
ed9b4362e7 fix whitespace 2017-08-24 09:57:43 +01:00
Rebecca Law
16f3aafa10 Removed service_api_client.get_monthly_notification_stats because it is not being used anymore. 2017-08-23 17:07:42 +01:00
Rebecca Law
10ad56f12e Merge pull request #1440 from alphagov/bump-utils-19.0.0
Bump utils to 19.0.0
2017-08-23 15:36:30 +01:00
Pete Herlihy
f54d84d383 Merge pull request #1442 from alphagov/73-74
73-74 for GDS Academy Booking
2017-08-23 14:27:44 +01:00
Pete Herlihy
b17382170b Merge pull request #1443 from alphagov/roadmap-update
Updated roadmap for August onwards
2017-08-23 14:26:51 +01:00
Rebecca Law
e73ff339e6 Bump utils to 19.0.1
To eliminate flask deprecation warnings.
2017-08-23 12:13:12 +01:00
Pete Herlihy
5290081ff8 Updated September features 2017-08-23 11:27:29 +01:00
Pete Herlihy
b0f56756b0 Updated roadmap for August onwards 2017-08-23 11:17:58 +01:00
Pete Herlihy
24e9b72d31 73-74 for GDS Academy Booking 2017-08-23 11:14:23 +01:00
Chris Hill-Scott
d36183db7d Bump utils to 19.0.0
Brings in:
- [ ] https://github.com/alphagov/notifications-utils/pull/201

https://github.com/alphagov/notifications-utils/compare/17.8.0...19.0.0
2017-08-22 16:34:58 +01:00
Leo Hemsted
3232440c26 Merge pull request #1441 from alphagov/typo
typo
2017-08-22 15:06:57 +01:00
Leo Hemsted
8dc9d1205b typo 2017-08-22 15:05:10 +01:00
Leo Hemsted
f97f249bc0 Merge pull request #1414 from alphagov/logs-cleanup
don't capture logs directly from stdout
2017-08-22 14:44:59 +01:00
Leo Hemsted
f68cdb20b5 Merge pull request #1439 from alphagov/dvla-endpoint
Add platform–admin-only page to preview DVLA code
2017-08-22 14:44:48 +01:00
Chris Hill-Scott
d116625cde Merge pull request #1421 from alphagov/pyup-update-boto3-1.4.5-to-1.4.6
Update boto3 to 1.4.6
2017-08-22 12:36:39 +01:00
Chris Hill-Scott
1e745bb736 Merge pull request #1424 from alphagov/row-error-cleanup
Tidy up some things around row-level errors in CSV files
2017-08-22 12:31:05 +01:00
Chris Hill-Scott
dd5d6e4d59 Merge pull request #1435 from alphagov/manage-templates-permission
Separate ‘manage service’ and ‘manage templates’ permissions
2017-08-22 12:30:57 +01:00
Chris Hill-Scott
eee9c2bb99 Merge pull request #1425 from alphagov/split-settings
Split settings page into multiple sections
2017-08-22 12:22:50 +01:00
Chris Hill-Scott
7f9c1a4df9 Merge pull request #1426 from pyexcel/master
use iget_array to reduce memory footprint. and removed useless import…
2017-08-22 12:22:42 +01:00
Chris Hill-Scott
ec339877c4 Merge pull request #1438 from alphagov/71-73
71-73 and 35-36 for VMD and VOA Relationship Mgrs
2017-08-22 12:22:33 +01:00
Chris Hill-Scott
5ffd7c4448 Add platform–admin-only page to preview DVLA code
Debugging the DVLA markup stuff is quite slow, because it’s split
between the API and utils, and things that work in tests don’t always
work with real template content.

This commit adds us a private endpoint that will let us see what DVLA
markup will be generated for any template, enabling a quicker feedback
loop.
2017-08-22 12:03:05 +01:00
Pete Herlihy
8f76039dd2 71-73 and 35-36 for VMD and VOA Relationship Mgrs 2017-08-22 10:26:17 +01:00
Rebecca Law
1b3d0ef9ab Merge pull request #1429 from alphagov/inbound_number_admin
Inbound number admin
2017-08-22 09:38:31 +01:00
Rebecca Law
2de66e8801 Renamed file to follow naming conventions. 2017-08-22 08:53:11 +01:00
Rebecca Law
0f6fcb8d0b formatting 2017-08-21 14:04:40 +01:00
Rebecca Law
8cf29a7d04 Merge branch 'master' into inbound_number_admin 2017-08-21 13:50:49 +01:00
Leo Hemsted
786af4e046 Merge pull request #1437 from alphagov/pyup-update-pytest-xdist-1.19.1-to-1.20.0
Update pytest-xdist to 1.20.0
2017-08-21 13:48:40 +01:00
Rebecca Law
6b04373bcf Remove unused template.
Revert formatting changes
2017-08-21 13:47:24 +01:00
pyup-bot
9ff5fdeec0 Update pytest-xdist from 1.19.1 to 1.20.0 2017-08-18 12:48:41 +01:00
chfw
886fb2bb3c 🐛 fix the broken test by replacing a buggy depdency ezodf v0.3.2 with pyexcerl-ezodf v0.3.2. More info can be found here: https://github.com/pyexcel/pyexcel-ezodf/issues/1. The package name change reason can be found here: https://github.com/pyexcel/pyexcel-ezodf/issues/2. 2017-08-17 23:52:34 +01:00
chfw
2a0b83e101 🤝 Merge remote-tracking branch 'alphagov/master' 2017-08-17 23:48:04 +01:00
Pete Herlihy
c5c37c5957 Merge pull request #1428 from alphagov/update-testing-page
Reckon on the integration testing page...
2017-08-17 19:09:53 +01:00
Pete Herlihy
f02c02310a Merge pull request #1434 from alphagov/70-71
70-71 and 34-35 for Manage your application for criminal injury compe…
2017-08-17 19:09:28 +01:00
Chris Hill-Scott
0092c8bb33 Change manage team layout to fit extra option
We’ve moved from three to four permissions. Four permissions don’t fit
in the exiting horizontal layout.

This commit makes the permissions stack vertically instead.

This approach has some downsides:
- makes the permissions less easy to scan vertically
- makes them take up a lot more space (and at lives services, most of
  them have somewhere around 15 team members)

But I think for now it’s better than any horizontal alternative that I
tried.
2017-08-17 17:53:12 +01:00
Chris Hill-Scott
d591b9aeb9 Add a fourth, ‘manage templates’ permission
We’ve seen from research (a long time ago) that the ‘manage service’
permission is too broad, and gives too much control to someone who only
needs the ability to edit templates. In other words, editing content
should be its own, separate permission, rather than being rolled up
into manage service.

Since this is already disaggregated on the API side, making this change
just means changing the mapping on the admin side and adding an extra
checkbox on the invite/edit page. Which is what this commit does.

So for now, an existing user who has the manage service permission gets
both manage service and manage templates (ie no change to what they can
do). Newly invited users will get to choose if they have both, either,
or neither.
2017-08-17 17:47:30 +01:00
Chris Hill-Scott
aac654cd38 Test that the right permissions in page
This commit makes sure that the right permission choices are shown in
these pages:
- manage team page
- invite a user page
- edit permissions page

This is in order to make changing these pages easier (see subsequent
commits).
2017-08-17 17:45:52 +01:00
Chris Hill-Scott
726e91bebb Make existing tests use ``client_request fixture
This commit makes the existing tests around user permissions less
verbose by using the new `client_request` fixture.

This fixture takes care of:
- setting up a service
- asserting that the response is `200`

It also tests that the page titles, some of which didn’t match with the
`<h1>`s, so this commit also fixes that mismatch.
2017-08-17 17:42:40 +01:00
Chris Hill-Scott
fd5dfdf4ad Refactor form -> permissions function into helper
This functionality was implemented twice, in two different ways. This
commit factors it out into a helper method that can be reused in the
two places. We chose to go with the more explicit implementation because
it’s easier to understand.
2017-08-17 17:39:23 +01:00
Imdad Ahad
8c09d07f76 Merge pull request #1433 from alphagov/imdad-fix-call-correct-endpoint-for-billing-usage
Call the correct endpoint to retrieve yearly billing usage
2017-08-17 16:36:48 +01:00
Pete Herlihy
3d951866af 70-71 and 34-35 for Manage your application for criminal injury compensation, Criminal Injuries Compensation Authority 2017-08-17 16:16:01 +01:00