947f9bb21c
// small isset in productcomments
2013-11-13 16:39:33 +01:00
c4837e65ec
[-] FO : FixBug #PSCFV-9291 - Ecotax increment display price in product combination
2013-11-13 11:24:25 +01:00
9f10a851e5
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-11-13 10:58:01 +01:00
26d1ad0668
[-] FO : fix contact-form id_order input when customer is not logged
2013-11-13 10:12:31 +01:00
6a99b84452
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-11-13 10:02:28 +01:00
c8dfe1c174
[-] FO : Wordwrap on prices in history
2013-11-12 19:17:12 +01:00
f0f630fb50
[-] FO : #PSCFV-10978 firstname displayed instead of lastname in invoice address
2013-11-12 12:32:21 +01:00
f3147b4e57
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-11-07 09:47:47 +01:00
ef5779f63f
// d321b9a5bc
2013-11-06 17:11:31 +01:00
d0522417eb
Merge pull request #937 from PhpMadman/DiscountPrice
...
[*] FO : Added possibility to display new price instead of quantity discount
2013-11-06 08:06:16 -08:00
d321b9a5bc
Update cart-summary.js
...
Just add this space to separate this classes. It's to display or not carrier option when we select one or another carrier during order finalisation.
2013-11-06 14:42:00 +01:00
d95885caae
[*] FO : Added posibilty to display new price instead of quantity discount
2013-11-06 14:41:42 +01:00
3f3dc0feb9
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-11-05 16:39:12 +01:00
6ef7f258ea
// small fix
2013-11-04 10:34:58 +01:00
2be72f50d1
[-] FO : FixBug Categories description
2013-11-04 10:29:44 +01:00
c7323c2bfe
[-] CORE : Fix bug #PSCFV-10901 warnings on htmlentities
2013-11-03 22:59:04 +01:00
036fa7cba6
[-] FO : Fix bug #PSCFV-10889 wrong color when oos product
2013-10-31 10:18:28 +01:00
7c1623c7fa
[-] BO : Order-follow displayed order id instead of order reference
2013-10-29 14:53:50 +01:00
0ba8fbc39a
Update stores.js
...
Phone number is already in the address field
2013-10-28 13:46:42 -04:00
63141a9c4d
[-] FO: fixed bug #PSCFV-10654 - TinyMCE editor: List of products by manufacturer, products by supplier - Long description is not hidden.
2013-10-28 14:48:48 +01:00
e1d1479f22
[*] FO : Fix bug #PSCFV-10689 handle image legend
2013-10-27 23:31:36 +01:00
9a26cf02a8
Turned "true" and "false" strings to proper booleans
...
It's cleaner this way, and matches how it is done on similar templates.
2013-10-25 16:36:39 +02:00
6f57093f50
[-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security
2013-10-24 18:36:36 +02:00
2ffc296279
FO : https://github.com/PrestaShop/PrestaShop/pull/878
2013-10-24 12:03:33 +02:00
81945cef71
[-] FO : Follow up https://github.com/PrestaShop/PrestaShop/pull/879
2013-10-24 10:00:19 +02:00
6d3640e895
Conditions to hide VAT fields fail if there are no company fields
...
"Company" fields may or may not be rendered on this form, whereas "VAT" fields are always rendered and depend on the former ones to be shown (or hidden) with CSS.
This fixes an edge case where there are no "Company" fields rendered and "VAT" fields still wrongly appear, which was caused by the fact that `$('#field').val() != ''` is truthy when `$('#field').length` is zero (since `'' != undefined`).
2013-10-24 09:43:50 +02:00
373604fc97
[-] FO: removed width on message product select
...
Limiting select could make the user think the select is not working if they click to much to the left on bigger screens
2013-10-23 11:52:35 +02:00
101b37b40a
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-10-23 11:45:26 +02:00
ad4ecefcf9
[-] FO : Prevent fatal error on getUniqReference when order not loaded
2013-10-23 11:44:12 +02:00
5bb4d48ddd
Merge pull request #870 from djfm/development
...
[*] LO : Fixed a few bugs with currency formats in Back-Office orders
2013-10-22 10:17:11 -07:00
e857fb5978
[*] FO: Removed missplaced </li> on mobile theme
2013-10-22 13:34:52 +02:00
c9d20f35b3
// norms
2013-10-21 00:00:17 +02:00
f2d70076bd
[-] : Fix bug #PSCFV-4859, could not register invoice address or invoice country in OPC as guest, and phone not required in standard registration
2013-10-20 23:52:48 +02:00
6b1d69dd7d
[-] FO : $back value twice escaped
2013-10-17 12:18:23 +02:00
80f6f4e223
[-] FO : Fix bug #PSCFV-10688, bad priceDisplay in order-carrier
2013-10-14 15:34:47 +02:00
5e407db21e
[*] LO : Fixed a few bugs with currency formats in Back-Office orders
2013-10-14 09:30:45 +00:00
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
77b2b4b6ca
// Manual merge PS 1.5.6.0
2013-10-07 18:22:55 +02:00
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
1ccc25f56c
Merge branch 'development' of github.com:202-ecommerce/PrestaShop into development
2013-10-02 14:38:44 +02:00
eb7655e318
[+] Added hook in maintenance page
2013-10-02 11:58:35 +02:00
340f6cebe4
[-] FO : FixBug #PSCFV-10542 - Category description view problem
2013-10-01 10:20:33 +02:00
dd5cd33bb4
[-] BO : fix pre-selection of id_contact in contact-form.tpl
2013-09-30 14:38:06 +02:00
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
345d4cdbcf
[-] MO productcomments: prevents guests to add comments when guest comment is disabled in backoffice
2013-09-27 11:27:58 +02:00
1d6593612f
[-] FO : Fix #PSCFV-10480 again css fix
2013-09-24 12:21:10 +02:00
b3a425c73a
[-] MO : Blockcart, wrong tbody
2013-09-23 18:20:35 +02:00
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
a1555c3fc8
Merge remote-tracking branch 'origin/development' into development
2013-09-23 11:24:26 +02:00
31697fde3c
[-] MO productcomments: confirmation message takes moderation mode into account
2013-09-23 11:24:14 +02:00
gRoussac