Merge branch 'develop'

frappe/__version__.py

@@ -1 +1 @@
-__version__ = "4.12.0"
+__version__ = "4.12.1"

frappe/core/page/desktop/desktop.js

@@ -141,7 +141,7 @@ frappe.desktop.show_all_modules = function() {
 				<div class="row">\
 					<div class="col-xs-2"><a href="#%(link)s">%(app_icon)s</a></div>\
 					<div class="col-xs-10" style="padding-top: 14px;">\
-						<a href="#%(link)s">%(label)s</a>\
+						%(label)s\
 						<input class="pull-right" type="checkbox" data-name="%(name)s" />\
 					</div>\
 				</div>\

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"
 

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');
 });

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()