Merge branch 'develop'

frappe/__init__.py

@@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template
 
-__version__ = '8.0.37'
+__version__ = '8.0.38'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/core/doctype/user/user.py

@@ -868,5 +868,5 @@ def extract_mentions(txt):
 def handle_password_test_fail(result):
 	suggestions = result['feedback']['suggestions'][0] if result['feedback']['suggestions'] else ''
 	warning = result['feedback']['warning'] if 'warning' in result['feedback'] else ''
-	suggestions += _("{0} Hint : Include Underscores, Numbers and Capital Letters in the password {0} Example : Eastern_43A1W").format("<br/>")
+	suggestions += "<br>" + _("Hint: Include symbols, numbers and capital letters in the password") + '<br>'
 	frappe.throw(_('Invalid Password: ' + ' '.join([warning, suggestions])))

frappe/public/js/frappe/socketio_client.js

@@ -196,15 +196,17 @@ frappe.socket = {
 	},
 	setup_file_watchers: function() {
 		var host = window.location.origin;
-		if(window.dev_server) {
-			var port = '6787';
-			var parts = host.split(":");
-			// remove the port number from string if exists
-			if (parts.length > 2) {
-				host = host.split(':').slice(0, -1).join(":");
-			}
-			host = host + ':' + port;
+		if(!window.dev_server) {
+			return;
+		}
+
+		var port = '6787';
+		var parts = host.split(":");
+		// remove the port number from string if exists
+		if (parts.length > 2) {
+			host = host.split(':').slice(0, -1).join(":");
 		}
+		host = host + ':' + port;
 
 		frappe.socket.file_watcher = io.connect(host);
 		// css files auto reload

frappe/website/website_generator.py

@@ -40,7 +40,13 @@ class WebsiteGenerator(Document):
 			self.route = self.route.strip('/.')[:139]
 
 	def make_route(self):
-		return self.scrubbed_title()
+		'''Returns the default route. If `route` is specified in DocType it will be
+		route/title'''
+		from_title = self.scrubbed_title()
+		if self.meta.route:
+			return self.meta.route + '/' + from_title
+		else:
+			return from_title
 
 	def scrubbed_title(self):
 		return self.scrub(self.get(self.get_title_field()))