dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,971 Commits 9 Branches 19 Tags
e138fd239e616503dbbb917edca88d74bd8aaca4
Commit Graph

3071 Commits

Author SHA1 Message Date
Rémi Gaillard e1664bbdfb [*] MO: Add smarty cache on some modules 2013-01-07 17:09:36 +01:00
Rémi Gaillard fc67af932f // perf optimization 2013-01-07 14:44:14 +01:00
vAugagneur b83ab4dc4b [-] CORE : fixed bug #PSCFV-4754 field name in image_type was too short 2013-01-07 14:08:08 +01:00
Rémi Gaillard 755349ef95 [-] FO: Fix cookie domain detection for com.co tld #PSCFV-5256 2013-01-07 12:01:11 +01:00
Rémi Gaillard 265bff345b [-] Core: Fix supplier_reference on cart/orders #PSCFV-6082 2013-01-07 11:25:33 +01:00
Vincent Augagneur b59669a7ae Merge pull request #137 from PrestaEdit/patch-4 
[+] Class: Product::getIdByEan13
 2013-01-07 01:38:41 -08:00
Vincent Augagneur 4cc890a05b Merge pull request #147 from raphaelMalie/development 
[-] CORE : Fix Collection->sqlGroupBy()
 2013-01-07 01:18:50 -08:00
Vincent Augagneur 86d00e6103 Merge pull request #152 from Shagshag/patch-4 
[-] _USER_ID_LANG_ doesn't exist anymore
 2013-01-07 01:03:33 -08:00
vAugagneur 7f93fefeae Merge Pull request 154 - thanks to @prestashop-iran 2013-01-07 09:35:36 +01:00
Shagshag 6516c768d9 _USER_ID_LANG_ doesn't exist anymore 2013-01-04 21:34:02 +01:00
Vincent Augagneur 4192e58888 Merge pull request #150 from djfm/development 
//Changed English strings using the translationsenglish module.
 2013-01-04 08:06:15 -08:00
djfm 714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
Rémi Gaillard 3b466c54e3 [-] FO: Fix #PSCFV-6493 root and home category id should be different of 1 and 2 2013-01-04 16:04:15 +01:00
Rémi Gaillard 091459bde6 [-] BO: Fix #PSCFV-6120 display of shipping price on BO order summary detail with freeshipping 2013-01-04 14:51:01 +01:00
Raphaël Malié bdceac5bb2 Fix Collection->sqlGroupBy() 2013-01-04 14:28:49 +01:00
vAugagneur 638bd51980 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-04 11:45:25 +01:00
vAugagneur b725fd2d4a //small refacto 2013-01-04 11:45:17 +01:00
Francois Gaillard 8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
Rémi Gaillard ed97ed5698 [-] Core: Fix #PSCFV-5912 price computation on cart with multiple product without combinations 2013-01-03 16:44:10 +01:00
Rémi Gaillard 5bb2856692 [-] FO: Fix #PSCFV-6159 order way of best sales 2013-01-03 12:08:29 +01:00
PrestaEdit 2a2190e4c9 [+] Class: Product::getIdByEan13 
Sometimes, it's can be good to get the Product ID by EAN13.
 2013-01-02 17:21:04 +01:00
vAugagneur f0f50db926 [-] FO : fixed bug #PSCFV-6411 Friendly URL on prices-drop for page 2 doesn't work 2013-01-02 14:40:35 +01:00
vAugagneur a4eb2cc7a9 //Merge branch release 2013-01-02 09:56:20 +01:00
Damien Metzger 68dbfcbfb0 Merge pull request #127 from PrestaEdit/Patch-#002 
[-] Project: Fix bug when you want to upload (and resize) an image
 2012-12-31 00:51:37 -08:00
PrestaEdit 80f3012345 [-] Project: Fix bug when you want to upload (and resize) an image 2012-12-30 20:14:51 +01:00
Rémi Gaillard 5e367744b6 [*] Core: Log the exceptions in a file #PSCFV-6334 2012-12-28 16:12:28 +01:00
vAugagneur a5568e8196 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-28 10:23:52 +01:00
vAugagneur e8920c859d //added methode to write default content in index.php file && added check in translation pack import 2012-12-28 10:18:14 +01:00
Damien Metzger 7bebdb5eb5 // Fixed deleteDirectory function (is_dir is cached and must not be used, because use the result of scandir) 2012-12-28 09:47:09 +01:00
Damien Metzger 7a8adaec25 [+] BO : you can now choose if a voucher is displayed under the cart in the frontend 2012-12-27 18:04:16 +01:00
Gregory Roussac dbb8a9f2e0 [-] FO : Fix html entities in order messages and threads 2012-12-27 12:23:10 +01:00
Damien Metzger d8a20d51d9 [-] BO : fixed error display for bad queries #PSCFI-6913 2012-12-24 10:32:41 +01:00
Rémi Gaillard b4217046ae [-] Core: the gift wrapping taxes is now handled by tax rules group 2012-12-21 18:01:43 +01:00
Damien Metzger 66dcbed995 [-] Fo : fixed warning in empty categories 2012-12-21 10:55:56 +01:00
Damien Metzger 6970bf57d9 [-] FO : changed behavior of the cart rules when the carrier and the address are not determined yet 2012-12-20 17:13:11 +01:00
Damien Metzger 5c1ac36f27 [-] FO : fixed wrong variable 2012-12-20 17:07:20 +01:00
Damien Metzger caf96db460 [-] BO : fixed warnings on the anti-XSS page 2012-12-20 16:04:01 +01:00
vAugagneur 7646ab35fa //small fix 2012-12-20 15:49:45 +01:00
Rémi Gaillard 1be7a98655 [*] Core: conversion_rate of currencies are now multishop 2012-12-20 11:35:20 +01:00
Rémi Gaillard dec0cf5177 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-18 16:00:12 +01:00
vAugagneur 66f58dfbd9 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-18 16:00:20 +01:00
vAugagneur 9b0dbae730 [-] CORE : fixed bug #PSCFV-5116 Horizontal top menu cache 2012-12-18 16:00:10 +01:00
Rémi Gaillard 85b1127be2 // small change 2012-12-18 15:59:57 +01:00
Rémi Gaillard d431802e7e [-] Core: The emails can now be sent with amazon SES when logo is in png 2012-12-18 15:45:43 +01:00
vAugagneur ef0eb49ba9 [-] CORE : fixed bug #PSCFV-4754 Image sizes are the same for all shops and themes 2012-12-18 14:59:34 +01:00
Damien Metzger 270ae41d15 [-] BO : fixed weight and distance units validation 2012-12-18 14:40:58 +01:00
Damien Metzger a80a5414cc // Grumpf 2012-12-18 14:35:28 +01:00
Damien Metzger d581396b0f // Not enough 2012-12-18 14:34:33 +01:00
Damien Metzger 975310f18b [-] BO : fixed weight and distance units validation 2012-12-18 14:27:11 +01:00
Damien Metzger 4aa5655613 [-] Core : do not die in production mode! #PSCFV-5751 2012-12-18 11:48:50 +01:00