Merge branch 'develop'

This commit is contained in:
Pratik Vyas 2014-09-26 16:49:23 +05:30
commit e1089d1f2d
7 changed files with 34 additions and 5 deletions

View file

@ -1 +1 @@
__version__ = "4.4.1"
__version__ = "4.4.2"

View file

@ -87,7 +87,7 @@
"idx": 1,
"issingle": 0,
"istable": 0,
"modified": "2014-05-27 03:49:14.476843",
"modified": "2014-09-18 02:25:57.031810",
"modified_by": "Administrator",
"module": "Core",
"name": "Page",
@ -103,6 +103,24 @@
"submit": 0,
"write": 1
},
{
"amend": 0,
"apply_user_permissions": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"email": 1,
"export": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 0,
"role": "System Manager",
"set_user_permissions": 0,
"submit": 0,
"write": 1
},
{
"apply_user_permissions": 1,
"email": 1,

View file

@ -0,0 +1,10 @@
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
# See license.txt
import frappe
import unittest
test_records = frappe.get_test_records('Page')
class TestPage(unittest.TestCase):
pass

View file

@ -0,0 +1 @@
[]

View file

@ -3,7 +3,7 @@ app_title = "Frappe Framework"
app_publisher = "Web Notes Technologies Pvt. Ltd."
app_description = "Full Stack Web Application Framework in Python"
app_icon = "assets/frappe/images/frappe.svg"
app_version = "4.4.1"
app_version = "4.4.2"
app_color = "#3498db"
app_email = "support@frappe.io"

View file

@ -103,7 +103,7 @@ def get_attachments(dt, dn):
return attachments
def get_comments(dt, dn, limit=20):
def get_comments(dt, dn, limit=100):
cl = frappe.db.sql("""select name, comment, comment_by, creation, comment_type from `tabComment`
where comment_doctype=%s and comment_docname=%s
order by creation asc limit %s""" % ('%s','%s', limit), (dt, dn), as_dict=1)

View file

@ -1,7 +1,7 @@
from setuptools import setup, find_packages
import os
version = "4.4.1"
version = "4.4.2"
with open("requirements.txt", "r") as f:
install_requires = f.readlines()