Commit Graph

7960 Commits

Author SHA1 Message Date
gRoussac 4b104f2358 [-] FO : Fix Exception when invoice address is empty in OPC 2013-01-07 18:02:01 +01:00
Gregory Roussac 1f7ab4f172 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-07 16:56:04 +01:00
gRoussac 6a7795a92f [-] FO : Fix #PSCFV-5544 same alias is no more rejected in OPC 2013-01-07 16:54:42 +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
vAugagneur 1df0aadb63 [-] FO : small fix in front office pagination thanks to @phproberto 2013-01-07 11:41:41 +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 e11ad812a0 Merge pull request #158 from PrestaEdit/patch-7
[-] MO: coding standard
2013-01-07 02:25:50 -08:00
Vincent Augagneur 9be771e9d5 Merge pull request #156 from PrestaEdit/patch-5
[*] MO: choose the number of products...
2013-01-07 02:23:45 -08:00
PrestaEdit 33971c4068 [-] MO: coding standard 2013-01-07 11:20:14 +01:00
Jonathan Danse b08e3a43ff [-] MO: coding standard 2013-01-07 11:11:28 +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 0ccd102de2 Merge pull request #146 from marcinsz101/development
[*] FO : Possibility of hook blocknewsletter in footer
2013-01-07 01:34:30 -08:00
vAugagneur 83823773a8 //added SET NAMES 'utf8'; in upgrade 2013-01-07 10:31:56 +01:00
Vincent Augagneur ea33576204 Merge pull request #141 from PrestaEdit/patch-6
[-] FO: name of the supplier page fixed #PSCFV-5571
2013-01-07 01:30:27 -08:00
marcinsz101 2e815f1bd4 [*] FO : Possibility of hook blocknewsletter in footer
I'm added hook footer to blocknewsletter, it is great to theme developers
2013-01-07 10:23:48 +01:00
Vincent Augagneur 88154e55a4 Merge pull request #147 from raphaelMalie/development
[-] CORE : Fix Collection->sqlGroupBy()
2013-01-07 01:18:50 -08:00
vAugagneur 9615de5dca //merge pull request 2013-01-07 10:15:47 +01: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
gRoussac 93fb44104a // Sorry correct \t for norms 2013-01-04 17:32:21 +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
Gregory Roussac ae117c2457 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-04 16:32:45 +01:00
gRoussac 51517e14a3 [-] FO : Fix #PSCFV-4885 for DNI field, states and postcode display 2013-01-04 16:31:05 +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 d7694b5900 [*] BO: Improve form of catalog price rules #PSCFV-6099 2013-01-04 15:50:13 +01:00
Rémi Gaillard 507309ddf5 [-] BO: Fix #PSCFV-6386 recyclable should be init to 0 on BO orders 2013-01-04 15:06:07 +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
marcinsz101 9bd5e530b6 [*] FO : Possibility of hook blocknewsletter in footer 2013-01-04 12:35:14 +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
Gregory Roussac b08444cccd Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-03 18:43:14 +01:00
root ce24ce6d1b [-] FO : Fix #PSCFV-6307 correct invoice address in OPC 2013-01-03 18:35:01 +01:00
Rémi Gaillard b9b5e7e998 [-] BO: override the compile check to true for smarty in the BackOffice 2013-01-03 17:49:04 +01:00
Rémi Gaillard 6d7986dae0 [-] MO: Fix blockviewd for non identified customers #PSCFV-6042 2013-01-03 17:25:56 +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
Gregory Roussac 9513a9e599 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-03 15:20:08 +01:00
gRoussac 5c80535287 [-] FO : Fix again #PSCFV-6209 #PSCFV-5686 no required phone 2013-01-03 15:19:04 +01:00
vAugagneur cc32366077 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-03 15:18:06 +01:00
vAugagneur 8d7196daf3 [-] BO : fixed import images 2013-01-03 15:18:00 +01:00
Rémi Gaillard b10b53028f [-] FO: Fix #PSCFV-6159 order way of best sales 2013-01-03 12:08:29 +01:00
PrestaEdit c4804b5cd0 [-] FO: name of the supplier page fixed #PSCFV-5571
You do it right in 5219457 , but if you already have a old version, it's no change...
2013-01-03 02:54:32 -08:00
Rémi Gaillard df405abfe9 [-] BO: Fix #PSCFV-6118 display of product image for git on BackOffice orders 2013-01-03 11:38:39 +01:00
Gregory Roussac 742c84bee8 // forgot delete 2013-01-03 11:11:16 +01:00
Gregory Roussac 4a26358517 [*] Installer : Lower memory for update_order_messages.php 2013-01-03 10:44:11 +01:00