100 Commits

Author SHA1 Message Date
Marion Muszynski
de1c8e211e addition of new landing page on home 2017-04-28 11:05:12 +02:00
Marion Muszynski
2d5c17ac1e cleaning before merge 2017-04-20 10:50:15 +02:00
Marion Muszynski
a7394fdc93 fix bug when product is not found from filter options 2017-04-20 10:48:53 +02:00
Marion Muszynski
bc8a76bb3d Merge branch 'ticket-12574-RemoveProductFromBlockcart' 2017-03-29 10:22:01 +02:00
Marion Muszynski
b390e60aaa changement img for qty up and down 2017-03-27 12:42:16 +02:00
Marion Muszynski
396444b912 Merge branch 'ticket-12487-HTTPS' 2017-03-27 11:28:22 +02:00
Marion Muszynski
6f501e8c42 fix trad 2017-03-23 15:19:18 +01:00
Marion Muszynski
e9aec9809c opening in blockuserinfo 2017-03-22 17:11:46 +01:00
Marion Muszynski
862850afa1 fix facebook link 2017-03-09 12:48:38 +01:00
Marion Muszynski
52a3477a1e fix //static 2017-03-09 11:07:11 +01:00
Marion Muszynski
ee271d98c8 continuation of updating of market data with addition of remove from cart to GA and addition of name of sale when product is sent to GA 2017-03-07 13:25:46 +01:00
Marion Muszynski
1aca7305b8 addition possibility to up/down or remove from blockcart list 2017-03-01 17:23:45 +01:00
Marion Muszynski
7a956baf2e addition of sentence in blocktext2 2017-03-01 11:34:40 +01:00
Marion Muszynski
c17728cdfe Merge branch 'ticket-12563-TrustedBadge' 2017-02-27 16:46:39 +01:00
Marion Muszynski
456c33e769 fix badge to have comment 2017-02-24 18:07:55 +01:00
Marion Muszynski
5b5e1933c4 changement position of badge 2017-02-24 14:20:53 +01:00
Marion Muszynski
c4edb90c2b fix js tooltips in product-list 2017-02-23 15:37:06 +01:00
Marion Muszynski
3f23070f12 fix css tooltip 2017-02-23 15:21:42 +01:00
Marion Muszynski
17633b00f8 add picto in categoryscroll 2017-02-21 11:57:07 +01:00
Marion Muszynski
fe1aed864a remove click on future sale links 2017-01-23 15:10:48 +01:00
Marion Muszynski
7d5783ac32 adding future sales in privatesale menu 2017-01-23 11:28:33 +01:00
Marion Muszynski
ef27ddd7af changement sentences according delivery delay 2016-11-24 11:59:20 +01:00
Marion Muszynski
5f8d23c3b1 open save paypal 2016-10-18 13:02:35 +02:00
Marion Muszynski
1abe8d0fbd hide paypal billing 2016-10-17 17:37:23 +02:00
Marion Muszynski
46cae17534 fix conflict 2016-10-06 16:00:32 +02:00
Marion Muszynski
71a4bcdd52 fix name of payment type 2016-10-06 15:58:50 +02:00
Marion Muszynski
e6fdac5dbe Merge branch 'ticket-8048' 2016-09-28 16:57:04 +02:00
Marion Muszynski
2f21284be4 fix conflict 2016-09-27 10:34:47 +02:00
Marion Muszynski
8509789d5e link to product page in other window" 2016-09-23 17:53:49 +02:00
Marion Muszynski
b83d7b994c modification in paymentinfo tpl 2016-09-15 13:01:20 +02:00
Marion Muszynski
3d325dbc7c small modif 2016-09-09 13:09:43 +02:00
Marion Muszynski
8074d6f063 modif css manage payments 2016-09-09 13:07:01 +02:00
Marion Muszynski
cb3b1de22c fix to not escape html on vp description 2016-09-09 11:35:36 +02:00
Marion Muszynski
b6dc54c290 addition html2text for emarsys and vp description 2016-09-05 15:45:05 +02:00
Marion Muszynski
afde5b69a7 Merge branch 'ticket_9890' 2016-08-31 12:19:57 +02:00
Marion Muszynski
40c9fb6bff fix 2016-08-31 12:18:17 +02:00
Marion Muszynski
bb5ff6ba97 fix conflicts 2016-08-31 11:04:16 +02:00
Marion Muszynski
bab94ab68b fix and modif css 2016-08-26 17:08:28 +02:00
Marion Muszynski
cafdba6107 Merge branch 'ticket-8039' 2016-08-23 14:53:45 +02:00
Marion Muszynski
01e7bedfe9 small fix 2016-08-23 14:53:24 +02:00
Marion Muszynski
e5dbd10cef Merge branch 'ticket-8039' 2016-08-23 14:50:53 +02:00
Marion Muszynski
52e59458d5 petit fix 2016-08-23 14:50:30 +02:00
Marion Muszynski
41845cd98d Merge branch 'ticket-8039' 2016-08-23 11:12:04 +02:00
Marion Muszynski
fe434095da modif for prod 2016-08-23 11:11:28 +02:00
root
880d16d5b0 updateprod 2016-08-18 15:56:46 +02:00
Marion Muszynski
fb51c877c4 suite save paybox info 2016-07-18 11:45:18 +02:00
Dylan Travers
c2d4fb13c9 Show only if product.quantity > 0 2016-07-08 15:37:30 +02:00
Marion Muszynski
699a06db48 fix conflict 2016-06-30 11:15:14 +02:00
Marion Muszynski
760bd50c06 adding sentence according delivery delay 2016-06-29 15:52:03 +02:00
Marion Muszynski
8a0b80e15e pop error cart 2016-06-28 14:45:48 +02:00