From a29a007b585365958897faf4f26d7b39c4a73d2a Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 10 Feb 2016 17:37:10 +0530 Subject: [PATCH 1/2] [fix] moved comment_feed_communication patch to top in patches.txt --- frappe/patches.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frappe/patches.txt b/frappe/patches.txt index a854e3853e..f90b3bc188 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -72,9 +72,10 @@ frappe.patches.v5_0.rename_table_fieldnames frappe.patches.v5_0.communication_parent frappe.patches.v5_0.clear_website_group_and_notifications execute:frappe.db.sql("""update tabComment set comment = substr(comment, 6, locate(":", comment)-6) where comment_type in ("Assigned", "Assignment Completed")""") -frappe.patches.v5_0.fix_feed +execute:frappe.db.sql("update `tabComment` set comment_type='Comment' where comment_doctype='Blog Post' and ifnull(comment_type, '')=''") frappe.patches.v5_0.update_shared execute:frappe.reload_doc("core", "doctype", "docshare") #2015-07-21 +frappe.patches.v6_19.comment_feed_communication frappe.patches.v6_16.star_to_like frappe.patches.v5_0.bookmarks_to_stars frappe.patches.v5_0.style_settings_to_website_theme @@ -87,7 +88,6 @@ execute:frappe.db.sql("delete from `tabProperty Setter` where `property` in ('id frappe.patches.v5_0.move_scheduler_last_event_to_system_settings execute:frappe.db.sql("update tabUser set new_password='' where ifnull(new_password, '')!=''") frappe.patches.v5_0.fix_text_editor_file_urls -execute:frappe.db.sql("update `tabComment` set comment_type='Comment' where comment_doctype='Blog Post' and ifnull(comment_type, '')=''") frappe.patches.v5_0.modify_session frappe.patches.v5_0.expire_old_scheduler_logs execute:frappe.permissions.reset_perms("DocType") @@ -113,6 +113,5 @@ execute:frappe.create_folder(os.path.join(frappe.local.site_path, 'private', 'fi frappe.patches.v6_15.remove_property_setter_for_previous_field #2015-12-29 frappe.patches.v6_15.set_username execute:frappe.permissions.reset_perms("Error Snapshot") -frappe.patches.v6_19.comment_feed_communication frappe.patches.v6_16.feed_doc_owner frappe.patches.v6_21.print_settings_repeat_header_footer From 10901d93f076d5e20df96c505e78ac1fd5026f32 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 10 Feb 2016 18:14:11 +0600 Subject: [PATCH 2/2] bumped to version 6.22.4 --- frappe/__version__.py | 2 +- frappe/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/__version__.py b/frappe/__version__.py index b6b9c95515..306b188892 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = "6.22.3" +__version__ = "6.22.4" diff --git a/frappe/hooks.py b/frappe/hooks.py index b23337d74b..452db51929 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd." app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node" app_icon = "octicon octicon-circuit-board" -app_version = "6.22.3" +app_version = "6.22.4" app_color = "orange" source_link = "https://github.com/frappe/frappe" app_license = "MIT" diff --git a/setup.py b/setup.py index 73aa14cf11..d058e0da4b 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages from pip.req import parse_requirements -version = "6.22.3" +version = "6.22.4" requirements = parse_requirements("requirements.txt", session="") setup(