Martyn Inglis
54e4311d1b
Merged in the defensive code by mistake
2016-08-22 16:56:43 +01:00
Martyn Inglis
9fbd410474
Merge branch 'master' into use_new_template_stats_endpoint
...
Conflicts:
app/notify_client/template_statistics_api_client.py
2016-08-22 16:47:42 +01:00
minglis
8a04770c8e
Merge pull request #878 from alphagov/handle_api_response
...
Handle the API migration
2016-08-22 16:30:37 +01:00
Chris Hill-Scott
d893a67fc2
Another content change from Gwen
...
_Missed this one because it was in a different email_
We don't use 'we'.
It's better to say 'An email has been sent to...'
2016-08-22 15:47:25 +01:00
Chris Hill-Scott
1e254415d2
Text message not Sms
2016-08-22 13:30:03 +01:00
Martyn Inglis
63fa77fde7
Admin app now in line with new API response for template statistics
...
- dropped the day level aggregate. Now grouped by template only,
2016-08-22 13:14:35 +01:00
Martyn Inglis
4cab7ffb3c
Merge branch 'master' into use_new_template_stats_endpoint
2016-08-22 12:55:11 +01:00
Martyn Inglis
5666719a92
Merge branch 'master' into more_wording_changes
...
Conflicts:
app/templates/views/verify-mobile.html
2016-08-22 12:54:10 +01:00
Martyn Inglis
380a6526c4
Changed some more instances of "confirmation" code to "security" code
2016-08-22 12:52:05 +01:00
Martyn Inglis
f59e05fb1a
Handle the API migration
...
If it;s the new format API hide the results
- Temp fix until new Admin code ships. Should be live for 5 mins.
2016-08-22 12:35:34 +01:00
Chris Hill-Scott
78de805b9a
Remove and/or from request to go live page
...
We don't use 'and/or' - you should just stick to 'and'.
2016-08-22 11:46:18 +01:00
Chris Hill-Scott
8cca2ef235
Lose the 'now' in the 'check your email' title
2016-08-22 11:46:10 +01:00
Chris Hill-Scott
aa166856b4
Change 'verification code' to 'security code'
...
Extensive testing on Verify has shown that this is understood better.
2016-08-22 11:46:07 +01:00
Martyn Inglis
55c4443a05
Admin app uses the new API response formats.
2016-08-18 15:30:57 +01:00
Martyn Inglis
d78c98970d
Removed this date. Wasn't integrated. Data was incorrect and didn't respect it. No API calls ensured it was true.
2016-08-18 15:30:32 +01:00
Leo Hemsted
fc14a800b5
remove print
2016-08-16 14:55:23 +01:00
Leo Hemsted
fde8d81868
send organisation back in correct variable
2016-08-15 11:15:49 +01:00
Leo Hemsted
3c0f06a36d
set value of radio input to be org id
...
also don't use nil, this isn't ruby
2016-08-15 10:39:34 +01:00
Leo Hemsted
fb510d2522
only set organisation on GET and add allowed fields to service client
...
we were overwriting it before validating the form for POST, so lost info
2016-08-12 12:37:18 +01:00
Leo Hemsted
7c16614538
set current services's values on service branding form
2016-08-12 11:48:04 +01:00
Chris Hill-Scott
6b5e64479a
Add a page to set organisation and branding option
...
Platform admin only.
Adds radio buttons to choose one of:
- three hard-coded branding options
- organisations from a list provided by the API
2016-08-12 10:31:43 +01:00
Leo Hemsted
20c39d24b7
Merge pull request #863 from alphagov/allow-partial-service-updates
...
Allow partial service updates from service API client
2016-08-12 10:07:55 +01:00
Leo Hemsted
6d27d568fe
Merge pull request #865 from alphagov/remove-noti-stats
...
remove unused call to notification statistics
2016-08-11 17:32:07 +01:00
Chris Hill-Scott
955566b127
Don’t allow changing service users on update
2016-08-11 17:10:10 +01:00
Chris Hill-Scott
da1fa2e61c
Make _attach_current_user a pure function
...
Mutating dictionaries is gross and doesn’t work as you’d expect. Better
to have the function return a new dictionary instead.
Means we can be explicit that `created_by` is one of the allowed params
when updating a service.
2016-08-11 17:07:55 +01:00
Chris Hill-Scott
0cfe10639a
Only allow update service to modify named attrs
...
To prevent typos and inadvertently updating something we shouldn’t,
this adds some filtering to the update_service method to make sure it
is only allowed to update certain attributes of a service.
2016-08-11 17:07:43 +01:00
Chris Hill-Scott
002b58a062
Make service API client do partial updates
...
The service API client was updating every attribute of a service. Which,
while kinda clunky, is fine…
…until something calling it doesn’t pass in every attribute of the
current service. It was then defaulting optional parameters to `None`.
Which resulted in a bug whereby every time a service was set to live,
its `reply_to_address` and `sms_sender_name` got overwritten to be
empty.
This commit changes the `update` method to only require the service ID,
and pass whatever other named arguments it received straight through to
the API. The API handles partial updates just fine (I think).
2016-08-11 17:07:33 +01:00
Chris Hill-Scott
a809ef59fb
Merge pull request #861 from alphagov/trial-mode-api-keys
...
Talk about trial mode on API keys page
2016-08-11 16:44:16 +01:00
Chris Hill-Scott
497a9548e3
Merge pull request #859 from alphagov/point-documentation-at-clients
...
Link to client documentation, not API documentation
2016-08-11 16:44:14 +01:00
Leo Hemsted
6fc474a37f
remove unused call to notification statistics
2016-08-11 12:07:50 +01:00
Chris Hill-Scott
e82cb21ecc
Talk about trial mode on API keys page
...
When you make a ‘normal’ API key it won’t work as described until your
serivce is live.
We should make this clear at the point at which you choose this key.
2016-08-10 17:04:22 +01:00
Leo Hemsted
e94a00850a
remove unused file
2016-08-10 15:40:41 +01:00
Chris Hill-Scott
3b2406ba02
Rename documentation to API documentation
...
Everything in this column of the footer is specifically to do with
the API now.
2016-08-10 10:36:08 +01:00
Chris Hill-Scott
bf6c3bfcc2
Move terms of use into help
...
Terms of use is non-technical, it should sit alongside the other
non-technical things like pricing.
2016-08-10 10:35:37 +01:00
Chris Hill-Scott
7010e35256
Remove example personalisation from template page
...
This was of dubious value, and the syntax probably isn’t accurate for
all languages.
2016-08-10 10:31:21 +01:00
Chris Hill-Scott
44a0845882
Replace documentation link with links to clients
...
In research we found that developers orientate themselves around the
API clients rather than the documentation.
We should get them to the client documentation as quickly as possible.
We currently link to the API documentation in three places:
- API integration page
- global footer
- template ‘API info’ page
For the first two this commit:
- removes the link to the documentation
- adds links to each of the 5 clients
For the last one it just removes the link entirely.
2016-08-10 10:31:10 +01:00
Leo Hemsted
3f3463b1ff
Merge branch 'master' into remove-stats-from-send
2016-08-09 14:41:00 +01:00
Chris Hill-Scott
981777a72a
Merge pull request #853 from alphagov/quis-patch-1
...
Delete spacer.png
2016-08-09 13:48:59 +01:00
Leo Hemsted
f2b6bfbfc2
Merge pull request #815 from alphagov/weekly-refactor
...
Weekly stats aggregate page refactor
2016-08-09 09:37:50 +01:00
Chris Hill-Scott
bc0c620fa1
Delete spacer.png
...
Depends on:
- [ ] https://github.com/alphagov/notifications-utils/pull/63
- [ ] https://github.com/alphagov/notifications-api/pull/587
The utils fix needs to be deployed to live on the API before this can be merged/deployed
2016-08-08 12:00:00 +01:00
Leo Hemsted
cd48f2c31a
Merge pull request #851 from alphagov/add-spacer
...
Add spacer image for email template
2016-08-08 11:34:34 +01:00
Leo Hemsted
f46d10b401
Merge pull request #844 from alphagov/deskpro-user-email
...
Fix deskpro user email
2016-08-08 11:32:13 +01:00
Chris Hill-Scott
aed10f711c
Add spacer image for email template
...
Forgot to include this before.
The template expects it in `./images` but it should probably live in
`./images/email-template`.
This commit puts it in both places; we can clean up later.
2016-08-08 11:12:01 +01:00
Chris Hill-Scott
d0ac61403a
Merge pull request #837 from alphagov/add-crests
...
Add department crests for email sub branding
2016-08-08 10:27:30 +01:00
Chris Hill-Scott
8c92737282
Make ‘total’ the default status on a job
...
The blue bar on the job page works out which is the current status from
the query parameters, not the parameters that the API gets called with.
2016-08-05 13:42:24 +01:00
Chris Hill-Scott
e482404eea
Merge pull request #832 from alphagov/make-numbers-less-confusing
...
Make numbers on a job less confusing
2016-08-05 12:14:29 +01:00
Chris Hill-Scott
040af920e9
Merge pull request #827 from alphagov/move-guidance-underneath
...
Move guidance underneath
2016-08-05 12:14:17 +01:00
Chris Hill-Scott
652534533b
Rewrite prev/next test to use BeautifulSoup
2016-08-05 11:33:32 +01:00
Chris Hill-Scott
b85b929b11
Lose the confusing list slicing
...
Slicing was to avoid duplicate items in the list. A more idomatic way
to avoid duplicate items in a list is to use a `set` instead.
The order of the list doesn’t really matter, but it’s a lot easier to
test for if the order is consistent.
2016-08-05 11:16:34 +01:00
Chris Hill-Scott
01bb2ada0a
Don’t let _set_status_filters mutate original list
...
Mutating stuff is scary and prone to problems. Better for it to
return a new list instead.
2016-08-05 11:02:30 +01:00