darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-24 01:11:38 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,245 Commits 128 Branches 60 Tags
63799f5ff27194d3f16b600ea03057ed95c36f55
Commit Graph

4245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rebecca Law
63799f5ff2 Merge branch 'populate-monthly-letter-usages' of github.com:alphagov/notifications-api into populate-monthly-letter-usages 2017-12-15 10:34:20 +00:00
Rebecca Law
012d80003a Update montly billing with letters 2017-12-14 17:17:05 +00:00
Rebecca Law
4ea79d9eb1 Monthly billing has been updated to populate for letters. 2017-12-12 15:54:59 +00:00
Rebecca Law
d9db4691a1 Merge branch 'master' into populate-monthly-letter-usages 2017-12-12 08:54:03 +00:00
Rebecca Law
a836ed037e Added query for billing usage of letter notifications. 2017-12-11 16:55:23 +00:00
Rebecca Law
46c88db13d Merge pull request #1478 from alphagov/fix-service-history 
Removed the events data for the service/{id}/history page.
 2017-12-11 15:40:30 +00:00
Rebecca Law
0e93e98c6a Merge branch 'master' into fix-service-history 2017-12-08 15:03:07 +00:00
Rebecca Law
624acf9ffe Removed the events data for the service/{id}/history page. It does not make sense there. 2017-12-08 15:01:19 +00:00
Venus Bailey
70890e9dfc Merge pull request #1476 from alphagov/vb-delivery-status-2 
modified dao_timeout_notifications
 2017-12-08 09:58:05 +00:00
venusbb
46226a25b4 modified dao_timeout_notifications 
added send delivery status in scheduled timeout sending email/sms tasks
 2017-12-07 16:44:08 +00:00
Chris Hill-Scott
aa8b092081 Merge pull request #1475 from alphagov/quis-patch-1 
Fix incomplete version number specification
 2017-12-07 15:41:33 +00:00
Chris Hill-Scott
21f6e78495 Fix incomplete version number specification 
It needs setting to the new one in both places.
 2017-12-07 15:07:54 +00:00
kentsanggds
96c382fdc7 Merge pull request #1474 from alphagov/ken-pin-html5lib 
Update requirements to fix html5lib issue
 2017-12-07 15:06:28 +00:00
kentsanggds
7e5005b4df Update requirements to fix html5lib issue 2017-12-07 14:47:00 +00:00
kentsanggds
1c1e5b230e Merge pull request #1472 from alphagov/ken-fix-incomplete-jobs-letters-processing 
Fixed processing of incomplete letter jobs
 2017-12-07 13:48:58 +00:00
Ken Tsang
68659bab1b Fixed processing of incomplete letter jobs 
- `template` argument passed in to `job_complete` should be `template.template_type` otherwise the job status is incorrectly set
 2017-12-07 12:03:16 +00:00
Rebecca Law
a08411bde0 Merge pull request #1470 from alphagov/refactor-letter-rates 
Refactor letter rates
 2017-12-07 11:15:50 +00:00
Rebecca Law
da656af6e0 Fix merge conflict with db script 2017-12-06 17:26:32 +00:00
Rebecca Law
ad060435ca Merge branch 'master' into refactor-letter-rates 2017-12-06 17:25:39 +00:00
Rebecca Law
14be85160c Insert initial letter rates. 
Create letter rates dao.
Query to fetch letter rates.
 2017-12-06 16:40:38 +00:00
Leo Hemsted
58fa6b2a4e Merge pull request #1468 from alphagov/pyup-update-pytest-3.3.0-to-3.3.1 
Update pytest to 3.3.1
 2017-12-06 16:24:26 +00:00
Leo Hemsted
53fe567cdc Merge branch 'master' into pyup-update-pytest-3.3.0-to-3.3.1 2017-12-06 16:08:42 +00:00
Leo Hemsted
0bb76dc972 Merge pull request #1466 from alphagov/pyup-update-requests-mock-1.3.0-to-1.4.0 
Update requests-mock to 1.4.0
 2017-12-06 16:08:29 +00:00
Leo Hemsted
a1daeea7c5 Merge branch 'master' into pyup-update-requests-mock-1.3.0-to-1.4.0 2017-12-06 15:51:48 +00:00
Leo Hemsted
cd5273eb62 Merge pull request #1460 from alphagov/pyup-update-marshmallow-2.14.0-to-2.15.0 
Update marshmallow to 2.15.0
 2017-12-06 15:51:36 +00:00
