Merge branch 'master' into 3022-IDatasetForm-fixes

ckan/config/deployment.ini_tmpl

@@ -33,7 +33,9 @@ app_instance_uuid = ${app_instance_uuid}
 
 # List the names of CKAN extensions to activate.
 # Note: This line is required to be here for packaging, even if it is empty.
-ckan.plugins = stats
+# Note: Add ``pdf_preview`` to enable the resource preview for PDFs
+#		Add the resource_proxy plugin to enable resorce proxying and get around the same origin policy
+ckan.plugins = stats json_preview recline_preview
 
 # If you'd like to fine-tune the individual locations of the cache data dirs
 # for the Cache data, or the Session saves, un-comment the desired settings
@@ -235,6 +237,18 @@ ckan.feeds.author_link =
 #ofs.aws_access_key_id = ....
 #ofs.aws_secret_access_key = ....
 
+## Previews
+#
+# Set the file types that should be previewed inline (e.g. images) or directly in an iframe.
+
+ckan.preview.direct = png jpg gif
+ckan.preview.loadable = html htm rdf+xml owl+xml xml n3 n-triples turtle plain atom csv tsv rss txt json
+
+# Activity Streams
+#
+# Default maximum number of activities to show in an activity stream.
+# ckan.activity_list_limit = 31
+
 
 # DEBUGGING
 

ckan/config/environment.py

@@ -173,6 +173,7 @@ def find_controller(self, controller):
     search.check_solr_schema_version()
 
     config['routes.map'] = routing.make_map()
+    config['routes.named_routes'] = routing.named_routes
     config['pylons.app_globals'] = app_globals.app_globals
     # initialise the globals
     config['pylons.app_globals']._init()