dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,844 Commits 9 Branches 19 Tags
f296f4e642d52d38113b485cd520d4b069946082
Commit Graph
7844 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
vAugagneur f296f4e642 //small fix in upgrade 2012-12-28 16:08:21 +01:00
vAugagneur d10bf0620a Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-28 10:23:52 +01:00
vAugagneur ef46d41800 //Merge controllers/admin/AdminTranslationsController.php 2012-12-28 10:23:37 +01:00
vAugagneur aae9aa82c4 //added methode to write default content in index.php file && added check in translation pack import 2012-12-28 10:18:14 +01:00
Damien Metzger 1dde9b6f2a // Fixed deleteDirectory function (is_dir is cached and must not be used, because use the result of scandir) 2012-12-28 09:47:09 +01:00
vAugagneur a35469768f //added translation 2012-12-28 09:27:12 +01:00
vAugagneur d4ba087158 //added check in translation pack import 2012-12-28 09:19:54 +01:00
Damien Metzger 434c0c43a9 // Clean covers in multishop 2012-12-28 09:17:16 +01:00
Damien Metzger c4d8bff01c [+] BO : you can now choose if a voucher is displayed under the cart in the frontend 2012-12-27 18:04:16 +01:00
Damien Metzger 070a4b013b [-] FO : vouchers created in the backend order creation are not displayed in the frontend anymore 2012-12-27 17:44:24 +01:00
Damien Metzger ebdb6fc74e [-] BO : better error management for translation packs 2012-12-26 18:19:36 +01:00
Damien Metzger e4c38f73f5 // Added a sandbox in order to check files before doing anything with them 2012-12-26 15:52:21 +01:00
Damien Metzger 8d1a66c0c1 // Small fixes, same module 2012-12-26 14:42:58 +01:00
Damien Metzger ba2099a161 [-] MO : statsbestvouchers small fix (but great difference) 2012-12-26 14:35:27 +01:00
Damien Metzger 532583b3ab [-] FO : fixed usage of "&" in the order messages added by the customers 2012-12-26 12:50:34 +01:00
Damien Metzger d0487a95ca [-] MO : fixed bad path in productcomments 2012-12-26 12:04:57 +01:00
Damien Metzger 404f366748 [-] MO : fixed bad character in the statsbestvouchers module 2012-12-26 12:01:08 +01:00
Damien Metzger d02d595e84 [-] BO : fixed translations on templates 2012-12-26 11:56:36 +01:00
Damien Metzger e442785fe7 [-] MO : fixed bugs on RSS modules 2012-12-26 11:32:59 +01:00
Damien Metzger a17dc139ce [-] BO : fixed image settings form #PSCFV-5458 2012-12-26 10:07:56 +01:00
Rémi Gaillard 41ca79cc77 [-] Core: the gift wrapping taxes is now handled by tax rules group 2012-12-21 18:01:43 +01:00
Damien Metzger 0e961a9ed1 [-] Fo : fixed warning in empty categories 2012-12-21 10:55:56 +01:00
Damien Metzger 0312d520e6 [-] FO : fixed wrong variable 2012-12-20 17:07:20 +01:00
Damien Metzger fb4777d536 [-] BO : fixed warnings on the anti-XSS page 2012-12-20 16:04:01 +01:00
vAugagneur 6ff4fe73d7 //small fix 2012-12-20 15:49:45 +01:00
Rémi Gaillard 2a14176055 [*] Core: conversion_rate of currencies are now multishop 2012-12-20 11:35:20 +01:00
François Gaillard e87d0f9337 [-] FO : Mobile, data-ajax added on vouchers form 2012-12-18 17:48:29 +01:00
François Gaillard 02dd4b1d62 [-] FO : Mobile, bug fix (JS page reload on OPC) 2012-12-18 17:48:17 +01:00
vAugagneur b390a51333 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-18 16:14:26 +01:00
vAugagneur f07b96f3d8 [-] FO : fixed bug #PSCFV-4878 - When disable show prices for default group don't show product accessories 2012-12-18 16:14:22 +01:00
vAugagneur 13425aff53 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-18 16:00:20 +01:00
Rémi Gaillard 49c3a3ab29 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-18 16:00:12 +01:00
vAugagneur a91fafe05a [-] CORE : fixed bug #PSCFV-5116 Horizontal top menu cache 2012-12-18 16:00:10 +01:00
Rémi Gaillard ee4534a548 // small change 2012-12-18 15:59:57 +01:00
Rémi Gaillard 26d95d1ea4 [-] Core: The emails can now be sent with amazon SES when logo is in png 2012-12-18 15:45:43 +01:00
vAugagneur 17350c6149 [-] CORE : fixed bug #PSCFV-4754 Image sizes are the same for all shops and themes 2012-12-18 14:59:34 +01:00
Damien Metzger c138e2dc5b [-] BO : fixed weight and distance units validation 2012-12-18 14:40:58 +01:00
vAugagneur 06345eab9a Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-17 18:05:25 +01:00
vAugagneur a7ad0d9b30 revert modif on product.js 2012-12-17 18:05:22 +01:00
Damien Metzger c705d1eb4b [-] FO : fixed multishipping crash when too many products and addresses 2012-12-17 16:27:47 +01:00
Rémi Gaillard c9ef2c44ae [-] FO: Fix cache product features #PSCFV-6138 2012-12-17 15:52:52 +01:00
Damien Metzger a0f51e20c2 [-] BO : fixed image upload (except with OVH firewall) #PSCFV-6152 #PSCFV-6157 #PSCFV-5862 #PSCFV-5756 #PSCFV-6074 #PSCFV-5459 2012-12-17 15:49:40 +01:00
vAugagneur 4785acb7f9 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-17 15:26:00 +01:00
vAugagneur 20b87785e3 [-] FO : fixed loop redirect when pagination have 0 product 2012-12-17 15:25:56 +01:00
Rémi Gaillard 35013b82fe [-] BO: Fix #PSCFV-6172 don't htmlentities the cart rule name && increase size of name order_cart_rule field 2012-12-17 14:42:24 +01:00
Rémi Gaillard 4320f4c30c [-] Core: Fix #PSCFV-6162 - can't add no tax for specific zip code or state 2012-12-17 12:29:29 +01:00
vAugagneur 9f474669e6 //small fix in admin modules 2012-12-17 09:58:33 +01:00
vAugagneur 1176a0eeb0 //display import button only on listing 2012-12-17 09:55:31 +01:00
vAugagneur c841ddfcf5 [-] BO : fixed bug #PSCFV-5408 - Affect a new zone button for selected states in States doesn't work correctly 2012-12-14 16:12:25 +01:00
Damien Metzger c13c378418 [-] BO : fixed duplicate code management on cart rules #PSCFV-6119 2012-12-14 09:48:16 +01:00