Marion Muszynski
|
eb1a6f66d2
|
Merge branch 'ticket-8048' into develop
|
2016-09-23 17:54:17 +02:00 |
|
Marion Muszynski
|
8509789d5e
|
link to product page in other window"
|
2016-09-23 17:53:49 +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
|
e05ee41c73
|
Merge branch 'fix-css' into develop
|
2016-09-12 15:40:41 +02:00 |
|
Marion Muszynski
|
410ddb43b1
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-09 13:10:00 +02:00 |
|
Marion Muszynski
|
3d325dbc7c
|
small modif
|
2016-09-09 13:09:43 +02:00 |
|
Marion Muszynski
|
3c7e15e2c3
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-09 13:07:18 +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
|
40457d1935
|
Merge branch 'ticket-10296' into develop
|
2016-09-07 08:58:24 +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
|
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
|
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
|
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 |
|
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
|
699a06db48
|
fix conflict
|
2016-06-30 11:15:14 +02:00 |
|
Marion Muszynski
|
e7f0c678de
|
fix conflict
|
2016-06-29 15:53:34 +02:00 |
|
Marion Muszynski
|
760bd50c06
|
adding sentence according delivery delay
|
2016-06-29 15:52:03 +02:00 |
|
Marion Muszynski
|
757c557a07
|
fix conflict
|
2016-06-28 14:47:38 +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
|
f57b04dbde
|
fix conflict
|
2016-06-24 12:43:26 +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
|
d8307d12ef
|
Merge branch 'ticket-8039' into develop
|
2016-06-22 17:51:17 +02:00 |
|
Marion Muszynski
|
d2d845a4d8
|
small fix
|
2016-06-22 17:50:52 +02:00 |
|
Marion Muszynski
|
22a8b5cac1
|
Merge branch 'ticket-8039' into develop
|
2016-06-22 17:23:56 +02:00 |
|
Marion Muszynski
|
7043f4b24a
|
other fix
|
2016-06-22 17:23:34 +02:00 |
|
Marion Muszynski
|
224267f45c
|
Merge branch 'ticket-8039' into develop
|
2016-06-22 17:08:37 +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
|
62009ba633
|
Merge branch 'ticket-8039' into develop
|
2016-06-10 16:50:05 +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
|
1b2020f041
|
Merge branch 'ticket-fidelite' into develop
|
2016-06-08 16:28:25 +02:00 |
|