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 |
|
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
|
696a5fa546
|
Merge branch 'ticket-parrainageMobile' into develop
|
2016-05-10 16:29:02 +02:00 |
|
Marion Muszynski
|
f8e85b7a41
|
hotfix trim email
|
2016-05-10 16:28:32 +02:00 |
|
Marion Muszynski
|
56683972c7
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-10 16:14:11 +02:00 |
|
Marion Muszynski
|
183ad376d0
|
modif for delay flag
|
2016-05-10 16:13:48 +02:00 |
|
Marion Muszynski
|
4fdccad3d5
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-10 15:45:01 +02:00 |
|
Marion Muszynski
|
320c6922c8
|
modif of credit format in header
|
2016-05-10 15:44:36 +02:00 |
|
Marion Muszynski
|
9bc89e472a
|
Merge branch 'ticket-flexibilite' into develop
|
2016-05-09 18:02:50 +02:00 |
|
Marion Muszynski
|
f0d183580a
|
modif cart
|
2016-05-09 18:02:20 +02:00 |
|
Marion Muszynski
|
7604dca9cd
|
Merge branch 'ticket-flexibilite' into develop
|
2016-05-09 17:44:43 +02:00 |
|
Marion Muszynski
|
ffbb3232b9
|
modif soflex
|
2016-05-09 17:43:57 +02:00 |
|
Marion Muszynski
|
944fe22c8d
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-04 16:20:10 +02:00 |
|
Marion Muszynski
|
8e8e2793ae
|
modif arroaw slider
|
2016-05-04 16:19:18 +02:00 |
|
Marion Muszynski
|
653d0031a6
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-04 16:00:55 +02:00 |
|
Marion Muszynski
|
e85b593e35
|
modif trad
|
2016-05-04 16:00:32 +02:00 |
|
Marion Muszynski
|
d54abebb29
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-04 15:37:03 +02:00 |
|
Marion Muszynski
|
231dbe444e
|
modif css
|
2016-05-04 15:36:41 +02:00 |
|
Marion Muszynski
|
de66d55c55
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-04 15:31:51 +02:00 |
|
Marion Muszynski
|
402ac44f49
|
slider blockbestsellers in product page
|
2016-05-04 15:31:28 +02:00 |
|
Marion Muszynski
|
b88d79c1cc
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-03 15:58:00 +02:00 |
|
Marion Muszynski
|
c8fb4bf96b
|
petite modif
|
2016-05-03 15:57:35 +02:00 |
|
Marion Muszynski
|
13bcd0d8c6
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-03 15:48:39 +02:00 |
|
Marion Muszynski
|
831cdefdf8
|
modif translation
|
2016-05-03 15:48:17 +02:00 |
|
Marion Muszynski
|
2a10c6a2fe
|
fix conflict in css
|
2016-05-03 15:40:01 +02:00 |
|