dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,091 Commits 9 Branches 19 Tags
dca6e39febeb73d7b9faa08cae787a4aba3ea607
Commit Graph
6365 Commits
Author SHA1 Message Date
vAugagneur a54df8e36a Merge Pull request 154 - thanks to @prestashop-iran 2013-01-07 09:35:36 +01:00
vAugagneur 7f93fefeae Merge Pull request 154 - thanks to @prestashop-iran 2013-01-07 09:35:36 +01:00
Shagshag 910c23e5ba _USER_ID_LANG_ doesn't exist anymore 2013-01-04 21:34:02 +01:00
Shagshag 6516c768d9 _USER_ID_LANG_ doesn't exist anymore 2013-01-04 21:34:02 +01:00
Shagshag 692b47c8fe Update classes/cache/CacheMemcache.php 2013-01-04 17:07:36 +01:00
Shagshag 6824518b74 Update classes/cache/CacheMemcache.php 2013-01-04 17:07:36 +01:00
Vincent Augagneur 1f9a3109b9 Merge pull request #150 from djfm/development 
//Changed English strings using the translationsenglish module.
 2013-01-04 08:06:15 -08: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 385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
djfm 714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
Rémi Gaillard 9c5f416f5e [-] 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 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 3fbd7dc55c [-] BO: Fix #PSCFV-6120 display of shipping price on BO order summary detail with freeshipping 2013-01-04 14:51:01 +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é 4696c57390 Fix Collection->sqlGroupBy() 2013-01-04 14:28:49 +01:00
Raphaël Malié bdceac5bb2 Fix Collection->sqlGroupBy() 2013-01-04 14:28:49 +01:00
vAugagneur 20fa64b05b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-04 11:45:25 +01:00
vAugagneur 638bd51980 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-04 11:45:25 +01:00
vAugagneur 6a07626114 //small refacto 2013-01-04 11:45:17 +01:00
vAugagneur b725fd2d4a //small refacto 2013-01-04 11:45:17 +01:00
François Gaillard 064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Francois Gaillard 8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
Rémi Gaillard 6c1c3402bc [-] Core: Fix #PSCFV-5912 price computation on cart with multiple product without combinations 2013-01-03 16:44:10 +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 b10b53028f [-] FO: Fix #PSCFV-6159 order way of best sales 2013-01-03 12:08:29 +01:00
Rémi Gaillard 5bb2856692 [-] FO: Fix #PSCFV-6159 order way of best sales 2013-01-03 12:08:29 +01:00
PrestaEdit 62703ee39b [+] Class: Product::getIdByEan13 
Sometimes, it's can be good to get the Product ID by EAN13.
 2013-01-02 17:21:04 +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 b9e688a4bf [-] 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 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
PrestaEdit b3479877bc [-] FO: need id_product_attribute to know quantity 2013-01-02 11:04:57 +01:00
PrestaEdit 1c24fe85c1 [-] FO: need id_product_attribute to know quantity 2013-01-02 11:04:57 +01:00
vAugagneur 2e90e12293 //Merge branch release 2013-01-02 09:56:20 +01:00
vAugagneur a4eb2cc7a9 //Merge branch release 2013-01-02 09:56:20 +01:00
Damien Metzger 6a67264325 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
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 353fa14078 [-] Project: Fix bug when you want to upload (and resize) an image 2012-12-30 20:14:51 +01: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 a788394a4a [*] Core: Log the exceptions in a file #PSCFV-6334 2012-12-28 16:12:28 +01:00
Rémi Gaillard 5e367744b6 [*] Core: Log the exceptions in a file #PSCFV-6334 2012-12-28 16:12:28 +01:00
vAugagneur d10bf0620a Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-28 10:23:52 +01:00
vAugagneur a5568e8196 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-28 10:23:52 +01:00
vAugagneur aae9aa82c4 //added methode to write default content in index.php file && added check in translation pack import 2012-12-28 10:18:14 +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 1dde9b6f2a // 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 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 c4d8bff01c [+] BO : you can now choose if a voucher is displayed under the cart in the frontend 2012-12-27 18:04:16 +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 3e9e765a5a [-] FO : Fix html entities in order messages and threads 2012-12-27 12:23:10 +01:00
Gregory Roussac dbb8a9f2e0 [-] FO : Fix html entities in order messages and threads 2012-12-27 12:23:10 +01:00