72 Commits

Author SHA1 Message Date
Marion Muszynski
2f21284be4 fix conflict 2016-09-27 10:34:47 +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
Dylan Travers
c3f3e05427 Change pink color and modify comportement (Use All_quantities and not product_quantity 2016-06-27 12:25:22 +02:00
Marion Muszynski
985bf52e83 update to add product with attribute to cart from bestsellers 2016-06-24 12:41:46 +02:00
Marion Muszynski
d2d845a4d8 small fix 2016-06-22 17:50:52 +02:00
Marion Muszynski
7043f4b24a other fix 2016-06-22 17:23:34 +02:00
Marion Muszynski
a6c46f9077 petit fix before prod 2016-06-22 17:08:09 +02:00
Marion Muszynski
77b9c22014 fix conflicts 2016-06-22 15:03:36 +02:00
Marion Muszynski
7af6d9ccd7 adding bg for sale 2016-06-10 16:49:43 +02:00
Marion Muszynski
ba706ec6c9 Merge branch 'ticket-fidelite' 2016-06-08 16:33:40 +02:00
Marion Muszynski
d47310bc0a redirect for es version 2016-06-08 16:27:56 +02:00
Marion Muszynski
ab21f10643 Merge branch 'ticket-fidelite' 2016-06-08 12:53:58 +02:00
Marion Muszynski
dc85f8eca6 modif trad 2016-06-08 12:53:38 +02:00
Marion Muszynski
5c8e35adf2 Merge branch 'ticket-fidelite' 2016-06-08 12:16:37 +02:00
Marion Muszynski
83c4acc83d opti request 2016-06-08 11:44:13 +02:00
Marion Muszynski
30b39b5776 fix conflicts 2016-06-08 10:53:07 +02:00
Srv Bebeboutik
f96c85f584 trad 2016-06-07 16:01:57 +02:00
Srv Bebeboutik
7025bce024 add phrase frais de port popup 2016-06-07 12:52:15 +02:00
Marion Muszynski
72545630a3 fix conflicts 2016-06-06 11:32:25 +02:00
Marion Muszynski
fd0de8d0aa other fix tpl 2016-05-30 17:16:54 +02:00
Marion Muszynski
633643d0c7 fix pagination 2016-05-30 17:13:22 +02:00
Marion Muszynski
93344e1770 fix shopping-cart tpl 2016-05-30 16:33:03 +02:00
Marion Muszynski
8e8e2793ae modif arroaw slider 2016-05-04 16:19:18 +02:00
Marion Muszynski
e85b593e35 modif trad 2016-05-04 16:00:32 +02:00
Marion Muszynski
402ac44f49 slider blockbestsellers in product page 2016-05-04 15:31:28 +02:00
Marion Muszynski
c8fb4bf96b petite modif 2016-05-03 15:57:35 +02:00
Marion Muszynski
831cdefdf8 modif translation 2016-05-03 15:48:17 +02:00
Marion Muszynski
63db0cc73c adding in blocuserinfo 2016-05-03 15:38:20 +02:00
Thibault UBUNTU
25bf39f711 trad es 2016-05-03 12:08:55 +02:00
Thibault UBUNTU
f15662e826 paypal suite 2016-05-02 15:30:12 +02:00