diff --git a/frappe/__init__.py b/frappe/__init__.py index 64a6b72771..77a7eb3a76 100644 --- a/frappe/__init__.py +++ b/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__ = "7.0.23" +__version__ = "7.0.24" local = Local() diff --git a/frappe/data/app_listing/paypal_integration.json b/frappe/data/app_listing/paypal_integration.json index 937e915c0c..a03f08fa40 100644 --- a/frappe/data/app_listing/paypal_integration.json +++ b/frappe/data/app_listing/paypal_integration.json @@ -7,7 +7,7 @@ "app_publisher": "Frappe", "app_email": "hello@frappe.io", "repo_url": "https://github.com/frappe/paypal_integration.git", - "app_title": "Paypal Integation", + "app_title": "Paypal Integration", "app_version": "1.0.0", "app_category": "Integrations", "featured": 1 diff --git a/frappe/data/app_listing/razorpay_integration.json b/frappe/data/app_listing/razorpay_integration.json index efbf38ed61..8041027daf 100644 --- a/frappe/data/app_listing/razorpay_integration.json +++ b/frappe/data/app_listing/razorpay_integration.json @@ -7,7 +7,7 @@ "app_publisher": "Frappe", "app_email": "hello@frappe.io", "repo_url": "https://github.com/frappe/razorpay_integration.git", - "app_title": "Razorpay Integation", + "app_title": "Razorpay Integration", "app_version": "1.0.0", "app_category": "Integrations", "featured": 1 diff --git a/frappe/docs/assets/query-report-out.png b/frappe/docs/assets/query-report-out.png new file mode 100644 index 0000000000..fd186ed37c Binary files /dev/null and b/frappe/docs/assets/query-report-out.png differ diff --git a/frappe/docs/assets/query-report.png b/frappe/docs/assets/query-report.png new file mode 100644 index 0000000000..b56f069864 Binary files /dev/null and b/frappe/docs/assets/query-report.png differ diff --git a/frappe/docs/license.html b/frappe/docs/license.html index c462cdba43..602685d65f 100644 --- a/frappe/docs/license.html +++ b/frappe/docs/license.html @@ -4,7 +4,7 @@

The MIT License (MIT)

-

Copyright (c) 2015 Frappe Technologies Pvt. Ltd.

+

Copyright (c) 2016 Frappe Technologies Pvt. Ltd.

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

diff --git a/frappe/public/js/frappe/misc/common.js b/frappe/public/js/frappe/misc/common.js index 6835019857..2d99189ce6 100644 --- a/frappe/public/js/frappe/misc/common.js +++ b/frappe/public/js/frappe/misc/common.js @@ -237,5 +237,7 @@ frappe.palette = [ ['#428B46', 1] ] - +frappe.is_mobile = function() { + return $(document).width() < 768; +} diff --git a/frappe/public/js/frappe/misc/utils.js b/frappe/public/js/frappe/misc/utils.js index c8c75192af..28f805cea8 100644 --- a/frappe/public/js/frappe/misc/utils.js +++ b/frappe/public/js/frappe/misc/utils.js @@ -32,9 +32,6 @@ frappe.utils = { } return true; }, - is_mobile: function() { - return frappe.utils.is_xs(); - }, is_xs: function() { return $(document).width() < 768; }, diff --git a/frappe/public/js/frappe/ui/charts.js b/frappe/public/js/frappe/ui/charts.js index a69d2086ee..5f010fa552 100644 --- a/frappe/public/js/frappe/ui/charts.js +++ b/frappe/public/js/frappe/ui/charts.js @@ -6,8 +6,8 @@ frappe.ui.Chart = Class.extend({ $.extend(this.opts, opts); this.show_chart(false); - if(this.opts.data && ((this.opts.data.columns && this.opts.data.columns.length > 1) - || (this.opts.data.rows && this.opts.data.rows.length > 1))) { + if(this.opts.data && ((this.opts.data.columns && this.opts.data.columns.length >= 1) + || (this.opts.data.rows && this.opts.data.rows.length >= 1))) { this.chart = this.render_chart(); this.show_chart(true); } diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js index 3c381f1f25..8d6d894c77 100644 --- a/frappe/public/js/frappe/ui/dialog.js +++ b/frappe/public/js/frappe/ui/dialog.js @@ -54,7 +54,7 @@ frappe.ui.Dialog = frappe.ui.FieldGroup.extend({ }) .on("shown.bs.modal", function() { // focus on first input - if(frappe.utils.is_mobile()) { + if(frappe.is_mobile()) { $("#body_div").toggle(false); me.body_hidden = true; } diff --git a/frappe/public/js/frappe/ui/toolbar/about.js b/frappe/public/js/frappe/ui/toolbar/about.js index 662cbc76e3..fb1c8454f2 100644 --- a/frappe/public/js/frappe/ui/toolbar/about.js +++ b/frappe/public/js/frappe/ui/toolbar/about.js @@ -13,7 +13,7 @@ frappe.ui.misc.about = function() {

Installed Apps

\
Loading versions...
\
\ -

© 2015 Frappe Technologies Pvt. Ltd and contributors

\ +

© 2016 Frappe Technologies Pvt. Ltd and contributors

\ ", frappe.app)); frappe.ui.misc.about_dialog = d; diff --git a/license.txt b/license.txt index 88438a3f89..a76f4ef0ba 100644 --- a/license.txt +++ b/license.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015 Frappe Technologies Pvt. Ltd. +Copyright (c) 2016 Frappe Technologies Pvt. Ltd. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: