Marion Muszynski
|
1b32124bb1
|
Merge branch 'ticket-modifAddress' into develop
|
2016-05-17 17:51:00 +02:00 |
|
Marion Muszynski
|
cbec52936b
|
modif
|
2016-05-17 17:50:49 +02:00 |
|
Marion Muszynski
|
9c861cd39e
|
Merge branch 'ticket-modifAddress' into develop
|
2016-05-17 17:49:17 +02:00 |
|
Marion Muszynski
|
0b077c192a
|
modif
|
2016-05-17 17:48:55 +02:00 |
|
Marion Muszynski
|
3db1f64164
|
Merge branch 'ticket-modifAddress' into develop
|
2016-05-17 17:43:49 +02:00 |
|
Marion Muszynski
|
77a757859b
|
modif ip for module cheque
|
2016-05-17 17:43:14 +02:00 |
|
Marion Muszynski
|
e57ae21c38
|
Merge branch 'ticket-modifCarrierTpl'
|
2016-05-17 16:36:46 +02:00 |
|
Marion Muszynski
|
2030584c84
|
modif img site mobile
|
2016-05-17 16:36:28 +02:00 |
|
Marion Muszynski
|
56c7c2717a
|
Merge branch 'ticket-modifCarrierTpl'
|
2016-05-17 16:33:44 +02:00 |
|
Marion Muszynski
|
9eda48a6b4
|
modif img payment_2
|
2016-05-17 16:33:20 +02:00 |
|
Marion Muszynski
|
f29c5a2405
|
Merge branch 'ticket-modifCarrierTpl'
|
2016-05-17 16:05:51 +02:00 |
|
Marion Muszynski
|
adbe272c7b
|
modif for prod
|
2016-05-17 16:05:20 +02:00 |
|
Marion Muszynski
|
1cb1c7398e
|
fix conflict css
|
2016-05-17 15:57:59 +02:00 |
|
Marion Muszynski
|
b7f247729f
|
modif tpl carrier et css
|
2016-05-17 15:56:27 +02:00 |
|
Marion Muszynski
|
42e3a7c814
|
Merge branch 'ticket-modifPriceCarrier'
|
2016-05-17 14:53:05 +02:00 |
|
Marion Muszynski
|
881878e994
|
modif fdp fix in cart
|
2016-05-17 14:51:12 +02:00 |
|
Marion Muszynski
|
b55350b9ef
|
Merge branch 'ticket-modifPriceCarrier'
|
2016-05-17 14:33:13 +02:00 |
|
Marion Muszynski
|
d571de9d0a
|
modif for prod
|
2016-05-17 14:32:35 +02:00 |
|
Marion Muszynski
|
30410a5fc8
|
supp des fdp fix pour vente consommable
|
2016-05-17 14:31:41 +02:00 |
|
Marion Muszynski
|
bd6dc8f8cb
|
Merge branch 'ticket-newImport'
|
2016-05-17 14:13:55 +02:00 |
|
Marion Muszynski
|
15881dbc7b
|
Merge branch 'ticket-newEan'
|
2016-05-13 16:19:42 +02:00 |
|
Marion Muszynski
|
6a2b2199de
|
Merge branch 'ticket-newEan' into develop
|
2016-05-13 16:14:05 +02:00 |
|
Marion Muszynski
|
6580dbc6a2
|
modif restrict ean for alphanum
|
2016-05-13 16:13:39 +02:00 |
|
Marion Muszynski
|
720eb1a5ce
|
Merge branch 'ticket-modifCarriers'
|
2016-05-13 15:51:11 +02:00 |
|
Marion Muszynski
|
85c5e03a39
|
adapte for prod
|
2016-05-13 15:50:44 +02:00 |
|
Marion Muszynski
|
a25c7779b0
|
Merge branch 'ticket-modifCarriers' into develop
|
2016-05-13 15:49:44 +02:00 |
|
Marion Muszynski
|
f542a268e7
|
pre checked carriers sale
|
2016-05-13 15:48:09 +02:00 |
|
Marion Muszynski
|
348be7d6f4
|
Merge branch 'ticket-modifCarriers' into develop
|
2016-05-13 15:41:23 +02:00 |
|
Marion Muszynski
|
6e124300d2
|
adapte carrier for dev
|
2016-05-13 15:40:56 +02:00 |
|
Marion Muszynski
|
a5a6b41b35
|
Merge branch 'ticket-filterOrders'
|
2016-05-13 15:26:21 +02:00 |
|
Marion Muszynski
|
64d6cb8431
|
Merge branch 'ticket-modifCarriers'
|
2016-05-13 14:49:27 +02:00 |
|
Marion Muszynski
|
70d2b78a74
|
modif site_mobile
|
2016-05-13 14:47:22 +02:00 |
|
Marion Muszynski
|
68669dfbcc
|
Merge branch 'ticket-modifCarriers'
|
2016-05-13 14:38:27 +02:00 |
|
Marion Muszynski
|
dbb4656f42
|
adapte carrier for prod
|
2016-05-13 14:36:51 +02:00 |
|
Marion Muszynski
|
b90cc78d1b
|
Merge branch 'ticket-modifCarriers' into develop
|
2016-05-13 14:19:59 +02:00 |
|
Marion Muszynski
|
acc8ded407
|
adapte carrier for dev
|
2016-05-13 14:19:35 +02:00 |
|
Marion Muszynski
|
44829771cf
|
fix conflict css
|
2016-05-13 13:33:44 +02:00 |
|
Marion Muszynski
|
7e7feb5a52
|
ajust css and opti restrict addresses
|
2016-05-13 13:31:50 +02:00 |
|
Srv Bebeboutik
|
1fef6beb19
|
modif css site et mobile
|
2016-05-13 11:41:40 +02:00 |
|
Marion Muszynski
|
e7a93aa24e
|
Merge branch 'ticket-filterOrders' into develop
|
2016-05-13 10:41:38 +02:00 |
|
Marion Muszynski
|
7e7b335749
|
modif filter adminOrder
|
2016-05-13 10:41:09 +02:00 |
|
Srv Bebeboutik
|
5a7c3a0241
|
modif cart
|
2016-05-13 10:37:05 +02:00 |
|
Srv Bebeboutik
|
3a4f5414d8
|
fix conflict
|
2016-05-12 12:12:42 +02:00 |
|
Srv Bebeboutik
|
34b34929ef
|
push la modif de cart
|
2016-05-12 12:10:50 +02:00 |
|
Marion Muszynski
|
19ed76d6ba
|
Merge branch 'ticket-flexibilite'
|
2016-05-12 12:06:43 +02:00 |
|
Marion Muszynski
|
e7d540092a
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-12 11:51:16 +02:00 |
|
Marion Muszynski
|
d2f0f5e7ad
|
add template
|
2016-05-12 11:50:42 +02:00 |
|
Marion Muszynski
|
7affaf4a41
|
Merge branch 'ticket-flexibilite' into develop
|
2016-05-12 10:18:44 +02:00 |
|
Marion Muszynski
|
ebdd485182
|
modif id carrier in cart
|
2016-05-12 10:18:15 +02:00 |
|
Marion Muszynski
|
89f5c51bcb
|
Merge branch 'ticket-newImport' into develop
|
2016-05-11 10:13:52 +02:00 |
|