Commit graph

6415 commits

Author SHA1 Message Date
Anand Doshi
049dd2fafa Merge pull request #969 from anandpdoshi/slickgrid-2-2
Updated to SlickGrid v2.2, which fixes scroll issue for > 1000 records
2015-01-15 14:29:43 +05:30
Anand Doshi
9189494ea6 Updated to SlickGrid v2.2, which fixes scroll issue for > 1000 records 2015-01-15 13:23:16 +05:30
Pratik Vyas
35b7328e0f Update .travis.yml 2015-01-12 12:31:59 +05:30
Pratik Vyas
01eb2d2f5c Update travis.yml 2015-01-12 12:28:14 +05:30
Pratik Vyas
ffe79a6f1c Merge branch 'develop' 2015-01-12 12:14:04 +05:30
Pratik Vyas
ebedab763a bumped to version 4.9.3 2015-01-12 12:44:03 +06:00
Anand Doshi
3b1d75c188 [minor] fix for link field in dialog 2015-01-12 11:42:25 +05:30
Anand Doshi
1b93c8ee06 Merge pull request #965 from anandpdoshi/anand-jan-9
[fix] End Date error on dragging an all day calendar event
2015-01-09 15:53:48 +05:30
Anand Doshi
cf23ef1eb3 [fix] strip (/ ) from route when rendering page 2015-01-09 14:24:13 +05:30
Anand Doshi
8f3643a57c [fix] End Date error on dragging an all day calendar event 2015-01-09 13:23:55 +05:30
Pratik Vyas
60bf71c569 Merge branch 'develop' 2014-12-31 12:40:01 +05:30
Pratik Vyas
da7b5d157f bumped to version 4.9.2 2014-12-31 13:10:01 +06:00
Anand Doshi
98ea6463fd Merge pull request #961 from anandpdoshi/anand-dec-29
Unicode fix for File Manager and added new currency - Romanian New Leu
2014-12-29 12:47:45 +05:30
Anand Doshi
f13b45a89d [minor] Added currency RON - Romanian New Leu 2014-12-29 12:35:53 +05:30
Anand Doshi
da9bbf8f09 [fix] [file manager] unicode issue in get_file_name() 2014-12-29 12:17:30 +05:30
Pratik Vyas
5d0ab13266 Merge branch 'develop' 2014-12-23 15:21:02 +05:30
Pratik Vyas
f3cc20a62f bumped to version 4.9.1 2014-12-23 15:51:02 +06:00
Nabin Hait
c2fb1445a0 Merge pull request #957 from anandpdoshi/anand-dec-23
[fix] Use df.precision if specified
2014-12-23 15:09:51 +05:30
Anand Doshi
ab286a89be [fix] Use df.precision if specified 2014-12-23 14:54:35 +05:30
Pratik Vyas
d9b8741cae remove pytz version pinning 2014-12-23 14:43:35 +05:30
Pratik Vyas
b3042546b1 Merge branch 'develop' 2014-12-19 18:11:06 +05:30
Pratik Vyas
ad1fd7fb9a bumped to version 4.9.0 2014-12-19 18:41:06 +06:00
Anand Doshi
0974c87f85 Merge pull request #955 from anandpdoshi/anand-dec-17
[fix] ability to parse number format # ###,## with appropriate rounding
2014-12-18 17:32:10 +05:30
Anand Doshi
89f5c19cba [fix] ability to parse number format # ###,## with appropriate rounding 2014-12-17 18:42:45 +05:30
Anand Doshi
758bb69296 Merge pull request #954 from pdvyas/jinja-error
Show a better error message in case of jinja syntax error
2014-12-17 16:57:01 +05:30
Pratik Vyas
65c5bea720 Show a better error message in case of jinja syntax error 2014-12-17 13:07:31 +05:30
Pratik Vyas
05587d4e0d Merge branch 'develop' 2014-12-16 15:46:28 +05:30
Pratik Vyas
c7b319cfdd bumped to version 4.8.0 2014-12-16 16:16:27 +06:00
Nabin Hait
1f84087caa Merge pull request #952 from pdvyas/doctor
add Doctor
2014-12-16 15:40:11 +05:30
Pratik Vyas
a56a7a7866 add Doctor 2014-12-16 15:30:34 +05:30
Anand Doshi
4cc50887fb Merge pull request #949 from anandpdoshi/anand-dec-15
[fix] frappe.attach_print() - encode html if pdf printing is disabled and set file extn accordingly
2014-12-16 12:28:30 +05:30
Nabin Hait
5a416d50f8 Merge pull request #950 from nabinhait/fix1
Minor fix in communication
2014-12-16 11:26:29 +05:30
Nabin Hait
79159f495d Minor fix in communication 2014-12-16 10:46:40 +05:30
Anand Doshi
5ce09c4e0c [fix] frappe.attach_print() - encode html if pdf printing is disabled and set file extn accordingly 2014-12-16 08:13:23 +05:30
Pratik Vyas
3eb9e1c156 Merge branch 'develop' 2014-12-12 16:51:36 +05:30
Pratik Vyas
a281f9ab05 bumped to version 4.7.1 2014-12-12 17:21:36 +06:00
Nabin Hait
1157ea5468 Merge pull request #945 from nabinhait/fix1
Allowed import for some custom field, custom script, property setter and...
2014-12-11 10:54:14 +05:30
Nabin Hait
95dd42a913 Allowed import for some custom field, custom script, property setter and todo doctype 2014-12-11 10:53:06 +05:30
Pratik Vyas
5b61a53917 Merge branch 'develop' 2014-12-09 16:39:41 +05:30
Pratik Vyas
50ce44fd45 bumped to version 4.7.0 2014-12-09 17:09:41 +06:00
Nabin Hait
222f77a898 Merge pull request #938 from nabinhait/fix1
Minor fixes
2014-12-02 14:38:10 +05:30
Nabin Hait
b797ef1bab fixes in website generator 2014-12-02 11:42:40 +05:30
Nabin Hait
88008f813a do not copy page name while copying webpage 2014-11-28 16:48:07 +05:30
Nabin Hait
32ca0b1847 Fixes for invalid date 2014-11-28 16:47:36 +05:30
Rushabh Mehta
7540443cad Merge pull request #928 from pdvyas/fix-css-url
Fix background url in custom style fix frappe/erpnext# 2434
2014-11-27 12:35:22 +05:30
Pratik Vyas
c35a01b31c Merge branch 'develop' 2014-11-26 18:40:43 +05:30
Pratik Vyas
e4aa1ed277 bumped to version 4.6.1 2014-11-26 19:10:42 +06:00
Nabin Hait
b9c2bb3b72 Merge pull request #930 from pdvyas/remove-missing-apps
remove frappe_subscription if doesnt exist on restore
2014-11-26 18:23:18 +05:30
Pratik Vyas
38074a9419 remove frappe_subscription if doesnt exist on restore 2014-11-26 18:18:48 +05:30
Pratik Vyas
08307d8876 Merge branch 'develop' 2014-11-25 11:15:26 +05:30