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__ = "7.0.23"
+__version__ = "7.0.24"
 
 local = Local()
 

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

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

frappe/docs/license.html

@@ -4,7 +4,7 @@
 
 <p>The MIT License (MIT)</p>
 
-<p>Copyright (c) 2015 Frappe Technologies Pvt. Ltd.</p>
+<p>Copyright (c) 2016 Frappe Technologies Pvt. Ltd.</p>
 
 <p>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:</p>
 

frappe/public/js/frappe/misc/common.js

@@ -237,5 +237,7 @@ frappe.palette = [
 	['#428B46', 1]
 ]
 
-
+frappe.is_mobile = function() {
+	return $(document).width() < 768;
+}
 

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;
 	},

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);
 		}

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;
 				}

frappe/public/js/frappe/ui/toolbar/about.js

@@ -13,7 +13,7 @@ frappe.ui.misc.about = function() {
 		<h4>Installed Apps</h4>\
 		<div id='about-app-versions'>Loading versions...</div>\
 		<hr>\
-		<p class='text-muted'>&copy; 2015 Frappe Technologies Pvt. Ltd and contributors </p> \
+		<p class='text-muted'>&copy; 2016 Frappe Technologies Pvt. Ltd and contributors </p> \
 		</div>", frappe.app));
 
 		frappe.ui.misc.about_dialog = d;

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: