Merge branch 'dev-v2.6' into 2.6

CHANGELOG.rst

@@ -8,6 +8,13 @@ Changelog
 ---------
 
 
+v2.6.7 2018-12-12
+=================
+
+  * Fix for Resouce View Re-order (`#4416 <https://github.com/ckan/ckan/issues/4416>`_)
+  * autocomplete.js: fix handling of comma key codes (`#4421 <https://github.com/ckan/ckan/issues/4421>`_)
+  * group_patch does not reset packages (`#4557 <https://github.com/ckan/ckan/issues/4557>`_)
+
 v2.6.6 2018-05-09
 =================
 

ckan/__init__.py

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

ckan/i18n/ne/LC_MESSAGES/ckan.po

@@ -4467,8 +4467,6 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
-#~ "{actor} updated the {related_type} "
-#~ "{related_item} of the dataset {dataset}"
 #~ msgstr ""
 
 #~ msgid "{actor} updated the {related_type} {related_item}"
@@ -4477,36 +4475,12 @@ msgstr ""
 #~ msgid "{actor} deleted the related item {related_item}"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "{actor} added the {related_type} "
-#~ "{related_item} to the dataset {dataset}"
-#~ msgstr ""
-
 #~ msgid "{actor} added the {related_type} {related_item}"
 #~ msgstr ""
 
 #~ msgid "Dear %s,"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "You have requested your password on {site_title} to be reset.\n"
-#~ "\n"
-#~ "Please click the following link to confirm this request:\n"
-#~ "\n"
-#~ "   {reset_link}\n"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "You have been invited to {site_title}."
-#~ " A user has already been created "
-#~ "to you with the username {user_name}."
-#~ " You can change it later.\n"
-#~ "\n"
-#~ "To accept this invite, please reset your password at:\n"
-#~ "\n"
-#~ "   {reset_link}\n"
-#~ msgstr ""
-
 #~ msgid "Invite for {site_title}"
 #~ msgstr ""
 
@@ -4552,17 +4526,6 @@ msgstr ""
 #~ msgid "Add Related Item"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "No apps, ideas, news stories or "
-#~ "images have been related to this "
-#~ "dataset yet."
-#~ msgstr ""
-
 #~ msgid "Add Item"
 #~ msgstr ""
 
-#~ msgid ""
-#~ " <p><strong>There was an error while "
-#~ "searching.</strong> Please try again.</p> "
-#~ msgstr ""
-