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

3087 Commits

Author SHA1 Message Date
Rémi Gaillard c2261cc7fc // fix php warning 2013-01-14 14:12:14 +01:00
Rémi Gaillard 76a12eb369 [-] BO: Fix #PSCFV-5930 #PSCFV-5939 the filters are handled as the same between tabs which can cause sql errors 2013-01-14 12:08:12 +01:00
Rémi Gaillard f516409fc0 // small fix for smarty pre-compile 2013-01-14 11:05:42 +01:00
vAugagneur 60260c4757 [-] CORE : fixed bug #PSCFV-6555 - Custom theme not working properly with image size 2013-01-14 10:38:41 +01:00
Rémi Gaillard 2b9f64b790 [-] FO: Fix add to cart for product packs with no quantity and out of stock allowed #PSCFV-4788 2013-01-10 11:30:41 +01:00
Rémi Gaillard 97626fc251 // small typo fix 2013-01-09 18:27:42 +01:00
gRoussac 882b20bd81 [-] FO : Do not suggest states that are not active 2013-01-09 17:05:33 +01:00
vAugagneur d76123db2f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-09 17:00:48 +01:00
vAugagneur 6632b1674d [-] CORE : fixed bug #PSCFV-5433 - Order confirmation email doesn't report customization 2013-01-09 17:00:41 +01:00
gRoussac 3e5289c812 [-] FO : Fix #PSCFV-5905 Fatal error: "no default carrier" 2013-01-09 15:55:48 +01:00
Rémi Gaillard 4a8c138a2c // small perf optimization 2013-01-09 14:35:06 +01:00
Rémi Gaillard db162ee987 // performances improvement 2013-01-09 14:16:22 +01:00
vAugagneur 66974a05e0 [-] BO : fixed bug #PSCFV-4961 - Strange behavior when reordering categories 2013-01-09 13:44:19 +01:00
Rémi Gaillard 2dac490089 // small fix 2013-01-09 10:28:28 +01:00
vAugagneur 857b8c2009 [-] CORE : fixed bug #PSCFV-4523 - Static _PS_DEFAULT_CUSTOMER_GROUP_ is still use in code even if deprecated 1.5.0.1 2013-01-09 10:26:16 +01:00
gRoussac d7f4a578a8 [-] FO : fix PSCFV-5934 bad redirection from https to http for CMS 2013-01-08 11:45:41 +01:00
Rémi Gaillard cd89916a20 [*] MO: Add smarty cache on some modules 2013-01-07 17:09:36 +01:00
Rémi Gaillard 963af9ca30 // perf optimization 2013-01-07 14:44:14 +01:00
vAugagneur a0a5aa929d [-] CORE : fixed bug #PSCFV-4754 field name in image_type was too short 2013-01-07 14:08:08 +01:00
Rémi Gaillard ef331654f2 [-] FO: Fix cookie domain detection for com.co tld #PSCFV-5256 2013-01-07 12:01:11 +01:00
Rémi Gaillard c0b1f0e793 [-] Core: Fix supplier_reference on cart/orders #PSCFV-6082 2013-01-07 11:25:33 +01:00
Vincent Augagneur eb3fca6abc Merge pull request #137 from PrestaEdit/patch-4 
[+] Class: Product::getIdByEan13
 2013-01-07 01:38:41 -08:00
Vincent Augagneur 88154e55a4 Merge pull request #147 from raphaelMalie/development 
[-] CORE : Fix Collection->sqlGroupBy()
 2013-01-07 01:18:50 -08:00
Vincent Augagneur 6dfd94677a Merge pull request #152 from Shagshag/patch-4 
[-] _USER_ID_LANG_ doesn't exist anymore
 2013-01-07 01:03:33 -08:00
vAugagneur a54df8e36a 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
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
djfm 385c593129 //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 3fbd7dc55c [-] 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
vAugagneur 20fa64b05b 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
François Gaillard 064ba453e6 // 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 b10b53028f [-] 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
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 2e90e12293 //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
PrestaEdit 353fa14078 [-] 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
vAugagneur d10bf0620a 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
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 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
Gregory Roussac 3e9e765a5a [-] FO : Fix html entities in order messages and threads 2012-12-27 12:23:10 +01:00
Damien Metzger 4836fe224a [-] BO : fixed error display for bad queries #PSCFI-6913 2012-12-24 10:32:41 +01:00
Rémi Gaillard 41ca79cc77 [-] Core: the gift wrapping taxes is now handled by tax rules group 2012-12-21 18:01:43 +01:00
Damien Metzger 0e961a9ed1 [-] Fo : fixed warning in empty categories 2012-12-21 10:55:56 +01:00