vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'develop'

Browse source
This commit is contained in:
Nabin Hait 2016-08-18 15:58:03 +05:30
commit 346bdce263
12 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -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()

2
frappe/data/app_listing/paypal_integration.json
View file

@ -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

2
frappe/data/app_listing/razorpay_integration.json
View file

@ -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

BIN
frappe/docs/assets/query-report-out.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 144 KiB

BIN
frappe/docs/assets/query-report.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 94 KiB

2
frappe/docs/license.html
View file

@ -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>

4
frappe/public/js/frappe/misc/common.js
View file

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

3
frappe/public/js/frappe/misc/utils.js
View file

@ -32,9 +32,6 @@ frappe.utils = {
}
return true;
},
is_mobile: function() {
return frappe.utils.is_xs();
},
is_xs: function() {
return $(document).width() < 768;
},

4
frappe/public/js/frappe/ui/charts.js
View file

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

2
frappe/public/js/frappe/ui/dialog.js
View file

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

2
frappe/public/js/frappe/ui/toolbar/about.js
View file

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

2
license.txt
View file

@ -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: