dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,245 Commits 9 Branches 19 Tags
2b5d600452fed194119dcd2e78fb29bbc6ae609b
Commit Graph
9245 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Gaillard 1edbebf8f5 [-] MO: Don't make unnecessary request to ajax cart 2013-05-20 10:50:34 +02:00
Rémi Gaillard a508be0a07 Merge pull request #442 from raulgundin/patch-1 
[-] CORE: Fix #PSCFV-9185 Wrong product price display (list by manufacturer)
 2013-05-20 00:53:07 -07:00
PrestaEdit fc1ecf0a70 [-] Translations: .. instead of . 2013-05-19 00:14:39 +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
Rémi Gaillard d096a5845e [-] 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
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
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 2bfad8017e [-] 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 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
Damien Metzger e1afce7f22 [-] 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 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
PrestaEdit e14509170b [-] BO: Ajax Confirmation / padding-left 2013-05-12 01:04:00 +03:00
AntonLejon 83a1ea5488 [-] 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 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
AntonLejon 448b8bad02 [*] MO: blockcart animation optimization 
The animated element would not be removed upon the animation being finished. This made the site slow and unresponsive if the animated image was heavy (eg. a transparent png) and added to cart many times without reloading the page. This addition makes the animation behave as expected also when performing it multiple times.
 2013-05-06 12:14:11 +03: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