188 Commits

Author SHA1 Message Date
Marion Muszynski
7945d0c0ad modif for ecotax style 2016-06-09 11:49:33 +02:00
Marion Muszynski
cf10bd3be0 fix conflicts 2016-06-08 17:15:28 +02:00
Marion Muszynski
0fcd71ee7d Merge branch 'tiket-productTemplate' into develop 2016-06-08 14:29:52 +02:00
Marion Muszynski
2b2ae3fa8a modif zoomdiv 2016-06-08 14:29:19 +02:00
Marion Muszynski
30b39b5776 fix conflicts 2016-06-08 10:53:07 +02:00
Marion Muszynski
f92562ca53 Merge branch 'ticket-fidelite' into develop 2016-06-08 10:38:22 +02:00
Marion Muszynski
b9f7b26a59 modif css shopping cart 2016-06-08 10:37:37 +02:00
Srv Bebeboutik
7025bce024 add phrase frais de port popup 2016-06-07 12:52:15 +02:00
Dylan Travers
9b8795607a Ajout de la phrase du ticket N°9891 2016-06-06 18:10:47 +02:00
Dylan Travers
54b10d9432 Ajout de la phrase demandée dans le ticket N°9891 2016-06-06 18:02:02 +02:00
Marion Muszynski
7065edffe4 fix conflict 2016-06-06 17:42:00 +02:00
Marion Muszynski
79c1381705 Merge branch 'ticket-fidelite' into develop 2016-06-06 15:53:52 +02:00
Marion Muszynski
cd3761a104 modif for site_mobile 2016-06-06 15:53:23 +02:00
Marion Muszynski
72545630a3 fix conflicts 2016-06-06 11:32:25 +02:00
Marion Muszynski
15871cea67 Merge branch 'tiket-productTemplate' into develop 2016-06-01 14:40:11 +02:00
Marion Muszynski
289a55b5e4 small update 2016-06-01 14:39:30 +02:00
Marion Muszynski
349aa65a7d Merge branch 'tiket-productTemplate' into develop 2016-06-01 12:57:39 +02:00
Marion Muszynski
e04cd105b8 modif code hex 2016-06-01 12:57:10 +02:00
Marion Muszynski
83ac3dbe3f fix conflcit 2016-06-01 12:45:33 +02:00
Marion Muszynski
d59e49e3ba update scrollbar color and more 2016-06-01 12:43:12 +02:00
Marion Muszynski
aeb00544fb Merge branch 'tiket-productTemplate' into develop 2016-05-30 18:07:07 +02:00
Marion Muszynski
cd56c49c48 modif css 2016-05-30 18:06:19 +02:00
Marion Muszynski
6c1d54467b Merge branch 'ticket-fidelite' into develop 2016-05-30 17:52:52 +02:00
Marion Muszynski
725251f138 fix css 2016-05-30 17:52:18 +02:00
Marion Muszynski
df3661299e Merge branch 'ticket-fidelite' into develop 2016-05-30 17:46:30 +02:00
Marion Muszynski
ed698c66f8 modif css 2016-05-30 17:45:51 +02:00
Marion Muszynski
66171d1e76 Merge branch 'ticket-fidelite' into develop 2016-05-30 17:42:05 +02:00
Marion Muszynski
0cf8ac97a9 modif css 2016-05-30 17:41:17 +02:00
Marion Muszynski
c9265f1116 Merge branch 'tiket-productTemplate' into develop 2016-05-30 12:07:47 +02:00
Marion Muszynski
a4ad9d98b0 modif tpl product css 2016-05-30 12:07:24 +02:00
Marion Muszynski
1af459d215 Merge branch 'tiket-productTemplate' into develop 2016-05-26 14:36:00 +02:00
Marion Muszynski
122cea0bc5 modif img product 2016-05-26 14:35:35 +02:00
Marion Muszynski
bee4986a9f Merge branch 'tiket-productTemplate' into develop 2016-05-20 15:02:56 +02:00
Marion Muszynski
f479a0f9a7 modif css 2016-05-20 15:02:22 +02:00
Marion Muszynski
da375df311 Merge branch 'tiket-productTemplate' into develop 2016-05-20 12:38:50 +02:00
Marion Muszynski
a356edf0df modif picto 2016-05-20 12:38:25 +02:00
Marion Muszynski
5c6f243d6b fix conflict 2016-05-19 13:17:54 +02:00
Marion Muszynski
eb441d8edf adding autocomplete postcode 2016-05-19 13:13:47 +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
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
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
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
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