Commit Graph

18638 Commits

Author SHA1 Message Date
Rémi Gaillard
16906d8590 [-] Core: fix redirection loop for bugged versions of mysql using column name aliases on order by 2013-04-19 15:48:18 +02:00
Rémi Gaillard
c96b4ca248 [-] Core: fix redirection loop for bugged versions of mysql using column name aliases on order by 2013-04-19 15:48:18 +02:00
Rémi Gaillard
cc3f9212ac // fix display of accessories for products without combinations 2013-04-19 15:15:25 +02:00
Rémi Gaillard
9c1bf63ab9 // fix display of accessories for products without combinations 2013-04-19 15:15:25 +02:00
Rémi Gaillard
236675544b Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-04-19 15:14:51 +02:00
Rémi Gaillard
ba7f9620c3 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-04-19 15:14:51 +02:00
vAugagneur
22135487ab //new addons url in install process 2013-04-19 11:44:29 +02:00
vAugagneur
2cde30c118 //new addons url in install process 2013-04-19 11:44:29 +02:00
vAugagneur
da4c87d9ba [-] CORE : fixed bug #PSCFV-8787 - URL Rewriting remove accent 2013-04-19 11:07:59 +02:00
vAugagneur
ce44e9a95c [-] CORE : fixed bug #PSCFV-8787 - URL Rewriting remove accent 2013-04-19 11:07:59 +02:00
gRoussac
f93c7ec8c7 [-] BO : Fix bug #PSCFV-8843, no closing span in category-filter helper 2013-04-19 10:34:20 +02:00
gRoussac
6e1f99f4b2 [-] BO : Fix bug #PSCFV-8843, no closing span in category-filter helper 2013-04-19 10:34:20 +02:00
Damien Metzger
54b75b9818 // Fixed potential warning 2013-04-18 17:12:59 -03:00
Damien Metzger
17536ff682 // Fixed potential warning 2013-04-18 17:12:59 -03:00
Damien Metzger
65c1198480 // Changed link to documentation in the installer 2013-04-18 16:57:05 -03:00
Damien Metzger
c4ae13af75 // Changed link to documentation in the installer 2013-04-18 16:57:05 -03:00
Damien Metzger
29c0761645 // Removed useless message 2013-04-18 16:53:27 -03:00
Damien Metzger
bfbc46cf51 // Removed useless message 2013-04-18 16:53:27 -03:00
Damien Metzger
b1000d63b9 // Fixed truncate / escape order 2013-04-18 16:39:33 -03:00
Damien Metzger
550ee435e8 // Fixed truncate / escape order 2013-04-18 16:39:33 -03:00
gRoussac
62836d65ab [-] Fo : Remove additionnal space in phone field value 2013-04-18 19:43:04 +02:00
gRoussac
b840b6bd2b [-] Fo : Remove additionnal space in phone field value 2013-04-18 19:43:04 +02:00
gRoussac
e2905ca845 [-] FO : fix bug #PSCFV-8684, phone not required in guest checkout when not set in BO 2013-04-18 19:12:07 +02:00
gRoussac
65a73c7d4b [-] FO : fix bug #PSCFV-8684, phone not required in guest checkout when not set in BO 2013-04-18 19:12:07 +02:00
François Gaillard
b6d9c89b99 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 18:23:18 +02:00
Francois Gaillard
8251e98323 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 18:23:18 +02:00
gRoussac
1a8ab7f68c [-] BO : Can not set PS_ORDER_OUT_OF_STOCK in one shop 2013-04-18 17:28:16 +02:00
gRoussac
dcb46e7867 [-] BO : Can not set PS_ORDER_OUT_OF_STOCK in one shop 2013-04-18 17:28:16 +02:00
Rémi Gaillard
38bdd421f7 // performance improve for ObjectModel::displayFieldName #PSCFV-8713 2013-04-18 17:12:05 +02:00
Rémi Gaillard
103513bf28 // performance improve for ObjectModel::displayFieldName #PSCFV-8713 2013-04-18 17:12:05 +02:00
vAugagneur
803447b88d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 17:02:51 +02:00
vAugagneur
ea0203f43f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 17:02:51 +02:00
vAugagneur
828ffb74ad [-] FO - fixed bug #PSCFV-8826 sort now work fine on bestsale controller 2013-04-18 17:02:45 +02:00
vAugagneur
75d395c84a [-] FO - fixed bug #PSCFV-8826 sort now work fine on bestsale controller 2013-04-18 17:02:45 +02:00
gRoussac
e22fe455b3 [-] CORE : Fix bug #PSCFV-8636 again, cart rule with a reduction and free shipping 2013-04-18 16:44:55 +02:00
gRoussac
2a3789d48b [-] CORE : Fix bug #PSCFV-8636 again, cart rule with a reduction and free shipping 2013-04-18 16:44:55 +02:00
vAugagneur
e9b8af0e97 [-] BO - fixed bug #PSCFV-8614 2013-04-18 15:14:37 +02:00
vAugagneur
b52c71c7ad [-] BO - fixed bug #PSCFV-8614 2013-04-18 15:14:37 +02:00
Rémi Gaillard
53cc380a6a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 14:59:02 +02:00
Rémi Gaillard
45fdb3f79d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 14:59:02 +02:00
Rémi Gaillard
986d57148f //AdminModulesController::extractArchive() now return something 2013-04-18 14:58:43 +02:00
Rémi Gaillard
a7be6b14e8 //AdminModulesController::extractArchive() now return something 2013-04-18 14:58:43 +02:00
gRoussac
ccfa343b0d [-] BO : Bad gender image when no gender 2013-04-18 14:54:12 +02:00
gRoussac
0a8eddf7d6 [-] BO : Bad gender image when no gender 2013-04-18 14:54:12 +02:00
Rémi Gaillard
ab700a6285 [-] FO: send current product to some hook like displayProductTabContent on product page #PSCFV-8825 2013-04-18 14:24:50 +02:00
Rémi Gaillard
f24022311e [-] FO: send current product to some hook like displayProductTabContent on product page #PSCFV-8825 2013-04-18 14:24:50 +02:00
Rémi Gaillard
158ab771b6 [-] BO: Fix #PSCFV-8827 fixed price of specific price rules should be a float 2013-04-18 14:21:44 +02:00
Rémi Gaillard
f7a1fdb9e0 [-] BO: Fix #PSCFV-8827 fixed price of specific price rules should be a float 2013-04-18 14:21:44 +02:00
Rémi Gaillard
5edfd03068 // don't try to clear smarty cache if smarty is not defined 2013-04-18 14:06:49 +02:00
Rémi Gaillard
e7b344adab // don't try to clear smarty cache if smarty is not defined 2013-04-18 14:06:49 +02:00