Commit Graph

273 Commits

Author SHA1 Message Date
Rebecca Law
d488c592f4 Fix conflict in db migration script 2017-06-06 10:59:01 +01:00
minglis
e3fecd1d57 Merge pull request #1016 from alphagov/data-gov-uk
Add data.gov.uk to the list of organisations
2017-06-06 10:25:05 +01:00
Chris Hill-Scott
6b01cfd5b5 Add data.gov.uk to the list of organisations
We need to send an email with data.gov.uk branding.

The image for the logo doesn’t exist yet, but doing this migration so
we’re ready when it the logo does exist.
2017-06-05 16:22:02 +01:00
Martyn Inglis
efb045fc68 Removed pre-populate column to run after migration 2017-06-05 11:55:13 +01:00
Martyn Inglis
b296e736f2 Reorder the migrations. 2017-06-05 11:51:30 +01:00
Martyn Inglis
f15d235d1e Merge branch 'master' into firetext-inbound-sms 2017-06-05 11:33:53 +01:00
Martyn Inglis
199c43c507 Migration script to populate the provider.
- initial build of this ONLY support MMG so we can assume that all existing entries are all MMG, so any nulls == MMG.
- This PR will put in fire text so not so safe to keep doing this back and forward.
2017-06-02 16:49:11 +01:00
Martyn Inglis
012f8d2675 Adds provider onto the inbound sms table so we know where this came from. 2017-06-02 16:37:57 +01:00
Rebecca Law
9d80bdc70f Merge branch 'master' into letters-billing-table
Conflicts:
	app/models.py
2017-06-02 14:47:28 +01:00
Martyn Inglis
3df868823d Fixed DB migration order 2017-06-01 15:58:15 +01:00
Martyn Inglis
c57e2a6894 Merge branch 'master' into inbound-sms
Conflicts:
	app/notifications/receive_notifications.py
	tests/app/notifications/test_receive_notification.py
2017-06-01 15:56:33 +01:00
Leo Hemsted
ab50a3557e fix versions 2017-06-01 13:18:56 +01:00
Leo Hemsted
3e47519045 Merge pull request #1006 from alphagov/revert-1001-revert-988-non-null-again
Revert "Revert "Remove nulls from sms_sender""
2017-06-01 13:14:03 +01:00
Leo Hemsted
d33698216c Revert "Revert "Remove nulls from sms_sender"" 2017-06-01 11:00:26 +01:00
Leo Hemsted
ea0ba8d87a Revert "Remove nulls from sms_sender" 2017-05-31 14:52:48 +01:00
Rebecca Law
0b642623fb Added table and model for letter rates.
The rates for the letters are per page, therefore it seemed better to build a different table.
2017-05-31 13:34:54 +01:00
Rebecca Law
566e56f888 Fix downgrade script 2017-05-31 10:35:27 +01:00
Leo Hemsted
de3b5a13a9 version number bump 2017-05-30 12:49:30 +01:00
Leo Hemsted
012b2bf36c version number bump 2017-05-30 10:47:15 +01:00
Leo Hemsted
25011f09ef test no longer applicable as null sms_sender is an error now 2017-05-30 10:47:15 +01:00
Leo Hemsted
eb6edf06a3 add upgrade script to remove non-null values from the sender column 2017-05-30 10:47:15 +01:00
Leo Hemsted
4a85818c34 add inbound sms table 2017-05-30 10:47:01 +01:00
Rebecca Law
1f6157eaf4 Migration script to add new permission type 2017-05-26 16:10:52 +01:00
Rebecca Law
6ad36b274b Fix merge conflict with migration file 2017-05-25 13:46:03 +01:00
Rebecca Law
b745e13a28 Merge branch 'master' into schedule-api-notification 2017-05-25 13:37:04 +01:00
Rebecca Law
53efb4e033 Merge branch 'master' into schedule-api-notification
Conflicts:
	tests/app/v2/notifications/test_post_notifications.py
2017-05-23 13:58:50 +01:00
Imdad Ahad
24dfcd2128 Add normalised_to field to notification 2017-05-23 10:44:39 +01:00
Ken Tsang
88215f4062 Removed drop columns from service_permissions table 2017-05-22 17:13:50 +01:00
kentsanggds
f5d3eed7e0 Revert "Refactored service permissisons data model" 2017-05-22 16:05:31 +01:00
Rebecca Law
9bfba52f53 Add pending flag to scheduled_notifications.
Set pending flag to false when the notification has been sent to provider task.
2017-05-22 15:07:16 +01:00
Rebecca Law
3a3161ecc4 Merge branch 'master' into schedule-api-notification
Conflicts:
	app/celery/scheduled_tasks.py
	app/v2/notifications/post_notifications.py
	tests/app/celery/test_scheduled_tasks.py
2017-05-22 14:05:57 +01:00
Ken Tsang
052004bef0 Refactored data model to remove cascade 2017-05-22 13:33:43 +01:00
Ken Tsang
28ef9a1853 Refactored service permissisons data model 2017-05-22 10:58:41 +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
069cf35878 Script to update the international flag from null to false 2017-05-19 10:31:36 +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
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
Rebecca Law
38659cc563 Merge branch 'master' into update-international 2017-05-18 11:01:27 +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
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
Ken Tsang
114d4d84d4 Add service permissions DAO and refactor user service permission mock 2017-05-15 17:28:14 +01:00
Rebecca Law
75a4dad8c1 New table to hold scheduled_notifications. 2017-05-15 12:59:44 +01:00
Ken Tsang
359c4d2138 add service permissions model + migration script 2017-05-15 12:52:28 +01:00
Martyn Inglis
835dcc6273 Not null job_id and rebuilt the migration script to include this 2017-05-12 13:18:12 +01:00
Martyn Inglis
2643a891fc Renumber the sql migrations. 2017-05-11 15:43:52 +01:00
Martyn Inglis
d324d72926 Merge branch 'master' into async-job-stats 2017-05-11 15:41:20 +01:00
Rebecca Law
76a267b896 Script to update international flag 10,000 rows at a time. 2017-05-11 15:40:56 +01:00