Commit Graph

17570 Commits

Author SHA1 Message Date
Rémi Gaillard 3fd12ef9bd [-] Installer: fix UNIQUE key on stock_available table #PSCFV-7886 2013-02-20 16:12:39 +01:00
Rémi Gaillard 9c293a992e [-] Installer: fix UNIQUE key on stock_available table #PSCFV-7886 2013-02-20 16:12:39 +01:00
Damien Metzger 9f2c5e5100 // Update default class_index 2013-02-20 15:58:02 +01:00
Damien Metzger c594b885e9 // Update default class_index 2013-02-20 15:58:02 +01:00
Rémi Gaillard dfa1804dfb Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-20 15:29:21 +01:00
Rémi Gaillard 34850fd89d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-20 15:29:21 +01:00
Rémi Gaillard 95c090ccec // small fix 2013-02-20 15:28:54 +01:00
Rémi Gaillard 7deb751ce9 // small fix 2013-02-20 15:28:54 +01:00
François Gaillard a236224da0 [-] AdminTab header updated 2013-02-20 15:24:58 +01:00
Francois Gaillard 978a4e05fa [-] AdminTab header updated 2013-02-20 15:24:58 +01:00
Gregory Roussac ba3a9de6df Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-20 14:27:05 +01:00
Gregory Roussac e389d1dd70 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-20 14:27:05 +01:00
gRoussac 477b0f8b1c [-] CORE : do not verify ssl certificate when using CURL 2013-02-20 14:26:16 +01:00
gRoussac 30e1ef8cc1 [-] CORE : do not verify ssl certificate when using CURL 2013-02-20 14:26:16 +01:00
sLorenzini 3f22df2cfb [-] BO: improve payment module page on IE 2013-02-20 11:35:50 +01:00
sLorenzini 755573184c [-] BO: improve payment module page on IE 2013-02-20 11:35:50 +01:00
sLorenzini 602c11079d [-] BO: improve module payment page 2013-02-20 11:08:20 +01:00
sLorenzini ae9b78dc0f [-] BO: improve module payment page 2013-02-20 11:08:20 +01:00
sLorenzini 110afe7b69 [-] BO: improve payment module page + header 2013-02-20 10:00:18 +01:00
sLorenzini 4ce88468df [-] BO: improve payment module page + header 2013-02-20 10:00:18 +01:00
Rémi Gaillard 702679a3a0 // fix 2 links in admincustomers view 2013-02-19 16:38:52 +01:00
Rémi Gaillard 3eeca3537a // fix 2 links in admincustomers view 2013-02-19 16:38:52 +01:00
Rémi Gaillard 7e6728b342 // small changes 2013-02-19 15:02:09 +01:00
Rémi Gaillard e152366d49 // small changes 2013-02-19 15:02:09 +01:00
Rémi Gaillard 23733e0158 // delete useless commented code 2013-02-19 14:45:25 +01:00
Rémi Gaillard 9b85cb1f76 // delete useless commented code 2013-02-19 14:45:25 +01:00
Rémi Gaillard 379381a5aa [-] FO: Fix display specific prices for combinations in product page #PSCFV-7807 2013-02-18 20:30:53 +01:00
Rémi Gaillard 51c6e2384f [-] FO: Fix display specific prices for combinations in product page #PSCFV-7807 2013-02-18 20:30:53 +01:00
gRoussac 3b4978af36 [-] CORE : Fix too big query for lastNoneOrderedCart 2013-02-18 17:44:09 +01:00
gRoussac 6a89fc4b0f [-] CORE : Fix too big query for lastNoneOrderedCart 2013-02-18 17:44:09 +01:00
Damien Metzger 28e8653e9c [-] FO : Fixed regexp for images embbed in description 2013-02-18 16:17:05 +01:00
Damien Metzger 690d880cb7 [-] FO : Fixed regexp for images embbed in description 2013-02-18 16:17:05 +01:00
Damien Metzger d811f74d6c // Fixed fatal error 2013-02-18 16:17:05 +01:00
Damien Metzger ad55093abb // Fixed fatal error 2013-02-18 16:17:05 +01:00
Damien Metzger 4479aa7c41 // Added information 2013-02-18 16:17:04 +01:00
Damien Metzger 27fced430f // Added information 2013-02-18 16:17:04 +01:00
Rémi Gaillard 7c26ea32e7 [-] BO: Fix #PSCFV-7851 - shop logo and name should depend of the order shop and from the context 2013-02-18 15:43:37 +01:00
Rémi Gaillard dd6a93d6f2 [-] BO: Fix #PSCFV-7851 - shop logo and name should depend of the order shop and from the context 2013-02-18 15:43:37 +01:00
Rémi Gaillard 08f5a01bd8 [-] BO: Fix #PSCFV-7646 JS error when adding a product existing in an other shop 2013-02-18 15:29:48 +01:00
Rémi Gaillard 96b86a79f3 [-] BO: Fix #PSCFV-7646 JS error when adding a product existing in an other shop 2013-02-18 15:29:48 +01:00
Rémi Gaillard 8ab6c87df0 [-] Core: Change cache key name of objectmodel now using classname against table name #PSCFV-7795 2013-02-18 10:56:00 +01:00
Rémi Gaillard 9b7c16ab9d [-] Core: Change cache key name of objectmodel now using classname against table name #PSCFV-7795 2013-02-18 10:56:00 +01:00
Rémi Gaillard f593ec5b8a [-] MO: regenerate the class_index after adding a new override 2013-02-15 18:41:06 +01:00
Rémi Gaillard c3dfe57036 [-] MO: regenerate the class_index after adding a new override 2013-02-15 18:41:06 +01:00
Rémi Gaillard 0cd1033527 // Delete empty override files - use IO/s for nothing 2013-02-15 18:04:52 +01:00
Rémi Gaillard b23a7fe061 // Delete empty override files - use IO/s for nothing 2013-02-15 18:04:52 +01:00
Rémi Gaillard d46868020f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-15 17:26:06 +01:00
Rémi Gaillard 319ccf4e9e Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-15 17:26:06 +01:00
Rémi Gaillard 4da97fe62e [-] BO: Fix #PSCFV-7730 update the multishop fields in adminproducts on default shop if context is all and if product is not associated to all shops 2013-02-15 17:25:53 +01:00
Rémi Gaillard 804f88ec23 [-] BO: Fix #PSCFV-7730 update the multishop fields in adminproducts on default shop if context is all and if product is not associated to all shops 2013-02-15 17:25:53 +01:00