7 files changed, 30 insertions, 13 deletions
diff --git a/config/deploy.rb b/config/deploy.rb
index 3ce1a1969..d26a199c8 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -58,7 +58,6 @@ namespace :deploy do
       "#{release_path}/files" => "#{shared_path}/files",
       "#{release_path}/cache" => "#{shared_path}/cache",
       "#{release_path}/vendor/plugins/acts_as_xapian/xapiandbs" => "#{shared_path}/xapiandbs",
-      "#{release_path}/public/download" => "#{release_path}/cache/zips/download"
     }
 
     # "ln -sf <a> <b>" creates a symbolic link but deletes <b> if it already exists
diff --git a/config/general.yml-example b/config/general.yml-example
index 5f3697a36..8e749d9d6 100644
--- a/config/general.yml-example
+++ b/config/general.yml-example
@@ -147,9 +147,9 @@ GAZE_URL: http://gaze.mysociety.org
 # The email address to which non-bounce responses should be forwarded
 FORWARD_NONBOUNCE_RESPONSES_TO: user-support@localhost
 
-# Path to a program that converts a page at a URL to HTML.  It should
-# take two arguments: the URL, and a path to an output file.  A static
-# binary of wkhtmltopdf is recommended:
+# Path to a program that converts an HTML page in a file to PDF.  It
+#should take two arguments: the URL, and a path to an output file.
+# A static binary of wkhtmltopdf is recommended:
 # http://code.google.com/p/wkhtmltopdf/downloads/list
 # If the command is not present, a text-only version will be rendered
 # instead.
diff --git a/config/httpd.conf-example b/config/httpd.conf-example
index 1326252f5..dc2e4966e 100644
--- a/config/httpd.conf-example
+++ b/config/httpd.conf-example
@@ -69,3 +69,13 @@ RewriteRule ^/request/((\d{1,3})\d*)/(response/\d+/attach/(html/)?\d+/.+) /views
     AddOutputFilterByType DEFLATE font/opentype font/truetype font/eot
     AddOutputFilterByType DEFLATE image/svg+xml
 </IFModule>
+
+# Set the Sendfile header and switch sendfile on - Apache will
+# now handle send_file calls from Alaveteli
+<Location />
+    <IfModule mod_xsendfile.c>
+    RequestHeader Set X-Sendfile-Type X-Sendfile
+    XSendFile On
+    XSendFileAllowAbove On
+    </IfModule>
+</Location>
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb
index 6e0cf076c..8ae78c80c 100644
--- a/config/initializers/alaveteli.rb
+++ b/config/initializers/alaveteli.rb
@@ -10,7 +10,7 @@ load "debug_helpers.rb"
 load "util.rb"
 
 # Application version
-ALAVETELI_VERSION = '0.13'
+ALAVETELI_VERSION = '0.14'
 
 # Add new inflection rules using the following format
 # (all these examples are active by default):
@@ -49,6 +49,7 @@ require 'ability'
 require 'normalize_string'
 require 'alaveteli_file_types'
 require 'alaveteli_localization'
+require 'message_prominence'
 
 AlaveteliLocalization.set_locales(AlaveteliConfiguration::available_locales,
                                   AlaveteliConfiguration::default_locale)
diff --git a/config/packages b/config/packages
index e89ede177..8bb00a849 100644
--- a/config/packages
+++ b/config/packages
@@ -3,7 +3,6 @@
 # alavateli mailing list if you want to change it
 ruby1.8
 ruby
-libopenssl-ruby1.8 # needed for Ubuntu 10.04 TLS; included in libruby1.8 in Squeeze
 rdoc | rdoc1.8
 irb | irb1.8
 wv
@@ -32,7 +31,7 @@ libxml2-dev
 libxslt-dev
 uuid-dev
 ruby1.8-dev
-rubygems
+rubygems (>= 1.8.15)
 rake (>= 0.9.2.2)
 build-essential
 bundler
diff --git a/config/routes.rb b/config/routes.rb
index 1df74b669..cadb7ec54 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -187,13 +187,8 @@ Alaveteli::Application.routes.draw do
     match '/admin/request/edit/:id' => 'admin_request#edit', :as => :admin_request_edit
     match '/admin/request/update/:id' => 'admin_request#update', :as => :admin_request_update
     match '/admin/request/destroy/:id' => 'admin_request#fully_destroy', :as => :admin_request_destroy
-    match '/admin/request/edit_outgoing/:id' => 'admin_request#edit_outgoing', :as => :admin_request_edit_outgoing
-    match '/admin/request/destroy_outgoing/:id' => 'admin_request#destroy_outgoing', :as => :admin_request_destroy_outgoing
-    match '/admin/request/update_outgoing/:id' => 'admin_request#update_outgoing', :as => :admin_request_update_outgoing
     match '/admin/request/edit_comment/:id' => 'admin_request#edit_comment', :as => :admin_request_edit_comment
     match '/admin/request/update_comment/:id' => 'admin_request#update_comment', :as => :admin_request_update_comment
-    match '/admin/request/destroy_incoming' => 'admin_request#destroy_incoming', :as => :admin_request_destroy_incoming
-    match '/admin/request/redeliver_incoming' => 'admin_request#redeliver_incoming', :as => :admin_request_redeliver_incoming
     match '/admin/request/move_request' => 'admin_request#move_request', :as => :admin_request_move_request
     match '/admin/request/generate_upload_url/:id' => 'admin_request#generate_upload_url', :as => :admin_request_generate_upload_url
     match '/admin/request/show_raw_email/:id' => 'admin_request#show_raw_email', :as => :admin_request_show_raw_email
@@ -202,6 +197,19 @@ Alaveteli::Application.routes.draw do
     match '/admin/request/hide/:id' => 'admin_request#hide_request', :as => :admin_request_hide
     ####
 
+    #### AdminIncomingMessage controller
+    match '/admin/incoming/destroy' => 'admin_incoming_message#destroy', :as => :admin_incoming_destroy
+    match '/admin/incoming/redeliver' => 'admin_incoming_message#redeliver', :as => :admin_incoming_redeliver
+    match '/admin/incoming/edit/:id' => 'admin_incoming_message#edit', :as => :admin_incoming_edit
+    match '/admin/incoming/update/:id' => 'admin_incoming_message#update', :as => :admin_incoming_update
+    ####
+
+    #### AdminOutgoingMessage controller
+    match '/admin/outgoing/edit/:id' => 'admin_outgoing_message#edit', :as => :admin_outgoing_edit
+    match '/admin/outgoing/destroy/:id' => 'admin_outgoing_message#destroy', :as => :admin_outgoing_destroy
+    match '/admin/outgoing/update/:id' => 'admin_outgoing_message#update', :as => :admin_outgoing_update
+    ####
+
     #### AdminUser controller
     match '/admin/user' => 'admin_user#index', :as => :admin_user_index
     match '/admin/user/list' => 'admin_user#list', :as => :admin_user_list
diff --git a/config/test.yml b/config/test.yml
index 5c08e928b..b26ca99d4 100644
--- a/config/test.yml
+++ b/config/test.yml
@@ -108,7 +108,7 @@ ACCELERATOR_PORT: '6081'
 # mySociety's gazeteer service.  Shouldn't change.
 GAZE_URL: http://gaze.mysociety.org
 
-# Path to a program that converts a page at a URL to HTML.  It should
+# Path to a program that converts a page in a file to PDF.  It should
 # take two arguments: the URL, and a path to an output file.  A static
 # binary of wkhtmltopdf is recommended:
 # http://code.google.com/p/wkhtmltopdf/downloads/list