Merge branch 'master' of github.com:okfn/ckan into 3028-dashboard-act…

…ivity-stream-filtering

Conflicts:
	ckan/controllers/user.py
	ckan/lib/helpers.py
	ckan/logic/action/get.py
	ckan/public/base/javascript/modules/popover-context.js
	ckan/templates/activity_streams/activity_stream_items.html

ckan/config/deployment.ini_tmpl

@@ -15,9 +15,27 @@
 debug = false
 
 email_to = you@yourdomain.com
-smtp_server = localhost
 error_email_from = paste@localhost
 
+# The SMTP server to connect to when sending emails to users, with optional
+# port (default: 25). For example: lavabit.com, or smtp.gmail.com:587. To
+# connect to a local sendmail process enter 'localhost'.
+smtp.server = localhost
+
+# Whether or not to use STARTTLS when connecting to the SMTP server.
+smtp.starttls = False
+
+# The username and password to use to authenticate with the SMTP server.
+# Optional, if these are left commented-out then CKAN will try to send email
+# to the SMTP server without logging in first.
+#smtp.user = your_username@gmail.com
+#smtp.password = your_password
+
+# The email address that emails sent by CKAN to users should appear to come
+# from. Optional (default: None, note that the SMTP server may insert its own
+# from address).
+#smtp.mail_from =
+
 [server:main]
 use = egg:Paste#http
 host = 0.0.0.0
@@ -33,7 +51,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
@@ -236,6 +256,32 @@ ckan.feeds.author_link =
 #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
+
+
+# Activity Streams Email Notifications
+#
+# Uncomment this line to enable activity streams email notifications.
+# You also need to setup a cron job to send the emails, see the documentation.
+#ckan.activity_streams_email_notifications = True
+
+# Email notifications for events older than this time delta will not be sent.
+# Accepted formats: '2 days', '14 days', '4:35:00' (hours, minutes, seconds),
+# '7 days, 3:23:34', etc.
+# ckan.email_notifications_since = 2 days
+
+
 # DEBUGGING
 
 # ckan.debug_supress_header This option can be set to suppress the debug

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()