gRoussac
80f6f4e223
[-] FO : Fix bug #PSCFV-10688, bad priceDisplay in order-carrier
2013-10-14 15:34:47 +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
Francois Gaillard
77b2b4b6ca
// Manual merge PS 1.5.6.0
2013-10-07 18:22:55 +02:00
tucoinfo
8f09d49ffc
[*] FO : add variable $nofollow to mobile theme header.tpl
...
Copied from normal theme which already manages the NoFollow variable
2013-10-03 12:19:10 +02:00
thoma202
1ccc25f56c
Merge branch 'development' of github.com:202-ecommerce/PrestaShop into development
2013-10-02 14:38:44 +02:00
thoma202
eb7655e318
[+] Added hook in maintenance page
2013-10-02 11:58:35 +02:00
Jerome Nadaud
340f6cebe4
[-] FO : FixBug #PSCFV-10542 - Category description view problem
2013-10-01 10:20:33 +02:00
Julien
dd5cd33bb4
[-] BO : fix pre-selection of id_contact in contact-form.tpl
2013-09-30 14:38:06 +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
gRoussac
1d6593612f
[-] FO : Fix #PSCFV-10480 again css fix
2013-09-24 12:21:10 +02:00
gRoussac
b3a425c73a
[-] MO : Blockcart, wrong tbody
2013-09-23 18:20:35 +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
5206496f64
[-] BO : Fix Bug For new Fancy Box events
2013-09-23 11:22:51 +02:00
Vincent Augagneur
322654cacf
//small fix with mode catalog and cart button
2013-09-17 14:54:38 +02:00
romainberger
876be3b452
[*] FO : removed extra slash and point
2013-09-12 14:07:45 +02:00
Fabio Chelly
9377775eca
[-] MO productcomments :
...
- Module was broken and works now
- A message is displayed to indicate when a comment has been added.
- Error li are correctly indented
#PNM-753
#PNM-1601
#PNM-1660
#PNM-1609
#PNM-1491
#PNM-1311
#PNM-1233
#PNM-1232
#PNM-937
#PNM-775
2013-09-06 17:54:12 +02:00
gRoussac
824a6b90f3
[-] FO : Fix bug #PSCFV-10118 quantity not updated when cart rules give the same product as gift
2013-09-05 11:07:41 +02:00
Vincent Augagneur
ad428dfb2b
//MERGE branche release
2013-08-26 10:59:36 +02:00
Rémi Gaillard
a21d3fd22e
// shipping block was missplaced on order-detail
2013-08-22 15:41:34 +02:00
gRoussac
533b28ce32
Merge branch 'prestarocket-duplicate_id' into release
2013-08-13 18:26:51 +02:00
gRoussac
f459af7090
Merge branch 'duplicate_id' of https://github.com/prestarocket/PrestaShop into prestarocket-duplicate_id
2013-08-13 18:26:22 +02:00
Krystian Podemski
dab86dffe1
* [MO] : blocknewsletter improvements
2013-08-13 16:45:40 +02:00
Damien Metzger
f9fdcb1103
[-] FO : fixed html tags that should not appear in blockcategories
2013-08-13 16:22:38 +02:00
Rémi Gaillard
284f758cb4
[-] FO: Fix quantity discount table display for non default attribute #PSCFV-9942
2013-08-12 18:40:52 +02:00
Jerome Nadaud
06cdeb45a5
[-] FO : FixBug #PSCFV-10058 - Missing required form fields in address format
2013-08-12 15:17:21 +02:00
Jerome Nadaud
4c47c980f8
// Javascript error if address does not exist
2013-08-12 11:57:40 +02:00
Jérôme Nadaud
f119b8e64f
[-] FO : FixBug #PSCFV-10058 Invalid id country after allow to select no country
2013-08-09 19:00:18 +02:00
Jérôme Nadaud
7b41098a5d
[-] FO : FixBug CGV does not pop-up in Fancy Box
2013-08-09 18:59:00 +02:00
Jerome Nadaud
8be3344e41
// W3C validation error
2013-08-09 18:49:47 +02:00
gRoussac
92840f85fe
[-] BO : Fix additional quote in live edit template
2013-08-09 18:04:08 +02:00
gRoussac
8733b968f5
[-] FO : input token missplaced in address.tpl
2013-08-09 14:31:59 +02:00
Jerome Nadaud
a38fe5ddd3
// W3C validation error
2013-08-09 14:10:38 +02:00
Jérôme Nadaud
84ded9f3db
[-] FO : FixBug #PSCFV-10058 Invalid id country after allow to select no country
2013-08-08 23:30:31 +02:00
Jérôme Nadaud
f5e28b9212
[-] FO : FixBug CGV does not pop-up in Fancy Box
2013-08-08 21:28:55 +02:00
Jerome Nadaud
8e72d122e6
[-] MO : blockcategories FixBug html tags in categories link title
2013-08-08 11:16:45 +02:00
Damien Metzger
0550ad5135
// Fixed smarty parse error on live edit
2013-08-08 09:29:13 +02:00
Jerome Nadaud
239c5adb5a
[-] BO : FixBug smarty email variable override by blockcontact
2013-08-07 15:09:14 +02:00
Jerome Nadaud
a32ff1e930
[-] BO : FixBug Missing tpl dir in default layout
2013-08-07 11:17:42 +02:00
gRoussac
7089ce10ef
// remove warnings in blockwishlist
2013-08-06 19:05:08 +02:00
Gregory Roussac
b1ea66d510
Merge pull request #528 from ldecoker/patch-7
...
[-] FO : missing $tpl_dir shopping-cart.tpl pathes
2013-08-06 09:57:36 -07:00
Gregory Roussac
bf355e934e
Merge pull request #634 from PhpMadman/RefSort
...
[*] FO : Sort by Product reference
2013-08-06 09:13:06 -07:00
PhpMadman
d4270289c1
Update category-product-sort.tpl
2013-08-06 16:06:03 +02:00
Damien Metzger
c8564fa6b2
// Quick CSS fix
2013-08-06 16:02:22 +02:00
Jerome Nadaud
375fa451d8
[-] FO : FixBug No warning message when no carriers available from advanced stock management
2013-08-06 15:53:25 +02:00
PhpMadman
598a5b3188
[*] FO : Add reference sort to theme
2013-08-06 15:38:25 +02:00
PhpMadman
cd254f8795
[*] FO : Add reference sort to theme
2013-08-06 15:37:10 +02:00
gRoussac
4bd59c14cc
[*] FO : Blur for tab navigation, followup a0ee3d3, thanks @Seynaeve
2013-08-06 15:21:46 +02:00