Rebecca Law d975f30888 Fix merge conflict

2017-10-19 14:39:53 +01:00

..

0001_restart_migrations.py

…

0002_add_content_char_count.py

…

0003_add_service_history.py

…

0004_notification_stats_date.py

…

0005_add_provider_stats.py

…

0006_api_keys_history.py

…

0007_template_history.py

…

0008_archive_template.py

…

0009_created_by_for_jobs.py

…

0010_events_table.py

…

0011_ad_provider_details.py

…

0012_complete_provider_details.py

…

0013_add_loadtest_client.py

…

0014_add_template_version.py

…

0015_fix_template_data.py

…

0016_reply_to_email.py

…

0017_add_failure_types.py

…

0018_remove_subject_uniqueness.py

…

0019_add_job_row_number.py

…

0020_template_history_fix.py

…

0021_add_delivered_failed_counts.py

…

0022_add_pending_status.py

…

0023_add_research_mode.py

…

0024_add_research_mode_defaults.py

…

0025_notify_service_data.py

…

0026_rename_notify_service.py

…

0027_update_provider_rates.py

…

0028_fix_reg_template_history.py

…

0029_fix_email_from.py

…

0030_service_id_not_null.py

…

0031_store_personalisation.py

…

0032_notification_created_status.py

…

0033_api_key_type.py

…

0034_pwd_changed_at_not_null.py

…

0035_notification_type_.py

…

0036_notif_key_type_not_null.py

…

0037_service_sms_sender.py

…

0038_test_api_key_type.py

…

0039_fix_notifications.py

…

0040_adjust_mmg_provider_rate.py

…

0041_email_template_.py

…

0042_notification_history.py

…

0043_notification_indexes.py

…

0044_jobs_to_notification_hist.py

…

0045_billable_units.py

…

0046_organisations_and_branding.py

…

0047_ukvi_spelling.py

…

0048_job_scheduled_time.py

…

0050_index_for_stats.py

…

0051_set_job_status.py

…

0052_drop_jobs_status.py

…

0053_cancelled_job_status.py

…

0054_perform_drop_status_column.py

…

0055_service_whitelist.py

…

0056_minor_updates.py

…

0057_change_email_template.py

…

0058_add_letters_flag.py

…

0059_set_services_to_active.py

…

0060_add_letter_template_type.py

…

0061_add_client_reference.py

…

0062_provider_details_history.py

…

0063_templates_process_type.py

…

0064_update_template_process_type.py

…

0065_users_current_session_id.py

…

0066_add_dvla_provider.py

…

0067_service_contact_block.py

…

0068_add_created_by_to_provider.py

…

0069_add_dvla_job_status.py

…

0070_fix_notify_user_email.py

…

0071_add_job_error_state.py

…

0072_add_dvla_orgs.py

…

0073_add_international_sms_flag.py

…

0074_update_sms_rate.py

…

0075_create_rates_table.py

…

0076_add_intl_flag_to_provider.py

…

0077_add_intl_notification.py

…

0078_add_sent_notification_status.py

…

0079_update_rates.py

…

0080_fix_rate_start_date.py

…

0081_noti_status_as_enum.py

…

0082_add_golive_template.py

…

0083_add_perm_types_and_svc_perm.py

Add service permissions DAO and refactor user service permission mock

2017-05-15 17:28:14 +01:00

0084_add_job_stats.py

Merge branch 'master' into async-job-stats

2017-05-17 09:49:43 +01:00

0085_update_incoming_to_inbound.py

Removed drop columns from service_permissions table

2017-05-22 17:13:50 +01:00

0086_add_norm_to_notification.py

Add normalised_to field to notification

2017-05-23 10:44:39 +01:00

0087_scheduled_notifications.py

Fix merge conflict with migration file

2017-05-25 13:46:03 +01:00

0088_add_schedule_serv_perm.py

Fix downgrade script

2017-05-31 10:35:27 +01:00

0089_govuk_sms_sender.py

fix versions

2017-06-01 13:18:56 +01:00

0090_inbound_sms.py

Fixed DB migration order

2017-06-01 15:58:15 +01:00

0091_letter_billing.py

Merge branch 'master' into letters-billing-table

2017-06-02 14:47:28 +01:00

0092_add_inbound_provider.py

