dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,747 Commits 9 Branches 19 Tags
82a230aa7003aa60f22bcaa3d55558d45328d565
Commit Graph
7747 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Gaillard 82a230aa70 [-] Core: Fix #PSCFV-5997 - Product::priceCalculation not return the price of default combination 2012-12-11 17:45:06 +01:00
sLorenzini 0727da6aeb [-] FO: CLONE - order_conf still not fixed propertly #2 - #PSCFV-5817 2012-12-11 17:43:30 +01:00
Rémi Gaillard c9cb49d5a1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-11 16:59:56 +01:00
vAugagneur fab1c02443 [-] CORE : fixed bug #PSCFV-6084 2012-12-11 16:59:35 +01:00
Rémi Gaillard 4c026fe0fc [-] BO: don't display stock available if stock management is disabled #PSCFV-6029 2012-12-11 16:59:26 +01:00
Rémi Gaillard 5891143e5b [-] BO: Improve memory usage in admin product in global context with a lot of shops and attributes 2012-12-11 16:05:29 +01:00
vAugagneur a4e48ccc7d [-] CORE : fixed bug #PSCFV-6098 Double @ in customer email address crashes BO 2012-12-11 15:44:32 +01:00
Damien Metzger 2c06839185 // Fixed stripos !== false in module search 2012-12-11 15:36:51 +01:00
Damien Metzger 8e8c1bee81 [-] FO : jquery mobile was not compatible with js minifier, I updated both 2012-12-11 14:01:40 +01:00
Rémi Gaillard a5e3bc711b // replace bad attribute name 2012-12-11 12:11:47 +01:00
Rémi Gaillard 7cd629b15b [-] BO: Fix root category should anyway be imported in shop creation #PSCFV-5885 2012-12-11 12:01:04 +01:00
Rémi Gaillard b2f01058a8 [-] BO: Fix various bugs in categories ntree generation 2012-12-11 11:19:21 +01:00
Damien Metzger ecac947c2e // config.xml in english 2012-12-11 11:19:40 +01:00
Damien Metzger 27eaed42bd [-] MO : fixed backslashes in homeslider #PSCFV-5664 2012-12-11 11:16:56 +01:00
Rémi Gaillard 68236c6a6d // Only js strings need to add slashes 2012-12-10 16:05:38 +01:00
Rémi Gaillard 50761112a1 [-] Core: send email when payment is remotly accepted #PSCFV-6064 2012-12-10 15:57:59 +01:00
sLorenzini e5143b1ee4 [-] FO: fix The French order_return_state HTML mail template has the wrong colours - #PSCFV-6005 2012-12-10 15:17:23 +01:00
Rémi Gaillard 27ae42b086 [-] Core: Fix Swift and TCPDF for hosting which disallow getmypid() php function 2012-12-10 15:06:03 +01:00
vAugagneur 83318055ce //added more check on module upload part 2 2012-12-10 14:45:14 +01:00
vAugagneur 337437be74 //added more check on module upload 2012-12-10 14:44:11 +01:00
Rémi Gaillard 29b4adb032 [-] Core: Fix search indexation when id_product is forced #PSCFV-6039 2012-12-10 13:52:09 +01:00
sLorenzini 05d5ab2df3 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-10 11:43:51 +01:00
sLorenzini dbe2d7998a [-] FO: fix Image attributes not set - #PSCFV-5957 2012-12-10 11:42:13 +01:00
François Gaillard 8b97a15405 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-10 11:39:11 +01:00
François Gaillard 6173a98b58 [*] FO : Bug fix : h4 -> title_block 2012-12-10 11:38:48 +01:00
vAugagneur 1b71add855 [-] BO : fixed bug #PSCFV-6000 - added check if zip uploaded is a real module in AdminModules 2012-12-10 11:16:33 +01:00
vAugagneur eb451604af [-] BO : fixed bug #PSCFV-5991 - CMS friendly URL does not automatically copied 2012-12-10 10:51:46 +01:00
Rémi Gaillard 60e99d6b66 // Display exception in admin regardless mode dev 2012-12-10 10:47:41 +01:00
François Gaillard 6483525900 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
vAugagneur 20187807e1 [-] BO : added import button on listing 2012-12-10 10:14:03 +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
vAugagneur e65478a1b4 //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 cd7cc208e8 [-] 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 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
Rémi Gaillard 5bcc1417dd // 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 accb337006 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
Rémi Gaillard 224646ef1f [-] FO: Fix some tax_display_method value for not default customer group 2012-12-06 16:38:31 +01:00
vAugagneur 78bfcfbaf0 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
Rémi Gaillard 0e0f6ee641 [-] 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 12f47a1b9b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-06 11:32:24 +01:00
vAugagneur d71970d5ff [-] BO : fixed bug #PSCFV-4699 - Module uninstall confirmation message is missing 2012-12-06 11:32:19 +01:00
Rémi Gaillard 2166937cf5 Merge pull request #72 from Milow/development 
// Fix mail error, make a little more robust
 2012-12-06 01:48:46 -08:00