Marion Muszynski
|
9eda48a6b4
|
modif img payment_2
|
2016-05-17 16:33:20 +02:00 |
|
Marion Muszynski
|
adbe272c7b
|
modif for prod
|
2016-05-17 16:05:20 +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
|
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
|
f542a268e7
|
pre checked carriers sale
|
2016-05-13 15:48:09 +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
|
acc8ded407
|
adapte carrier for dev
|
2016-05-13 14:19:35 +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
|
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
|
ebdd485182
|
modif id carrier in cart
|
2016-05-12 10:18:15 +02:00 |
|
Marion Muszynski
|
51a8fd9437
|
adding of new import for product customs
|
2016-05-11 10:13:20 +02:00 |
|
Marion Muszynski
|
5fcccda0ee
|
Merge branch 'ticket-parrainageMobile'
|
2016-05-10 16:30:25 +02:00 |
|
Marion Muszynski
|
f8e85b7a41
|
hotfix trim email
|
2016-05-10 16:28:32 +02:00 |
|
Marion Muszynski
|
f0d183580a
|
modif cart
|
2016-05-09 18:02:20 +02:00 |
|
Marion Muszynski
|
ffbb3232b9
|
modif soflex
|
2016-05-09 17:43:57 +02:00 |
|
Alexandre Simonet
|
cc86b7849d
|
add rss fluxcatalogue
|
2016-05-03 12:20:54 +02:00 |
|
Marion Muszynski
|
e82357544c
|
Merge branch 'ticket-newExtract'
|
2016-04-27 18:07:18 +02:00 |
|
Marion Muszynski
|
397a73d037
|
modif product price for DEB exp
|
2016-04-27 18:04:42 +02:00 |
|
Marion Muszynski
|
caa68a4c2f
|
Merge branch 'ticket-newExtract'
|
2016-04-27 12:10:03 +02:00 |
|
Marion Muszynski
|
9e2c4c5c39
|
adding origin product to DEB exp
|
2016-04-27 12:08:22 +02:00 |
|
Marion Muszynski
|
ae1687a105
|
Merge branch 'master' of gitlab.antadis.fr:dev-antadis/bebeboutik
|
2016-04-27 11:35:03 +02:00 |
|
Marion Muszynski
|
cd3d9b43af
|
Merge branch 'ticket-newExtract'
|
2016-04-27 11:33:58 +02:00 |
|
Srv Bebeboutik
|
6a1fd27e32
|
optimize stat
|
2016-04-27 11:31:43 +02:00 |
|
Marion Muszynski
|
5f96303fe9
|
modif for multi generation of csv in same time
|
2016-04-27 11:11:23 +02:00 |
|
Marion Muszynski
|
54bbfd5248
|
modif extract
|
2016-04-25 17:16:29 +02:00 |
|
Marion Muszynski
|
dde198080d
|
modif extract custom
|
2016-04-25 16:50:51 +02:00 |
|
Marion Muszynski
|
e8f0026211
|
Merge branch 'ticket-updBraderie'
|
2016-04-25 10:48:17 +02:00 |
|
Marion Muszynski
|
72a3792897
|
fix bug double adding
|
2016-04-25 10:43:24 +02:00 |
|
Marion Muszynski
|
811ba9b3a9
|
Merge branch 'ticket-newExtracts'
|
2016-04-20 16:40:37 +02:00 |
|
Marion Muszynski
|
4b80f9f7a6
|
correction
|
2016-04-20 16:40:12 +02:00 |
|
Marion Muszynski
|
ef33e2cbc7
|
Merge branch 'ticket-newExtracts'
|
2016-04-20 16:05:20 +02:00 |
|