dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,260 Commits 9 Branches 19 Tags
94f7b2fa3c94dd6e52964a9a74b014d4e6db005d
Commit Graph
9260 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 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
Edouard Gaulué 443e22aa72 [*] FO : AuthController can now have its own template 2013-05-06 00:32:16 +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
Rémi Gaillard 41786587ba [-] BO: Fix #PSCFV-8179 shop domain used in emails sometimes was for the wrong shop 2013-05-02 18:42:01 +02:00
Edouard Gaulué 444a99f564 [-] BO : don't show translation for class/controler overrides when on modules translation page 2013-05-02 18:21:54 +02:00
gRoussac 4b59516a52 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-02 17:10:49 +02:00
gRoussac b4547fbd83 // small fix when rel of big pic is empty 2013-05-02 17:06:32 +02:00
Damien Metzger fb604492b7 [-] BO : fixed infinite loop in the categories #PSCFV-8965 2013-05-02 16:06:26 +02:00
sLorenzini f1c2d431a9 // FO: improve jqzoom product 2013-05-02 15:56:55 +02:00
gRoussac 5c7f3e256d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-02 15:41:34 +02:00
gRoussac a1ce0fda13 [-] INSTALLER : Fix bug #PSCFV-8750 do not activate disabled module during upgrade 2013-05-02 15:41:21 +02:00
sLorenzini 9e78586d2b [-] FO: fixed bug: Solved a javascript problem on the new 1.5.4.1 with the full image on product page - PSCFV-8967 2013-05-02 15:06:57 +02:00
vAugagneur 0ba4d91c43 [-] MO : fixed hug #PSCFV-8994 - clear cache when truncate catalog 2013-05-02 11:41:49 +02:00
PrestaEdit 2d1c6514f3 // fix </description> 2013-04-30 20:40:03 +02:00
Rémi Gaillard fb3291a08f // id_product_attribute is not necessary in the cache name of Product::getPriceStatic for cart_quantity 2013-04-30 12:33:52 +02:00
sLorenzini ad8291353b [-] FO: improve some css for RTL language 2013-04-30 11:34:13 +02:00
sLorenzini 6b178752ff [-] FO: replace logo on the left (fixed bug RTL language - #PSCFV-8891) 2013-04-30 11:23:18 +02:00
sLorenzini dc2b69f699 // BO: Improve product display on supplier page 2013-04-30 11:09:08 +02:00
Gregory Roussac 028bffd363 // remove unused .show() 2013-04-29 23:14:57 +02:00
Gregory Roussac 5c02334aab [-] FO : Jqzoom must be enabled to add class jqzoom 2013-04-29 22:05:01 +02:00
Gregory Roussac 2051b925a1 //norms 2013-04-29 21:55:30 +02:00
Gregory Roussac 93d5016848 [-] Bo : Admin login loop under Firefox 2013-04-29 21:54:26 +02:00
Rémi Gaillard 8996690a65 [-] Core: Fix specific prices if they are configured to count quantity per product and not per combination 2013-04-29 18:49:42 +02:00
Damien Metzger e56ec2f234 // BO : Changed product display on supplier page 2013-04-29 18:34:34 +02:00
Dragan Skrbic 7f8a33763a // Fixed image import 2013-04-29 18:07:42 +02:00
Damien Metzger 7eba77ae66 // Fixed case which caused duplicated translation #PSCFV-8936 2013-04-29 17:45:45 +02:00
Damien Metzger 3600a31862 [-] BO : fixed image import with allow_url_fopen deactivated #PSCFV-8181 2013-04-29 17:45:45 +02:00
gRoussac d2d4b68f7c // typo 2013-04-29 17:19:07 +02:00
gRoussac 140b9b2bba // rework of https://github.com/PrestaShop/PrestaShop/commit/5f6d0614df4bf7d354988dd7320d012238488401#commitcomment-3108107 2013-04-29 17:12:17 +02:00
gRoussac 7afdb08a56 // revert from commit 5f6d0614df 2013-04-29 17:03:41 +02:00
vAugagneur 7b1c50b97f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-29 16:21:51 +02:00
vAugagneur f58c8e7a93 Merged Pull Request #242 - thanks @andskiba 2013-04-29 16:21:33 +02:00
Rémi Gaillard bfc8a0ad02 [-] BO: Fix #PSCFV-8957 order creation when id_cart=0 is present in database but should normally not happen 2013-04-29 13:47:46 +02:00