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

18638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gRoussac
2cd6724591 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-16 11:05:28 +02:00
gRoussac
11575fb749 [-] CORE : referer keywords truncated before insertion in connections table 2013-05-16 11:05:19 +02:00
gRoussac
0753dab214 [-] CORE : referer keywords truncated before insertion in connections table 2013-05-16 11:05:19 +02:00
Damien Metzger
9a2ddd7608 [-] BO : fixed gift deletion when there is no products anymore in the cart 2013-05-16 11:03:21 +02:00
Damien Metzger
21d45b61bd [-] BO : fixed gift deletion when there is no products anymore in the cart 2013-05-16 11:03:21 +02:00
prestarocket
112583edeb [-] FO : first_item class don t exist if shopping cart have only one item 
if shopping cart have only one product, last_item class exist but not
first_item because of "else if" after if isset($productLast)
 2013-05-16 10:37:02 +02:00
gRoussac
0a0f313de7 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-15 17:12:55 +02:00
gRoussac
da15136c67 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-15 17:12:55 +02:00
gRoussac
68cdfd0dae // no controllerUri for front office please 2013-05-15 17:11:32 +02:00
gRoussac
e34ef4f7f4 // no controllerUri for front office please 2013-05-15 17:11:32 +02:00
Rémi Gaillard
963dfe8ca2 // also set query_string and server_name 2013-05-15 16:46:48 +02:00
Rémi Gaillard
ee8da0499b // also set query_string and server_name 2013-05-15 16:46:48 +02:00
Rémi Gaillard
da8c21d644 // small fix 2013-05-15 16:26:02 +02:00
Rémi Gaillard
a0423d6226 // small fix 2013-05-15 16:26:02 +02:00
Rémi Gaillard
932d949392 // small fix for id_shop and php-cli 2013-05-15 16:23:29 +02:00
Rémi Gaillard
a22138f3c7 // small fix for id_shop and php-cli 2013-05-15 16:23:29 +02:00
Rémi Gaillard
7ca9356f65 [-] BO: Fix listing exports with image or other empty fields 2013-05-15 15:49:42 +02:00
Rémi Gaillard
8d0e28291b [-] BO: Fix listing exports with image or other empty fields 2013-05-15 15:49:42 +02:00
Damien Metzger
e27ef3e7f2 [-] BO : catch prestashop exception and display smart error messages #PSCFV-9147 2013-05-15 15:39:58 +02:00
Damien Metzger
45b1c864a5 [-] BO : catch prestashop exception and display smart error messages #PSCFV-9147 2013-05-15 15:39:58 +02:00
Damien Metzger
e1afce7f22 [-] BO : fixed issue with reduction in the category for groups #PSCFV-9101 2013-05-15 15:23:13 +02:00
Damien Metzger
3e4ef99214 [-] BO : fixed issue with reduction in the category for groups #PSCFV-9101 2013-05-15 15:23:13 +02:00
gRoussac
2e00a1662e [-] INSTALLER : Fix bug #PSCFI-7075 too short column in PREFIX_webservice_account 2013-05-15 15:18:13 +02:00
gRoussac
e105f8fff7 [-] 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
gRoussac
d9e93a6352 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
Rémi Gaillard
2c10ba5359 [*] 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
gRoussac
792d477a9d [-] 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
Damien Metzger
35463be99a // 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
79c1d7d0f0 // 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
be977a5f17 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
gRoussac
9b615244b1 [-] 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
Rémi Gaillard
f33e8d8b4a [-] 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
2bcd5bd0c2 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
gRoussac
81553d81da [-] 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
dff200ac9d [-] 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
Rémi Gaillard
ce71def570 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
Samy Rabih
7b26967df0 $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