Martyn Inglis
|
119f0532ab
|
Renamed the API method/url
|
2017-05-22 10:06:34 +01:00 |
|
Rebecca Law
|
2e864411af
|
Create a server command to run custom db scripts.
|
2017-05-19 17:04:39 +01:00 |
|
Martyn Inglis
|
f0395e7496
|
New endpoint to get the count of billable SMS units.
|
2017-05-19 16:43:05 +01:00 |
|
Martyn Inglis
|
7268bc28fe
|
New array of non-billable states
|
2017-05-19 16:42:47 +01:00 |
|
Martyn Inglis
|
2a0669636d
|
Add and test new DAO method that counts the billable units multiplied by rate multiplier for a given service for a given time period.
Currently this is SMS only.
Used by the dashboard for a headline figure.
|
2017-05-19 16:42:33 +01:00 |
|
Rebecca Law
|
35e9abe8b5
|
Merge pull request #965 from alphagov/revert-964-update-international
Revert "Script to update the international flag from null to false"
|
2017-05-19 12:22:35 +01:00 |
|
Rebecca Law
|
315e776ebb
|
Revert "Script to update the international flag from null to false"
|
2017-05-19 12:22:05 +01:00 |
|
Rebecca Law
|
f00dbfa34f
|
Merge pull request #964 from alphagov/update-international
Script to update the international flag from null to false
|
2017-05-19 10:54:48 +01:00 |
|
Rebecca Law
|
069cf35878
|
Script to update the international flag from null to false
|
2017-05-19 10:31:36 +01:00 |
|
Imdad Ahad
|
0e0c18583f
|
Fix test data and how we parse the JSON
|
2017-05-19 10:16:48 +01:00 |
|
Rebecca Law
|
e2b5bb613b
|
Merge pull request #963 from alphagov/revert-949-update-international
Revert "Script to update international flag 10,000 rows at a time."
|
2017-05-18 15:46:22 +01:00 |
|
Rebecca Law
|
9b79ac2189
|
Revert "Script to update international flag 10,000 rows at a time."
|
2017-05-18 15:45:50 +01:00 |
|
Rebecca Law
|
6d9a32bda1
|
Merge pull request #949 from alphagov/update-international
Script to update international flag 10,000 rows at a time.
|
2017-05-18 14:47:18 +01:00 |
|
Rebecca Law
|
097510b029
|
Testing the update script
|
2017-05-18 14:28:49 +01:00 |
|
Rebecca Law
|
a75db81334
|
Fix name condflicts with migration script
|
2017-05-18 13:12:05 +01:00 |
|
minglis
|
da6a6f6641
|
Merge pull request #959 from alphagov/comma-format-message-limit
Comma-format number when emailing live services
|
2017-05-18 11:06:24 +01:00 |
|
Rebecca Law
|
38659cc563
|
Merge branch 'master' into update-international
|
2017-05-18 11:01:27 +01:00 |
|
minglis
|
0d35736eee
|
Merge pull request #962 from alphagov/remove-space-from-queue-list
Removed whitespace from queue list
|
2017-05-18 10:24:16 +01:00 |
|
Martyn Inglis
|
ea794705ab
|
Removed whitespace from queue list
|
2017-05-18 10:24:03 +01:00 |
|
minglis
|
8e4466bc04
|
Merge pull request #948 from alphagov/async-job-stats
Async job stats
|
2017-05-18 09:52:23 +01:00 |
|
Martyn Inglis
|
8dc7a86148
|
Merge branch 'master' into async-job-stats
Conflicts:
app/dao/services_dao.py
|
2017-05-18 09:34:54 +01:00 |
|
kentsanggds
|
7850781245
|
Merge pull request #961 from alphagov/ken-default-permissions-when-creating-service
Ken default permissions when creating service
|
2017-05-17 16:49:25 +01:00 |
|
Ken Tsang
|
e68c3900e8
|
Add restricted argument for service mock
|
2017-05-17 16:06:35 +01:00 |
|
Rebecca Law
|
973cc2c4c9
|
Changed the scheduled_for datetime to only send and hour of a day to send.
Also expect the date being passed in is BST. The date is converted to UTC before saving. And converted to BST when returning a notification.
|
2017-05-17 15:06:15 +01:00 |
|
Chris Hill-Scott
|
d33e19da28
|
Merge pull request #950 from alphagov/bump-utils-placeholder-contact
Output contact blocks with placeholders replaced
|
2017-05-17 14:43:13 +01:00 |
|
minglis
|
0b4f0b35d5
|
Merge pull request #960 from alphagov/fix-created-at-date
Fix created at date
|
2017-05-17 14:24:17 +01:00 |
|
Ken Tsang
|
edff192efc
|
Remove whitespace
|
2017-05-17 14:18:12 +01:00 |
|
Ken Tsang
|
54446d5f4d
|
Add default permissions when creating a service
|
2017-05-17 14:18:12 +01:00 |
|
Martyn Inglis
|
ee5bb5f01a
|
Fixed issues caused by single evaluation of method signature defaults
|
2017-05-17 13:27:05 +01:00 |
|
Martyn Inglis
|
09f45332eb
|
Fixed issues caused by single evaluation of method signature defaults
|
2017-05-17 13:25:40 +01:00 |
|
Rebecca Law
|
5f8338dd80
|
Remove the beat job.
Add logging to the task.
|
2017-05-17 12:59:00 +01:00 |
|
minglis
|
05a179c6ef
|
Merge pull request #941 from alphagov/load-service-on-auth
Load service on auth
|
2017-05-17 10:49:00 +01:00 |
|
Martyn Inglis
|
83a1b1526e
|
Merge branch 'master' into async-job-stats
Conflicts:
app/notifications/notifications_ses_callback.py
|
2017-05-17 09:49:43 +01:00 |
|
Rebecca Law
|
1034762489
|
Ensure the relationship between Notification and ScheduledNotification is one-to-one.
Update db script with the right number
|
2017-05-16 15:29:31 +01:00 |
|
kentsanggds
|
c4964d8cf4
|
Merge pull request #956 from alphagov/add-service-permissions
Add service permissions DAO and refactor user service permission mock
|
2017-05-16 14:26:15 +01:00 |
|
Martyn Inglis
|
d2a7a7b3c9
|
Fixed error in code
|
2017-05-16 13:55:32 +01:00 |
|
Rebecca Law
|
2e078f9fc8
|
Add scheduled task to send scheduled notifcations.
Fix the query to fetch scheduled notifications.
|
2017-05-16 13:47:22 +01:00 |
|
Ken Tsang
|
3602431c2a
|
Renamed test and refactored fixtures
|
2017-05-16 13:41:54 +01:00 |
|
Martyn Inglis
|
1dc3970595
|
Code tidy up as be @imdad comments.
|
2017-05-16 12:55:12 +01:00 |
|
Ken Tsang
|
2a48891025
|
Removed unused pytest from test
|
2017-05-16 12:54:32 +01:00 |
|
Ken Tsang
|
b233ae46f3
|
Tidy up test code for service permissions
|
2017-05-16 12:53:46 +01:00 |
|
Martyn Inglis
|
a5dae0bebd
|
Fixed test - I had deliberately failed the test as part of debugging and not fixed the assert. Doh.
|
2017-05-16 12:49:20 +01:00 |
|
Ken Tsang
|
733c16b2bb
|
Update to strip down DAO and clarify tests
|
2017-05-16 12:33:27 +01:00 |
|
Chris Hill-Scott
|
2d4f10bd22
|
Comma-format number when emailing live services
250,000 is easier to read than 250000.
|
2017-05-16 12:33:01 +01:00 |
|
Imdad Ahad
|
0f0afab372
|
Merge pull request #958 from alphagov/imdad-fix-sns-plaintext-header-json
Force parse JSON received from SNS
|
2017-05-16 11:39:26 +01:00 |
|
Martyn Inglis
|
d1aff5bb6e
|
Complex test to check updating one type of notification job, doesn't update the other
- so if we timeout both SMS and Email the counts are correct
|
2017-05-16 11:36:52 +01:00 |
|
Rebecca Law
|
56f657de9b
|
fix style
|
2017-05-16 11:04:55 +01:00 |
|
Ken Tsang
|
54d801979c
|
Refactored to handle single service permission
|
2017-05-16 10:57:57 +01:00 |
|
Rebecca Law
|
4aacb3e6ef
|
Fix db migration conflict
|
2017-05-16 10:51:25 +01:00 |
|
Rebecca Law
|
3c0da9c8fd
|
Merge branch 'master' into schedule-api-notification
|
2017-05-16 10:50:53 +01:00 |
|