dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,570 Commits 9 Branches 19 Tags
94de4d3d2f35403b5de1c10a4a02503f11ca1c2b
Commit Graph

17570 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vincent Augagneur 01b04d4035 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
PrestaEdit 4e51871e0c [-] 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
Jonathan Danse 19198aec81 [-] 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 b59669a7ae 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
Vincent Augagneur baf579bf91 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
vAugagneur f13a14de0e //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
Vincent Augagneur 106d00a938 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
marcinsz101 30274ce92d [*] 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
Vincent Augagneur 4cc890a05b 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
vAugagneur 7a942164b7 //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
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 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
gRoussac 93fb44104a // Sorry correct \t for norms 2013-01-04 17:32:21 +01:00
gRoussac a3194257c8 // Sorry correct \t for norms 2013-01-04 17:32:21 +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
Gregory Roussac ae117c2457 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-04 16:32:45 +01:00
Gregory Roussac adb95f7693 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
gRoussac 34f98b0987 [-] 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 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 d7694b5900 [*] BO: Improve form of catalog price rules #PSCFV-6099 2013-01-04 15:50:13 +01:00
Rémi Gaillard e7d5985d41 [*] 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 cb818d1ece [-] 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
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
marcinsz101 9bd5e530b6 [*] FO : Possibility of hook blocknewsletter in footer 2013-01-04 12:35:14 +01:00
marcinsz101 93ce66df70 [*] FO : Possibility of hook blocknewsletter in footer 2013-01-04 12:35:14 +01:00