Commit Graph
9238 Commits
Author SHA1 Message Date
gRoussac e2cfa9f08e [-] BO : Fix #PSCFI-7186 incorrect return in Meta->deleteSelection() 2013-05-17 17:56:42 +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 d691e1d403 [-] MO: Fix #PSCFV-8973 product images in the blockviewed module 2013-05-17 16:35:21 +02:00
Cédric Mouleyre f921fd2352 Add Wysiwyg Category Controller 2013-05-17 12:00:43 +03: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 4253754afd [-] Class: Tools / link_rewrite(displayParameterAsDeprecated) 2013-05-17 00:52:39 +02:00
PrestaEdit 2e9efe58cc [-] Class: Tools / displayDate (displayParameterAsDeprecated) 2013-05-17 00:40:22 +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 e7f54d3694 [-] CORE : TRACKING_DIRECT_TRAFFIC not respected 2013-05-16 11:24:44 +02:00
gRoussac 2cd6724591 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-16 11:05:28 +02:00
gRoussac 0753dab214 [-] CORE : referer keywords truncated before insertion in connections table 2013-05-16 11:05:19 +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
gRoussac da15136c67 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-15 17:12:55 +02:00
gRoussac e34ef4f7f4 // no controllerUri for front office please 2013-05-15 17:11:32 +02:00
Rémi Gaillard ee8da0499b // also set query_string and server_name 2013-05-15 16:46:48 +02:00
Rémi Gaillard a0423d6226 // small fix 2013-05-15 16:26:02 +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 8d0e28291b [-] BO: Fix listing exports with image or other empty fields 2013-05-15 15:49:42 +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 3e4ef99214 [-] BO : fixed issue with reduction in the category for groups #PSCFV-9101 2013-05-15 15:23: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 d9e93a6352 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-15 14:51:16 +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 792d477a9d [-] CORE : Fix bug #PSCFI-7072 redundant configuration get 2013-05-15 14:44:33 +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 79c1d7d0f0 // refacto for last commit c7aa92f3b3 2013-05-15 11:47:46 +02:00
gRoussac be977a5f17 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-15 11:32:03 +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 f33e8d8b4a [-] FO: Fix #PSCFV-9057 close output buffer before sending attachment and virtualproducts 2013-05-14 18:13:07 +02:00
gRoussac 2bcd5bd0c2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-14 16:46:38 +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 dff200ac9d [-] Core: Fix StockManager::getProductRealQuantities() for refunded quantities on non delivered orders 2013-05-14 09:53:33 +02: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 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
PrestaEdit 28af026c06 [-] BO: Ajax Confirmation / padding-left 2013-05-12 01:04:00 +03:00
AntonLejon 6e425c518b [-] MO: blockcart ajax cart product insert missing html class
Added the same HTML class as the other product names have in the ajax cart. Perhaps it would be nice to add an added_from_ajax as well in case you would want to differ between the newly added items and previously added ones?
Another potential issue is on line 445 where there is no space after the insert. If Prestashop is set to minify the normal page, this is correct, otherwise there will be a space missing.
2013-05-09 00:53:06 +03:00
Damien Metzger 52bffe6917 // Fixed warning 2013-05-07 17:27:16 +02:00
Damien Metzger 693b3355a8 [-] BO : fixed turkish characters replacement #PSCFV-8968 2013-05-07 14:09:28 +02:00
Damien Metzger 4ed5d1bf4e 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 0ab7b15753 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 9ce563e332 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 f4df47986b 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 80b5855006 [-] BO : fixed potential warning with texture list #PSCFV-9050 2013-05-06 09:27:03 +02:00
Damien Metzger 4df5ac447f [-] BO : tab cache wasn't emptied on delete #PSCFV-9053 2013-05-06 09:23:07 +02:00
Rémi Gaillard 63993a425b [-] BO: You can now disable the email sent after account creation 2013-05-03 17:01:12 +02:00
Gregory Roussac 50b7e77a0c [-] FO : Fix bug #PSCFV-8967 large image instead of thickbox when one image 2013-05-02 22:19:28 +02:00
gRoussac 8fe323239b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-02 19:03:11 +02:00
gRoussac 5a922391e2 [-] 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 7eb318b0b0 // small fix 2013-05-02 18:58:05 +02:00
Edouard Gaulué 0442bee919 [-] BO : don't show unecessary tpl module translations - complience with documentation 2013-05-02 18:46:13 +02:00