Commit Graph

4285 Commits

Author SHA1 Message Date
venusbb
050c68142b merged codes 2017-08-10 10:29:31 +01:00
pyup-bot
3f6996334f Update pytest from 3.2.0 to 3.2.1 2017-08-09 22:09:24 +01:00
Leo Hemsted
bf1f68fd55 make sure log path is set 2017-08-09 16:53:56 +01:00
Rebecca Law
9b9c6d75dc - Change update service name to check that the name/email_from is unique across all services.
- This is done using a new endpoint in the api.
- Removed the AddServiceForm in favor or using the ServiceNameForm
- Removed ServiceApiClient.find_all_service_email_from
2017-08-09 16:52:10 +01:00
Chris Hill-Scott
955eb5648f Merge pull request #1415 from alphagov/pyup-update-pytest-xdist-1.18.2-to-1.19.0
Update pytest-xdist to 1.19.0
2017-08-09 16:50:06 +01:00
pyup-bot
6f1fd0f2cc Update pytest-xdist from 1.18.2 to 1.19.0 2017-08-09 16:48:23 +01:00
Leo Hemsted
56746e6f0f don't capture logs directly from stdout
previously in run_app_paas.sh, we captured stdout from the app and
piped that into the log file. However, this came up with a bunch of
problems, mainly that exceptions with stack traces often weren't
formatted properly, and kibana could not parse them

instead, with the updated utils library, we can use that to log json
straight to the appropriate directory directly.
2017-08-09 15:41:33 +01:00
Chris Hill-Scott
14be8dc463 Merge pull request #1413 from alphagov/logo-bucket-name
Fix logo bucket name
2017-08-09 15:29:07 +01:00
Chris Hill-Scott
2eab6bf781 Fix logo bucket name
The app was uploading into ...live but then looking for the logos in ...production.

The existing logos are in ...production
2017-08-09 15:13:36 +01:00
Chris Hill-Scott
5eb2cf859c Merge pull request #1403 from alphagov/ken-admin-orgs
Add pages to create and manage organisation branding for Emails
2017-08-09 13:15:27 +01:00
Chris Hill-Scott
fb1a050e20 Merge pull request #1406 from alphagov/focus-states-navigation
Improve focus states on navigational elements
2017-08-09 13:15:19 +01:00
Chris Hill-Scott
66df44dd31 Merge pull request #1412 from alphagov/move-performance
Moving performance link to the support column in the footer
2017-08-09 13:15:13 +01:00
Pete Herlihy
d881104475 Moving performance link to the support column in the footer
Feels more appropriate here - these are all the live things the about is all the static things.
2017-08-09 10:57:49 +01:00
pyup-bot
ebe8b2b51c Update pyexcel-io from 0.4.3 to 0.4.4 2017-08-08 19:45:24 +01:00
Rebecca Law
fca663c183 Merge pull request #1410 from alphagov/test-deploy
Testing deploy - changing order of requirements
2017-08-08 16:32:29 +01:00
Rebecca Law
48162f46bd Testing deploy - changing order of requirements 2017-08-08 16:09:16 +01:00
Rebecca Law
e3a35965fb Merge pull request #1408 from alphagov/69-70
69-70 and 33-34 for Veterans Welfare (MOD)
2017-08-08 15:30:11 +01:00
Rebecca Law
ad6b44e1ee Merge pull request #1409 from alphagov/let-api-check-unique-email
Let api check unique email
2017-08-08 15:25:38 +01:00
Rebecca Law
98595d8d80 Added an else: raise 2017-08-08 15:04:45 +01:00
Rebecca Law
dbbd70d0ef Revert change to package-lock.json 2017-08-08 14:29:29 +01:00
Pete Herlihy
108d4a5646 69-70 and 33-34 for Veterans Welfare (MOD) 2017-08-08 11:58:21 +01:00
Rebecca Law
7e8c76bbc5 Let the API error when the service name is a duplicate.
- Remove the name_func from the AddServiceForm
- Catch the HTTPError and set the error on the form
2017-08-08 11:15:22 +01:00
Pete Herlihy
57808b1d84 Updated the video to the new one 2017-08-08 11:15:21 +01:00
Chris Hill-Scott
5af0542d7a Update trial mode page to talk about letters
The meaning of trial mode has evolved now that we’re adding letters:
- the existing conditions only apply to texts and emails
- we need to explain what trial mode means for letters
2017-08-08 11:13:49 +01:00
Chris Hill-Scott
4ff674158c Ensure trial mode error overrides too many rows
Telling users that they can’t send to more than 50 recipients in trial
mode doesn’t apply for letters (they can’t send to _any_ recipients).

