From 77f55a0ee1537ea8fe713e87a33d41077047cd09 Mon Sep 17 00:00:00 2001
From: Makarand Bauskar <mbauskar@gmail.com>
Date: Tue, 10 Oct 2017 13:48:20 +0530
Subject: [PATCH 1/4] [hotfix] fixed margin for disabled check field (#4293)

---
 frappe/public/css/desk.css   | 4 ++++
 frappe/public/less/desk.less | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css
index 4f9342c1f1..6e7b9768c2 100644
--- a/frappe/public/css/desk.css
+++ b/frappe/public/css/desk.css
@@ -626,6 +626,10 @@ li.user-progress .progress-bar {
 }
 .frappe-rtl .checkbox .disp-area {
   margin-right: -20px;
+  margin-left: 0px;
+}
+.checkbox .disp-area {
+  margin-left: -20px;
 }
 .text-editor {
   height: 400px;
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index f6cca63716..613db4940d 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -484,6 +484,11 @@ li.user-progress {
 
 .frappe-rtl .checkbox .disp-area {
 	margin-right: -20px;
+	margin-left: 0px;
+}
+
+.checkbox .disp-area {
+	margin-left: -20px;
 }
 
 .text-editor {

From 007bb0d684a76a887ca5c5262d1ed949022f350b Mon Sep 17 00:00:00 2001
From: Makarand Bauskar <mbauskar@gmail.com>
Date: Tue, 10 Oct 2017 13:56:25 +0530
Subject: [PATCH 2/4] [hotfix] enable Update button if error occured after
 customize form save (#4294)

---
 frappe/custom/doctype/customize_form/customize_form.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/custom/doctype/customize_form/customize_form.js b/frappe/custom/doctype/customize_form/customize_form.js
index ea9835525b..8198f545da 100644
--- a/frappe/custom/doctype/customize_form/customize_form.js
+++ b/frappe/custom/doctype/customize_form/customize_form.js
@@ -146,6 +146,7 @@ frappe.customize_form.set_primary_action = function(frm) {
 			return frm.call({
 				doc: frm.doc,
 				freeze: true,
+				btn: frm.page.btn_primary,
 				method: "save_customization",
 				callback: function(r) {
 					if(!r.exc) {

From ff954462a2a76885c6cb6f0329ea1351dcb74604 Mon Sep 17 00:00:00 2001
From: Makarand Bauskar <mbauskar@gmail.com>
Date: Wed, 11 Oct 2017 14:37:12 +0530
Subject: [PATCH 3/4] [minor] attach only image type files to Background Image
 field (#4283)

---
 frappe/core/doctype/user/user.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/core/doctype/user/user.json b/frappe/core/doctype/user/user.json
index 63c530e297..5ce4df115f 100644
--- a/frappe/core/doctype/user/user.json
+++ b/frappe/core/doctype/user/user.json
@@ -1213,6 +1213,7 @@
    "label": "Background Image", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "image", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -2001,7 +2002,7 @@
  "istable": 0, 
  "max_attachments": 5, 
  "menu_index": 0, 
- "modified": "2017-09-14 14:55:26.044665", 
+ "modified": "2017-10-09 15:33:43.818915", 
  "modified_by": "Administrator", 
  "module": "Core", 
  "name": "User", 

From 6757c5d61bf2a25b9124d5a6a0871a5be3f23642 Mon Sep 17 00:00:00 2001
From: mbauskar <mbauskar@gmail.com>
Date: Wed, 11 Oct 2017 15:08:26 +0600
Subject: [PATCH 4/4] bumped to version 9.1.6

---
 frappe/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 8ba0dc0f61..36597d5a3c 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.5'
+__version__ = '9.1.6'
 __title__ = "Frappe Framework"
 
 local = Local()