Commit Graph
18608 Commits
Author SHA1 Message Date
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
PrestaEdit 47d3085a4a [*]WS: POST and XML ressource 2013-03-18 01:03:43 +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
vAugagneur f4537c022f //added _PS_CREATION_DATE_ in rewriteSettingsFile function 2013-03-15 12:04:31 +01:00
vAugagneur 905eca2fd0 //added _PS_CREATION_DATE_ in rewriteSettingsFile function 2013-03-15 12:04:31 +01:00
vAugagneur 16badbd45d //removed moneybookers during install 2013-03-15 12:02:16 +01:00
vAugagneur 24602d3fd1 //removed moneybookers during install 2013-03-15 12:02:16 +01:00
Rémi Gaillard d4d0661ff8 // Clean order_detail_tax table after deleting an order detail #PSCFV-8278 2013-03-15 11:51:19 +01:00
Rémi Gaillard e1bb55dbba // Clean order_detail_tax table after deleting an order detail #PSCFV-8278 2013-03-15 11:51:19 +01:00
Rémi Gaillard 564aafd10d // Clean Language::checkAndAddLanguage() 2013-03-15 11:14:29 +01:00
Rémi Gaillard 8244e15408 // Clean Language::checkAndAddLanguage() 2013-03-15 11:14:29 +01:00
gRoussac f9feec981a // remove warning in multishop 2013-03-14 17:49:07 +01:00
gRoussac 96afbb53cf // remove warning in multishop 2013-03-14 17:49:07 +01:00
François Gaillard 7dc7de6ba7 Merge branch 'release' into development 2013-03-14 17:02:40 +01:00
Francois Gaillard 82d81ed58c Merge branch 'release' into development 2013-03-14 17:02:40 +01:00
François Gaillard 138c225845 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-14 17:01:55 +01:00
Francois Gaillard 3599958b5c Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-14 17:01:55 +01:00
François Gaillard ad7c73348d Revert "[-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler"
This reverts commit da77ce1029.
2013-03-14 17:01:16 +01:00