So we should make sure that the error message about not being able to
send to any recipients always comes up instead of the 50 recipients one,
whether you’re trying to upload a file with 1 or 111 rows.
2017-08-08 11:13:48 +01:00
venusbb
26ed24abb2 Include numbers that are not used 2017-08-08 10:56:55 +01:00
venusbb
1bd958eb78 Inbound number admin page 2017-08-08 10:24:54 +01:00
Chris Hill-Scott
8f40cbd2bb Don’t let users in trial mode send letters
Users in trial mode haven’t signed the MOU. This means that they haven’t
agreed to pay for any costs they incur.

Unlike text messages and emails, we don’t give you any free allowance of
letters. Sending _any_ letters will cost the user money.

Therefore we shouldn’t let users who haven’t agreed that they will pay
for the service to incur costs by sending letters.

The pattern used for this is roughly the same as other trial mode errors
that we have already, ie a red box that says you’re not allowed. Not
sure if this is exactly right because it’s not exactly an error so the
pattern might feel too heavy-handed.

Getting this in place means we can turn letters on for users in trial
mode without worrying that they’ll accidentally send real letters, which
would result in:
- us having to absorb those costs
- some awkward conversations
2017-08-08 10:10:06 +01:00
Chris Hill-Scott
f90bab8e0c Add whitespace to code for consistency
It’s harder to scan over all the different possible errors if some of
them are bunched up together with no line breaks between them.
2017-08-08 10:08:52 +01:00
venusbb
a10fce8bf7 Merge branch 'master' of https://github.com/alphagov/notifications-admin 2017-08-08 09:46:25 +01:00
Chris Hill-Scott
db98af7ec3 Make hit areas bigger on nav
Bigger click areas make them quicker to hit, as per Fitt’s law:
https://en.wikipedia.org/wiki/Fitts%27s_law
2017-08-07 13:08:43 +01:00
Chris Hill-Scott
dc356b6c7c Make focus colour pass WCAG
The default combination of blue on orange is not easy to read.
2017-08-07 13:08:32 +01:00
Chris Hill-Scott
5782ad49d9 Make focus state of switch service align nicely
There is padding on the switch service link so that:
- it lines up with the service name
- it has a bigger hit area (because Fitt’s law[1])

This means that visually, the default focus state overlaps the blue
bar under the GOV.UK banner. So it needs a bit of custom CSS to make it
look right visually.
2017-08-07 13:08:07 +01:00
Rebecca Law
186202cc9d [WIP]
Let the API return a 400 error message if the service name is a duplicate.
2017-08-07 11:30:25 +01:00
Chris Hill-Scott
2fbf0acb08 Merge pull request #1405 from alphagov/new-video
Updated the video to the new one
2017-08-07 09:49:47 +01:00
Pete Herlihy
d5bc6743d8 Updated the video to the new one 2017-08-04 14:31:08 +01:00
kentsanggds
8b313ed8d1 Merge pull request #1404 from alphagov/ken-bump-utils-17.8
Bump utils version to fix dashes issue
2017-08-03 16:17:34 +01:00
Ken Tsang
75575db602 Bump utils version to fix dashes issue 2017-08-03 14:54:16 +01:00
venusbb
f3a15d2e2d Merge branch 'master' of https://github.com/alphagov/notifications-admin 2017-08-03 10:55:25 +01:00
Ken Tsang
e85e809c23 Fixed styling 2017-08-03 09:58:26 +01:00
Ken Tsang
ba9f1ac554 Add platform admin side nav 2017-08-02 12:50:01 +01:00
Ken Tsang
50ddef6a7e Update organisation link to new Platform Admin area 2017-08-02 12:12:54 +01:00
Ken Tsang
82f0ef58bf Refactor code after rebase 2017-08-02 11:20:33 +01:00
Ken Tsang
b1d1c6881f Refactor code 2017-08-02 11:07:27 +01:00
Ken Tsang
6c18c9d6ac Update config to new s3 bucket names 2017-08-02 11:05:17 +01:00
Ken Tsang
81d8494755 Add tests for s3_client 2017-08-02 11:04:14 +01:00
Ken Tsang
93eab4ca5f Refactored to use kwarg 2017-08-02 11:04:14 +01:00
Ken Tsang
615d80cd41 Add test for update org 2017-08-02 11:04:14 +01:00
Ken Tsang
681cf3b852 Fixed pep8 issues in test_org 2017-08-02 11:04:14 +01:00
Ken Tsang
005c8b53d7 Add org select and manage pages 2017-08-02 11:04:14 +01:00