Commit Graph

18638 Commits

Author SHA1 Message Date
DrySs 48c996f8c0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-22 20:01:45 +01:00
DrySs d6baffa4d6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-22 20:01:45 +01:00
DrySs 00e889f711 [-] BO: fixed lots of UI bugs in CMS:
- no more id_category (doesn't exists, it's id_cms_category)
- change category position now redirects in parent category (not at root category)
- change category status now redirects in parent category (not at root category)
- delete multiples category now redirects in parent category (not at root category)
- add form new category now auto select parent category (not root category)
- add a new category now redirects in parent category (not at root category)
- delete multiple categories now redirects in parent category (not at root category)
- now execute parent::postProcess() only if none action found (duplicate postProcess was done)
- now redirects to CMS form if found errors (not at root category)
- fixed unexists $object variable (was $cms) for saveAndStay
- delete multiple cms content now redirects in parent category (not at root category)
- change cms content position now redirects in parent category (not at root category)
- change cms content status now redirects in parent category (not at root category)
2013-02-22 19:59:46 +01:00
DrySs efa3c8838a [-] BO: fixed lots of UI bugs in CMS:
- no more id_category (doesn't exists, it's id_cms_category)
- change category position now redirects in parent category (not at root category)
- change category status now redirects in parent category (not at root category)
- delete multiples category now redirects in parent category (not at root category)
- add form new category now auto select parent category (not root category)
- add a new category now redirects in parent category (not at root category)
- delete multiple categories now redirects in parent category (not at root category)
- now execute parent::postProcess() only if none action found (duplicate postProcess was done)
- now redirects to CMS form if found errors (not at root category)
- fixed unexists $object variable (was $cms) for saveAndStay
- delete multiple cms content now redirects in parent category (not at root category)
- change cms content position now redirects in parent category (not at root category)
- change cms content status now redirects in parent category (not at root category)
2013-02-22 19:59:46 +01:00
Rémi Gaillard a6d2b42a1a [-] Installer: Fix 2 path for the upgrader 2013-02-22 17:25:35 +01:00
Rémi Gaillard bde0215fbb [-] Installer: Fix 2 path for the upgrader 2013-02-22 17:25:35 +01:00
Gregory Roussac 392dfb199c Merge pull request #283 from DrySs/patch-2
[*] BO: add a save and stay button in CMS edit page
2013-02-22 06:58:31 -08:00
Gregory Roussac 5f7e9510e9 Merge pull request #283 from DrySs/patch-2
[*] BO: add a save and stay button in CMS edit page
2013-02-22 06:58:31 -08:00
DrÿSs' 0263e3b28d [*] 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
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 f015d37682 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-22 14:17:06 +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 f6e6cab13e 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
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 0e38d44a21 // some changes on admin customer view 2013-02-22 14:16:49 +01:00
Rémi Gaillard 0a716e03c5 // some changes on admin customer view 2013-02-22 14:16:49 +01:00
DrÿSs' 25675b8d38 [-] 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
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
François Gaillard 6b501dc409 // URL rewrite encoding fixed 2013-02-22 11:19:00 +01:00
Francois Gaillard eab9204c84 // URL rewrite encoding fixed 2013-02-22 11:19:00 +01:00
Rémi Gaillard f88d8fa354 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-22 10:47:14 +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 8653618711 [-] BO: Fix PHP notice on ob_clean if no buffer to delete 2013-02-22 10:47:00 +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 f024f14cb7 // Fix fixtures installer 2013-02-22 10:43:54 +01:00
Rémi Gaillard d400059472 // Fix fixtures installer 2013-02-22 10:43:54 +01:00
François Gaillard 23695a516c // Order confirmation rewrite rule added 2013-02-22 10:14:47 +01:00
Francois Gaillard 86215b6cd8 // Order confirmation rewrite rule added 2013-02-22 10:14:47 +01:00
Damien Metzger 6e569f9f83 [*] Core : added the possibility to disable the emails (i.e. for test purpose) 2013-02-21 17:12:04 +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 2d2e88be9e [-] MO: html was broken on statsdata configuration 2013-02-21 17:07:24 +01:00
Rémi Gaillard eb80b65eab [-] MO: html was broken on statsdata configuration 2013-02-21 17:07:24 +01:00
Damien Metzger 54843a3e21 // Changed CMS list behavior (edit instead of front office view) 2013-02-21 16:51:22 +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 60671ab46b [-] FO : cut long referrers in order to avoid a crash #PSCFV-7775 2013-02-21 16:19:10 +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 e9cacdcfd4 [-] 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 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 2ac8f92880 [-] BO : automatic conversion of , into . in cart rules #PSCFV-7430 2013-02-21 15:40:24 +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 3d456b8c08 // small fix 2013-02-21 15:24:33 +01:00
Rémi Gaillard b6db160c47 // small fix 2013-02-21 15:24:33 +01:00
Damien Metzger d9c5be55b1 [-] MO : fixed voucher currency in referral program #PSCFV-5950 2013-02-21 12:20:32 +01:00
Damien Metzger eeb0f504d4 [-] MO : fixed voucher currency in referral program #PSCFV-5950 2013-02-21 12:20:32 +01:00
Damien Metzger 1ac6681178 [-] FO : fixed guest saving #PSCFV-6150 2013-02-21 12:10:28 +01:00
Damien Metzger 574819bb69 [-] FO : fixed guest saving #PSCFV-6150 2013-02-21 12:10:28 +01:00
Damien Metzger 84f10e908a [*] Installer : mbstring check added (optionnal) #PSCFV-6489 2013-02-21 12:01:32 +01:00
Damien Metzger fe419acc18 [*] Installer : mbstring check added (optionnal) #PSCFV-6489 2013-02-21 12:01:32 +01:00
Damien Metzger dc027cb3cf // 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 5059d825f8 // Unit changed for product pictures, I set it up to a usable minimum #PSCFV-6597 2013-02-21 11:52:42 +01:00