From a0a6fb19cf168734fab0514ed9cd44bc25e7536c Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Mon, 2 May 2016 15:52:24 +0530 Subject: [PATCH 1/4] Added data-link to issues tab under navbar --- frappe/public/js/frappe/ui/toolbar/navbar.html | 2 +- frappe/public/js/frappe/ui/toolbar/offcanvas_left_sidebar.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/ui/toolbar/navbar.html b/frappe/public/js/frappe/ui/toolbar/navbar.html index 01dc3f29d2..c95d03629d 100644 --- a/frappe/public/js/frappe/ui/toolbar/navbar.html +++ b/frappe/public/js/frappe/ui/toolbar/navbar.html @@ -37,7 +37,7 @@ {%= __("Documentation") %}
  • {%= __("Forums") %}
    • -
  • +
  • {%= __("Report an Issue") %}
  • diff --git a/frappe/public/js/frappe/ui/toolbar/offcanvas_left_sidebar.html b/frappe/public/js/frappe/ui/toolbar/offcanvas_left_sidebar.html index 54dbaebec2..478773ae7c 100644 --- a/frappe/public/js/frappe/ui/toolbar/offcanvas_left_sidebar.html +++ b/frappe/public/js/frappe/ui/toolbar/offcanvas_left_sidebar.html @@ -27,7 +27,7 @@ {%= __("Documentation") %}
  • {%= __("Forums") %}
    • -
  • +
  • {%= __("Report an Issue") %}
  • {%= __("Reload") %}
    • From 0ec3f847780e2351f290979d450ff4886fd6d2ea Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Mon, 2 May 2016 18:16:01 +0530 Subject: [PATCH 2/4] redirect issues of frappe to frappe repository --- frappe/public/js/frappe/ui/toolbar/navbar.html | 2 +- frappe/public/js/frappe/ui/toolbar/offcanvas_left_sidebar.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/ui/toolbar/navbar.html b/frappe/public/js/frappe/ui/toolbar/navbar.html index c95d03629d..2885c4be87 100644 --- a/frappe/public/js/frappe/ui/toolbar/navbar.html +++ b/frappe/public/js/frappe/ui/toolbar/navbar.html @@ -37,7 +37,7 @@ {%= __("Documentation") %}
  • {%= __("Forums") %}
    • -
  • +
  • {%= __("Report an Issue") %}
  • diff --git a/frappe/public/js/frappe/ui/toolbar/offcanvas_left_sidebar.html b/frappe/public/js/frappe/ui/toolbar/offcanvas_left_sidebar.html index 478773ae7c..b2a0e64681 100644 --- a/frappe/public/js/frappe/ui/toolbar/offcanvas_left_sidebar.html +++ b/frappe/public/js/frappe/ui/toolbar/offcanvas_left_sidebar.html @@ -27,7 +27,7 @@ {%= __("Documentation") %}
  • {%= __("Forums") %}
    • -
  • +
  • {%= __("Report an Issue") %}
  • {%= __("Reload") %}
    • From ca07fc8376cfeec6540c560de06a20889a3e59ea Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 4 May 2016 16:05:38 +0530 Subject: [PATCH 3/4] [fix] email_alert.py --- frappe/email/doctype/email_alert/email_alert.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/email/doctype/email_alert/email_alert.py b/frappe/email/doctype/email_alert/email_alert.py index e8c38c83dd..1233fb90e8 100644 --- a/frappe/email/doctype/email_alert/email_alert.py +++ b/frappe/email/doctype/email_alert/email_alert.py @@ -51,7 +51,7 @@ def trigger_email_alerts(doc, method=None): diff_days = -diff_days for name in frappe.db.sql_list("""select name from `tab{0}` where - DATE({1}) = ADDDATE(DATE(%s), INTERVAL %s DAY)""".format(alert.document_type, alert.date_changed), + DATE(`{1}`) = ADDDATE(DATE(%s), INTERVAL %s DAY)""".format(alert.document_type, alert.date_changed), (nowdate(), diff_days or 0)): evaluate_alert(frappe.get_doc(alert.document_type, name), From 85f87f3748e58f54987bb2b9385c2745ac42f216 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 6 May 2016 16:41:54 +0600 Subject: [PATCH 4/4] bumped to version 6.27.17 --- 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 7e44af67d7..32eb206248 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = "6.27.16" +__version__ = "6.27.17" diff --git a/frappe/hooks.py b/frappe/hooks.py index 9499c5a257..3fd947a6cf 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies" app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node" app_icon = "octicon octicon-circuit-board" -app_version = "6.27.16" +app_version = "6.27.17" app_color = "orange" source_link = "https://github.com/frappe/frappe" app_license = "MIT" diff --git a/setup.py b/setup.py index 8399d88229..19964bd62a 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.27.16" +version = "6.27.17" requirements = parse_requirements("requirements.txt", session="") setup(