Merge branch 'zurich-2015-dev-candidate'

This is the work done in early 2015 to improve the Zürich admin interface, primarily.

1 files changed, 11 insertions, 1 deletions

diff --git a/db/schema.sql b/db/schema.sql
index 2db89bddb..72fccd7f3 100644
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -427,7 +427,8 @@ create table admin_log (
     action text not null,
     whenedited timestamp not null default current_timestamp,
     user_id int references users(id) null,
-    reason text not null default ''
+    reason text not null default '',
+    time_spent int not null default 0
 ); 
 
 create table moderation_original_data (
@@ -457,3 +458,12 @@ create table user_body_permissions (
     ),
     unique(user_id, body_id, permission_type)
 );
+
+create table response_templates (
+    id serial not null primary key,
+    body_id int references body(id) not null,
+    title text not null,
+    text text not null,
+    created timestamp not null default current_timestamp,
+    unique(body_id, title)
+);