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

3184 Commits

Author SHA1 Message Date
Rémi Gaillard 66f82b119c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-05 15:28:28 +01:00
Rémi Gaillard c80e0f48be [-] BO: Don't display delete icon for order carts 2013-02-05 15:28:09 +01:00
Damien Metzger 49d310fe49 [*] Core : added automatic conversion of ',' into '.' for floating values 2013-02-05 15:02:41 +01:00
vAugagneur df860f1f47 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-05 14:16:58 +01:00
vAugagneur b73ca29b58 //added getWidthSize and getHeightSize method in tpl thanks to @PrestaEdit 2013-02-05 14:16:47 +01:00
Rémi Gaillard b9fec8eb0c // Fix merge bug 2013-02-05 11:02:05 +01:00
vAugagneur 0d9eb664d4 //failed to delete buffer. No buffer to delete in PDF 2013-02-05 10:12:00 +01:00
Vincent Augagneur 288c3e1323 Merge pull request #134 from PrestaEdit/patch-2 
[-] FO: need id_product_attribute to know quantity
 2013-02-05 00:52:50 -08:00
vAugagneur 606b3eedd5 [-] BO : error message on install module 2013-02-05 09:41:34 +01:00
vAugagneur d0d3180509 Merge branch 'dispatch_modules' into development 2013-02-04 18:20:24 +01:00
vAugagneur 947397c69b [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +01:00
Damien Metzger 168ccb2687 Merge pull request #243 from burhanbvk/patch-3 
[-] FO : Fixed a typo for ui.droppable dependencies
 2013-02-04 09:14:20 -08:00
Rémi Gaillard 0caea77c36 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-04 16:05:17 +01:00
Rémi Gaillard 44d26d5804 [-] BO: Fix id_shop for configuration variables in global context for orders 2013-02-04 16:05:01 +01:00
Damien Metzger 2bf3df1c7d [-] Core : Fixed a lot of issue with free shipping vouchers #PSCFV-7325 2013-02-04 16:00:46 +01:00
Damien Metzger 49ecd42395 // Voucher cleaning 2013-02-04 16:00:45 +01:00
Damien Metzger e9a7474bbe [-] FO : fixed voucher display in the customer view #PSCFV-7332 2013-02-04 16:00:45 +01:00
Rémi Gaillard d72ce0d892 [-] BO: get the invoice prefix from the right shop 2013-02-04 15:11:29 +01:00
Rémi Gaillard 8fd63e0f6e // PHP_SELF is only index.php 2013-02-04 14:22:59 +01:00
Damien Metzger 9c3f58b6a2 [-] FO : Fixed voucher value when it exceeds the product total #PSCFV-7421 2013-02-04 11:53:07 +01:00
Damien Metzger 197778c91a [-] FO : fixed customer discounts #PSCFV-7479 2013-02-04 11:53:06 +01:00
Burhan c9a2f61dae [-] Fixed a typo for ui.droppable dependencies 2013-02-03 23:49:19 +02:00
Damien Metzger b6bb0637d6 Merge pull request #151 from Shagshag/patch-2 
[-] Core : Wrong parameters for Memcache::addServer
 2013-02-01 10:04:33 -08:00
Damien Metzger 067e055858 Merge pull request #164 from Shagshag/patch-7 
[-] BO : OrderHistory::changeIdOrderState
 2013-02-01 10:00:10 -08:00
Rémi Gaillard 8507cab98d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-01 18:36:48 +01:00
Rémi Gaillard 418a3ba10d [-] Installer: check create table privileges 2013-02-01 18:36:35 +01:00
Damien Metzger fd74aa2798 [-] Core : cart rule cache cleared on update 2013-02-01 18:30:32 +01:00
gRoussac c0a62be1c5 [-] FO : Fix bug #PSCFI-6864 #PSCFV-6516 Issue with deleted address blocking order process 2013-01-31 19:06:19 +01:00
Rémi Gaillard f9f24aef84 [-] FO: Fix #PSCFV-7530 bad quantity returned displayed on order detail for multiple return 2013-01-31 15:10:52 +01:00
gRoussac cf2bc874ba // forgot debug sorry 2013-01-31 11:50:19 +01:00
gRoussac 92ca63402a [-] BO : Adresses not deduplicate in orders page 2013-01-31 11:33:37 +01:00
gRoussac 836a30b029 // norms 2013-01-30 18:52:52 +01:00
gRoussac 4658b24e4b [-] CORE : FIx #PSCFV-3163 getextendedstats returning new keys 2013-01-30 18:47:30 +01:00
gRoussac 1d06030a66 [-] FO : Fix fatal error when memcache is not installed and using Memcached 2013-01-30 17:08:51 +01:00
gRoussac d74f9c837b [-] BO : Fix bug #PSCFI-6902 fatal error when memcache not installed and Memcached previously activated 2013-01-30 16:28:11 +01:00
Damien Metzger bf9b1de873 // Fixed hook names 2013-01-30 16:03:37 +01:00
Gregory Roussac edd4bb0323 // fix warning 2013-01-30 14:56:54 +01:00
Rémi Gaillard f39d623f27 [-] BO: Fix #PSCFV-7523 htaccess generation for SSL domain 2013-01-30 11:29:59 +01:00
Damien Metzger cf83821c60 [-] Core : prepend/append are now a little more optionnal in the routes for the dispatcher 2013-01-29 15:59:49 +01:00
Rémi Gaillard 3f8e52d3f8 [-] BO: Fix warning when image is uploaded with PHP < 5.3 #PSCFV-7425 2013-01-29 11:53:53 +01:00
Rémi Gaillard a97843353b [-] FO: Fix Product::getProductName for multilang and multishop 2013-01-29 11:40:39 +01:00
Rémi Gaillard 734b227a7f // Tools::simplexml_load_file now use curl if allow_url_fopen is disabled 2013-01-29 10:13:34 +01:00
Rémi Gaillard d920c050b4 // Tools::file_get_contents load with file_get_content for local paths 2013-01-28 19:01:54 +01:00
Rémi Gaillard 2da4ae138e [-] Core: Fix Tools::file_get_contents for post and curl 2013-01-28 18:51:02 +01:00
vAugagneur 178d2dede2 [-] CORE : fixed bug #PSCFV-6238 2013-01-28 18:14:22 +01:00
Gregory Roussac d0b6d8d838 [-] MO : Fix bug #PNM-985 bad zone for carrier listing update 2013-01-28 15:57:07 +01:00
Rémi Gaillard 8a5f5222f1 // Too many bugs on PDO with PHP < 5.2 2013-01-28 14:23:15 +01:00
Vincent Augagneur 1cff484c3d Merge pull request #229 from PrestaEdit/patch-18 
[*] Class Tools: enhance fd method
 2013-01-28 01:29:43 -08:00
Rémi Gaillard 3354db0f64 [-] BO: the attached file of downloadable products duplicated should not be the same than the original #PSCFV-7460 2013-01-25 15:57:54 +01:00
Rémi Gaillard 1629e68c68 [-] BO: Fix SQL request on downloadable product duplication 2013-01-25 15:47:09 +01:00