Merge branch 'dev-v2.6' into release-v2.6-latest

CHANGELOG.rst

@@ -7,6 +7,24 @@
 Changelog
 ---------
 
+v2.6.1 2017-02-22
+=================
+
+ * Fix DataPusher being fired multiple times (#3245)
+ * Use the url_for() helper for datapusher URLs (#2866)
+ * Resource creation date use datetime.utcnow() (#3447)
+ * Fix locale error when using fix ckan.root_path
+ * `render_markdown` breaks links with ampersands
+ * Check group name and id during package creation
+ * Use utcnow() on dashboard_mark_activities_old (#3373)
+ * Fix encoding error on DataStore exception
+ * Datastore doesn't add site_url to resource created via API (#3189)
+ * Fix memberships after user deletion (#3265)
+ * Remove idle database connection (#3260)
+ * Fix package_owner_org_update action when called via the API (#2661)
+ * Fix French locale (#3327)
+ * Updated translations
+
 v2.6.0 2016-11-02
 =================
 
@@ -104,6 +122,21 @@ Bug fixes:
 API changes and deprecations:
  * Replace `c.__version__` with new helper `h.ckan_version()` (#3103)
 
+v2.5.4 2017-02-22
+=================
+
+ * Fix DataPusher being fired multiple times (#3245)
+ * Use the url_for() helper for datapusher URLs (#2866)
+ * Resource creation date use datetime.utcnow() (#3447)
+ * Fix locale error when using fix ckan.root_path
+ * `render_markdown` breaks links with ampersands
+ * Check group name and id during package creation
+ * Use utcnow() on dashboard_mark_activities_old (#3373)
+ * Fix encoding error on DataStore exception
+ * Datastore doesn't add site_url to resource created via API (#3189)
+ * Fix memberships after user deletion (#3265)
+ * Remove idle database connection (#3260)
+ * Fix package_owner_org_update action when called via the API (#2661)
 
 v2.5.3 2016-11-02
 =================
@@ -206,6 +239,21 @@ v2.5.0 2015-12-17
 
 Cancelled release
 
+v2.4.5 2017-02-22
+=================
+
+ * Use the url_for() helper for datapusher URLs (#2866)
+ * Resource creation date use datetime.utcnow() (#3447)
+ * Fix locale error when using fix ckan.root_path
+ * `render_markdown` breaks links with ampersands
+ * Check group name and id during package creation
+ * Use utcnow() on dashboard_mark_activities_old (#3373)
+ * Fix encoding error on DataStore exception
+ * Datastore doesn't add site_url to resource created via API (#3189)
+ * Fix memberships after user deletion (#3265)
+ * Remove idle database connection (#3260)
+ * Fix package_owner_org_update action when called via the API (#2661)
+
 v2.4.4 2016-11-02
 =================
 

ckan/__init__.py

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-__version__ = '2.6.0'
+__version__ = '2.6.1'
 
 __description__ = 'CKAN Software'
 __long_description__ = \

ckan/config/environment.py

@@ -98,6 +98,12 @@ def find_controller(self, controller):
 
     app_globals.reset()
 
+    # issue #3260: remove idle transaction
+    # Session that was used for getting all config params nor committed,
+    # neither removed and we have idle connection as result
+    model.Session.commit()
+
+
 # A mapping of config settings that can be overridden by env vars.
 # Note: Do not remove the following lines, they are used in the docs
 # Start CONFIG_FROM_ENV_VARS

ckan/controllers/util.py

@@ -17,7 +17,7 @@ def redirect(self):
         if not url:
             base.abort(400, _('Missing Value') + ': url')
 
-        if h.url_is_local(url):
+        if h.url_is_local(url) and '\r' not in url and '\n' not in url:
             return base.redirect(url)
         else:
             base.abort(403, _('Redirecting to external site is not allowed.'))

ckan/i18n/ar/LC_MESSAGES/ckan.po

@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2016-10-18 10:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Adrià Mercader <amercadero@gmail.com>, 2016\n"
+"Last-Translator: Adrià Mercader <adria.mercader@okfn.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/okfn/teams/11162/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"

ckan/i18n/bg/LC_MESSAGES/ckan.po

@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2016-10-18 10:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Adrià Mercader <amercadero@gmail.com>, 2016\n"
+"Last-Translator: Adrià Mercader <adria.mercader@okfn.org>, 2016\n"
 "Language-Team: Bulgarian (https://www.transifex.com/okfn/teams/11162/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"

ckan/i18n/ca/LC_MESSAGES/ckan.po

@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2016-10-18 10:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Adrià Mercader <amercadero@gmail.com>, 2016\n"
+"Last-Translator: Adrià Mercader <adria.mercader@okfn.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/okfn/teams/11162/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"

ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po

@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2016-10-18 10:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Adrià Mercader <amercadero@gmail.com>, 2016\n"
+"Last-Translator: Adrià Mercader <adria.mercader@okfn.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/okfn/teams/11162/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"

ckan/i18n/da_DK/LC_MESSAGES/ckan.po

@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2016-10-18 10:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Adrià Mercader <amercadero@gmail.com>, 2016\n"
+"Last-Translator: Adrià Mercader <adria.mercader@okfn.org>, 2016\n"
 "Language-Team: Danish (Denmark) (https://www.transifex.com/okfn/teams/11162/da_DK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"