Commit graph

11166 commits

Author SHA1 Message Date
Rushabh Mehta
ca97204bdb [fix] tests + add google analytics id in docs 2016-12-09 16:39:38 +05:30
Rushabh Mehta
2bf66a6bcb [fix] blog links inside blog post 2016-12-09 16:14:36 +05:30
Rushabh Mehta
e0d582bfd4 [minor] expand all in tree frappe/erpnext#6915 (#2431) 2016-12-09 16:00:48 +05:30
DrTrills
d921ae839c fixed directory path (#2436) 2016-12-09 15:59:32 +05:30
Rushabh Mehta
889079504c Blog fixes (#2437)
* [minor] update fetch field only if null

* [fix] blog filtering, titles etc
2016-12-09 15:59:05 +05:30
Rushabh Mehta
5da6226e2e [minor] web form paging fix 2016-12-08 14:19:29 +05:30
Nabin Hait
958d8ea6c0 Merge branch 'master' into develop 2016-12-08 12:32:20 +05:30
Nabin Hait
1bc35a6926 Merge branch 'hotfix' 2016-12-08 12:32:19 +05:30
Nabin Hait
203ca857db bumped to version 7.1.24 2016-12-08 13:02:19 +06:00
Nabin Hait
8d947dfc4c Merge pull request #2426 from rmehta/print-format-custom-fix
[fix] render from custom template if custom_html is set in print format
2016-12-08 12:21:45 +05:30
Nabin Hait
a0f174621a Merge pull request #2419 from rmehta/update-fetch-on-doctype-save
[enhance] update fetch values on doctype save #2414
2016-12-08 12:20:06 +05:30
Nabin Hait
5c3213ffa8 Update report.py 2016-12-08 12:18:04 +05:30
Rushabh Mehta
cd2d45b37f [minor] create trigger for timeline refresh (#2428) 2016-12-07 14:40:57 +05:30
robert schouten
acfb0996cf hide disabled reports (#2427)
* hide disabled reports

* Update moduleview.py
2016-12-07 14:40:39 +05:30
Rushabh Mehta
337b6c4621 [minor] updated icons for social logins 2016-12-07 12:29:53 +05:30
Saurabh
cff4af8323 [fix] schduler call fix (#2423) 2016-12-07 11:31:32 +05:30
Rushabh Mehta
3eb4266aae [minor] cleanup style of comments (#2425) 2016-12-07 11:31:22 +05:30
khatrijitendra
9a44a83117 Make Translation for introduction in web form (#2420) 2016-12-07 11:30:19 +05:30
Rushabh Mehta
bd0852b965 [fix] email account, add sparkpost, sendgrid as options and refactor property use_tls, fixes frappe/erpnext#7129 (#2418) 2016-12-07 11:29:12 +05:30
Léo
9aeec44087 [fix] correct french translation (#2422) 2016-12-07 11:28:40 +05:30
Rushabh Mehta
103f54d06b [fix] date formatting for languages, fixes #2389 (#2417) 2016-12-07 11:27:53 +05:30
robert schouten
bfadc9f81f move email group with newsletter (#2416) 2016-12-07 11:27:41 +05:30
Faris Ansari
455a43e2cd allow 1 filter to be added at a time! (#2404) 2016-12-07 11:26:26 +05:30
Rushabh Mehta
14586e7450 [minor] fontawesome icons 2016-12-07 11:09:23 +05:30
Rushabh Mehta
e26619bf26 [minor] js fix 2016-12-06 19:16:08 +05:30
Rushabh Mehta
d0175628ce [fix] render from custom template if custom_html is set in print format 2016-12-06 19:09:00 +05:30
Nabin Hait
dd53ed0f75 Merge branch 'hotfix' 2016-12-06 16:53:54 +05:30
Nabin Hait
f73e8d0404 Merge branch 'master' into develop 2016-12-06 16:53:54 +05:30
Nabin Hait
efd35845e3 bumped to version 7.1.23 2016-12-06 17:23:54 +06:00
Nabin Hait
1d5b903a4d Merge pull request #2424 from nabinhait/hotfix
Fixed patch
2016-12-06 16:52:35 +05:30
Nabin Hait
03e7957cd6 Fixed patch 2016-12-06 16:52:03 +05:30
Nabin Hait
c52dc83256 Fixed merge conflict 2016-12-06 16:12:32 +05:30
Nabin Hait
c99179746d Merge branch 'hotfix' 2016-12-06 16:09:08 +05:30
Nabin Hait
d48f6f433e bumped to version 7.1.22 2016-12-06 16:39:07 +06:00
Nabin Hait
2f2e80b0a1 Merge pull request #2421 from nabinhait/hotfix
Hotfix
2016-12-06 16:06:51 +05:30
Nabin Hait
961071b311 removed print statements 2016-12-06 16:05:26 +05:30
Rohit Waghchaure
82ac63e5ac [Fix] Total row not working in the report for the report builder type 2016-12-06 16:05:26 +05:30
Rushabh Mehta
9cd262c0c5 [minor] dont check developer mode in test 2016-12-06 15:39:39 +05:30
Rushabh Mehta
281d8a6481 [fix] for new doctype 2016-12-06 15:31:23 +05:30
Rushabh Mehta
9e7b174c76 [enhance] update fetch values on doctype save #2414 2016-12-06 15:20:50 +05:30
Rushabh Mehta
5f8b360123 [fix] #7130 2016-12-06 11:51:38 +05:30
Rushabh Mehta
d1a57e697a [fix] font-awesome for tree 2016-12-06 11:41:03 +05:30
Nabin Hait
cd0f5e76c6 [fix] Set filter values as default only if no_copy is not marked (#2413) 2016-12-05 18:24:03 +05:30
Vladyslav Baidak
597a34cd5d Update site.py (#2306)
* Update site.py

Fixed --db-name ignoring when creating new-site

* Update site.py

Fixed --db-name ignoring when creating new-site
2016-12-05 18:22:59 +05:30
KanchanChauhan
054d0f663f Invalid language error on creation of Language (#2390) 2016-12-05 18:20:36 +05:30
Rushabh Mehta
593214c189 [fix] expand collapse buttons only for tree reports 2016-12-05 17:58:44 +05:30
Rushabh Mehta
72569d1313 [fix] file .zip upload; 2016-12-05 17:39:52 +05:30
Nabin Hait
8c7bd2f76f Merge pull request #2341 from rmehta/fetch-server-side
[fix] fetch values server side for link fields
2016-12-05 16:41:07 +05:30
Prateeksha Singh
45c8365438 Grid: Expand/Collapse all buttons (#2399)
* Add disabling of buttons

* Commonify polar functions
2016-12-05 15:12:10 +05:30
sbkolate
764cbfe217 added Bulk Upload from zip file feature #2055 (#2062)
*  added  Bulk Upload from zip file feature #2055

* Added upload zip in file list

* Fix File URL

* Update file_list.js
2016-12-05 15:09:17 +05:30