Commit Graph

17570 Commits

Author SHA1 Message Date
Rémi Gaillard b3175fed08 // Fix sql query 2013-03-27 10:40:40 +01:00
Rémi Gaillard 47aa02bdb9 // Fix sql query 2013-03-27 10:40:40 +01:00
François Gaillard 22fe9f9d01 Merge branch 'release' into development 2013-03-27 10:29:58 +01:00
Francois Gaillard fbcbfdb663 Merge branch 'release' into development 2013-03-27 10:29:58 +01:00
vAugagneur 6f0968b324 //CHANGELOG version 1.5.4.0 2013-03-27 10:28:13 +01:00
vAugagneur dd2b460d48 //CHANGELOG version 1.5.4.0 2013-03-27 10:28:13 +01:00
François Gaillard 8bc725f4b6 // Release branch merged 2013-03-27 10:25:16 +01:00
Francois Gaillard 77871338c6 // Release branch merged 2013-03-27 10:25:16 +01:00
gRoussac 98306be83f // admin folder name 2013-03-26 19:15:37 +01:00
gRoussac 033daeb7ff // admin folder name 2013-03-26 19:15:37 +01:00
gRoussac 135bd2cd42 [-] BO : Remove warning at login template 2013-03-26 18:58:03 +01:00
gRoussac e11f0e7ce9 [-] BO : Remove warning at login template 2013-03-26 18:58:03 +01:00
Rémi Gaillard b8ecaa8528 // Fix installer in russian 2013-03-26 18:50:37 +01:00
Rémi Gaillard a505f8063e // Fix installer in russian 2013-03-26 18:50:37 +01:00
Rémi Gaillard 6b1293b569 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-26 18:23:33 +01:00
Rémi Gaillard d2db198e4e Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-26 18:23:33 +01:00
Rémi Gaillard fcdc9db624 // Also clear language cache in AdminTranslationsController 2013-03-26 18:23:17 +01:00
Rémi Gaillard db1a2fccf9 // Also clear language cache in AdminTranslationsController 2013-03-26 18:23:17 +01:00
gRoussac 07789c8815 // remove warning 2013-03-26 18:10:32 +01:00
gRoussac 9f56750b43 // remove warning 2013-03-26 18:10:32 +01:00
gRoussac ddb2bf1602 //bad commit for Auth controller sorry about this 2013-03-26 18:05:54 +01:00
gRoussac 80d2b1aba3 //bad commit for Auth controller sorry about this 2013-03-26 18:05:54 +01:00
gRoussac af61d866a7 [-] FO : Fix bug #PSCFV-8415 zipcode is required without zip code format too 2013-03-26 18:05:39 +01:00
gRoussac c49c267532 [-] FO : Fix bug #PSCFV-8415 zipcode is required without zip code format too 2013-03-26 18:05:39 +01:00
gRoussac fdbceb7db0 //bad commit for Auth controller sorry about this 2013-03-26 16:36:51 +01:00
gRoussac ac76ccfa40 //bad commit for Auth controller sorry about this 2013-03-26 16:36:51 +01:00
Rémi Gaillard eda7758ab6 [-] Core: clean Language:: after adding a new lang 2013-03-26 16:06:50 +01:00
Rémi Gaillard a5f5ebb1d8 [-] Core: clean Language:: after adding a new lang 2013-03-26 16:06:50 +01:00
gRoussac c9c9454ca5 [-] FO : Fix bug #PSCFV-8415 zipcode is required without zip code format too 2013-03-26 15:53:51 +01:00
gRoussac abca3de81e [-] FO : Fix bug #PSCFV-8415 zipcode is required without zip code format too 2013-03-26 15:53:51 +01:00
Rémi Gaillard d5b41ba686 // Update default translations packs 2013-03-26 15:32:15 +01:00
Rémi Gaillard 8b10427883 // Update default translations packs 2013-03-26 15:32:15 +01:00
gRoussac 0e51b31acf // ooops, parse error sorry 2013-03-26 12:02:59 +01:00
gRoussac a99dc0646d // ooops, parse error sorry 2013-03-26 12:02:59 +01:00
gRoussac 53b0e11292 [-] MO : Fix bug #PSCFV-7800, lang fields definition in Retrocompatibility definition, thankx to Olea 2013-03-26 11:51:50 +01:00
gRoussac c2adae114d [-] MO : Fix bug #PSCFV-7800, lang fields definition in Retrocompatibility definition, thankx to Olea 2013-03-26 11:51:50 +01:00
Rémi Gaillard 1fd9fd1bfc [-] BO: it is now possible to change the default customer/guest/visitor group per shop 2013-03-26 11:45:23 +01:00
Rémi Gaillard 09e5037ebd [-] BO: it is now possible to change the default customer/guest/visitor group per shop 2013-03-26 11:45:23 +01:00
vAugagneur 70bc9b7f6e //fixed bug when install module from specific tab 2013-03-26 11:21:50 +01:00
vAugagneur 98b186a8c6 //fixed bug when install module from specific tab 2013-03-26 11:21:50 +01:00
Rémi Gaillard 6b4738c7ef // fix for price computation with combination in product page FO 2013-03-26 11:04:07 +01:00
Rémi Gaillard d90902b569 // fix for price computation with combination in product page FO 2013-03-26 11:04:07 +01:00
vAugagneur 016cdc1685 //fix install bug when no internet connection 2013-03-26 10:46:44 +01:00
vAugagneur a07a3204ea //fix install bug when no internet connection 2013-03-26 10:46:44 +01:00
gRoussac 65ef8c7053 [-] INSTALLER : Last fix of bug #PSCFV-8168 loyalty ADD id_shop to layered_product_attribute 2013-03-26 10:36:23 +01:00
gRoussac 3edab0eb3e [-] INSTALLER : Last fix of bug #PSCFV-8168 loyalty ADD id_shop to layered_product_attribute 2013-03-26 10:36:23 +01:00
Vincent Augagneur e1f3f163bc Merge pull request #348 from djfm/installer
[-] Installer : do not fail on warning when addons modules list empty
2013-03-26 02:00:35 -07:00
Vincent Augagneur 869e3ad2af Merge pull request #348 from djfm/installer
[-] Installer : do not fail on warning when addons modules list empty
2013-03-26 02:00:35 -07:00
gRoussac 0211e83413 [-] INSTALLER : Second fix of bug #PSCFV-8168 loyalty CHANGE id_discount to id_cart_rule 2013-03-26 09:57:05 +01:00
gRoussac f4663165b7 [-] INSTALLER : Second fix of bug #PSCFV-8168 loyalty CHANGE id_discount to id_cart_rule 2013-03-26 09:57:05 +01:00