Rebecca Law 6c5e60f0a9 Fix merge conflicts

2018-08-23 15:04:44 +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

…

0084_add_job_stats.py

…

0085_update_incoming_to_inbound.py

…

0086_add_norm_to_notification.py

…

0087_scheduled_notifications.py

…

0088_add_schedule_serv_perm.py

…

0089_govuk_sms_sender.py

…

0090_inbound_sms.py

…

0091_letter_billing.py

…

0092_add_inbound_provider.py

…

0093_data_gov_uk.py

…

0094_job_stats_update.py

…

0095_migrate_existing_svc_perms.py

…

0096_update_job_stats.py

…

0097_notnull_inbound_provider.py

…

0098_service_inbound_api.py

…

0099_tfl_dar.py

…

0100_notification_created_by.py

…

0101_een_logo.py

…

0102_template_redacted.py

…

0103_add_historical_redact.py

…

0104_more_letter_orgs.py

…

0105_opg_letter_org.py

…

0106_null_noti_status.py

…

0107_drop_template_stats.py

…

0108_change_logo_not_nullable.py

…

0109_rem_old_noti_status.py

…

0110_monthly_billing.py

…

0111_drop_old_service_flags.py

…

0112_add_start_end_dates.py

…

0113_job_created_by_nullable.py

…

0114_drop_monthly_billing_cols.py

…

0115_add_inbound_numbers.py

…

0116_another_letter_org.py

…

0117_international_sms_notify.py

…

0118_service_sms_senders.py

…

0119_add_email_reply_to.py

…

0120_add_org_banner_branding.py

…

0121_nullable_logos.py

…

0122_add_service_letter_contact.py

…

0123_add_noti_to_email_reply.py

…

0124_add_free_sms_fragment_limit.py

…

0125_add_organisation_type.py

…

0126_add_annual_billing.py

…

0127_remove_unique_constraint.py

…

0128_noti_to_sms_sender.py

…

0129_add_email_auth_permission_.py

…

0130_service_email_reply_to_row.py

…

0131_user_auth_types.py

…

0132_add_sms_prefix_setting.py

…

0133_set_services_sms_prefix.py

…

0134_add_email_2fa_template_.py

…

0135_stats_template_usage.py

…

0136_user_mobile_nullable.py

…

0137_notification_template_hist.py

…

0138_sms_sender_nullable.py

…

0139_migrate_sms_allowance_data.py

…

0140_sms_prefix_non_nullable.py

…

0141_remove_unused.py

…

0142_validate_constraints.py

…

0143_remove_reply_to.py

…

0144_template_service_letter.py

…

0145_add_notification_reply_to.py

…

0146_add_service_callback_api.py

…

0147_drop_mapping_tables.py

…

0148_add_letters_as_pdf_svc_perm.py

…

0149_add_crown_to_services.py

…

0150_another_letter_org.py

…

0151_refactor_letter_rates.py

…

0152_kill_service_free_fragments.py

…

0153_add_is_letter_contact_blank.py

…

0154_nullable_is_blank.py

…

0155_revert_0153.py

…

0156_set_temp_letter_contact.py

…

0157_add_rate_limit_to_service.py

…

0158_remove_rate_limit_default.py

…

0159_add_historical_redact.py

…

0160_another_letter_org.py

…

0161_email_branding.py

…

0162_remove_org.py

…

0163_add_new_org_model.py

…

0164_add_organisation_to_service.py

…

0165_another_letter_org.py

…

0166_add_org_user_stuff.py

…

0167_add_precomp_letter_svc_perm.py

…

0168_hidden_templates.py

Set Template.hidden as nullable before the new app code gets released

2018-02-26 10:46:20 +00:00

0169_hidden_templates_nullable.py

Set Template.hidden as nullable before the new app code gets released

2018-02-26 10:46:20 +00:00

0170_hidden_non_nullable.py

Set Templates.hidden column as non-nullable

2018-02-26 13:28:08 +00:00

0171_add_org_invite_template.py

Fix db migration conflicts

2018-02-26 16:48:12 +00:00

0172_deprioritise_examples.py

Remove priority flag from example templates

2018-03-01 09:37:14 +00:00

0173_create_daily_sorted_letter.py

Create DailySortedLetter table

2018-03-06 09:09:02 +00:00

0174_add_billing_facts.py

Rename tables, column and added indexes

2018-03-09 08:17:02 +00:00

0175_drop_job_statistics_table.py

Migration to drop job_statistics table

2018-03-12 12:38:06 +00:00

0176_alter_billing_columns.py

Add billing models and small alteration to billing tables

