Merge branch 'master' into 2961-pluggable-previews

Conflicts: ckan/controllers/package.py ckan/public/base/datapreview/css/recline.min.css ckan/public/base/datapreview/preview_recline.min.js ckan/public/base/datapreview/vendor/leaflet/leaflet.min.css ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.css ckan/public/base/datapreview/vendor/recline/css/recline.min.css
nispc · Dec 18, 2012 · e28cd00 · e28cd00
2 parents 8d9e230 + eb1034c
commit e28cd00
Show file tree

Hide file tree

Showing 210 changed files with 7,752 additions and 8,291 deletions.
diff --git a/ckan/authz.py b/ckan/authz.py
diff --git a/ckan/config/deployment.ini_tmpl b/ckan/config/deployment.ini_tmpl
@@ -244,6 +244,12 @@ ckan.feeds.author_link =
 preview.direct = png jpg gif
 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.debug_supress_header This option can be set to suppress the debug

diff --git a/ckan/config/environment.py b/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()