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

6583 Commits

Author SHA1 Message Date
vAugagneur 2e90e12293 //Merge branch release 2013-01-02 09:56:20 +01:00
vAugagneur a4eb2cc7a9 //Merge branch release 2013-01-02 09:56:20 +01:00
Damien Metzger 6a67264325 Merge pull request #127 from PrestaEdit/Patch-#002 
[-] Project: Fix bug when you want to upload (and resize) an image
 2012-12-31 00:51:37 -08:00
Damien Metzger 68dbfcbfb0 Merge pull request #127 from PrestaEdit/Patch-#002 
[-] Project: Fix bug when you want to upload (and resize) an image
 2012-12-31 00:51:37 -08:00
PrestaEdit 353fa14078 [-] Project: Fix bug when you want to upload (and resize) an image 2012-12-30 20:14:51 +01:00
PrestaEdit 80f3012345 [-] Project: Fix bug when you want to upload (and resize) an image 2012-12-30 20:14:51 +01:00
Rémi Gaillard a788394a4a [*] Core: Log the exceptions in a file #PSCFV-6334 2012-12-28 16:12:28 +01:00
Rémi Gaillard 5e367744b6 [*] Core: Log the exceptions in a file #PSCFV-6334 2012-12-28 16:12:28 +01:00
vAugagneur d10bf0620a Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-28 10:23:52 +01:00
vAugagneur a5568e8196 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-28 10:23:52 +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
vAugagneur e8920c859d //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
Damien Metzger 7bebdb5eb5 // 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
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 7a8adaec25 [+] BO : you can now choose if a voucher is displayed under the cart in the frontend 2012-12-27 18:04:16 +01:00
Gregory Roussac 3e9e765a5a [-] FO : Fix html entities in order messages and threads 2012-12-27 12:23:10 +01:00
Gregory Roussac dbb8a9f2e0 [-] FO : Fix html entities in order messages and threads 2012-12-27 12:23:10 +01:00
Damien Metzger 4836fe224a [-] BO : fixed error display for bad queries #PSCFI-6913 2012-12-24 10:32:41 +01:00
Damien Metzger d8a20d51d9 [-] BO : fixed error display for bad queries #PSCFI-6913 2012-12-24 10:32:41 +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
Rémi Gaillard b4217046ae [-] 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 66dcbed995 [-] Fo : fixed warning in empty categories 2012-12-21 10:55:56 +01:00
Damien Metzger 9b3965425e [-] FO : changed behavior of the cart rules when the carrier and the address are not determined yet 2012-12-20 17:13:11 +01:00
Damien Metzger 6970bf57d9 [-] FO : changed behavior of the cart rules when the carrier and the address are not determined yet 2012-12-20 17:13:11 +01:00
Damien Metzger 0312d520e6 [-] FO : fixed wrong variable 2012-12-20 17:07:20 +01:00
Damien Metzger 5c1ac36f27 [-] 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
Damien Metzger caf96db460 [-] 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
vAugagneur 7646ab35fa //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
Rémi Gaillard 1be7a98655 [*] Core: conversion_rate of currencies are now multishop 2012-12-20 11:35: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 13425aff53 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-18 16:00:20 +01:00
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 a91fafe05a [-] CORE : fixed bug #PSCFV-5116 Horizontal top menu cache 2012-12-18 16:00:10 +01:00
vAugagneur 9b0dbae730 [-] 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 85b1127be2 // 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
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 17350c6149 [-] CORE : fixed bug #PSCFV-4754 Image sizes are the same for all shops and themes 2012-12-18 14:59:34 +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 c138e2dc5b [-] BO : fixed weight and distance units validation 2012-12-18 14:40:58 +01:00
Damien Metzger 270ae41d15 [-] BO : fixed weight and distance units validation 2012-12-18 14:40:58 +01:00
Damien Metzger 86547e0b79 // Grumpf 2012-12-18 14:35:28 +01:00
Damien Metzger a80a5414cc // Grumpf 2012-12-18 14:35:28 +01:00