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

2475 Commits

Author SHA1 Message Date
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
Fabio Chelly
ea57b3fdd1 [-] MO watermark: original pictures are now protected through htaccess 
#PNM-109
 2013-10-03 15:32:10 +02:00
Krystian Podemski
9e4b6c020f [*] FO: We let style selected category in CSS on blockcategories 
It's good to have this by default.
 2013-10-01 12:02:19 +02:00
Fabio Chelly
9d94337c9b [-] MO sendtoafriend: The method used to check all required input fields could lead to errors 2013-09-27 16:08:00 +02:00
Fabio Chelly
6d8cc454e1 [-] MO productcomments: prevents guests to add comments when guest comment is disabled in backoffice 
(cherry picked from commit 345d4cd)
 2013-09-27 11:30:42 +02:00
Fabio Chelly
345d4cdbcf [-] MO productcomments: prevents guests to add comments when guest comment is disabled in backoffice 2013-09-27 11:27:58 +02:00
Fabio Chelly
7a7a2fb8c3 [-] MO productcomments and loyalty: loyalty doesn't disconnect current user anymore 2013-09-26 14:19:08 +02:00
Gregory Roussac
f3e36b896b Merge pull request #746 from Mainmich/patch-1 
[-] MO : Blocklayered Fix pagination incompatibility
 2013-09-26 14:16:51 +02:00
Mainmich
a6e67b078e Fix pagination incompatibility 
Javascript function paginateButton does not work with "p" GET parameter in first position, regex only takes &p and not ?p.
 2013-09-25 18:33:58 +02:00
Jerome Nadaud
757fe64217 [-] MO : FixBug #10460 - UTF8 bug on accented URL 2013-09-25 16:09:55 +02:00
Fabio Chelly
bdd84771b7 [-] MO productcomments and loyalty: loyalty doesn't disconnect current user anymore 2013-09-25 14:43:30 +02:00
gRoussac
89ac0bc439 [-] FO : Fix #PSCFV-10480 again, css fix 2013-09-24 16:34:18 +02:00
gRoussac
1d6593612f [-] FO : Fix #PSCFV-10480 again css fix 2013-09-24 12:21:10 +02:00
gRoussac
d37f545058 [-] MO : Fix buig #PSCFV-10480 Blockcart too long cart_block_product_name 2013-09-23 17:26:36 +02:00
gRoussac
92382e347c [-] FO : Fix bug #PSCFV-10478 could not see auto added cart rule voucher on product page 2013-09-23 16:08:44 +02:00
Fabio Chelly
a1555c3fc8 Merge remote-tracking branch 'origin/development' into development 2013-09-23 11:24:26 +02:00
Fabio Chelly
31697fde3c [-] MO productcomments: confirmation message takes moderation mode into account 2013-09-23 11:24:14 +02:00
Jerome Nadaud
cf82157d47 // oops 2013-09-23 10:48:56 +02:00
Jerome Nadaud
32a7a28567 [-] MO : FixBug #PNM-1683 - Treeview problem 2013-09-23 10:42:10 +02:00
Fabio Chelly
4f639329e9 Merge remote-tracking branch 'origin/development' into development 2013-09-20 10:47:17 +02:00
Fabio Chelly
91ae972655 [-] MO mailalert : products alerts can be registered for multiple guests 
#PNM-1669
 2013-09-20 10:46:56 +02:00
Damien Metzger
f8ca06d927 // Better cache depth management for smarty 2013-09-20 10:26:58 +02:00
Francois Gaillard
8c6aaa3c7d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-19 17:31:42 +02:00
Francois Gaillard
63f4743134 [-] MO : PNM-1715 - Bug fix accented chars & ajax-cart 2013-09-19 17:31:35 +02:00
gRoussac
3aec242600 [-] MO : Editorial could not delete image 2013-09-18 16:16:36 +02:00
Julien
08373c0541 [+] Modules : add hookHome 2013-09-14 14:57:00 +02:00
gRoussac
3870388e1c Merge branch 'mailalerts_real_multishop' of https://github.com/axome/PrestaShop into axome-mailalerts_real_multishop 
Conflicts:
	modules/mailalerts/mailalerts.php
 2013-09-12 10:09:25 +02:00
Gregory Roussac
f0297824d7 Merge pull request #709 from AgenceNetDesign/development 
[-] MO : carriercompare fixed bug, override template's files in theme. Ticket #PNM-1691
 2013-09-12 00:56:36 -07:00
Prestaspirit
a37033e478 [-] MO : Fixed a bug when displaying textures 
Corrections links texture image in the blocklayered
 2013-09-12 07:01:55 +02:00
Daniel
614e56283a Update mailalerts.php 
Fixes issue where customization data is not included in new order email.
 2013-09-11 10:49:34 +08:00
unknown
c5afbc75bd [-] MO : carriercompare fixed bug, override template's files in theme. Ticket #PNM-1691 2013-09-10 12:01:38 +02:00
Nicolas Sorosac
f30a088848 [*] MO : MailAlerts : Add SQL update script for v2.5 2013-09-10 11:01:11 +02:00