From bdf54d81f44de96acce6f5645272758fadeb9eb6 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 17 Feb 2015 12:53:59 +0530 Subject: [PATCH 1/3] [minor] All Applications list should not be clickable --- frappe/core/page/desktop/desktop.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/page/desktop/desktop.js b/frappe/core/page/desktop/desktop.js index 13249f8c8e..e519a6184c 100644 --- a/frappe/core/page/desktop/desktop.js +++ b/frappe/core/page/desktop/desktop.js @@ -141,7 +141,7 @@ frappe.desktop.show_all_modules = function() {
\ \
\ - %(label)s\ + %(label)s\ \
\
\ From f43060031bc27edff5206fbab1b718b697fbdfcd Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 17 Feb 2015 13:00:15 +0530 Subject: [PATCH 2/3] [fix] Login page hashchange --- frappe/templates/includes/login.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/frappe/templates/includes/login.js b/frappe/templates/includes/login.js index 00d81f5460..92b3a0b15d 100644 --- a/frappe/templates/includes/login.js +++ b/frappe/templates/includes/login.js @@ -124,9 +124,14 @@ login.login_handlers = (function() { })(); frappe.ready(function() { - window.location.hash = "#login"; login.bind_events(); - login.login(); + + if (!window.location.hash) { + window.location.hash = "#login"; + } else { + $(window).trigger("hashchange"); + } + $(".form-signup, .form-forgot").removeClass("hide"); $(document).trigger('login_rendered'); }); From 83eb74ee7062262412c4cdb26260448b77096de2 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Tue, 17 Feb 2015 16:28:36 +0600 Subject: [PATCH 3/3] bumped to version 4.12.1 --- 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 ade1e2b4ce..33111828cc 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1 +1 @@ -__version__ = "4.12.0" +__version__ = "4.12.1" diff --git a/frappe/hooks.py b/frappe/hooks.py index aaf7a9cce2..60d1da83e4 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -3,7 +3,7 @@ app_title = "Frappe Framework" app_publisher = "Web Notes Technologies Pvt. Ltd." app_description = "Full Stack Web Application Framework in Python" app_icon = "assets/frappe/images/frappe.svg" -app_version = "4.12.0" +app_version = "4.12.1" app_color = "#3498db" app_email = "support@frappe.io" diff --git a/setup.py b/setup.py index b8ba745945..5237a425d4 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import os -version = "4.12.0" +version = "4.12.1" with open("requirements.txt", "r") as f: install_requires = f.readlines()