dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,608 Commits 9 Branches 19 Tags
a07733fcec16f471ec447789631804a0a33b94de
Commit Graph
18608 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
François Gaillard 6483525900 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-10 10:18:53 +01:00
Francois Gaillard 2f3799abb8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-10 10:18:53 +01:00
François Gaillard 312df517fb [*] FO : Cart vouchers style edited 2012-12-10 10:18:41 +01:00
Francois Gaillard 9ab0485946 [*] FO : Cart vouchers style edited 2012-12-10 10:18:41 +01:00
vAugagneur 20187807e1 [-] BO : added import button on listing 2012-12-10 10:14:03 +01:00
vAugagneur ae7569bde3 [-] BO : added import button on listing 2012-12-10 10:14:03 +01:00
PrestaEdit 5e563f2a48 [-] FO : mobile template - states management 2012-12-08 23:46:14 +01:00
PrestaEdit 7a91409023 [-] FO : mobile template - states management 2012-12-08 23:46:14 +01:00
montes 48d6b63d8e Fixed variable typo (redution instead of reduction in some places) 2012-12-07 23:24:41 +01:00
montes aa4b474522 Fixed variable typo (redution instead of reduction in some places) 2012-12-07 23:24:41 +01:00
Rémi Gaillard db9ff416c0 // small fix 2012-12-07 18:01:32 +01:00
vAugagneur 1d70dad851 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-07 18:01:46 +01:00
Rémi Gaillard 7e6d94053b // small fix 2012-12-07 18:01:32 +01:00
vAugagneur 90d4c27d17 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-07 18:01:46 +01:00
vAugagneur e65478a1b4 //small js fix 2012-12-07 18:01:32 +01:00
vAugagneur af3eb2cc38 //small js fix 2012-12-07 18:01:32 +01:00
Rémi Gaillard d274f6d84a [-] WS: Fix #PSCFV-5915 temporary images deletion 2012-12-07 17:58:46 +01:00
Rémi Gaillard 3280bfbeed [-] WS: Fix #PSCFV-5915 temporary images deletion 2012-12-07 17:58:46 +01:00
Rémi Gaillard cd7cc208e8 [-] FO: FIX #PSCFV-5703 quotes in modules translations break javascript execution 2012-12-07 17:23:06 +01:00
Rémi Gaillard 3497af985a [-] FO: FIX #PSCFV-5703 quotes in modules translations break javascript execution 2012-12-07 17:23:06 +01:00
vAugagneur 6dd0a04ed0 [-] BO : fixed bug #PSCFV-5774 BO SAV : the response of the admin appears without newline 2012-12-07 17:22:06 +01:00
vAugagneur cc7c40d4e9 [-] BO : fixed bug #PSCFV-5774 BO SAV : the response of the admin appears without newline 2012-12-07 17:22:06 +01:00
vAugagneur 006bb7b19a [-] FO : fixed bug #PSCFV-5849 now customer addresses can't be edited if country is not enable in this shop excepte if group shop is shared order 2012-12-07 16:23:52 +01:00
vAugagneur 7bc49194b7 [-] FO : fixed bug #PSCFV-5849 now customer addresses can't be edited if country is not enable in this shop excepte if group shop is shared order 2012-12-07 16:23:52 +01:00
Rémi Gaillard 5bcc1417dd // small fix for urls 2012-12-07 11:46:50 +01:00
Rémi Gaillard 1c1fd827da // small fix for urls 2012-12-07 11:46:50 +01:00
vAugagneur 4dbb321836 [-] CORE : fixed sql bug in PaymentModuleCore::getInstalledPaymentModules() - now get only active payment modules 2012-12-06 17:05:19 +01:00
vAugagneur f40369ef6a [-] CORE : fixed sql bug in PaymentModuleCore::getInstalledPaymentModules() - now get only active payment modules 2012-12-06 17:05:19 +01:00
vAugagneur accb337006 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-06 16:53:37 +01:00
vAugagneur adc1197320 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-06 16:53:37 +01:00
vAugagneur 52f4fca6e1 [-] CORE : small fix in Dispatcher::createURL() when friendly URL is disabled 2012-12-06 16:53:29 +01:00
vAugagneur 048f3cce14 [-] CORE : small fix in Dispatcher::createURL() when friendly URL is disabled 2012-12-06 16:53:29 +01:00
Rémi Gaillard 224646ef1f [-] FO: Fix some tax_display_method value for not default customer group 2012-12-06 16:38:31 +01:00
Rémi Gaillard 56819e3573 [-] FO: Fix some tax_display_method value for not default customer group 2012-12-06 16:38:31 +01:00
David Gasperoni 310dbaaf24 move header tag out of carrier block 2012-12-06 15:06:08 +01:00
David Gasperoni 52ea6cddf8 move header tag out of carrier block 2012-12-06 15:06:08 +01:00
David Gasperoni 3b9b19ec48 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 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 497968fd7a 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 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 094e38206c 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
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 78bfcfbaf0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-06 12:16:47 +01:00
vAugagneur 276696dd6c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-06 12:16:47 +01:00
vAugagneur 640ec6d006 [-] BO : fixed bug #PSCFV-4701 - Module onclickOption is not called 2012-12-06 12:16:37 +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 0e0f6ee641 [-] FO: Fix cart summary ajax refreshment 2012-12-06 11:58:29 +01:00
Rémi Gaillard b474ca3d85 [-] FO: Fix cart summary ajax refreshment 2012-12-06 11:58:29 +01:00
vAugagneur 76b435b639 //revert all config.xml 2012-12-06 11:41:52 +01:00
vAugagneur 4fa7eb6a3d //revert all config.xml 2012-12-06 11:41:52 +01:00