Commit graph

14692 commits

Author SHA1 Message Date
Makarand Bauskar
a6b4ca1892 [minor][hot] fixes for 'list' object has no attribute 'get' while receiving mails (#3093) 2017-04-14 13:36:17 +05:30
Kanchan Chauhan
0ff340ba3b [WIP] [Enhancement] Employee Address moved to Address 2017-04-13 19:17:09 +05:30
Neil Trini Lasrado
c531b12547 Added reset password button to User doctype (#3089) 2017-04-13 19:00:07 +05:30
Makarand Bauskar
3e1a794289 [minor] fixed blog list issue and filter blogs by blogger (#3090) 2017-04-13 18:59:01 +05:30
Nabin Hait
5f48514cd9 Merge branch 'rmehta-decimal-precision' into develop 2017-04-13 18:10:19 +05:30
Nabin Hait
546ad3e453 [fix] Get field precision for currency field 2017-04-13 18:09:40 +05:30
Nabin Hait
60572affbf Merge branch 'decimal-precision' of https://github.com/rmehta/frappe into rmehta-decimal-precision 2017-04-13 16:30:48 +05:30
Nabin Hait
3494f12b8d Merge branch 'develop' 2017-04-13 15:36:56 +05:30
Nabin Hait
be1ac24a2b bumped to version 8.0.14 2017-04-13 16:06:56 +06:00
Nabin Hait
19b38ecaf9 Get allowed reports with report type 2017-04-13 15:14:15 +05:30
Nabin Hait
d0318a78d4 Fix non english desktop icons 2017-04-13 15:14:15 +05:30
Nabin Hait
7f78e255ce Get allowed reports with report type 2017-04-13 15:09:25 +05:30
Nabin Hait
6d0cfaf27f Fix non english desktop icons 2017-04-13 15:09:25 +05:30
Rushabh Mehta
dff0608d2e [test] test_user.py for expiry 2017-04-13 15:02:12 +05:30
Rushabh Mehta
d45cf60c6c [fix] expiry message 2017-04-13 14:52:29 +05:30
pratu16x7
f1595c06b4 [fix] set report-type for custom role reports 2017-04-13 14:33:09 +05:30
Rushabh Mehta
510f2e51ac [test] check patch names 2017-04-13 13:36:33 +05:30
Rushabh Mehta
abb4732491 [fix] patch name 2017-04-13 12:55:42 +05:30
Nabin Hait
31784df537 Fix non english desktop icons (#3080) 2017-04-13 12:47:45 +05:30
rohitwaghchaure
b4ae808980 Added system_page field in page to differentiate system page and custom page, patch to set reference doctype in the custom role, fixed sql query to get users reports (#3078) 2017-04-13 12:43:32 +05:30
Neil Trini Lasrado
5761fd5569 Update email_account.js (#3076) 2017-04-13 12:41:27 +05:30
Rushabh Mehta
a1e31ed20b [feature] set decimal precision for currency in currency settings and currency formatting will be global 2017-04-13 12:39:01 +05:30
Saurabh
c5c024e903 Merge branch 'develop' 2017-04-12 20:23:48 +05:30
Saurabh
bfff2a41d0 bumped to version 8.0.13 2017-04-12 20:53:48 +06:00
Saurabh
0f3bd863a3 Merge pull request #3081 from saurabh6790/setup_help_fix
[fix] read apps dir if setting up global help else get installed apps from respective site
2017-04-12 20:22:39 +05:30
Saurabh
91a40435b4 [fix] read apps dir if setting up global help else get installed apps from respective site 2017-04-12 20:11:54 +05:30
Saurabh
9b05047e74 Merge branch 'develop' 2017-04-12 17:33:28 +05:30
Saurabh
310cb85f26 bumped to version 8.0.12 2017-04-12 18:03:27 +06:00
Rushabh Mehta
1983549833 [minor] show last commit ref in about, fixes #3048 2017-04-12 17:06:32 +05:30
Faris Ansari
1f03685fab [ui] Ellipsis in name column (#3074)
- frappe/erpnext#8422
2017-04-12 16:36:17 +05:30
Rushabh Mehta
c96f406e8b [fix] broken breadcrumbs, https://github.com/frappe/frappe/pull/3050 2017-04-12 16:24:46 +05:30
Charles-Henri Decultot
0402a40f8b Language order for the setup wizard (#3031) 2017-04-12 15:51:44 +05:30
Rushabh Mehta
9173562ff9 [minor] patch for language and validation in doctype.py 2017-04-12 15:50:12 +05:30
Prateeksha Singh
18572c0758 Summernote image insert modal (#3029)
* modify summernote modal base HTML

* Image modal working

* set modal option to image
2017-04-12 15:47:52 +05:30
Charles-Henri Decultot
7883b9d6f0 Language first letter as uppercase to improve the setup experience (#3028) 2017-04-12 14:52:40 +05:30
Rushabh Mehta
7e78117712 [minor] README.md 2017-04-12 14:31:26 +05:30
Rushabh Mehta
2932ff7cb1 [fix] script execution 2017-04-12 14:16:52 +05:30
Makarand Bauskar
d552ad86ed [minor] fixes for has_website_permission of address doctype (#3070) 2017-04-12 14:10:33 +05:30
Khairil Zhafri
cdefb061fb Update email_account.json (#3044)
* Update email_account.json

More intuitive labels to avoid confusion:
Email Id -> Email Address
Login Id is Different -> Use Different Email Login
Email Address -> Email Login ID

* Update email_account.json
2017-04-12 12:43:43 +05:30
Rushabh Mehta
89895718b2 [fix] invalid login, #3060 2017-04-12 12:21:13 +05:30
Makarand Bauskar
8cf45d2bb3 [minor] added _ method to safe evel for edit profile page (#3069) 2017-04-12 10:14:03 +05:30
Nabin Hait
8e55070b3a Merge branch 'develop' 2017-04-11 19:13:11 +05:30
Nabin Hait
d6a1c07377 bumped to version 8.0.11 2017-04-11 19:43:11 +06:00
Makarand Bauskar
30c0f625ab [fixes] address and contact filter query fixes (#3065) 2017-04-11 19:11:34 +05:30
Makarand Bauskar
8013ede138 [translation] translation updates for - frappe on 2017-04-04 (#3009) 2017-04-11 19:11:34 +05:30
Nabin Hait
0dda08f032 Fix non english desktop icon labels 2017-04-11 19:11:34 +05:30
mbauskar
7dd4e1ae96 [fixes] minor fixes in feedback trigger _get 2017-04-11 18:48:50 +05:30
Faris Ansari
39fb1c8db4 Show unsupported message for old browsers 2017-04-11 18:33:51 +05:30
mbauskar
92dcd79a84 [minor] fixes in update_in_all_rows 2017-04-11 17:52:59 +05:30
Makarand Bauskar
5d793a903b [fixes] address and contact filter query fixes (#3065) 2017-04-11 16:35:27 +05:30