Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into open311-consumer

Conflicts:
	t/app/model/problem.t
	templates/web/default/report/new/fill_in_details.html
	web/css/core.css

1 files changed, 19 insertions, 0 deletions

diff --git a/db/schema_0006-alter_problem_state.sql b/db/schema_0006-alter_problem_state.sql
new file mode 100644
index 000000000..6fada1eb8
--- /dev/null
+++ b/db/schema_0006-alter_problem_state.sql
@@ -0,0 +1,19 @@
+begin;
+
+    ALTER TABLE problem DROP CONSTRAINT problem_state_check;
+
+    ALTER TABLE problem ADD CONSTRAINT problem_state_check CHECK ( 
+        state = 'unconfirmed'
+        or state = 'confirmed'
+        or state = 'investigating'
+        or state = 'planned'
+        or state = 'in progress'
+        or state = 'closed'
+        or state = 'fixed'
+        or state = 'fixed - council'
+        or state = 'fixed - user'
+        or state = 'hidden'
+        or state = 'partial'
+    );
+
+commit;