Nabin Hait
|
b60ab4eb41
|
Update report.py
|
2016-12-29 13:09:39 +05:30 |
|
Rushabh Mehta
|
2b85e18ffb
|
[fix] tests
|
2016-12-26 14:29:50 +05:30 |
|
Rushabh Mehta
|
da7537f872
|
[minor] remove print
|
2016-12-26 13:05:27 +05:30 |
|
Rushabh Mehta
|
eabceaec56
|
[fix] formatting and modified filters for auto email report, fixes frappe/erpnext#7081 and frappe/erpnext#7147
|
2016-12-26 13:03:57 +05:30 |
|
Rushabh Mehta
|
f2cad09a3b
|
Merge branch 'v7.2.0-beta' into develop
|
2016-12-23 11:06:38 +05:30 |
|
Rushabh Mehta
|
a99575f6c6
|
[fix] [test]
|
2016-12-23 11:05:21 +05:30 |
|
Rushabh Mehta
|
5ce11a8cb7
|
Merge branch 'v7.2.0-beta' into develop
|
2016-12-23 09:42:41 +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 |
|
Faris Ansari
|
1531367c33
|
hide toolbar fix (#2497)
|
2016-12-22 21:02:17 +05:30 |
|
Nabin Hait
|
f00eecb3b0
|
Update query_report.js
|
2016-12-22 18:40:11 +05:30 |
|
Nabin Hait
|
11f718a0af
|
Merge pull request #2493 from nabinhait/develop
[fix] Auto completion fix for dynamic link field
|
2016-12-22 16:53:32 +05:30 |
|
Nabin Hait
|
9cd064e049
|
[fix] Auto completion fix for dynamic link field
|
2016-12-22 16:50:23 +05:30 |
|
robert schouten
|
a1f4ce4867
|
[fix] allow route flexibility (#2484)
* [fix] allow route flexibility
* [fix] route flexibility
|
2016-12-22 11:33:12 +05:30 |
|
Neil Trini Lasrado
|
c53bd84c9f
|
Use get_list instead of get_all in filters so that it honours permissions. (#2483)
|
2016-12-22 11:32:17 +05:30 |
|
Faris Ansari
|
bfe3dc8f4b
|
date text translatable (#2482)
|
2016-12-22 11:31:26 +05:30 |
|
Rushabh Mehta
|
3c4ffb2e19
|
[minor] lanugage code is redundant (#2479)
|
2016-12-22 11:29:09 +05:30 |
|
Nabin Hait
|
b9b5a0246d
|
Merge branch 'master' into develop
|
2016-12-21 17:37:36 +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
|
af455b9491
|
Merge branch 'v7.2.0-beta' into develop
|
2016-12-21 17:29:38 +05:30 |
|
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
|
a4dc85d2c9
|
Merge branch 'v7.2.0-beta' into develop
|
2016-12-21 14:53:51 +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
|
3c71cb0c3e
|
Merge branch 'v7.2.0-beta' into develop
|
2016-12-21 13:02:11 +05:30 |
|
Rushabh Mehta
|
c8a80786e3
|
[fix] validate sort_field in doctype.py
|
2016-12-21 13:01:21 +05:30 |
|
Rushabh Mehta
|
4075418358
|
Merge branch 'v7.2.0-beta' into develop
|
2016-12-21 12:51:29 +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
|
5330158d65
|
Merge branch 'master' into develop
|
2016-12-21 11:40:53 +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
|
095220179e
|
Merge branch 'v7.2.0-beta' into develop
|
2016-12-21 11:39:28 +05:30 |
|
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
|
451faeeef5
|
Merge branch 'v7.2.0-beta' into develop
|
2016-12-21 11:27:11 +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 |
|
rohitwaghchaure
|
d78ae6001d
|
[Enhancement] Added letter head for the report (#2472)
|
2016-12-20 16:43:07 +05:30 |
|
Rushabh Mehta
|
a6d5cec95c
|
[minor] unicode fix for frappe/erpnext#7070 (#2478)
|
2016-12-20 16:21:50 +05:30 |
|
Javier Wong
|
c1465a0eb9
|
[FIXED] Set forms to READ ONLY for users that do not have the role specified under "Only Allow Edit For" when a Workflow is activated (#2477)
|
2016-12-20 15:40:02 +05:30 |
|
Rushabh Mehta
|
e858797290
|
Merge branch 'v7.2.0-beta' into develop
|
2016-12-20 12:36:25 +05:30 |
|
Rushabh Mehta
|
5d7eb494a0
|
[minor] frappe.as_unicode
|
2016-12-20 12:35:59 +05:30 |
|
Faris Ansari
|
ff906ca546
|
Removed jquery-ui, new datepicker and autocomplete (#2460)
* Replaced old datepicker with flatpickr
* Replaced jquery ui-autocomplete with awesomplete
* airdatepicker, bcoz it's cooler
* air datepicker change event fixed
* ControlLink migrated to awesomeplete
* jQuery ui-autocomplete completely replaced with awesomplete
* removed jquery-ui styling
* awesomebar code cleanup
* @mention now uses awesomplete
* Fix datepicker, added css to complement erpnext, minor fixes
* taggle library for tags
* Communication email input uses awesomplete
* filter dashboard uses awesomplete
* grid report uses awesomplete
* Removed jquery-ui lib, updated build.json
|
2016-12-20 11:44:19 +05:30 |
|
Rushabh Mehta
|
db25d89d00
|
[fix] password strength (via error snapshot)
|
2016-12-20 11:38:19 +05:30 |
|
Nabin Hait
|
a3cd960eed
|
fixed version conflict
|
2016-12-20 11:35:28 +05:30 |
|
Nabin Hait
|
7dbe38e37a
|
Merge branch 'hotfix'
|
2016-12-20 11:34:42 +05:30 |
|