Commit Graph

8405 Commits

Author SHA1 Message Date
DrÿSs 75e5eab23e [*] BO: add a save and stay button in CMS edit page
This button was missing to edit easily CMS pages.
2013-02-22 15:47:50 +01:00
Rémi Gaillard 4d83665ca1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-22 14:17:06 +01:00
Damien Metzger 6782ad3264 Merge pull request #282 from DrySs/patch-1
[-] Core: ProductSale no more takes products with no visibility
2013-02-22 05:16:53 -08:00
Rémi Gaillard 0a716e03c5 // some changes on admin customer view 2013-02-22 14:16:49 +01:00
DrÿSs ed5266d64b [-] Core: ProductSale no more takes products with no visibility
Fixed bug that's ProductSale is taking products with no visibility, displaying them in module blockbestsellers. But as they have no visibility, we don't want to display them!
2013-02-22 14:12:24 +01:00
Francois Gaillard eab9204c84 // URL rewrite encoding fixed 2013-02-22 11:19:00 +01:00
Rémi Gaillard b6584c4432 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-22 10:47:14 +01:00
Rémi Gaillard 0a8abd087a [-] BO: Fix PHP notice on ob_clean if no buffer to delete 2013-02-22 10:47:00 +01:00
Rémi Gaillard d400059472 // Fix fixtures installer 2013-02-22 10:43:54 +01:00
Francois Gaillard 86215b6cd8 // Order confirmation rewrite rule added 2013-02-22 10:14:47 +01:00
Damien Metzger 0e3f3ed462 [*] Core : added the possibility to disable the emails (i.e. for test purpose) 2013-02-21 17:12:04 +01:00
Rémi Gaillard eb80b65eab [-] MO: html was broken on statsdata configuration 2013-02-21 17:07:24 +01:00
Damien Metzger ba954ac1c4 // Changed CMS list behavior (edit instead of front office view) 2013-02-21 16:51:22 +01:00
Damien Metzger a8c0a119ea [-] FO : cut long referrers in order to avoid a crash #PSCFV-7775 2013-02-21 16:19:10 +01:00
Damien Metzger 75bb9cf3c0 [-] FO : display total voucher without taxes when the customer group does not display taxes #PSCFV-7746 2013-02-21 16:11:26 +01:00
Damien Metzger 43e52b69ac [-] BO : automatic conversion of , into . in cart rules #PSCFV-7430 2013-02-21 15:40:24 +01:00
Rémi Gaillard b6db160c47 // small fix 2013-02-21 15:24:33 +01:00
Damien Metzger eeb0f504d4 [-] MO : fixed voucher currency in referral program #PSCFV-5950 2013-02-21 12:20:32 +01:00
Damien Metzger 574819bb69 [-] FO : fixed guest saving #PSCFV-6150 2013-02-21 12:10:28 +01:00
Damien Metzger fe419acc18 [*] Installer : mbstring check added (optionnal) #PSCFV-6489 2013-02-21 12:01:32 +01:00
Damien Metzger 5059d825f8 // Unit changed for product pictures, I set it up to a usable minimum #PSCFV-6597 2013-02-21 11:52:42 +01:00
Damien Metzger 16abd9b407 [-] BO : fixed payment distribution #PSCFV-7398 2013-02-21 11:30:13 +01:00
Damien Metzger aa4f94e189 // Missing files for new installer 2013-02-21 11:24:37 +01:00
Damien Metzger 669757f388 [-] MO : you should be able to empty values in homeslider #PSCFV-7407 2013-02-21 11:05:48 +01:00
Damien Metzger f4bf4c47a9 [*] Installer : installer improvements - Step 1 2013-02-21 11:05:47 +01:00
Francois Gaillard eaa45dfb03 // order-opc.php default permissions updated 2013-02-20 17:58:03 +01:00
Rémi Gaillard b77cfcdaef // images.inc.php don't need to be called anymore 2013-02-20 17:54:12 +01:00
Rémi Gaillard a3de006c5a [-] BO: Fix #PSCFV-7838 deleted taxes should not appears on the listing 2013-02-20 17:34:32 +01:00
Rémi Gaillard c70f080fb2 // small fix 2013-02-20 16:24:51 +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 c594b885e9 // Update default class_index 2013-02-20 15:58:02 +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 7deb751ce9 // small fix 2013-02-20 15:28:54 +01:00
Francois Gaillard 978a4e05fa [-] AdminTab header updated 2013-02-20 15:24:58 +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 30e1ef8cc1 [-] CORE : do not verify ssl certificate when using CURL 2013-02-20 14:26:16 +01:00
sLorenzini 755573184c [-] BO: improve payment module page on IE 2013-02-20 11:35:50 +01:00
sLorenzini ae9b78dc0f [-] BO: improve module payment page 2013-02-20 11:08:20 +01:00
sLorenzini 4ce88468df [-] BO: improve payment module page + header 2013-02-20 10:00:18 +01:00
Rémi Gaillard 3eeca3537a // fix 2 links in admincustomers view 2013-02-19 16:38:52 +01:00
Rémi Gaillard e152366d49 // small changes 2013-02-19 15:02:09 +01:00
Rémi Gaillard 9b85cb1f76 // delete useless commented code 2013-02-19 14:45:25 +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 6a89fc4b0f [-] CORE : Fix too big query for lastNoneOrderedCart 2013-02-18 17:44:09 +01:00
Damien Metzger 690d880cb7 [-] FO : Fixed regexp for images embbed in description 2013-02-18 16:17:05 +01:00
Damien Metzger ad55093abb // Fixed fatal error 2013-02-18 16:17:05 +01:00
Damien Metzger 27fced430f // Added information 2013-02-18 16:17:04 +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 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 9b7c16ab9d [-] Core: Change cache key name of objectmodel now using classname against table name #PSCFV-7795 2013-02-18 10:56:00 +01:00