From beeaa3f6ab0bbb116ba136b41155116dfc8e4fae Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Fri, 13 Oct 2017 10:51:38 +0530 Subject: [PATCH 1/2] [hotfix] no_socketio while uploading file for data-import-tool (#4306) (#4310) --- frappe/core/page/data_import_tool/data_import_tool.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/core/page/data_import_tool/data_import_tool.js b/frappe/core/page/data_import_tool/data_import_tool.js index 78c3bf47c6..9d21c28348 100644 --- a/frappe/core/page/data_import_tool/data_import_tool.js +++ b/frappe/core/page/data_import_tool/data_import_tool.js @@ -107,6 +107,7 @@ frappe.DataImportTool = Class.extend({ make_upload: function() { var me = this; frappe.upload.make({ + no_socketio: true, parent: this.page.main.find(".upload-area"), btn: this.page.main.find(".btn-import"), get_params: function() { From be3cbd790a16e9d9d6c8fd730967d709fc90dbff Mon Sep 17 00:00:00 2001 From: mbauskar Date: Fri, 13 Oct 2017 11:33:54 +0600 Subject: [PATCH 2/2] bumped to version 9.1.7 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 36597d5a3c..0088fe5142 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template -__version__ = '9.1.6' +__version__ = '9.1.7' __title__ = "Frappe Framework" local = Local()