Commit graph

11265 commits

Author SHA1 Message Date
Nabin Hait
ec42dcd4f7 minor fix for function import 2016-12-28 12:17:32 +05:30
Nabin Hait
67ce410824 Merge branch 'hotfix' 2016-12-28 11:08:12 +05:30
Nabin Hait
82448297c7 bumped to version 7.2.3 2016-12-28 11:38:12 +06:00
Nabin Hait
345c85f3d8 Merge pull request #2521 from saurabh6790/disable_additional_users
[fix] reset simultaneous sessions after disabling users
2016-12-28 11:06:09 +05:30
Saurabh
f246cc3810 [fix] reset simultaneous sessions after disabling users 2016-12-27 19:20:17 +05:30
Nabin Hait
15a050dc68 Merge branch 'hotfix' 2016-12-27 14:25:59 +05:30
Nabin Hait
46229be379 bumped to version 7.2.2 2016-12-27 14:55:59 +06:00
Nabin Hait
9a2c086dc6 Merge pull request #2518 from netchampfaris/hotfix
[hotfix] Allow Page break inside tables
2016-12-27 13:36:12 +05:30
Nabin Hait
da9cff2337 Update print_settings.json 2016-12-27 13:35:50 +05:30
Faris Ansari
dd0dfe1231 Allow Page break inside tables 2016-12-27 11:50:17 +05:30
Nabin Hait
181b37d67e Merge branch 'hotfix' 2016-12-24 14:57:07 +05:30
Nabin Hait
37277b2a1e bumped to version 7.2.1 2016-12-24 15:27:07 +06:00
Nabin Hait
a2215c7a9a [Fix]Attachment in Amended doc 2016-12-24 14:51:07 +05:30
Nabin Hait
f2bc961e1b Fixed merge conflict 2016-12-23 17:35:38 +05:30
Nabin Hait
4b23110806 bumped to version 7.2.0 2016-12-23 18:05:03 +06:00
Nabin Hait
26507591d9 Update __init__.py 2016-12-23 16:59:42 +05:30
Rushabh Mehta
a99575f6c6 [fix] [test] 2016-12-23 11:05:21 +05:30
Rushabh Mehta
6b637203f9 [minor] remove document_flow.py, use _sidebar.json and fix frappe/erpnext#7300 2016-12-23 09:42:15 +05:30
Nabin Hait
f00eecb3b0 Update query_report.js 2016-12-22 18:40:11 +05:30
Nabin Hait
8509d3a45c Merge branch 'hotfix' 2016-12-21 17:37:35 +05:30
Nabin Hait
930e0bba9c bumped to version 7.1.29 2016-12-21 18:07:35 +06:00
Rushabh Mehta
afa8bf1e96 [fix] sortfield validation for multiple fields and frappe.model.set_value (js) takes in a dict 2016-12-21 17:29:16 +05:30
Rushabh Mehta
7dd822aeb6 [fix] loading page title from html 2016-12-21 14:51:34 +05:30
Nabin Hait
a92c753be7 Merge pull request #2470 from saurabh6790/disable_additional_users
[fix] dissable additional users by creation date
2016-12-21 13:41:06 +05:30
Saurabh
0577fcff3b [fix] exclude one user with system manger role while pulling active users list 2016-12-21 13:31:37 +05:30
Rushabh Mehta
c8a80786e3 [fix] validate sort_field in doctype.py 2016-12-21 13:01:21 +05:30
Rushabh Mehta
17d78e2bbb [fix] email validation 2016-12-21 12:41:51 +05:30
Saurabh
b627342a9b [fix] testcase fix for deactivating additional users after limit set 2016-12-21 12:34:28 +05:30
Saurabh
68cbbaacc7 [fix] test case to deactivate additional user 2016-12-21 12:34:28 +05:30
Saurabh
86ebaf22aa [fix] dissable additiona users by creation date 2016-12-21 12:34:28 +05:30
Nabin Hait
8443debfdf Merge branch 'hotfix' 2016-12-21 11:40:52 +05:30
Nabin Hait
865ecde1cb bumped to version 7.1.28 2016-12-21 12:10:52 +06:00
Rushabh Mehta
1f8f1ef2dc [fix] filter can_import with can_create, fixes frappe/erpnext#6966 2016-12-21 11:39:05 +05:30
Nabin Hait
065b514be3 Merge pull request #2481 from rmehta/security-fixes
[security] fixed
2016-12-21 11:34:20 +05:30
Rushabh Mehta
863f16050a [fix] doc loading in lists, fix for blog 2016-12-21 11:26:38 +05:30
Rushabh Mehta
68e14d40c2 [security] fixed 2016-12-21 11:17:24 +05:30
Rushabh Mehta
a6d5cec95c [minor] unicode fix for frappe/erpnext#7070 (#2478) 2016-12-20 16:21:50 +05:30
Rushabh Mehta
5d7eb494a0 [minor] frappe.as_unicode 2016-12-20 12:35:59 +05:30
Rushabh Mehta
db25d89d00 [fix] password strength (via error snapshot) 2016-12-20 11:38:19 +05:30
Nabin Hait
7dbe38e37a Merge branch 'hotfix' 2016-12-20 11:34:42 +05:30
Nabin Hait
b5e6589710 bumped to version 7.1.27 2016-12-20 12:04:42 +06:00
Rushabh Mehta
241b35ab0a [fix] dots on setup wizard 2016-12-20 11:14:38 +05:30
Rushabh Mehta
8ff97f64ce [minor] website list, reload doc only if required 2016-12-20 11:01:23 +05:30
Rushabh Mehta
e82e22640a [fix] web form fixes for job opening 2016-12-19 17:05:30 +05:30
Nabin Hait
38e5e2aad8 Merge pull request #2476 from rmehta/fix-dropbox-for-site-config
[fix] dropbox access for site_config
2016-12-19 16:20:38 +05:30
Rushabh Mehta
df649a7f6d [minor] grid open bug 2016-12-19 16:18:48 +05:30
Rushabh Mehta
bcf6d6ec6d [minor] grid checks refresh via flow 2016-12-19 15:03:07 +05:30
Rushabh Mehta
a74a9d1afe [fix] dropbox access for site_config 2016-12-19 12:59:27 +05:30
Rushabh Mehta
8301a17209 [minor] allow any type of user for user_query 2016-12-19 12:16:37 +05:30
Rushabh Mehta
8bfd1e8bbd Delete zh-tw.csv 2016-12-19 11:45:15 +05:30