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

..

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

Fix conflicting migration versions

2016-11-11 16:30:05 +00:00

0061_add_client_reference.py

Create new column in notifications and notification_history to store the client_reference because I remembered that reference is used for email providers.

2016-11-17 13:42:34 +00:00

0062_provider_details_history.py

add updated_at to provider_details

2016-12-19 17:45:46 +00:00

0063_templates_process_type.py

Fix foreign key names

2017-01-13 12:29:13 +00:00

0064_update_template_process_type.py

dB script to default templates/templates_history.process_type = 'normal' and set the column to not null

2017-01-16 11:19:46 +00:00

0065_users_current_session_id.py

Add current_session_id to the user model, update on login

2017-02-22 17:30:55 +00:00

0066_add_dvla_provider.py

Fix tests.

2017-03-02 12:12:01 +00:00

0067_service_contact_block.py

add letter_contact_block text field to service

2017-03-02 16:42:06 +00:00

0068_add_created_by_to_provider.py

Fix migration and small refactor

2017-03-08 09:49:47 +00:00

0069_add_dvla_job_status.py

Add new job status.

2017-03-10 16:33:15 +00:00

0070_fix_notify_user_email.py

fix notify service user email

2017-03-30 15:05:03 +01:00

0071_add_job_error_state.py

roll error jobs into finished state - unsure where to go with these as these have failed, but this leaves them nowhere to go.

2017-04-18 14:40:33 +01:00

0072_add_dvla_orgs.py

Add DVLA org migration with default values

2017-04-21 13:27:04 +01:00

0073_add_international_sms_flag.py

Add international sms feature flag in db

2017-04-24 12:43:19 +01:00

0074_update_sms_rate.py

Fix db migration merge conflicts

2017-04-25 10:19:57 +01:00

0075_create_rates_table.py

Added a new rates table.

2017-04-24 16:20:03 +01:00

0076_add_intl_flag_to_provider.py

Fix comment

2017-04-26 10:37:12 +01:00

0077_add_intl_notification.py

Rebase off master

2017-04-26 11:31:58 +01:00

0078_add_sent_notification_status.py

set migration number

2017-04-26 16:54:24 +01:00

0079_update_rates.py

Adjust rates in line to what admin expects

2017-05-03 13:02:36 +01:00

0080_fix_rate_start_date.py

Update the valid_from date for the rate that is intended to start at the begining of the financial year.

2017-05-03 17:11:48 +01:00

0081_noti_status_as_enum.py

populate notification_status_types table, and add foreign keys

2017-05-09 15:46:58 +01:00

0082_add_golive_template.py

Add go live template

2017-05-11 12:38:32 +01:00

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

0088_inbound_sms.py

add inbound sms table

2017-05-30 10:47:01 +01:00

0089_govuk_sms_sender.py

fix versions

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