Commit Graph

8017 Commits

Author SHA1 Message Date
vAugagneur cbb87e4bbc //clean duplicate css in BO 2013-01-14 17:44:34 +01:00
vAugagneur 451383e4c0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-14 14:24:14 +01:00
vAugagneur 61371b5b4c //BO more compliant with 1024x768 2013-01-14 14:24:05 +01:00
Rémi Gaillard c2261cc7fc // fix php warning 2013-01-14 14:12:14 +01:00
Rémi Gaillard f496b844db Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-14 12:08:26 +01:00
Rémi Gaillard 76a12eb369 [-] BO: Fix #PSCFV-5930 #PSCFV-5939 the filters are handled as the same between tabs which can cause sql errors 2013-01-14 12:08:12 +01:00
sLorenzini 6659bdceca [-] FO: improvement shopping cart voucher 2013-01-14 11:25:50 +01:00
Rémi Gaillard f516409fc0 // small fix for smarty pre-compile 2013-01-14 11:05:42 +01:00
vAugagneur 60260c4757 [-] CORE : fixed bug #PSCFV-6555 - Custom theme not working properly with image size 2013-01-14 10:38:41 +01:00
Rémi Gaillard 2c855558cd [*] Installer: pre-compile the smarty templates to improve the loading time of first connection 2013-01-11 18:13:28 +01:00
sLorenzini 52a6a67f74 [-] FO: fixed bug CSS 2013-01-10 17:23:32 +01:00
sLorenzini 6ca6a83412 [-] FO: fixed Css issue in BO - #PSCFV-6408 2013-01-10 17:18:17 +01:00
Rémi Gaillard 2b9f64b790 [-] FO: Fix add to cart for product packs with no quantity and out of stock allowed #PSCFV-4788 2013-01-10 11:30:41 +01:00
vAugagneur 74774be65e [-] FO : fixed bug #PSCFV-5569 - Trying to get property of non-object in SitemapController 2013-01-10 09:31:46 +01:00
Vincent Augagneur 195c2c48f8 [-] FO : fixed bug #PSCFV-6529 2013-01-09 23:18:09 +01:00
vAugagneur 796b02bb68 [-] BO : fixed bug #PSCFV-6536 indefined index in toolbar.tpl 2013-01-09 23:03:20 +01:00
Rémi Gaillard c740199e4f [-] BO: Disallow advanced stock management if the product become a pa 2013-01-09 19:09:49 +01:00
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 97626fc251 // 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 06b339fab0 [-] 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 882b20bd81 [-] 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 6632b1674d [-] 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
gRoussac 3e5289c812 [-] 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 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
Rémi Gaillard 4a8c138a2c // 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
vAugagneur 66974a05e0 [-] 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 26055c26e7 //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 68e5a6746a 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
Rémi Gaillard 2dac490089 // 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
Rémi Gaillard 32d10acf79 // 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
Gregory Roussac 778302980b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-08 11:46:31 +01:00
gRoussac d7f4a578a8 [-] FO : fix PSCFV-5934 bad redirection from https to http for CMS 2013-01-08 11:45:41 +01:00
Rémi Gaillard 49104743e8 [*] MO: Add smarty cache on editorial module 2013-01-08 10:39:44 +01:00
Rémi Gaillard 8ede60847b [*] MO: Add smarty cache on blocksocial 2013-01-08 10:34:57 +01:00
Rémi Gaillard b4752de972 [*] MO: Add smarty cache on blocksearch 2013-01-08 10:32:09 +01:00
Rémi Gaillard 553d449a38 [*] MO: Add smarty cache on blockcustomerprivacy 2013-01-08 10:23:01 +01:00
gRoussac 7349259ec5 [-] FO : Bad checkbox behavior in FF in OPC 2013-01-08 10:04:30 +01:00
Gregory Roussac b5ff070f8b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-08 09:53:12 +01:00
gRoussac d74d8398e3 [-] FO : Countries in invoice address in OPC 2013-01-08 09:52:08 +01:00