2018-03-12 18:19:26 +00:00

0177_add_virus_scan_statuses.py

Fix revision numbers in migration 0177

2018-03-13 13:26:20 +00:00

0178_add_filename.py

Handle duplicate calls to update_letter_notifications_statuses

2018-03-15 10:49:18 +00:00

0179_billing_primary_const.py

merged master and up migration version

2018-03-16 10:57:23 +00:00

0180_another_letter_org.py

Add Rother District Council logo for letters

2018-03-20 11:12:15 +00:00

0181_billing_primary_key.py

primary key for ft_billing should use notification_type

2018-03-21 15:02:08 +00:00

0182_add_upload_document_perm.py

Add a service permission for uploading documents to Document Download

2018-03-27 10:16:56 +01:00

0183_alter_primary_key.py

Database tweak and BST bug fix

2018-03-27 10:37:56 +01:00

0184_alter_primary_key_1.py

add international as a composite primary key for billing

2018-03-28 16:09:06 +01:00

0185_add_is_active_to_reply_tos.py

Add is_active column for the 3 reply_to tables

2018-04-17 16:23:46 +01:00

0186_rename_is_active_columns.py

Change 'is_active' column names to 'archived'

2018-04-30 11:21:28 +01:00

0187_another_letter_org.py

Add letter organisation for CADW

2018-05-03 11:50:53 +01:00

0188_add_ft_notification_status.py

Migration to create the ft_notification_status table

2018-05-14 08:51:32 +01:00

0189_ft_billing_data_type.py

Fix merge conflict in db migration

2018-05-14 09:49:24 +01:00

0190_another_letter_org.py

Add letter logos for TWFRS and Thames Valley Police

2018-05-16 11:00:05 +01:00

0191_ft_billing_pkey.py

Add rate to the primary key of ft_billing.

2018-05-21 14:38:25 +01:00

0192_drop_provider_statistics.py

Migration to drop unused provider_statistics table

2018-05-22 08:57:13 +01:00

0193_add_ft_billing_timestamps.py

Add timestamp columns to ft_billing table

2018-05-22 14:32:49 +01:00

0194_ft_billing_created_at.py

Update created_at column of ft_billing to be non-nullable

2018-05-23 11:09:13 +01:00

0195_ft_notification_timestamps.py

Add created_at and updated_at columns to ft_notification_status

2018-05-24 10:51:38 +01:00

0196_complaints_table_.py

New complaints model to persist complaints from SES.

2018-05-31 14:43:49 +01:00

0197_service_contact_link.py

Rebase of master and increment filename for as there was already a 196

2018-05-31 16:30:14 +01:00

0198_add_caseworking_permission.py

Add ‘caseworking’ service permission

2018-06-11 13:23:06 +01:00

0199_another_letter_org.py

Add letter logo for HM Passport Office

2018-06-15 14:06:16 +01:00

0200_another_letter_org.py

Add Ofgem letter logo

2018-06-29 10:09:18 +01:00

0201_another_letter_org.py

Add letter organisation for Hackney Council

2018-07-05 15:50:38 +01:00

0202_new_letter_pricing.py

Migration for new letter pricing

2018-07-10 09:34:42 +01:00

0203_fix_old_incomplete_jobs.py

Clean up old, incomplete jobs

2018-07-10 15:39:51 +01:00

0204_service_data_retention.py

Fix merge conflict

2018-07-11 10:09:33 +01:00

0205_service_callback_type.py

Add callback_type column to service_callback_api table

2018-07-17 16:54:00 +01:00

0206_assign_callback_type.py

Assign delivery_status type to existing callbacks

2018-07-18 11:36:39 +01:00

0207_set_callback_history_type.py

Add callback_type to service callback history records

2018-07-18 13:57:42 +01:00

0208_fix_unique_index.py

Added missing migration file

2018-07-25 14:16:36 +01:00

0209_add_cancelled_status.py

Fix file name for migration script

2018-07-31 14:00:18 +01:00

0210_remove_monthly_billing.py

Fix migration version numbering

2018-07-31 16:44:21 +01:00

0211_email_branding_update_.py

Instead of deleting the data in the name field just copy it to the text field.

2018-08-02 15:55:45 +01:00

0212_remove_caseworking.py

Remove caseworking permission

2018-08-10 09:09:18 +01:00

0213_brand_colour_domain_.py

DB update script - missing from last commit

2018-08-16 17:10:02 +01:00

0214_another_letter_org.py

Fix name typo

2018-08-23 14:43:41 +01:00

0215_email_brand_type.py

Fix merge conflicts

2018-08-23 15:04:44 +01:00