From e4ca25ce651e6cd5620c274e01f52ad378ec311e Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Wed, 22 Jan 2014 16:32:47 +0600 Subject: [PATCH 1/5] bumped to version 3.7.5 --- config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.json b/config.json index 449437fc09..3418b61f31 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,6 @@ { "base_template": "lib/website/templates/base.html", - "framework_version": "3.7.4", + "framework_version": "3.7.5", "modules": { "Calendar": { "color": "#2980b9", From b268b3d8d9dfee6075ca8ae68c53ed2a2bce9285 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 23 Jan 2014 13:27:09 +0530 Subject: [PATCH 2/5] show last visited page afer login for customer login, if came from email link --- website/js/website.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/website/js/website.js b/website/js/website.js index 5cd7ef80ca..d8acba3109 100644 --- a/website/js/website.js +++ b/website/js/website.js @@ -274,9 +274,10 @@ function is_html(txt) { } function ask_to_login() { - if(!full_name) { + if(!window.full_name) { if(localStorage) { - localStorage.setItem("last_visited", window.location.href.split("/").slice(-1)[0]); + localStorage.setItem("last_visited", + window.location.href.replace(window.location.origin, "")); } window.location.href = "login"; } From e803d84b93a493d60fc7f2f41fcd3b3e437cffdc Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 24 Jan 2014 18:55:34 +0530 Subject: [PATCH 3/5] Minor fix in query report and doc --- webnotes/model/doc.py | 3 +-- webnotes/widgets/query_report.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/webnotes/model/doc.py b/webnotes/model/doc.py index b8d0a7dc80..a0b1e81640 100755 --- a/webnotes/model/doc.py +++ b/webnotes/model/doc.py @@ -348,8 +348,7 @@ class Document: self.fields[f] = self._validate_link(link_list, f) if old_val and not self.fields[f]: - s = link_list[f][1] + ': ' + old_val - err_list.append(s) + err_list.append("{}: {}".format(link_list[f][1], old_val)) return err_list diff --git a/webnotes/widgets/query_report.py b/webnotes/widgets/query_report.py index 7e29bfa463..93f965d3bd 100644 --- a/webnotes/widgets/query_report.py +++ b/webnotes/widgets/query_report.py @@ -52,7 +52,7 @@ def get_script(report_name): return script @webnotes.whitelist() -def run(report_name, filters=None): +def run(report_name, filters=()): from webnotes.plugins import get_code_and_execute report = webnotes.doc("Report", report_name) From 84f331766e25f591fcc7d38ae55648136a453448 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 27 Jan 2014 10:49:27 +0530 Subject: [PATCH 4/5] Use svg font-face for chrome browser Reference: http://www.adtrak.co.uk/blog/font-face-chrome-rendering/ --- public/css/font-awesome.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/public/css/font-awesome.css b/public/css/font-awesome.css index 58f3f8d473..3cd3789352 100644 --- a/public/css/font-awesome.css +++ b/public/css/font-awesome.css @@ -32,6 +32,14 @@ font-weight: normal; font-style: normal; } + +@media screen and (-webkit-min-device-pixel-ratio:0) { + @font-face { + font-family: 'FontAwesome'; + src: url('../lib/css/font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg'); + } +} + /* FONT AWESOME CORE * -------------------------- */ [class^="icon-"], From bcc4868c3b03ba31cb24e5463cbef4a4f7aa18f1 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Mon, 27 Jan 2014 17:44:59 +0600 Subject: [PATCH 5/5] bumped to version 3.8.0 --- config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.json b/config.json index 3418b61f31..6ca9e453c8 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,6 @@ { "base_template": "lib/website/templates/base.html", - "framework_version": "3.7.5", + "framework_version": "3.8.0", "modules": { "Calendar": { "color": "#2980b9",