dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,708 Commits 9 Branches 19 Tags
52ea6cddf8025b75ac09e8ddae5fa09330e14707
Commit Graph
7708 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
David Gasperoni 52ea6cddf8 move header tag out of carrier block 2012-12-06 15:06:08 +01:00
David Gasperoni 897462b3ee order-carrier more compatible with order-opc 
carriers' block didn't have the opc-main-block when in opc-order
 2012-12-06 14:56:06 +01:00
David Gasperoni c89082855a order-carrier more compatible with order-opc 
carriers' block didn't have the opc-main-block when in opc-order
 2012-12-06 14:52:14 +01:00
David Gasperoni 523ec5c27c order carrier more compatible with opc 
The carriers' block didnt't have the 'opc-main-block' in the order-opc page.
 2012-12-06 14:46:40 +01:00
vAugagneur 276696dd6c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-06 12:16:47 +01:00
vAugagneur 61c23c7e75 [-] BO : fixed bug #PSCFV-4701 - Module onclickOption is not called 2012-12-06 12:16:37 +01:00
Rémi Gaillard b474ca3d85 [-] FO: Fix cart summary ajax refreshment 2012-12-06 11:58:29 +01:00
vAugagneur 4fa7eb6a3d //revert all config.xml 2012-12-06 11:41:52 +01:00
vAugagneur e809f6bfdb Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-06 11:32:24 +01:00
vAugagneur 6f37326675 [-] BO : fixed bug #PSCFV-4699 - Module uninstall confirmation message is missing 2012-12-06 11:32:19 +01:00
Rémi Gaillard d9ba307893 Merge pull request #72 from Milow/development 
// Fix mail error, make a little more robust
 2012-12-06 01:48:46 -08:00
sLorenzini 2a4b7cae75 [-] FO: improvement on h4/h5 edits (id become class) 2012-12-06 10:06:56 +01:00
Milow cf7aebd029 Fix typo 2012-12-05 21:27:37 -06:00
Milow c87fb469fd Fix mail error 
This changes two things in the mail class.

1. If the html template was missing, it would tell you the txt template
was missing. It now tells you that the html template is missing.

2. If the type is set to only text or html, don't fail if the other
template is missing. Example, if set to only use text templates, don't
fail if the html template does not exist. If the type is set to both,
or if the specific type of template is missing, it will still complain.
 2012-12-05 21:26:07 -06:00
Sarah Lorenzini 7897d40e22 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-05 11:03:16 +01:00
sLorenzini 5c63deb469 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-05 10:59:47 +01:00
sLorenzini 59e793fa99 //[-] FO: fixed bug #product_list li span.new: IE 6,7,8 bug: New product badge still not correct position - #PSCFV-5921 2012-12-05 10:42:26 +01:00
vAugagneur 2c3ad2e7f9 //small variable name fix part 2 2012-12-04 18:47:00 +01:00
vAugagneur 89e9f90cf1 //small variable name fix 2012-12-04 18:35:10 +01:00
vAugagneur 712f0c3d6d [-] FO : fixed bug #PSCFV-5826 #PSCFV-4697 Live edit only works for home page && Live edit can't load module 2012-12-04 18:29:10 +01:00
Sarah Lorenzini 2b10fcd712 // change h4, h5 2012-12-04 17:15:49 +01:00
Rémi Gaillard da5c5fb4a0 [-] Core: Locales should be setted anywhere #PSCFV-5953 2012-12-04 15:40:17 +01:00
Rémi Gaillard 2d93064fb9 [-] Core: Fix #PSCFV-5948 id_warehouse was sometime set to null on validateorder with stock management disabled 2012-12-04 15:32:06 +01:00
sLorenzini 9322f3338e // fixed FO bugs 2012-12-04 15:27:43 +01:00
Rémi Gaillard 0071850981 [-] Core: Fix #PSCFV-5966 the tax rate applied to shipping cost for the visitors was the product tax rate 2012-12-04 15:09:41 +01:00
Rémi Gaillard 6cad7c2bf4 // Fix PHP notice #PSCFV-5967 2012-12-04 14:33:12 +01:00
Rémi Gaillard e568e0992d [-] WS: #PSCFV-5982 logo email/invoices/mail don't return standard logo if not exists 2012-12-04 11:56:17 +01:00
Rémi Gaillard b80bc2a6ba [-] WS: Fix #PSCFV-5981 logo path 2012-12-04 11:52:04 +01:00
Rémi Gaillard 7d05a6d8e9 [-] BO: Fix #PSCFV-4889 don't delete product if physical stock > 0 2012-12-04 11:38:47 +01:00
Rémi Gaillard e5ec07f95a [-] BO: Add display of modules errors on reset #PSCFV-2077 2012-12-04 11:13:06 +01:00
vAugagneur 3510cc03ab //small html fix 2012-12-04 11:07:56 +01:00
Vincent Augagneur 640c0202dd Merge pull request #63 from Ha99y/blockcms-fix 
[*] FO - Update modules/blockcms/blockcms.tpl
 2012-12-04 01:37:32 -08:00
Rémi Gaillard 7d9057a476 // Fix PHP warning 2012-12-03 19:11:37 +01:00
Rémi Gaillard d42172e6f8 [-] BO: Fix #PSCFV-5706 save of product availability on global context 2012-12-03 17:53:47 +01:00
Rémi Gaillard 6ddd3a03bb [-] Core: Fix isDate validator 2012-12-03 16:52:22 +01:00
Rémi Gaillard 0f3bbaf65c [-] Core: Fix date validator #PSCFV-5797 2012-12-03 16:12:08 +01:00
vAugagneur c6d5d6a95b //small js fix 2012-12-03 15:55:46 +01:00
vAugagneur f278ab5bd8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-03 15:23:40 +01:00
vAugagneur f6b1e86449 [-] BO : fixed bug when toggle status on product listing, redirect_type was not good 2012-12-03 15:23:25 +01:00
Rémi Gaillard 38044ad2cf [-] BO: Fix #PSCFV-5345 quotes in translations of languages packs imported 2012-12-03 15:03:32 +01:00
vAugagneur 6a4100687f //small fix with js on product page 2012-12-03 14:47:38 +01:00
vAugagneur 13ebd3afef Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-03 14:14:54 +01:00
vAugagneur ed3e0e1a58 [+] CORE : now you can choose the redirect option when your product is disable 2012-12-03 14:13:50 +01:00
Rémi Gaillard 428c1fa99b [-] BO: Fix #PSCFV-5332 wrong rights on folder after uploading image 2012-12-03 12:26:27 +01:00
Rémi Gaillard 4a106e51bb [-] BO: Fix category association in global context #PSCFV-5551 2012-12-03 11:25:59 +01:00
Rémi Gaillard 088cb759f0 [-] FO: js was missing on order follow #PSCFV-5441 2012-12-03 10:44:32 +01:00
Sarah Lorenzini 936817999c [-] FO: fix CSS / formatting needed on blocks - #PSCFV-3013 2012-12-03 10:25:35 +01:00
vAugagneur 12cb5316ee //remove debug 2012-12-02 20:05:39 +01:00
vAugagneur 2d30a966c3 [*] FO : improve SEO and http error code 2012-12-02 19:46:09 +01:00
Ha!*!*y c0fedd3c16 Update modules/blockcms/blockcms.tpl 
remove blockpermanentlinks and ID header_link_sitemap

https://github.com/PrestaShop/PrestaShop/pull/11
 2012-12-01 22:09:00 -08:00