Commit Graph

17570 Commits

Author SHA1 Message Date
François Gaillard 97c5c0d0c7 [*] Mobile : OPC, display carrier price, gift wrapping price and gift products 2013-03-19 10:01:07 +01:00
Francois Gaillard cd60e6785e [*] Mobile : OPC, display carrier price, gift wrapping price and gift products 2013-03-19 10:01:07 +01:00
François Gaillard fddbfa6032 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-19 09:47:46 +01:00
Francois Gaillard 3cd5de42b0 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-19 09:47:46 +01:00
François Gaillard a7f4f82fc0 // Debug removed from shopping cart 2013-03-19 09:47:39 +01:00
Francois Gaillard fef6c04f32 // Debug removed from shopping cart 2013-03-19 09:47:39 +01:00
Damien Metzger ce4148b89a [-] BO : added important check of the default language for ObjectModel multilang properties 2013-03-18 17:48:37 +01:00
Damien Metzger bf171af16a [-] BO : added important check of the default language for ObjectModel multilang properties 2013-03-18 17:48:37 +01:00
DrÿSs' 6a278d405d [-] FO: CMS link to conditions should not be in SSL 2013-03-18 17:07:41 +01:00
DrÿSs b4b90669d0 [-] FO: CMS link to conditions should not be in SSL 2013-03-18 17:07:41 +01:00
DrÿSs' 29cc8fc782 [-] FO: CMS link to conditions should not be in SSL 2013-03-18 17:05:22 +01:00
DrÿSs 52f76312f0 [-] FO: CMS link to conditions should not be in SSL 2013-03-18 17:05:22 +01:00
vAugagneur e9c618e55b //small fix when click on install button on tab module list 2013-03-18 15:27:56 +01:00
vAugagneur 5b2465e9bb //small fix when click on install button on tab module list 2013-03-18 15:27:56 +01:00
vAugagneur 734c5a7c8f [-] BO : fixed bug #PSCFV-8285 - module tab listing permission 2013-03-18 14:54:04 +01:00
vAugagneur 7bcc1ff651 [-] BO : fixed bug #PSCFV-8285 - module tab listing permission 2013-03-18 14:54:04 +01:00
Damien Metzger e549207b8d // Small fix 2013-03-18 11:49:45 +01:00
Damien Metzger d346307c97 // Small fix 2013-03-18 11:49:45 +01:00
Damien Metzger a0f97f5425 // Clean code 2013-03-18 11:08:57 +01:00
Damien Metzger 83b6c3bbab // Clean code 2013-03-18 11:08:57 +01:00
Rémi Gaillard f6674417cb [-] Core: Fix #PSCFV-8293 bad sql vars name on Order::getShipping() #PSCFV-8293 2013-03-18 11:05:06 +01:00
Rémi Gaillard f483feb53d [-] Core: Fix #PSCFV-8293 bad sql vars name on Order::getShipping() #PSCFV-8293 2013-03-18 11:05:06 +01:00
François Gaillard 016ae80514 // Version number updated 2013-03-18 10:47:50 +01:00
Francois Gaillard bd1cc77cf1 // Version number updated 2013-03-18 10:47:50 +01:00
François Gaillard e5e6e8c29c [*] Mobile : Shopping cart displays gifts 2013-03-15 17:24:00 +01:00
Francois Gaillard 97490b5e7b [*] Mobile : Shopping cart displays gifts 2013-03-15 17:24:00 +01:00
Gregory Roussac 4c704c97c4 Merge pull request #325 from DrySs/patch-3
[-] BO: fixed member "customer_id" to "id_customer" for address import in AdminImport
2013-03-15 17:12:02 +01:00
Gregory Roussac 2dfe1826e9 Merge pull request #325 from DrySs/patch-3
[-] BO: fixed member "customer_id" to "id_customer" for address import in AdminImport
2013-03-15 17:12:02 +01:00
Gregory Roussac f032670f33 Merge pull request #325 from DrySs/patch-3
[-] BO: fixed member "customer_id" to "id_customer" for address import in AdminImport
2013-03-15 09:08:30 -07:00
Gregory Roussac 9c8fca3a41 Merge pull request #325 from DrySs/patch-3
[-] BO: fixed member "customer_id" to "id_customer" for address import in AdminImport
2013-03-15 09:08:30 -07:00
DrÿSs' 70bb7de9b5 [-] BO: fixed member "customer_id" to "id_customer" for address import in AdminImport 2013-03-15 16:51:55 +01:00
DrÿSs a87a31125f [-] BO: fixed member "customer_id" to "id_customer" for address import in AdminImport 2013-03-15 16:51:55 +01:00
Rémi Gaillard 85c77105f6 // Remove unnecessary fsockopen 2013-03-15 16:25:19 +01:00
Rémi Gaillard 0f2551f5d6 // Remove unnecessary fsockopen 2013-03-15 16:25:19 +01:00
Rémi Gaillard 74533ab801 // Fix product multishop association when the product is created before the shop 2013-03-15 15:23:18 +01:00
Rémi Gaillard f17f9c9bee // Fix product multishop association when the product is created before the shop 2013-03-15 15:23:18 +01:00
François Gaillard e015d9d25e [-] Mobile : Bug fix : Combinations, radio buttons without select 2013-03-15 15:00:49 +01:00
Francois Gaillard 001cf9a5bd [-] Mobile : Bug fix : Combinations, radio buttons without select 2013-03-15 15:00:49 +01:00
gRoussac 71819afa0b Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-15 14:38:07 +01:00
gRoussac ea804bb79d Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-15 14:38:07 +01:00
gRoussac 182f8cdbaa [-] BO : Fix live edit link 2013-03-15 14:36:59 +01:00
gRoussac 9aada9f24b [-] BO : Fix live edit link 2013-03-15 14:36:59 +01:00
Rémi Gaillard 27ef057564 [*] WS: Add contact entity 2013-03-15 14:36:26 +01:00
Rémi Gaillard e3ea401fe0 [*] WS: Add contact entity 2013-03-15 14:36:26 +01:00
gRoussac 4f32fe810e [-] FO : remove 404 images in Live Edit 2013-03-15 14:23:12 +01:00
gRoussac fe02aceddf [-] FO : remove 404 images in Live Edit 2013-03-15 14:23:12 +01:00
Rémi Gaillard 0e7ded19c1 // same on admintabs 2013-03-15 12:11:47 +01:00
Rémi Gaillard 85b0a24fdb // same on admintabs 2013-03-15 12:11:47 +01:00
Rémi Gaillard 868926f24a // delete multishop toolbar on adminstatuses 2013-03-15 12:07:53 +01:00
Rémi Gaillard 4c0a7ca161 // delete multishop toolbar on adminstatuses 2013-03-15 12:07:53 +01:00