darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-04-15 06:41:23 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,389 Commits 50 Branches 59 Tags
01ac70f6a065fbe3e4777e021e18f6f1c4c669fd
Commit Graph

2389 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Hill-Scott
01ac70f6a0 Merge pull request #905 from alphagov/sms-sender-no-prefix 
Don’t prefix text messages is sender name is set
 2016-08-26 15:10:34 +01:00
Chris Hill-Scott
c745422578 Don’t prefix text messages is sender name is set 
Implements:
- [x] alphagov/notifications-utils#66
 2016-08-26 14:45:26 +01:00
Leo Hemsted
4fbd23d5e9 Merge pull request #907 from alphagov/plat-admin 
Platform admin stats rework
 2016-08-26 13:51:36 +01:00
bandesz
cf34aff673 Travis cleanup: remove deploy + functest trigger 2016-08-25 16:20:17 +01:00
minglis
9a60cf49a4 Merge pull request #899 from alphagov/handle-new-jobs-api 
Handle new jobs api
 2016-08-25 09:56:30 +01:00
Martyn Inglis
c61199d17d Rewrote some slighlt over complicated logic 2016-08-25 09:15:55 +01:00
Leo Hemsted
6ad7b019ea added tests for reworked platform admin page 2016-08-24 17:39:20 +01:00
Leo Hemsted
b983f020ff remove old statistics_api_client 
now unused - replaced mock fn with detailed_services too
 2016-08-24 16:26:08 +01:00
Andras Ferencz-Szabo
ae3c4fe1fc Merge pull request #906 from alphagov/env_rename 
Rename development env to preview
 2016-08-24 15:59:42 +01:00
bandesz
ca8ad56be9 Rename development env to preview 2016-08-24 15:55:54 +01:00
Leo Hemsted
7864f9455d rewrite platform-admin page to use new non-stats endpoints 
had to change because format from api is slightly different
 2016-08-24 15:04:03 +01:00
minglis
bcfe2a90e1 Merge pull request #885 from alphagov/new-api-for-deleting-templates 
Using new endpoint for template statistics
 2016-08-24 12:42:40 +01:00
Martyn Inglis
d56c14e147 Actually use the right exception class. 
Two HTTPError classes exist. Need to use the one in notifications_python_client.
 2016-08-24 12:12:19 +01:00
Martyn Inglis
d149a9691a Added tests for the 2 use cases: 
used templates

unused templates
 2016-08-24 12:09:38 +01:00
Martyn Inglis
0b95a30e2f Raise the exception if not a 404 2016-08-24 11:26:34 +01:00
Martyn Inglis
6e3759eb1f Merge branch 'master' into new-api-for-deleting-templates 
Conflicts:
	app/main/views/templates.py
 2016-08-24 11:05:19 +01:00
Martyn Inglis
9b348880ef Test for old style stats - make sure we don't override / fail if no new block present. 2016-08-24 10:42:57 +01:00
Martyn Inglis
5b2ae43d5d Wrote some tests around the stats conversions. 
Properly named the finished parameter.

Handled the root JSON key
 2016-08-24 10:35:04 +01:00
Martyn Inglis
b5de1dae5e Merge branch 'master' into handle-new-jobs-api 2016-08-23 16:59:28 +01:00
Martyn Inglis
4a551329c5 Parse the JOB API response converting new style response to old style object 
- allows migration of API
 2016-08-23 16:58:50 +01:00
Andras Ferencz-Szabo
8b99f484d4 Merge pull request #898 from alphagov/jenkins_deploy_stage 
Disable Travis deploys for staging
 2016-08-23 16:56:21 +01:00
bandesz
62605a2ed5 Disable Travis deploys for staging 2016-08-23 16:45:40 +01:00
Chris Hill-Scott
cd091af9e7 Merge pull request #894 from alphagov/fix-research-mode-toggle 
Fix admin app putting service into research mode
 2016-08-23 14:27:02 +01:00
Andras Ferencz-Szabo
204823a45f Merge pull request #897 from alphagov/jenkins_deploy_dev 
Fix version file generation, remove master deploys from travis
 2016-08-23 14:07:40 +01:00
bandesz
d7324136ae Fix version file generation, remove master deploys from travis 2016-08-23 13:44:20 +01:00
minglis
9b389b93b3 Merge pull request #886 from alphagov/handle-new-template-stats-endpoint 
For the brief moment when we have incompatible API versions out,
 2016-08-23 10:30:06 +01:00
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
Martyn Inglis
c44a6cb65d Merge branch 'master' into new-api-for-deleting-templates 2016-08-23 09:31:05 +01:00
Martyn Inglis
49b4387b25 Merge branch 'master' into handle-new-template-stats-endpoint 2016-08-23 09:30:38 +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
Martyn Inglis
c43fde0ac0 For the brief moment when we have incompatible API versions out, 
We won't call template stats by template id as the format has changed. So just ask the question "do you want to delete" without the context.
 2016-08-22 16:35:14 +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
Martyn Inglis
9d25f326b0 Using new endpoint for template statistics 
- gets notifications by template id, returning the most recent to illustrate the last use of that template.
 2016-08-22 16:25:35 +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