Commit graph

8029 commits

Author SHA1 Message Date
Rushabh Mehta
1d44e8eca1 [design] timeline, print preview, pos 2014-12-26 12:50:44 +05:30
Rushabh Mehta
24e6a47477 [design] navbar, form grids 2014-12-26 12:50:44 +05:30
Rushabh Mehta
313bed4762 [design] list views 2014-12-26 12:50:44 +05:30
Rushabh Mehta
1739b4b003 [design] wip 2014-12-26 12:50:43 +05:30
Rushabh Mehta
c35a4e1235 [design] wip 2014-12-26 12:50:43 +05:30
Pratik Vyas
d16d3be524 remove pytz version pinning 2014-12-24 10:19:52 +05:30
John Vermette
86715e55ad Update base_document.py 2014-12-23 10:55:46 -05:00
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
Rushabh Mehta
59c0f27d63 Merge pull request #956 from pdvyas/improve-json-import
import a list of docs with json
2014-12-23 10:35:40 +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
Pratik Vyas
9da81fb327 import a list of docs with json 2014-12-19 10:47:25 +05:30
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
84021befcb add highlight.pack.js to build.json 2014-12-17 16:28:12 +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
erp
a045c73ae0 first is translation commit 2014-12-05 13:37:48 +00:00
Nabin Hait
222f77a898 Merge pull request #938 from nabinhait/fix1
Minor fixes
2014-12-02 14:38:10 +05:30
Rushabh Mehta
0e85139034 [docs] database.py + login fix 2014-12-02 14:35:26 +05:30
Nabin Hait
b797ef1bab fixes in website generator 2014-12-02 11:42:40 +05:30
Rushabh Mehta
6d26c90dd9 [fix] Added attach in Custom Field 2014-12-01 10:44:59 +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
8fd55ace16 [test-fix] 2014-11-28 15:02:49 +05:30
Rushabh Mehta
8283603f89 [fix] for tests 2014-11-28 14:27:57 +05:30
Rushabh Mehta
2b9f6bace1 [merge] 2014-11-28 12:00:15 +05:30
Nabin Hait
c03bb49235 Test case fixes 2014-11-28 11:20:54 +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
Rushabh Mehta
a2fdef2c50 [fixes] complete signup and email footer frappe/erpnext#2433 2014-11-27 12:33:40 +05:30
Rushabh Mehta
e1c4ec3e0c [oauth] ask for email if missing 2014-11-27 10:46:50 +05:30
Pratik Vyas
c35a01b31c Merge branch 'develop' 2014-11-26 18:40:43 +05:30