Commit Graph

621 Commits

Author SHA1 Message Date
Marion Muszynski
d1ef2e6fe7 Merge branch 'ticket-13166-upgradeReturnPart2' into develop 2017-06-23 12:25:12 +02:00
Marion Muszynski
86c27e3ba3 Merge branch 'ticket-BandeauMobile' 2017-06-23 11:01:01 +02:00
Marion Muszynski
94fe7668a4 add promo in sale page 2017-06-23 11:00:46 +02:00
Marion Muszynski
013edd892f Merge branch 'ticket-BandeauMobile' 2017-06-23 10:41:36 +02:00
Marion Muszynski
fd003a8443 add img promo 2017-06-23 10:41:25 +02:00
Marion Muszynski
2c78e0ac86 Merge branch 'ticket-BandeauMobile' 2017-06-23 10:40:33 +02:00
Marion Muszynski
c44bcdb281 add promo es on mobile version 2017-06-23 10:40:19 +02:00
Marion Muszynski
45431b2bb1 Merge branch 'ticket-13550-FixPayboxDirect' 2017-06-23 10:19:38 +02:00
Marion Muszynski
fe9de26a25 Merge branch 'ticket-13550-FixPayboxDirect' into develop 2017-06-23 10:11:24 +02:00
Marion Muszynski
6c4f773c7c addition of promo on mobile 2017-06-22 17:34:21 +02:00
Marion Muszynski
4572379dfc fix multi paiement and css 2017-06-22 16:53:29 +02:00
Marion Muszynski
77f3034f5f Merge branch 'ticket-13324-pixelFB' into develop 2017-06-19 11:06:04 +02:00
Marion Muszynski
86ccf2ef15 check if customer already exists to prevent fb tracking resending for registration 2017-06-19 11:05:46 +02:00
Marion Muszynski
d11e800d34 Merge branch 'ticket-13473-IVAForEs' into develop 2017-06-14 11:57:41 +02:00
Marion Muszynski
96b66b0eae fix translation 2017-06-14 11:57:18 +02:00
Marion Muszynski
a4b3b52b27 Merge branch 'ticket-13473-IVAForEs' into develop 2017-06-14 10:58:42 +02:00
Marion Muszynski
904f9865e7 fix price tax on product page add to cart box 2017-06-14 10:58:27 +02:00
Marion Muszynski
58aafd79c1 fix trad mobile 2017-06-08 15:41:22 +02:00
Marion Muszynski
96c04a1d8d Merge branch 'ticket-9103-TradCategoryscroll' into develop 2017-06-08 13:06:36 +02:00
Marion Muszynski
7d1934296b fix translation module categoryscroll 2017-06-08 13:06:19 +02:00
Marion Muszynski
d313207099 Merge branch 'ticket-9103-saleBg' into develop 2017-06-08 11:51:50 +02:00
Marion Muszynski
043cfee852 fix cookie close bug on mobile 2017-06-02 15:19:06 +02:00
Marion Muszynski
cfe960cfa2 fix logo carrier when it is a dropshipping 2017-06-02 10:21:06 +02:00
Marion Muszynski
0cde6166bb Merge branch 'ticket-13306-ModifES' into develop 2017-06-01 12:59:39 +02:00
Marion Muszynski
2395374281 checked cdc for es version 2017-06-01 12:59:00 +02:00
Marion Muszynski
2ba4eb0a09 Merge branch 'ticket-13306-ModifES' into develop 2017-06-01 12:53:29 +02:00
Marion Muszynski
221bc66f44 modif for carrier logo 2017-06-01 12:53:13 +02:00
Marion Muszynski
fc042bbd16 Merge branch 'ticket-13306-ModifES' into develop 2017-06-01 12:27:24 +02:00
Marion Muszynski
d97e11d79c change logo and fix colissimo choice in carrier step 2017-06-01 12:26:41 +02:00
Marion Muszynski
dc0ff8e9b6 Merge branch 'fix-OnCustomerRemoving' into develop 2017-06-01 10:53:25 +02:00
Marion Muszynski
487a5c4c00 Merge branch 'Ticket-10648-MobileModif' 2017-05-17 16:39:34 +02:00
Marion Muszynski
14aa04ee1d fix length 2017-05-17 16:39:22 +02:00
Marion Muszynski
c8f5eb8273 Merge branch 'Ticket-10648-MobileModif' 2017-05-17 16:36:46 +02:00
Marion Muszynski
49137526de fix 2017-05-17 16:36:35 +02:00
Marion Muszynski
e6a948861e Merge branch 'Ticket-10648-MobileModif' 2017-05-17 16:34:42 +02:00
Marion Muszynski
db786b07ca fix name ps in home mobile 2017-05-17 16:34:26 +02:00
Marion Muszynski
633b163638 fix gclid in redirection 2017-05-17 16:04:42 +02:00
Marion Muszynski
96cb372568 Merge branch 'add-LogPaybox' into develop 2017-05-17 11:33:01 +02:00
Marion Muszynski
6b058474c3 fix - prevent scroll on description short 2017-05-17 10:46:22 +02:00
Marion Muszynski
20bca1c110 fix mobile 2017-05-17 10:28:41 +02:00
Marion Muszynski
dc33a0af8c some fixes 2017-05-16 11:35:03 +02:00
Nolwenn
c5ed75ed58 Merge branch 'mobile' into develop 2017-05-10 11:15:33 +02:00
Nolwenn
900c528fcf suite recette 2017-05-10 11:15:04 +02:00
Nolwenn
419e9ce268 Merge branch 'mobile' into develop 2017-05-10 10:38:56 +02:00
Nolwenn
0d96ebce2c truncate nom produit 2017-05-10 09:50:39 +02:00
Nolwenn
f77ecbda85 recette client mobile 2017-05-10 09:48:13 +02:00
root
b1082032a2 fix from prod 2017-05-09 15:54:17 +02:00
root
4c72d94cdf fix from prod 2017-05-09 15:48:05 +02:00
root
652c005888 fix from prod 2017-05-09 15:30:32 +02:00
Marion Muszynski
68537be426 Merge branch 'mobile' 2017-05-09 14:46:10 +02:00