dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,815 Commits 9 Branches 19 Tags
a0f4eab4c149cd5adadaa39bd267f16fa09fc4e4
Commit Graph

2506 Commits

Author SHA1 Message Date
djfm
0288696c90 // English 2013-10-29 14:37:55 +00:00
Jerome Nadaud
9f2580f3bd Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-29 10:31:12 +01:00
Jerome Nadaud
d2e475dd3a // Removed line from merge 2013-10-29 10:30:59 +01:00
Gregory Roussac
b885c63564 Merge pull request #900 from kpodemski/patch-10 
[*] MO: productcomments optimization
 2013-10-29 02:06:56 -07:00
Gregory Roussac
d74291e5b5 Merge pull request #901 from kpodemski/patch-11 
[*] MO: blocksharefb optimization
 2013-10-29 02:06:25 -07:00
Jerome Nadaud
1d90218e0d // Update mailalert module version 2013-10-29 10:00:57 +01:00
Jerome Nadaud
9660cef0aa [-] MO : mailalert - Fix deprecated warning on displayDate 2013-10-29 09:58:42 +01:00
gRoussac
0aca1d4a67 [*] BO : AdminProducts find smallest images 2013-10-29 08:47:41 +01:00
Krystian Podemski
526f32b6a0 [*] MO: blocksharefb optimization 2013-10-28 23:24:32 +01:00
Krystian Podemski
faa4a18a82 [*] MO: productcomments optimization 2013-10-28 23:21:35 +01:00
Gregory Roussac
12a257db7a Merge pull request #898 from Jacky75/blulab20131028-slider-virtualuri 
[-] MO : homeslider stores slider about multistore with virtual uri
 2013-10-28 06:53:41 -07:00
