dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,814 Commits 9 Branches 19 Tags
dec0cf5177ab63ff5c1dd4fa898b6b99ffb4eef3
Commit Graph

3022 Commits

Author SHA1 Message Date
Rémi Gaillard dec0cf5177 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-18 16:00:12 +01:00
vAugagneur 66f58dfbd9 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-18 16:00:20 +01:00
vAugagneur 9b0dbae730 [-] CORE : fixed bug #PSCFV-5116 Horizontal top menu cache 2012-12-18 16:00:10 +01:00
Rémi Gaillard 85b1127be2 // small change 2012-12-18 15:59:57 +01:00
Rémi Gaillard d431802e7e [-] Core: The emails can now be sent with amazon SES when logo is in png 2012-12-18 15:45:43 +01:00
vAugagneur ef0eb49ba9 [-] 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 270ae41d15 [-] BO : fixed weight and distance units validation 2012-12-18 14:40:58 +01:00
Rémi Gaillard 5b7069f0bf [-] FO: Fix cache product features #PSCFV-6138 2012-12-17 15:52:52 +01:00
Damien Metzger ffa72b0b93 [-] 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 1c181b7c20 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-17 15:26:00 +01:00
vAugagneur e472ff7239 [-] FO : fixed loop redirect when pagination have 0 product 2012-12-17 15:25:56 +01:00
Rémi Gaillard 3e89821b1d [-] Core: Fix #PSCFV-6162 - can't add no tax for specific zip code or state 2012-12-17 12:29:29 +01:00
Damien Metzger 6e2ebf1c07 // Cleaned modules call 2012-12-13 14:38:55 +01:00
vAugagneur cfa1359c87 [-] FO : small fix on mobile logo url 2012-12-13 09:30:55 +01:00
Rémi Gaillard e0aa292a69 [-] BO: Fix catalog price rules creation with mysql strict mod #PSCFV-5916 2012-12-12 19:38:40 +01:00
Rémi Gaillard 91ba2bfa2e // fix js arg missing for translations in javascript 2012-12-12 19:07:29 +01:00
Vincent Augagneur ebff913250 Merge pull request #69 from PrestaEdit/mails 
[+] Project: add the possibility to change the default color (#db3484)
 2012-12-12 06:59:04 -08:00
vAugagneur 39f108d79d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-12 14:37:40 +01:00
vAugagneur 42f3587e8e //remove PS_HIGH_HTML_THEME_COMPRESSION and all code related to this option 2012-12-12 14:37:15 +01:00
Rémi Gaillard ed65ab64de [-] BO: useSSL global does not exist anymore #PSCFV-6113 2012-12-12 14:33:42 +01:00
Damien Metzger 0f6b60a3af // Merged 4 lignes of code in the Configuration class 2012-12-12 14:29:37 +01:00
Rémi Gaillard 1d909b1248 [-] FO: The dispatcher now load the custom routes prior the defaults to avoid infinite loops 2012-12-12 11:46:19 +01:00
vAugagneur bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
Rémi Gaillard b3b5f7a1e9 [-] Core: Fix #PSCFV-5997 - Product::priceCalculation not return the price of default combination 2012-12-11 17:45:06 +01:00
sLorenzini 05a6f856da [-] FO: CLONE - order_conf still not fixed propertly #2 - #PSCFV-5817 2012-12-11 17:43:30 +01:00
Rémi Gaillard bf1b491e94 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-11 16:59:56 +01:00
vAugagneur ec05f5e384 [-] CORE : fixed bug #PSCFV-6084 2012-12-11 16:59:35 +01:00
Rémi Gaillard 8d2f5d6e42 [-] BO: don't display stock available if stock management is disabled #PSCFV-6029 2012-12-11 16:59:26 +01:00
Rémi Gaillard ef4b3576fc [-] BO: Improve memory usage in admin product in global context with a lot of shops and attributes 2012-12-11 16:05:29 +01:00
vAugagneur 5698e05f63 [-] CORE : fixed bug #PSCFV-6098 Double @ in customer email address crashes BO 2012-12-11 15:44:32 +01:00
Damien Metzger e6ad7ec815 [-] FO : jquery mobile was not compatible with js minifier, I updated both 2012-12-11 14:01:40 +01:00
Rémi Gaillard e8718ec42f [-] BO: Fix root category should anyway be imported in shop creation #PSCFV-5885 2012-12-11 12:01:04 +01:00
Rémi Gaillard a8096c2800 [-] BO: Fix various bugs in categories ntree generation 2012-12-11 11:19:21 +01:00
Damien Metzger b7d4321e5a [-] MO : fixed backslashes in homeslider #PSCFV-5664 2012-12-11 11:16:56 +01:00
Rémi Gaillard a68e5c1cfb [-] Core: Fix Swift and TCPDF for hosting which disallow getmypid() php function 2012-12-10 15:06:03 +01:00
Rémi Gaillard 8b817a4a8c [-] Core: Fix search indexation when id_product is forced #PSCFV-6039 2012-12-10 13:52:09 +01:00
Rémi Gaillard 53f1e8fcbb // Display exception in admin regardless mode dev 2012-12-10 10:47:41 +01:00
Rémi Gaillard 7e6d94053b // small fix 2012-12-07 18:01:32 +01:00
Rémi Gaillard 3280bfbeed [-] WS: Fix #PSCFV-5915 temporary images deletion 2012-12-07 17:58:46 +01:00
Rémi Gaillard 3497af985a [-] FO: FIX #PSCFV-5703 quotes in modules translations break javascript execution 2012-12-07 17:23:06 +01:00
vAugagneur 7bc49194b7 [-] FO : fixed bug #PSCFV-5849 now customer addresses can't be edited if country is not enable in this shop excepte if group shop is shared order 2012-12-07 16:23:52 +01:00
Rémi Gaillard 1c1fd827da // small fix for urls 2012-12-07 11:46:50 +01:00
vAugagneur f40369ef6a [-] CORE : fixed sql bug in PaymentModuleCore::getInstalledPaymentModules() - now get only active payment modules 2012-12-06 17:05:19 +01:00
vAugagneur adc1197320 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-06 16:53:37 +01:00
vAugagneur 048f3cce14 [-] CORE : small fix in Dispatcher::createURL() when friendly URL is disabled 2012-12-06 16:53:29 +01:00
Rémi Gaillard 56819e3573 [-] FO: Fix some tax_display_method value for not default customer group 2012-12-06 16:38:31 +01:00
vAugagneur 61c23c7e75 [-] BO : fixed bug #PSCFV-4701 - Module onclickOption is not called 2012-12-06 12:16:37 +01:00
vAugagneur e809f6bfdb Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-06 11:32:24 +01:00
vAugagneur 6f37326675 [-] BO : fixed bug #PSCFV-4699 - Module uninstall confirmation message is missing 2012-12-06 11:32:19 +01:00
Milow cf7aebd029 Fix typo 2012-12-05 21:27:37 -06:00