darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-03-02 07:11:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,359 Commits 50 Branches 59 Tags
f8db73ecc7cc09e69d3d11a7c2c4a30fa91ca89f
Commit Graph

2359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Hill-Scott
f8db73ecc7 Reduce uneccessary indentation 2016-08-23 10:21:05 +01:00
Chris Hill-Scott
0f6a090470 Fix admin app putting service into research mode 
We changed the `update_service` method to only update indivdual
attributes of a service, and only allow it to update specified
attributes: 0cfe10639a

We neglected to specify `research_mode` as one of the allowed
attributes.

This broke the app’s ability to put a service in or out of research
mode.

This commit:
- makes sure the tests cover this eventuality
- fixes the bug by specifying `research_mode` as one of the allowed
  attributes
 2016-08-23 10:16:27 +01:00
minglis
74c0c3e132 Merge pull request #891 from alphagov/order-by-count-not-template-name 
from alphabetical to desc co…
 2016-08-23 09:28:21 +01:00
Martyn Inglis
4dec7a7939 Changed order of templates activity page from alphabetical to desc count. 2016-08-23 09:14:21 +01:00
Andras Ferencz-Szabo
25009f3ac9 Merge pull request #870 from alphagov/jenkins_deploy 
Create Docker build image, build project with Docker
 2016-08-22 17:57:28 +01:00
minglis
8195f6c33b Merge pull request #888 from alphagov/merge-fix-for-template-stats 
Merged in the defensive code by mistake
 2016-08-22 17:32:42 +01:00
bandesz
26ff449b77 Create Docker build image, build project with Docker 2016-08-22 17:25:05 +01:00
Martyn Inglis
54e4311d1b Merged in the defensive code by mistake 2016-08-22 16:56:43 +01:00
minglis
388b8f8e4b Merge pull request #876 from alphagov/use_new_template_stats_endpoint 
Use new template stats endpoint
 2016-08-22 16:47:59 +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
minglis
b6de6d283c Merge pull request #884 from alphagov/quis-patch-1 
Another content change from Gwen
 2016-08-22 16:27:40 +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
minglis
e31b19ea61 Merge pull request #879 from alphagov/more_wording_changes 
Changed some more instances of "confirmation" code to "security" code
 2016-08-22 13:31:51 +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
minglis
351b91fe2e Merge pull request #874 from alphagov/readme-cleanup 
Update README.md
 2016-08-22 12:38:23 +01:00
minglis
88622f1638 Merge pull request #877 from alphagov/gwen 
Make Gwen’s content changes
 2016-08-22 12:37:53 +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
6279b327d6 Update README.md 2016-08-17 15:59:16 +01:00
Leo Hemsted
e610d83be4 Merge pull request #872 from alphagov/bump-utils-vers 
notifications-utils 8.7.5
 2016-08-17 10:18:04 +01:00
Leo Hemsted
ad18c5fe1e Update requirements.txt 2016-08-17 10:09:04 +01:00
Leo Hemsted
5bec1b091c Merge pull request #864 from alphagov/set-branding-org 
Add a page to set branding and organisation
 2016-08-16 17:08:50 +01:00
Leo Hemsted
fc14a800b5 remove print 2016-08-16 14:55:23 +01:00
Leo Hemsted
bfcf4be447 separate branding/org test into two tests 
it's a bit more legible and the running time of these tests is
negligable so split up the test into its two logical components
 2016-08-16 14:46:59 +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
4417fa1af7 Merge pull request #809 from alphagov/remove-stats-from-send 
don't hit statistics endpoints from send
 2016-08-10 16:11:50 +01:00
Leo Hemsted
f642d6a6f1 rename test variables for clarity 2016-08-10 15:55:13 +01:00