Daniele Giachino
c84689ec71 homeslider stores slider about multistore with virtual uri 2013-10-28 14:09:35 +01:00
gRoussac
c5c861b59e [-] MO : Blockwishlist no product image when id_product_attribute is defined, thanks @Broceliande 2013-10-27 13:28:34 +01:00
gRoussac
4c484afda1 [-] MO : Fix bug #PSCFV-10841, blockcart hides on product page when last product is removed from cart 2013-10-25 17:37:32 +02:00
gRoussac
942d3c7151 [-] MO : Fixbug #PSCFV-10679 dateofdelivery PDF invoice array and array 2013-10-25 00:01:25 +02:00
gRoussac
1e094f4016 [-] FO: Fix bug #PSCFV-10623 blocknewproducts shows products when PS_NB_DAYS_NEW_PRODUCT == 0 2013-10-24 23:29:23 +02:00
gRoussac
4cd3e1b830 [-] FO: Fix bug #PSCFV-10230, Blockspecials still caching when files cache limit is 0 2013-10-24 21:59:32 +02:00
Jerome Nadaud
6f57093f50 [-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security 2013-10-24 18:36:36 +02:00
Rémi Gaillard
cc3363011e // rewrited urls for feeder module 2013-10-24 17:54:44 +02:00
gRoussac
fc9b39968b // remove notice 2013-10-24 11:46:09 +02:00
Fabio Chelly
b9de912dd3 [-] MO : Fixed bug PNM-1431 - referralprogram Lack the % sign 2013-10-24 09:53:16 +02:00
Fabio Chelly
3e999ab591 [-] MO blockcart 
#PNM-1685 - [CODE] incorrect spelled variable in ajax-cart.js
 2013-10-23 10:56:48 +02:00
Gregory Roussac
e557db6429 Merge pull request #866 from studiokiwik/sk-ps15x-007 
[-] MO : Loyalty if customer is logged do not recreate it
 2013-10-22 10:15:55 -07:00
Fabio Chelly
bc38b542fe Merge remote-tracking branch 'origin/development' into development 2013-10-22 15:53:43 +02:00
Fabio Chelly
2989538ce1 [*] BO Module mailalerts: send e-mail to merchand when product is out of stock 2013-10-22 15:53:20 +02:00
gRoussac
1ae587475b [-] MO : Fix bug #PSCFV-10787, cms associated to all shops 2013-10-22 12:19:58 +02:00
Gaelle ITZKOVITZ
ce8d01ad4c [-] MO : if customer is logged we do not recreate it 2013-10-22 11:09:53 +02:00
gRoussac
a05c748e81 // addJqueryPlugin receives array in first argument 2013-10-21 15:05:03 +02:00
gRoussac
a9e45fccf3 [-] MO : ScrollTo not loaded 2013-10-21 14:35:23 +02:00
Fabio Chelly
7133e74c17 [-] MO mailalerts: module mailalerts shows all messages regarding the order 
PNM-1632 - MailAlert does not show Paypal error message if order has comments
 2013-10-18 17:49:00 +02:00
Rémi Gaillard
6ee538c710 // fix on ps_cleaner 2013-10-15 19:53:59 +02:00
gRoussac
f9cfde9a05 [-] MO : Trackingfront, could not load employee stats date 2013-10-12 23:24:32 +02:00
gRoussac
ee29f4365e [-] FO : Copuld not load datepicker in trackingfront stats.php 2013-10-12 17:54:26 +02:00
Mickael Desgranges
1786f8e907 Update blocktopmenu.php 
Fix: block top menu is not updated when content is added in CMS

adding support of AddAfter hook for Cms, Supplier, Manufaturer and Product
 2013-10-11 16:42:21 +02:00
Fabio Chelly
9e3b82e8ed [*] BO Module productcomments: JS variables are correctly escaped. Padding in error message has also been pushed to theme tpl 2013-10-11 16:37:26 +02:00
gRoussac
45e9040606 [-] Bo : Could not update mailarler 2.5 with id_mlang 2013-10-11 15:51:02 +02:00
Fabio Chelly
d1a7ff50d5 [*] BO Module watermark: minimum transparency level is 1 and not 0. 2013-10-11 10:51:28 +02:00
fchellypresta
075a911cee Merge pull request #830 from indesign47/patch-5 
[-] MO : productcomments errors translated in multi-language
 2013-10-11 00:40:32 -07:00
fchellypresta
6f878353a6 Merge pull request #831 from indesign47/patch-7 
[-] MO : productcomments round average up not down
 2013-10-11 00:29:37 -07:00
gRoussac
008c6ce759 [-] FO : Fix bug #PSCFV-10497 cart_block hooked on column disappearing 2013-10-08 18:37:50 +02:00
Gregory Roussac
4daaa206d2 Merge pull request #818 from cedricfontaine/patch-2 
[-] MO : Price should apply tax as in configuration.
 2013-10-07 09:55:35 -07:00
Gregory Roussac
644e38c05f Merge pull request #817 from cedricfontaine/patch-1 
[-] MO :Loyalty voucher should be without taxes, otherwise points would be negative.
 2013-10-07 09:54:22 -07:00
Francois Gaillard
77b2b4b6ca // Manual merge PS 1.5.6.0 2013-10-07 18:22:55 +02:00
cedricfontaine
d63288affd Update loyalty.php 
Price should apply tax as in configuration.
 2013-10-07 12:14:13 -04:00
cedricfontaine
717e195f57 Update LoyaltyModule.php 
Voucher should be without taxes, otherwise points would be negative.
 2013-10-07 12:07:03 -04:00
indesign47
d3d0897012 [-] MO : productcomments round average up not down 
200 comments with 5 stars and only 1 with 4 stars give only 4 stars
Thanks to manit4c
 2013-10-07 04:02:42 +02:00
indesign47
e0978a0b84 [-] MO : productcomments errors translated in multi-language 2013-10-07 03:18:56 +02:00
Jerome Nadaud
093bf9e065 [-] MO : Blocklayered - Fix expand/collapse tree problem 2013-10-04 11:51:12 +02:00
Jerome Nadaud
3d8591c588 [-] MO : Blocklayered - Fix empty fancy box after template edit 2013-10-04 10:14:07 +02:00
Jerome Nadaud
6a0c376a18 [-] MO : Blocklayered - Fix empty fancy box after template edit 2013-10-03 18:58:09 +02:00