From 50410347ac20f3037672b22290f7d08dadcb94ee Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 2 Dec 2015 22:23:03 +0530 Subject: [PATCH 1/2] [hotfix] pull now=False --- frappe/email/doctype/email_account/email_account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py index 7ca1448dde..3d9b3504af 100644 --- a/frappe/email/doctype/email_account/email_account.py +++ b/frappe/email/doctype/email_account/email_account.py @@ -357,7 +357,7 @@ def get_append_to(doctype=None, txt=None, searchfield=None, start=None, page_len if not txt: txt = "" return [[d] for d in frappe.get_hooks("email_append_to") if txt in d] -def pull(now=True): +def pull(now=False): """Will be called via scheduler, pull emails from all enabled Email accounts.""" import frappe.tasks for email_account in frappe.get_list("Email Account", filters={"enable_incoming": 1}): From 8fd07bda2d8b1adb14f527fa84676527411314a4 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 2 Dec 2015 22:54:26 +0600 Subject: [PATCH 2/2] bumped to version 6.12.2 --- 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 e077bdfc8b..ecbf2c39da 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = "6.12.1" +__version__ = "6.12.2" diff --git a/frappe/hooks.py b/frappe/hooks.py index 40f0ecddf2..ec122fbb4b 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.12.1" +app_version = "6.12.2" app_color = "orange" source_link = "https://github.com/frappe/frappe" app_license = "MIT" diff --git a/setup.py b/setup.py index cb482b415a..26dff58e02 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -version = "6.12.1" +version = "6.12.2" with open("requirements.txt", "r") as f: install_requires = f.readlines()