Commit Graph

7919 Commits

Author SHA1 Message Date
Rémi Gaillard 6d7986dae0 [-] MO: Fix blockviewd for non identified customers #PSCFV-6042 2013-01-03 17:25:56 +01:00
Rémi Gaillard 6c1c3402bc [-] Core: Fix #PSCFV-5912 price computation on cart with multiple product without combinations 2013-01-03 16:44:10 +01:00
Gregory Roussac 9513a9e599 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-03 15:20:08 +01:00
gRoussac 5c80535287 [-] FO : Fix again #PSCFV-6209 #PSCFV-5686 no required phone 2013-01-03 15:19:04 +01:00
vAugagneur cc32366077 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-03 15:18:06 +01:00
vAugagneur 8d7196daf3 [-] BO : fixed import images 2013-01-03 15:18:00 +01:00
Rémi Gaillard b10b53028f [-] FO: Fix #PSCFV-6159 order way of best sales 2013-01-03 12:08:29 +01:00
Rémi Gaillard df405abfe9 [-] BO: Fix #PSCFV-6118 display of product image for git on BackOffice orders 2013-01-03 11:38:39 +01:00
Gregory Roussac 742c84bee8 // forgot delete 2013-01-03 11:11:16 +01:00
Gregory Roussac 4a26358517 [*] Installer : Lower memory for update_order_messages.php 2013-01-03 10:44:11 +01:00
vAugagneur 865c98e096 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-02 17:48:07 +01:00
vAugagneur a5ab1d5bc2 //small fix when disabled language with bulk action 2013-01-02 17:47:49 +01:00
Vincent Augagneur e0eafaaac1 Merge pull request #136 from PrestaEdit/patch-3
//remove WAHOU
2013-01-02 08:18:24 -08:00
vAugagneur 13ad25f331 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-02 17:09:44 +01:00
vAugagneur f7754045fb [-] BO : fixed bug #PSCFV-6130 - Wrong currency in product specific prices administration 2013-01-02 17:09:39 +01:00
PrestaEdit c811f6a835 [-] FO: remove WAHOU 2013-01-02 17:06:24 +01:00
Rémi Gaillard 384c610d81 [-] BO: Fix #PSCFV-6394 price/weight/unit_price reduction impact on combinations form 2013-01-02 16:48:30 +01:00
Rémi Gaillard 301dc491b4 [-] BO: Fix #PSCFV-6415 php notice 2013-01-02 16:21:54 +01:00
vAugagneur b9e688a4bf [-] FO : fixed bug #PSCFV-6411 Friendly URL on prices-drop for page 2 doesn't work 2013-01-02 14:40:35 +01:00
Damien Metzger 691dc919c4 // Changelog, readme and install_version.php 2013-01-02 12:01:12 +01:00
Damien Metzger 039b3fa9cf // Fix upgrade 2013-01-02 12:00:57 +01:00
vAugagneur a232288ee1 //retro compat smarty variable name 'onr_phone_at_least' 2013-01-02 11:53:43 +01:00
vAugagneur 2e90e12293 //Merge branch release 2013-01-02 09:56:20 +01:00
Rémi Gaillard b3639c958b // oups.... 2012-12-31 12:20:26 +01:00
Rémi Gaillard 1edd663b11 // small fix 2012-12-31 12:17:42 +01:00
Rémi Gaillard 37f9d31c0a [-] FO: Fix retrocompatibility for modules and old themes 2012-12-31 12:06:28 +01:00
Rémi Gaillard f49630e02b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-31 12:03:54 +01:00
Damien Metzger a9f123f3f2 // Just to be sure... 2012-12-31 12:00:29 +01:00
Rémi Gaillard ed238ad619 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-31 11:54:12 +01:00
Damien Metzger c6ca7b6215 [-] BO : fixed accentuated URLs in products 2012-12-31 10:22:53 +01:00
Rémi Gaillard 4d76877ec6 [-] FO: Fix PHP warning on category controller 2012-12-31 10:04:53 +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 0af5008818 // Missing part of a fix 2012-12-31 09:45:10 +01:00
Damien Metzger 50b8332bf7 [-] Installer : mysql text cannot have a default value #PSCFV-6395 2012-12-31 09:42:07 +01:00
Rémi Gaillard 062d74912d [-] Installer: Fix #PSCFV-6392 redirect_type was missing on upgrade 2012-12-31 09:35:00 +01:00
PrestaEdit 353fa14078 [-] Project: Fix bug when you want to upload (and resize) an image 2012-12-30 20:14:51 +01:00
vAugagneur 992449c99e //CHANGELOG 1.5.3.0 2012-12-28 16:14:42 +01:00
Rémi Gaillard a788394a4a [*] Core: Log the exceptions in a file #PSCFV-6334 2012-12-28 16:12:28 +01:00
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
Gregory Roussac d0eb31f3d6 [-] FO : Fix #PSCFV-6209 required phone with Guest Checkout 2012-12-27 18:05:26 +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
Gregory Roussac 3e9e765a5a [-] FO : Fix html entities in order messages and threads 2012-12-27 12:23:10 +01:00