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

9165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gRoussac 2e00a1662e [-] INSTALLER : Fix bug #PSCFI-7075 too short column in PREFIX_webservice_account 2013-05-15 15:18:13 +02:00
gRoussac 57a13efa18 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-15 14:51:16 +02:00
Rémi Gaillard a9684804d5 [*] Core: you can now pass a query string with php-cli which will merged with for cronjobs and other things 2013-05-15 14:46:40 +02:00
gRoussac e793d8e25f [-] CORE : Fix bug #PSCFI-7072 redundant configuration get 2013-05-15 14:44:33 +02:00
Damien Metzger d3a87e845e // Fixed product rules issue in the cart rules with mod_mysql 2013-05-15 14:14:46 +02:00
gRoussac 5fedb03b30 // refacto for last commit c7aa92f3b3 2013-05-15 11:47:46 +02:00
gRoussac 37193efc9d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-15 11:32:03 +02:00
gRoussac c7aa92f3b3 [-] BO : Fix "The controller adminnotound is missing or invalid." error when no controller get variable 2013-05-15 11:31:55 +02:00
Rémi Gaillard 84aff1d469 [-] FO: Fix #PSCFV-9057 close output buffer before sending attachment and virtualproducts 2013-05-14 18:13:07 +02:00
gRoussac 6796738cfd Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-14 16:46:38 +02:00
gRoussac 8db48ed534 [-] MO : Fix bug #PSCFI-7055 do not relay on ".html" in referer to find previous category 2013-05-14 16:46:03 +02:00
Rémi Gaillard e54609e3a5 [-] Core: Fix StockManager::getProductRealQuantities() for refunded quantities on non delivered orders 2013-05-14 09:53:33 +02:00
Rémi Gaillard 897c1ae1d4 Merge pull request #431 from samy-r/dev-add_attribute 
$id_shop_list filtering in addAttribute
 2013-05-14 00:12:55 -07:00
Samy Rabih 0fc1b7b7a2 $id_shop_list filtering in addAttribute 
When addAttribute is used with a not-empty $id_shop_list array argument,
the shop IDs are not filtered to be unique, so $combination->add()
fails.
 2013-05-13 14:50:24 +02:00
Damien Metzger 11fdc8f74b // Fixed warning 2013-05-07 17:27:16 +02:00
Damien Metzger f878e3c721 [-] BO : fixed turkish characters replacement #PSCFV-8968 2013-05-07 14:09:28 +02:00
Damien Metzger ab2008e82a Merge pull request #381 from PrestaEdit/patch-29 
[-] MO: added cart rule code in statsbestvouchers
 2013-05-06 07:34:05 -07:00
Damien Metzger 8fb086059e Merge pull request #412 from MyBB-Services/dev/gb/contributing 
// Wrong link to coding starndards in CONTRIBUTING.md
 2013-05-06 07:21:57 -07:00
Damien Metzger 387b54d322 Merge pull request #419 from e-gaulue/Module_translation_patch 
[-] BO : don't show translations for module overrides in admin modules translation page
 2013-05-06 07:09:58 -07:00
Damien Metzger 7c4cabf0f2 Merge pull request #420 from e-gaulue/Module_translation_patch_2 
[-] BO : don't show unecessary tpl module translations - complience with documentation
 2013-05-06 07:08:41 -07:00
Damien Metzger 2af342c864 [-] BO : fixed potential warning with texture list #PSCFV-9050 2013-05-06 09:27:03 +02:00
Damien Metzger dc294d24cb [-] BO : tab cache wasn't emptied on delete #PSCFV-9053 2013-05-06 09:23:07 +02:00
Rémi Gaillard abcb083cb3 [-] BO: You can now disable the email sent after account creation 2013-05-03 17:01:12 +02:00
Gregory Roussac 4e8c5a24df [-] FO : Fix bug #PSCFV-8967 large image instead of thickbox when one image 2013-05-02 22:19:28 +02:00
gRoussac 3e93198b13 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-02 19:03:11 +02:00
gRoussac 049d00a9db [-] INSTALLER : Fix bug #PSCFV-8605 first part, do not affect memeory limit when upgrading if set to -1 2013-05-02 19:02:48 +02:00
Rémi Gaillard 32a11677e7 // small fix 2013-05-02 18:58:05 +02:00
Edouard Gaulué fdb931e3e8 [-] BO : don't show unecessary tpl module translations - complience with documentation 2013-05-02 18:46:13 +02:00
Rémi Gaillard 4d4eb9df19 [-] BO: Fix #PSCFV-8179 shop domain used in emails sometimes was for the wrong shop 2013-05-02 18:42:01 +02:00
Edouard Gaulué 467c183564 [-] BO : don't show translation for class/controler overrides when on modules translation page 2013-05-02 18:21:54 +02:00
gRoussac 63fe5b8d4a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-02 17:10:49 +02:00
gRoussac 311ad3087c // small fix when rel of big pic is empty 2013-05-02 17:06:32 +02:00
Damien Metzger 87be8bd39e [-] BO : fixed infinite loop in the categories #PSCFV-8965 2013-05-02 16:06:26 +02:00
sLorenzini e67965e6bc // FO: improve jqzoom product 2013-05-02 15:56:55 +02:00
gRoussac 15a4d1c60f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-02 15:41:34 +02:00
gRoussac 605f95eb88 [-] INSTALLER : Fix bug #PSCFV-8750 do not activate disabled module during upgrade 2013-05-02 15:41:21 +02:00
sLorenzini e158ea1227 [-] FO: fixed bug: Solved a javascript problem on the new 1.5.4.1 with the full image on product page - PSCFV-8967 2013-05-02 15:06:57 +02:00
vAugagneur 77b8e106f7 [-] MO : fixed hug #PSCFV-8994 - clear cache when truncate catalog 2013-05-02 11:41:49 +02:00
Rémi Gaillard 46f7922a8f // id_product_attribute is not necessary in the cache name of Product::getPriceStatic for cart_quantity 2013-04-30 12:33:52 +02:00
sLorenzini e0a16977ef [-] FO: improve some css for RTL language 2013-04-30 11:34:13 +02:00
sLorenzini 4d961564f7 [-] FO: replace logo on the left (fixed bug RTL language - #PSCFV-8891) 2013-04-30 11:23:18 +02:00
sLorenzini 00bd78e843 // BO: Improve product display on supplier page 2013-04-30 11:09:08 +02:00
Gregory Roussac cb29f20f1e // remove unused .show() 2013-04-29 23:14:57 +02:00
Gregory Roussac 1e4e8d6a13 [-] FO : Jqzoom must be enabled to add class jqzoom 2013-04-29 22:05:01 +02:00
Gregory Roussac d618c8618a //norms 2013-04-29 21:55:30 +02:00
Gregory Roussac a8698d9e59 [-] Bo : Admin login loop under Firefox 2013-04-29 21:54:26 +02:00
Rémi Gaillard 9fc4bce500 [-] Core: Fix specific prices if they are configured to count quantity per product and not per combination 2013-04-29 18:49:42 +02:00
Damien Metzger 548ef7691a // BO : Changed product display on supplier page 2013-04-29 18:34:34 +02:00
Dragan Skrbic d00ccdf306 // Fixed image import 2013-04-29 18:07:42 +02:00
Damien Metzger 4c259393f5 // Fixed case which caused duplicated translation #PSCFV-8936 2013-04-29 17:45:45 +02:00