Commit Graph

8017 Commits

Author SHA1 Message Date
vAugagneur ffbc326454 //clean duplicate css in BO 2013-01-14 17:44:34 +01:00
vAugagneur 7e8192280b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-14 14:24:14 +01:00
vAugagneur 7e4897034d //BO more compliant with 1024x768 2013-01-14 14:24:05 +01:00
Rémi Gaillard 5cecff7251 // fix php warning 2013-01-14 14:12:14 +01:00
Rémi Gaillard 968d6b4cfd Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-14 12:08:26 +01:00
Rémi Gaillard ef904c9083 [-] 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 3f4bf5f559 [-] FO: improvement shopping cart voucher 2013-01-14 11:25:50 +01:00
Rémi Gaillard 556955a7f0 // small fix for smarty pre-compile 2013-01-14 11:05:42 +01:00
vAugagneur 4dad9522e5 [-] CORE : fixed bug #PSCFV-6555 - Custom theme not working properly with image size 2013-01-14 10:38:41 +01:00
Rémi Gaillard 3f4f5f5df0 [*] Installer: pre-compile the smarty templates to improve the loading time of first connection 2013-01-11 18:13:28 +01:00
sLorenzini 542d3aa1da [-] FO: fixed bug CSS 2013-01-10 17:23:32 +01:00
sLorenzini c2a1e1f150 [-] FO: fixed Css issue in BO - #PSCFV-6408 2013-01-10 17:18:17 +01:00
Rémi Gaillard 90b3c7c467 [-] 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 6e3c743948 [-] FO : fixed bug #PSCFV-5569 - Trying to get property of non-object in SitemapController 2013-01-10 09:31:46 +01:00
Vincent Augagneur 2fad90640d [-] FO : fixed bug #PSCFV-6529 2013-01-09 23:18:09 +01:00
vAugagneur d72a5d4d94 [-] BO : fixed bug #PSCFV-6536 indefined index in toolbar.tpl 2013-01-09 23:03:20 +01:00
Rémi Gaillard c0d35d6d28 [-] BO: Disallow advanced stock management if the product become a pa 2013-01-09 19:09:49 +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 1956accc32 // small typo fix 2013-01-09 18:27:42 +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 84b6222de1 [-] FO : Fix backslashes for smartyTranslate and js=1 2013-01-09 18:20:25 +01:00
gRoussac 6abb99552e [-] FO : Bad html entities for alert of order-address.js 2013-01-09 17:09:15 +01:00
gRoussac b672b3281e [-] FO : Do not suggest states that are not active 2013-01-09 17:05:33 +01:00
vAugagneur f768081aa0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-09 17:00:48 +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 554dd4aba4 // Fix PHP warning 2013-01-09 16:55:28 +01:00
gRoussac 425a108aab [-] FO : Fix #PSCFV-5905 Fatal error: "no default carrier" 2013-01-09 15:55:48 +01:00
vAugagneur 1eefd74994 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-09 15:47:03 +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 c46521883c // small perf optimization 2013-01-09 14:35:06 +01:00
Rémi Gaillard c855621e17 // performances improvement 2013-01-09 14:16:22 +01:00
vAugagneur 108dfb292c [-] BO : fixed bug #PSCFV-4961 - Strange behavior when reordering categories 2013-01-09 13:44:19 +01:00
vAugagneur 39e4dc96d4 //small fix part 2 2013-01-09 12:06:00 +01:00
vAugagneur 107295e570 //small fix 2013-01-09 11:58:48 +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 b3e54c78b8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-09 10:34:08 +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 d52c1c4516 // small fix 2013-01-09 10:28:28 +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 9edb5e8911 // initialize also the link in config.inc.php for retrocompatibility 2013-01-08 15:52:31 +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 30e4b19b34 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-08 11:46:31 +01:00
gRoussac 6ecd23a743 [-] FO : fix PSCFV-5934 bad redirection from https to http for CMS 2013-01-08 11:45:41 +01:00
Rémi Gaillard d18eec1c14 [*] MO: Add smarty cache on editorial module 2013-01-08 10:39:44 +01:00
Rémi Gaillard a45811590d [*] MO: Add smarty cache on blocksocial 2013-01-08 10:34:57 +01:00
Rémi Gaillard 6c99b48ebf [*] MO: Add smarty cache on blocksearch 2013-01-08 10:32:09 +01:00
Rémi Gaillard e138fd239e [*] MO: Add smarty cache on blockcustomerprivacy 2013-01-08 10:23:01 +01:00
gRoussac 609abe4656 [-] FO : Bad checkbox behavior in FF in OPC 2013-01-08 10:04:30 +01:00
Gregory Roussac 3e5e5baa8c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-08 09:53:12 +01:00
gRoussac d6dbaf1113 [-] FO : Countries in invoice address in OPC 2013-01-08 09:52:08 +01:00