dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,608 Commits 9 Branches 19 Tags
a07733fcec16f471ec447789631804a0a33b94de
Commit Graph
18608 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
PrestaEdit e14509170b [-] BO: Ajax Confirmation / padding-left 2013-05-12 01:04:00 +03:00
PrestaEdit 28af026c06 [-] 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
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 11fdc8f74b // Fixed warning 2013-05-07 17:27:16 +02:00
Damien Metzger 52bffe6917 // 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 693b3355a8 [-] 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 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 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 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 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 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 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
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
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
AntonLejon cb6f696dad [*] 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 80b5855006 [-] 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
Damien Metzger 4df5ac447f [-] BO : tab cache wasn't emptied on delete #PSCFV-9053 2013-05-06 09:23:07 +02:00
Edouard Gaulué 4346d9e57c [*] FO : AuthController can now have its own template 2013-05-06 00:32:16 +02:00
Edouard Gaulué 443e22aa72 [*] FO : AuthController can now have its own template 2013-05-06 00:32:16 +02:00
Rémi Gaillard abcb083cb3 [-] BO: You can now disable the email sent after account creation 2013-05-03 17:01:12 +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 4e8c5a24df [-] FO : Fix bug #PSCFV-8967 large image instead of thickbox when one image 2013-05-02 22:19:28 +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 3e93198b13 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-02 19:03:11 +02:00
gRoussac 8fe323239b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-02 19:03:11 +02:00