Leo Hemsted
6fe54e220b Merge branch 'master' into pyup-update-marshmallow-2.14.0-to-2.15.0 2017-12-06 15:36:29 +00:00
Leo Hemsted
093fe5dd8e Merge pull request #1467 from alphagov/pyup-update-awscli-1.14.2-to-1.14.4 
Update awscli to 1.14.4
 2017-12-06 15:36:20 +00:00
Leo Hemsted
c69d7be732 Merge branch 'master' into pyup-update-awscli-1.14.2-to-1.14.4 2017-12-06 15:17:03 +00:00
Leo Hemsted
8c170d859e Merge pull request #1457 from alphagov/bye-bye-free-fragments 
Bye bye free fragments
 2017-12-06 15:16:50 +00:00
Leo Hemsted
f63a67823d Merge branch 'master' into pyup-update-pytest-3.3.0-to-3.3.1 2017-12-06 15:01:47 +00:00
Leo Hemsted
ca152d8281 Merge branch 'master' into pyup-update-requests-mock-1.3.0-to-1.4.0 2017-12-06 15:01:35 +00:00
Leo Hemsted
f29e08c778 don't update current year twice 2017-12-06 14:45:44 +00:00
Leo Hemsted
78099de776 make sure POST /free-sms-fragment-limit always creates 
refactored billing/rest.py and annual_billing_dao.py to remove logic
from the dao, and simplify the process around creating new rows. Make
sure that the POST always creates (it previously wouldn't create rows
for years that don't already exist). Clean up some tests that were
doing too much set-up/data verification via rest calls rather than
directly inserting test data in to the DB.
 2017-12-06 14:45:44 +00:00
Leo Hemsted
4cdcc4e035 no longer add an annual billing entry creating a service 
this is now handled by a separate call from the admin app
 2017-12-06 14:45:44 +00:00
Leo Hemsted
8cd422ebea remove unnecessary None from .get 2017-12-06 14:45:43 +00:00
Leo Hemsted
a4e2a40134 update dao tests to pass in free sms fragment limit, remove command 2017-12-06 14:45:43 +00:00
Leo Hemsted
664187f878 update model to reflect service.prefix_sms not being nullable 2017-12-06 14:45:43 +00:00
Leo Hemsted
b0d4044ff5 remove free_sms_fragment_limit from service 
* remove from model
* still required when calling POST /service - we just call through
  from dao_create_service to add a new annual billing entry.
* removed from POST /service/<id> update_service - if you want to
  update/add a new one, use POST /service/<id>/free-sms-fragment-limit
* made sure tests create services with default 250k limit.
 2017-12-06 14:45:43 +00:00
Pete Herlihy
f0ba491d04 Merge pull request #1428 from alphagov/new-dwp-letter-orgs 
Add a new organisation for letter branding
 2017-12-06 14:22:35 +00:00
Pete Herlihy
aeb3b44a98 Merge branch 'master' into new-dwp-letter-orgs 2017-12-06 13:37:39 +00:00
Rebecca Law
21e2940e5b Merge branch 'master' into pyup-update-requests-mock-1.3.0-to-1.4.0 2017-12-06 11:05:55 +00:00
Richard Chapman
739f484361 Merge branch 'master' into pyup-update-marshmallow-2.14.0-to-2.15.0 2017-12-06 11:02:44 +00:00
Richard Chapman
4f1cb0eb4d Merge pull request #1469 from alphagov/rc_performance_testing_updates_staging 
Revert changes to staging for performance tests and increased rate limit
 2017-12-06 10:21:57 +00:00
Rebecca Law
bc1f9cf6aa Merge branch 'master' into new-dwp-letter-orgs 2017-12-06 10:18:28 +00:00
Richard Chapman
af1ab437be Revert changes to staging for performance tests and increased rate limit 
- Reverted the Gunicorn worker number to 5 (this should be investigated
further on a well baselined system to compare)
- Enabled REDIS
- Increased the rate limit to 400 req/sec as using early testing
yesterday 450+ was being achieved
 2017-12-06 09:38:31 +00:00
pyup-bot
b53fe651cb Update pytest from 3.3.0 to 3.3.1 2017-12-06 01:21:54 +00:00
pyup-bot
0d12b06667 Update awscli from 1.14.2 to 1.14.4 2017-12-05 23:50:00 +00:00
pyup-bot
7fd0bf8bd8 Update requests-mock from 1.3.0 to 1.4.0 2017-12-05 23:18:56 +00:00
kentsanggds
e85b4b6ea3 Merge pull request #1462 from alphagov/ken-add-letters-pdf-s3-bucket 
Add letters pdf s3 bucket
 2017-12-05 16:19:17 +00:00
Ken Tsang
7b390e74c4 Upper case the filename to meet requirements 2017-12-05 16:03:08 +00:00