Commit Graph

17570 Commits

Author SHA1 Message Date
Rémi Gaillard a933346af9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-09 19:09:09 +01:00
Rémi Gaillard ada8d3e28a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-09 19:09:09 +01:00
Rémi Gaillard 97626fc251 // small typo fix 2013-01-09 18:27:42 +01:00
Rémi Gaillard 1956accc32 // small typo fix 2013-01-09 18:27:42 +01:00
gRoussac 015037c65f [-] FO : fix #PSCFV-6165 cart update when inactive country in old address 2013-01-09 18:23:40 +01:00
gRoussac ffa3be6e89 [-] FO : fix #PSCFV-6165 cart update when inactive country in old address 2013-01-09 18:23:40 +01:00
gRoussac 06b339fab0 [-] FO : Fix backslashes for smartyTranslate and js=1 2013-01-09 18:20:25 +01:00
gRoussac 84b6222de1 [-] FO : Fix backslashes for smartyTranslate and js=1 2013-01-09 18:20:25 +01:00
gRoussac 9771af9e28 [-] FO : Bad html entities for alert of order-address.js 2013-01-09 17:09:15 +01:00
gRoussac 6abb99552e [-] FO : Bad html entities for alert of order-address.js 2013-01-09 17:09:15 +01:00
gRoussac 882b20bd81 [-] FO : Do not suggest states that are not active 2013-01-09 17:05:33 +01:00
gRoussac b672b3281e [-] FO : Do not suggest states that are not active 2013-01-09 17:05:33 +01:00
vAugagneur d76123db2f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-09 17:00:48 +01:00
vAugagneur f768081aa0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-09 17:00:48 +01:00
vAugagneur 6632b1674d [-] CORE : fixed bug #PSCFV-5433 - Order confirmation email doesn't report customization 2013-01-09 17:00:41 +01:00
vAugagneur 6629542a22 [-] CORE : fixed bug #PSCFV-5433 - Order confirmation email doesn't report customization 2013-01-09 17:00:41 +01:00
Rémi Gaillard 3d6b3d2cb0 // Fix PHP warning 2013-01-09 16:55:28 +01:00
Rémi Gaillard 554dd4aba4 // Fix PHP warning 2013-01-09 16:55:28 +01:00
gRoussac 3e5289c812 [-] FO : Fix #PSCFV-5905 Fatal error: "no default carrier" 2013-01-09 15:55:48 +01:00
gRoussac 425a108aab [-] FO : Fix #PSCFV-5905 Fatal error: "no default carrier" 2013-01-09 15:55:48 +01:00
vAugagneur 735c934702 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-09 15:47:03 +01:00
vAugagneur 1eefd74994 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-09 15:47:03 +01:00
vAugagneur 5e2a2a0781 [-] FO : fixed bug #PSCFV-5312 - Error Uncaught TypeError: Cannot read property top of null in ajax-cart.js when Cart Block is not on product page 2013-01-09 15:46:50 +01:00
vAugagneur 05b4e197b4 [-] FO : fixed bug #PSCFV-5312 - Error Uncaught TypeError: Cannot read property top of null in ajax-cart.js when Cart Block is not on product page 2013-01-09 15:46:50 +01:00
Rémi Gaillard 4a8c138a2c // small perf optimization 2013-01-09 14:35:06 +01:00
Rémi Gaillard c46521883c // small perf optimization 2013-01-09 14:35:06 +01:00
Rémi Gaillard db162ee987 // performances improvement 2013-01-09 14:16:22 +01:00
Rémi Gaillard c855621e17 // performances improvement 2013-01-09 14:16:22 +01:00
vAugagneur 66974a05e0 [-] BO : fixed bug #PSCFV-4961 - Strange behavior when reordering categories 2013-01-09 13:44:19 +01:00
vAugagneur 108dfb292c [-] BO : fixed bug #PSCFV-4961 - Strange behavior when reordering categories 2013-01-09 13:44:19 +01:00
vAugagneur b64098f3f2 //small fix part 2 2013-01-09 12:06:00 +01:00
vAugagneur 39e4dc96d4 //small fix part 2 2013-01-09 12:06:00 +01:00
vAugagneur 26055c26e7 //small fix 2013-01-09 11:58:48 +01:00
vAugagneur 107295e570 //small fix 2013-01-09 11:58:48 +01:00
vAugagneur 58100276a6 [-] BO : fixed bug #PSCFV-4668 - added check if module folder is writable before upgrade it 2013-01-09 11:37:02 +01:00
vAugagneur e9726f2463 [-] BO : fixed bug #PSCFV-4668 - added check if module folder is writable before upgrade it 2013-01-09 11:37:02 +01:00
vAugagneur 68e5a6746a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-09 10:34:08 +01:00
vAugagneur b3e54c78b8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-09 10:34:08 +01:00
vAugagneur bb558446e8 [-] BO : bad initialization of context due to miss define of _PS_ADMIN_DIR_ in displayImage.php 2013-01-09 10:33:57 +01:00
vAugagneur 5480cb4691 [-] BO : bad initialization of context due to miss define of _PS_ADMIN_DIR_ in displayImage.php 2013-01-09 10:33:57 +01:00
Rémi Gaillard 2dac490089 // small fix 2013-01-09 10:28:28 +01:00
Rémi Gaillard d52c1c4516 // small fix 2013-01-09 10:28:28 +01:00
vAugagneur 857b8c2009 [-] CORE : fixed bug #PSCFV-4523 - Static _PS_DEFAULT_CUSTOMER_GROUP_ is still use in code even if deprecated 1.5.0.1 2013-01-09 10:26:16 +01:00
vAugagneur 9154984c78 [-] CORE : fixed bug #PSCFV-4523 - Static _PS_DEFAULT_CUSTOMER_GROUP_ is still use in code even if deprecated 1.5.0.1 2013-01-09 10:26:16 +01:00
Rémi Gaillard 32d10acf79 // initialize also the link in config.inc.php for retrocompatibility 2013-01-08 15:52:31 +01:00
Rémi Gaillard 9edb5e8911 // initialize also the link in config.inc.php for retrocompatibility 2013-01-08 15:52:31 +01:00
gRoussac a05f1db4bd [*] FO : Fix #PSCFV-6122 for better adresses aliasing in shopping-cart 2013-01-08 15:39:11 +01:00
gRoussac 7dffb963ba [*] FO : Fix #PSCFV-6122 for better adresses aliasing in shopping-cart 2013-01-08 15:39:11 +01:00
Gregory Roussac 778302980b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-08 11:46:31 +01:00
Gregory Roussac 30e4b19b34 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-08 11:46:31 +01:00