Commit Graph

203 Commits

Author SHA1 Message Date
Marion Muszynski
ba2adf4ec8 Merge branch 'ticket-12487-HTTPS' into develop 2017-03-09 11:00:36 +01:00
Marion Muszynski
1bd2edfe4d other fix getpagelink 2017-03-09 11:00:20 +01:00
Marion Muszynski
17c6ac82b6 fix bugs 2017-03-08 16:11:36 +01:00
Marion Muszynski
2e6e1d23ec start of changement to full https 2017-03-08 16:10:35 +01:00
Marion Muszynski
8bd907d1bd Merge branch 'ticket-12591-MarketingModifications' into develop 2017-03-07 13:26:08 +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
a6fe73118a Merge branch 'ticket-12591-MarketingModifications' into develop 2017-03-03 13:21:23 +01:00
Marion Muszynski
92c5988b96 differentiation of url order 2017-03-03 13:21:08 +01:00
Marion Muszynski
eeac92d0ef fix conflicts 2017-02-07 16:35:59 +01:00
Marion Muszynski
5159283a8a making order choice required 2017-02-07 16:34:03 +01:00
Marion Muszynski
1c36dc6731 fix conflicts 2017-01-24 12:35:45 +01:00
Marion Muszynski
9fe2c90d1c revert changement 2017-01-24 12:34:44 +01:00
Marion Muszynski
e02f19c21b fix conflict 2017-01-24 11:30:02 +01:00
Marion Muszynski
4eaa76f76a hide relay select for widget socol 2017-01-24 11:27:47 +01:00
Marion Muszynski
1bd6618395 Merge branch 'ticket-12204-ImportEan' into develop 2017-01-17 13:25:53 +01:00
Marion Muszynski
217c96b383 fix css 2 2017-01-13 12:47:30 +01:00
Marion Muszynski
17bf597781 fix css 2017-01-13 12:42:49 +01:00
Marion Muszynski
4f3b7c2b15 Merge branch 'ticket-12122-ModifNewStatus' into develop 2016-12-23 14:00:01 +01:00
Marion Muszynski
9d79455930 fix trad 2016-12-21 12:50:35 +01:00
Marion Muszynski
b3b9d7313f Merge branch 'ticket-12052-PreventDelivery' into develop 2016-12-15 12:02:48 +01:00
Marion Muszynski
a13396baa8 restriction for delivery to ceuta and melina 2016-12-15 12:02:32 +01:00
Marion Muszynski
b5f2e365ad fix conflicts 2016-12-12 16:09:07 +01:00
Marion Muszynski
809cc513a4 addition of delivery info in product tpl mobile version 2016-12-12 15:45:59 +01:00
Marion Muszynski
8c5dec2293 beginning 2016-12-09 15:26:22 +01:00
Marion Muszynski
ee8cd5807a remove background of vp logo in product tpl 2016-12-07 15:39:03 +01:00
Marion Muszynski
f26aaab52b Merge branch 'ticket-11957-removePersonalData' into develop 2016-12-06 12:07:40 +01:00
Marion Muszynski
655a7515d7 remove other personal datas 2016-12-06 12:07:23 +01:00
Marion Muszynski
908f81cea3 Merge branch 'ticket-11957-removePersonalData' into develop 2016-12-06 11:53:59 +01:00
Marion Muszynski
a509d4f0ab remove personal data in ga module 2016-12-06 11:53:34 +01:00
Marion Muszynski
4164ff25fb Merge branch 'ticket-11957-removePersonalData' into develop 2016-12-06 11:49:19 +01:00
Marion Muszynski
22d5994ee4 remove console log 2016-12-06 11:48:56 +01:00
Marion Muszynski
e43c69b94b Merge branch 'ticket-11957-removePersonalData' into develop 2016-12-06 11:22:42 +01:00
Marion Muszynski
82fdce66ce remove personal data from url before sending to GA 2016-12-06 11:22:25 +01:00
Marion Muszynski
f7882c7c7f Merge branch 'ticket-11902-AddTagManager' into develop 2016-11-30 14:16:04 +01:00
Marion Muszynski
d3564a0a5e addition of goggle tag manager code 2016-11-30 14:15:48 +01:00
Marion Muszynski
b8e6780110 Merge branch 'ticket-11784-QtyInShoppingCart' into develop 2016-11-28 12:02:59 +01:00
Marion Muszynski
51e0ed8589 fix bug update product quantity in cart 2016-11-28 12:02:39 +01:00
Marion Muszynski
2c3293199c Merge branch 'fix-fatal-mobile' into develop 2016-11-28 10:05:59 +01:00
Marion Muszynski
cfdab3cc09 error cause of id_product for product_id 2016-11-25 18:50:38 +01:00
Marion Muszynski
ddad6db847 fix tpl order-detail 2016-11-25 18:45:07 +01:00
Marion Muszynski
19b28d1e13 Merge branch 'ticket-7768-UpdateSAV' into develop 2016-11-25 10:56:48 +01:00
Marion Muszynski
420f2d870c fix trad 2016-11-25 10:56:23 +01:00
Marion Muszynski
fb7a9616ff Merge branch 'ticket-7768-UpdateSAV' into develop 2016-11-25 10:53:08 +01:00
Marion Muszynski
5d963638fa fix 2016-11-25 10:52:50 +01:00
Marion Muszynski
3a630a0d93 Merge branch 'ticket-7768-UpdateSAV' into develop 2016-11-25 10:49:27 +01:00
Marion Muszynski
0e6992f29b changement delivery date estimation 2016-11-25 10:49:10 +01:00
Marion Muszynski
94cbb73027 Merge branch 'fix-AideContact' into develop 2016-11-15 11:49:19 +01:00
Marion Muszynski
4f9add049e addition redirect to all forms 2016-11-15 11:48:52 +01:00
Marion Muszynski
a839bafd66 addition of redirection to the good form 2016-11-15 10:43:45 +01:00
Marion Muszynski
40497ffb14 fix conflict 2016-11-14 14:20:50 +01:00