Ken Tsang
|
3d2c12128b
|
Update services test
|
2017-05-22 17:27:26 +01:00 |
|
Ken Tsang
|
112071a31e
|
Merge branch 'ken-refactor-service_permissions-data_model-inc-updated_at' of https://github.com/alphagov/notifications-api into ken-refactor-service_permissions-data_model-inc-updated_at
|
2017-05-22 17:26:04 +01:00 |
|
Ken Tsang
|
de7ad6fb95
|
Refactored service_permissions data model
|
2017-05-22 17:25:58 +01:00 |
|
Ken Tsang
|
88215f4062
|
Removed drop columns from service_permissions table
|
2017-05-22 17:13:50 +01:00 |
|
Ken Tsang
|
111e9df000
|
Removed drop columns from service_permissions table
|
2017-05-22 16:56:43 +01:00 |
|
kentsanggds
|
566166fcbf
|
Merge pull request #974 from alphagov/revert-969-ken-refactor-service_permissions-data_model
Revert "Refactored service permissisons data model"
|
2017-05-22 16:40:14 +01:00 |
|
kentsanggds
|
f5d3eed7e0
|
Revert "Refactored service permissisons data model"
|
2017-05-22 16:05:31 +01:00 |
|
kentsanggds
|
39f23c6189
|
Merge pull request #969 from alphagov/ken-refactor-service_permissions-data_model
Refactored service permissisons data model
|
2017-05-22 14:08:15 +01:00 |
|
Ken Tsang
|
052004bef0
|
Refactored data model to remove cascade
|
2017-05-22 13:33:43 +01:00 |
|
Imdad Ahad
|
47f361037e
|
Merge pull request #968 from alphagov/imdad-fix-parse-json-properly-sns-callback
Fix issue with parsing JSON in SNS callback
|
2017-05-22 11:18:35 +01:00 |
|
Ken Tsang
|
28ef9a1853
|
Refactored service permissisons data model
|
2017-05-22 10:58:41 +01:00 |
|
Imdad Ahad
|
02db3be37c
|
General refactor
|
2017-05-22 10:12:18 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Ken Tsang
|
54d801979c
|
Refactored to handle single service permission
|
2017-05-16 10:57:57 +01:00 |
|