298 Commits

Author SHA1 Message Date
Marion Muszynski
ab39335846 integration of enhanced ecommerce on mobile version 2016-10-19 16:23:01 +02:00
Marion Muszynski
179771c5df Merge branch 'fix-paypal' into develop 2016-10-18 13:02:52 +02:00
Marion Muszynski
5f8d23c3b1 open save paypal 2016-10-18 13:02:35 +02:00
Marion Muszynski
1f5d683f4b fix conflict 2016-10-18 12:58:26 +02:00
Marion Muszynski
1abe8d0fbd hide paypal billing 2016-10-17 17:37:23 +02:00
Marion Muszynski
8729c7a6aa fix conflict 2016-10-11 11:49:33 +02:00
Marion Muszynski
1ff084929e fix conflict 2016-10-11 11:41:40 +02:00
Marion Muszynski
a93a5b14f2 modif css 2016-10-11 11:40:18 +02:00
Marion Muszynski
541a0ed663 fix conflict 2016-10-05 11:27:50 +02:00
Marion Muszynski
6ec5d67fa3 fix conflict 2016-09-28 11:50:08 +02:00
Marion Muszynski
5fb300b503 modif css 2016-09-28 11:47:25 +02:00
Marion Muszynski
2f21284be4 fix conflict 2016-09-27 10:34:47 +02:00
Marion Muszynski
6f89c44d2c prepare tests prod 2016-09-27 10:28:39 +02:00
Marion Muszynski
a8086dcfdc Merge branch 'ticket-eanUpgrade' into develop 2016-09-20 14:55:24 +02:00
Marion Muszynski
85cc7b57dc showing of comments for braderie on product page 2016-09-20 14:55:03 +02:00
Marion Muszynski
5a9c94e694 Merge branch 'ticket-payboxAgreement' into develop 2016-09-15 13:02:36 +02:00
Marion Muszynski
b83d7b994c modification in paymentinfo tpl 2016-09-15 13:01:20 +02:00
Marion Muszynski
13e85738e6 Merge branch 'ticket-9260' 2016-09-05 10:37:24 +02:00
Marion Muszynski
c9bdecd1d4 Merge branch 'ticket-9260' into develop 2016-08-31 15:35:29 +02:00
Marion Muszynski
5a8d3eb781 small fix 2016-08-31 15:35:09 +02:00
Marion Muszynski
0221ccb2e7 Merge branch 'ticket-10527' into develop 2016-08-31 15:17:41 +02:00
Marion Muszynski
144733299c up reassurance sentence at first place 2016-08-31 15:17:21 +02:00
Marion Muszynski
e0c4e0dfe6 Merge branch 'ticket-10527' into develop 2016-08-31 14:55:15 +02:00
Marion Muszynski
abdbb008b5 adding reassurance sentences in payment step 2016-08-31 14:54:30 +02:00
Marion Muszynski
742a8d1ca9 fix conflicts 2016-08-31 13:36:10 +02:00
Marion Muszynski
2dd1baef49 adding reassurance sentences for es 2016-08-31 13:32:59 +02:00
Marion Muszynski
afde5b69a7 Merge branch 'ticket_9890' 2016-08-31 12:19:57 +02:00
Marion Muszynski
1046fd27f2 Merge branch 'ticket_9890' into develop 2016-08-31 12:18:37 +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
c164e03c24 fix conflict 2016-08-31 10:37:12 +02:00
Marion Muszynski
8db5762b5b modif css mobile 2016-08-31 10:35:33 +02:00
Marion Muszynski
c45e018298 Merge branch 'ticket_9890' into develop 2016-08-26 17:08:53 +02:00
Marion Muszynski
bab94ab68b fix and modif css 2016-08-26 17:08:28 +02:00
Marion Muszynski
cf8f32d6c1 Merge branch 'ticket-9895' into develop 2016-08-25 12:48:36 +02:00
Marion Muszynski
63ee2fb3c9 fix tpl product add to cart 2016-08-23 18:07:24 +02:00
Marion Muszynski
343fc553aa modif for prod 2016-08-23 15:21:43 +02:00
Marion Muszynski
b3e04efabe Merge branch 'evo-10581' into develop 2016-08-23 12:32:54 +02:00
Marion Muszynski
e02097858b fix css conflicts 2016-08-23 12:31:28 +02:00
Rodney Figaro
b335e6adf1 fix original text in product info size in french rather than in spanish 2016-08-23 12:17:56 +02:00
Rodney Figaro
b95db0bb8c change css of the size info popup for mobile version 2016-08-23 12:06:39 +02:00
Rodney Figaro
2a2949882d display informations on sizes in product details 2016-08-23 10:33:48 +02:00
Marion Muszynski
2a82114fa9 fix conflict 2016-08-22 17:10:12 +02:00
root
880d16d5b0 updateprod 2016-08-18 15:56:46 +02:00
Marion Muszynski
a2e67137bf Merge branch 'ticket-payboxAgreement' into develop 2016-07-18 11:45:49 +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
155dd48cad fix conflict 2016-07-01 11:02:09 +02:00
Marion Muszynski
e695afb543 Merge branch 'ticket-simplemulti_front' into develop 2016-06-30 10:48:06 +02:00
Marion Muszynski
f99cacd293 small update for mobile site 2016-06-30 10:47:46 +02:00