Commit Graph
18608 Commits
Author SHA1 Message Date
gRoussac 110064a0c1 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
gRoussac e2cfa9f08e [-] 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
Rémi Gaillard 8b95e9f2ca [-] 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
Rémi Gaillard d096a5845e [-] MO: Fix #PSCFV-8973 product images in the blockviewed module 2013-05-17 16:35:21 +02:00
Rémi Gaillard d691e1d403 [-] MO: Fix #PSCFV-8973 product images in the blockviewed module 2013-05-17 16:35:21 +02:00
Cédric Mouleyre 334c5d35fd Add Wysiwyg Category Controller 2013-05-17 12:00:43 +03:00
Cédric Mouleyre f921fd2352 Add Wysiwyg Category Controller 2013-05-17 12:00:43 +03:00
Daniel ce9f147d58 Update _shipping.tpl
Added target="_blank" so when clicking on the tracking link, the user do not risk "loosing" the order by closing the tracking page by misstake.
2013-05-17 11:48:47 +08:00
Daniel c63ca0cdf8 Update _shipping.tpl
Added target="_blank" so when clicking on the tracking link, the user do not risk "loosing" the order by closing the tracking page by misstake.
2013-05-17 11:48:47 +08:00
PrestaEdit 57bb00a6a8 [-] Class: Tools / link_rewrite(displayParameterAsDeprecated) 2013-05-17 00:52:39 +02:00
PrestaEdit 4253754afd [-] 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
PrestaEdit 2e9efe58cc [-] Class: Tools / displayDate (displayParameterAsDeprecated) 2013-05-17 00:40:22 +02:00
gRoussac 2bfad8017e [-] CORE : Fix bug #PSCFI-7168 cast and truncate POST values for statistics.php controller 2013-05-16 18:30:58 +02:00
gRoussac eaa5605e91 [-] CORE : Fix bug #PSCFI-7168 cast and truncate POST values for statistics.php controller 2013-05-16 18:30:58 +02:00
gRoussac 0765dde5c0 [-] CORE : TRACKING_DIRECT_TRAFFIC not respected 2013-05-16 11:24:44 +02:00
gRoussac e7f54d3694 [-] 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 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