Reorder the migrations.

2017-06-05 11:51:30 +01:00

0093_data_gov_uk.py

Revert "Remove name from organisation"

2017-06-26 13:52:01 +01:00

0094_job_stats_update.py

Add three new columns to job_statistics for sent, delivered and failed.

2017-06-07 11:15:05 +01:00

0095_migrate_existing_svc_perms.py

Fix merge conflicts

2017-06-08 15:24:18 +01:00

0096_update_job_stats.py

Update the new job_statistics columns with the right values.

2017-06-08 16:24:16 +01:00

0097_notnull_inbound_provider.py

Merge branch 'master' into firetext-inbound-sms-not-null-provider

2017-06-09 11:56:32 +01:00

0098_service_inbound_api.py

Update model to remove the string length restriction.

2017-06-19 12:25:05 +01:00

0099_tfl_dar.py

Unpick migration conflict

2017-06-20 10:56:50 +01:00

0100_notification_created_by.py

add created_by to notifications

2017-06-20 11:51:17 +01:00

0101_een_logo.py

Remove name from organisation

2017-06-26 14:03:02 +01:00

0102_template_redacted.py

add template personalisation redaction

2017-06-28 15:53:08 +01:00

0103_add_historical_redact.py

add historical redaction data

2017-06-29 12:54:48 +01:00

0104_more_letter_orgs.py

Add more organisations for letter branding

2017-07-06 12:27:55 +01:00

0105_opg_letter_org.py

Add OPG to letter organisations

2017-07-06 12:31:02 +01:00

0106_null_noti_status.py

Make Noti and NotiHis status column nullable:

2017-07-10 12:09:02 +01:00

0107_drop_template_stats.py

Fix merge conflict with db migration script

2017-07-10 15:44:01 +01:00

0108_change_logo_not_nullable.py

Rename migration script

2017-07-12 12:05:03 +01:00

0109_rem_old_noti_status.py

Remove old notification status column

2017-07-12 16:24:18 +01:00

0110_monthly_billing.py

- Added a scheduled task to create or update billing for the month, yesterday is used to calculate the start and end date for the month.

2017-07-24 15:13:18 +01:00

0111_drop_old_service_flags.py

Renamed migration script

2017-07-25 17:23:30 +01:00

0112_add_start_end_dates.py

Rename method to get start and end date of a month for clarity

2017-08-11 16:56:47 +01:00

0113_job_created_by_nullable.py

add tests for letter api notifications

2017-07-27 16:43:55 +01:00

0114_drop_monthly_billing_cols.py

Drop unused month and year columns from monthlybilling

2017-08-11 10:44:34 +01:00

0115_add_inbound_numbers.py

Update migration script

2017-08-11 13:25:09 +01:00

0116_another_letter_org.py

Fix order of DB migrations

2017-08-14 13:54:18 +01:00

0117_international_sms_notify.py

Allow Notify service to send international sms

2017-08-29 15:18:49 +01:00

0118_service_sms_senders.py

Create a table for service_sms_senders.

2017-09-05 17:53:47 +01:00

0119_add_email_reply_to.py

Create ServiceEmailReplyTo table

2017-09-07 15:41:23 +01:00

0120_add_org_banner_branding.py

Add a non-GOV.UK banner option for email branding

2017-09-19 14:40:22 +01:00

0121_nullable_logos.py

Make organisation logo nullable

2017-09-20 11:06:16 +01:00

0122_add_service_letter_contact.py

Add ServiceLetterContact data model and script

2017-09-21 16:08:49 +01:00

0123_add_noti_to_email_reply.py

Added a unique constraint to the notification_id column of the notification_to_email_reply_to table so that each notification can only have one mapping to service_email_reply_to and hence one email address.

2017-10-03 11:03:31 +01:00

0124_add_free_sms_fragment_limit.py

Revert "Revert "[#151837054] Add new column free_sms_fragment_limit in the Services table""

2017-10-16 16:24:34 +01:00

0125_add_organisation_type.py

Store organisation type against each service

2017-10-18 10:49:31 +01:00

0126_add_annual_billing.py

Unique constrain and db.relationship

2017-10-19 12:00:01 +01:00

0127_remove_unique_constraint.py

Fix merge conflict

2017-10-19 14:39:53 +01:00