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

3482 Commits

Author SHA1 Message Date
gRoussac 5c6db0510f [-] CORE : Report of https://github.com/PrestaShop/PrestaShop-1.4/commit/a6e8a2eda7fe3bab5245df9b98df7b2f6f7d541f 2013-05-27 10:12:41 +02:00
gRoussac b05ffb6a89 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-24 17:22:20 +02:00
gRoussac 95e46afc99 [-] FO : Fix bug #PSCFV-9171, can not order with a unactivated country 2013-05-24 17:21:56 +02:00
François Gaillard adb0da00f6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-24 11:39:37 +02:00
François Gaillard 3b1a9f9f80 [-] BO : Fixed unregistered version field for some modules 2013-05-24 11:39:20 +02:00
Rémi Gaillard 3de79c7015 // same for attributes and attributegroups 2013-05-24 11:33:58 +02:00
Rémi Gaillard 3b5f18a96d [-] BO: Fix language deletion with multishop when shops still associate to the language #PSCFV-9244 2013-05-24 11:28:07 +02:00
vAugagneur cc79b6a675 [-] BO : fixed bug #PSCFV-9178 - is_color_group is not inserted correctly 2013-05-24 10:47:48 +02:00
Vincent Augagneur dd363be433 Merge pull request #444 from PrestaEdit/patch-38 
[*] Class: Module / Use method instead of SQL query
 2013-05-23 05:21:11 -07:00
Damien Metzger 9e7d2ac9c7 [-] Core : fixed URL regexp #PSCFV-8986 2013-05-23 12:13:28 +02:00
Rémi Gaillard c7a056f301 [-] FO: Tools::getMediaServer() should return Tools::getShopDomain() instead of Tools::getHttpHost() #PSCFV-9217 2013-05-22 10:42:35 +02:00
Rémi Gaillard b65423f232 [-] Core: Fix StockManager::getProductRealQuantities() per warehouse with some orderstatuses #PSCFV-9219 2013-05-22 10:30:57 +02:00
Rémi Gaillard 2542e97164 [-] BO: Fix PHP warning on orderslip generation without ecotax #PSCFV-8743 2013-05-21 15:25:58 +02:00
PrestaEdit 446abf7e3f // use getModuleIdByName() 2013-05-21 13:11:41 +02:00
PrestaEdit 0abe3b3193 [*] Class: Module / Use method instead of SQL query 2013-05-21 13:03:41 +03:00
vAugagneur 43a333ff03 //remove useless comments 2013-05-21 11:28:24 +02:00
Vincent Augagneur 70b061343b Merge pull request #225 from emily-d/development 
[-] FO : PS_SSL_ENABLED and mod_rewrite yields a 301 error (Too Many Red...
 2013-05-21 02:27:30 -07:00
vAugagneur 2a606999fd //small bug 2013-05-21 10:30:35 +02:00
vAugagneur e01383c5a1 [-] BO : remove deprecated parameter when call Tools::displayDate() 2013-05-20 16:55:52 +02:00
vAugagneur 5244fdaa21 [-] BO : remove deprecated parameter when call Tools::link_rewrite() part 2 2013-05-20 16:39:08 +02:00
vAugagneur 90f0781377 [-] BO : remove deprecated parameter when call Tools::link_rewrite() 2013-05-20 16:33:12 +02:00
Vincent Augagneur d106d3a136 Merge pull request #438 from PrestaEdit/patch-36 
[-] Class: Tools / link_rewrite(displayParameterAsDeprecated)
 2013-05-20 06:23:20 -07:00
Vincent Augagneur 3368ff1d69 Merge pull request #437 from PrestaEdit/patch-35 
[-] Class: Tools / displayDate (displayParameterAsDeprecated)
 2013-05-20 06:22:59 -07:00
PrestaEdit c0b9736cf4 // Set param as null 2013-05-20 14:56:12 +02:00
PrestaEdit 7864f38438 // Set params as null 2013-05-20 14:49:45 +02:00
raulgundin 5c0605d73f [-] CORE: Fix #PSCFV-9185 Wrong product price display on list by manufacturer 
Added default_on condition on getProducts() query in Manufacturer class.
 2013-05-18 14:38:07 +03:00
gRoussac eb74e0c2d1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-17 18:09:32 +02:00
gRoussac 7123d47f91 [-] BO : Fix #PSCFI-7186 incorrect return in Meta->deleteSelection() 2013-05-17 17:56:42 +02:00
Rémi Gaillard 626e556575 [-] BO: Root category should be the shop category and not the higher category with multiple root and without multishop #PSCFV-8860 2013-05-17 17:10:11 +02:00
PrestaEdit 57bb00a6a8 [-] Class: Tools / link_rewrite(displayParameterAsDeprecated) 2013-05-17 00:52:39 +02:00
PrestaEdit fe4223593d [-] Class: Tools / displayDate (displayParameterAsDeprecated) 2013-05-17 00:40:22 +02:00
gRoussac 0765dde5c0 [-] CORE : TRACKING_DIRECT_TRAFFIC not respected 2013-05-16 11:24:44 +02:00
gRoussac 11eaf792e9 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
Damien Metzger 9a2ddd7608 [-] BO : fixed gift deletion when there is no products anymore in the cart 2013-05-16 11:03:21 +02:00
gRoussac 0a0f313de7 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
Rémi Gaillard 963dfe8ca2 // 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 932d949392 // 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
Damien Metzger e27ef3e7f2 [-] BO : catch prestashop exception and display smart error messages #PSCFV-9147 2013-05-15 15:39:58 +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 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 e54609e3a5 [-] Core: Fix StockManager::getProductRealQuantities() for refunded quantities on non delivered orders 2013-05-14 09:53:33 +02: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